diff --git a/.github/workflows/android-internal-release.yml b/.github/workflows/android-internal-release.yml
index 9a872738..f04a684c 100644
--- a/.github/workflows/android-internal-release.yml
+++ b/.github/workflows/android-internal-release.yml
@@ -25,8 +25,10 @@ jobs:
           fetch-depth: 0
 
       - name: Setup JDK 17
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
+          distribution: "temurin"
+          cache: "gradle"
           java-version: 17
 
       - name: Setup Flutter
diff --git a/analysis_options.yaml b/analysis_options.yaml
index f230517c..a4679e19 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -1,7 +1,34 @@
-include: package:flutter_lints/flutter.yaml
+include:
+  - package:very_good_analysis/analysis_options.yaml
+  - package:flutter_lints/flutter.yaml
 
 formatter:
   page_width: 130
 analyzer:
   errors:
+    avoid_catches_without_on_clauses: ignore
+    avoid_dynamic_calls: ignore
+    cascade_invocations: ignore
+    inference_failure_on_function_invocation: ignore
+    inference_failure_on_instance_creation: ignore
     invalid_annotation_target: ignore
+    lines_longer_than_80_chars: ignore
+    comment_references: ignore # enable when starting documentation
+    public_member_api_docs: ignore # enable when starting documentation
+    sort_pub_dependencies: ignore
+    prefer_null_aware_method_calls: ignore
+    strict_raw_type: ignore
+    avoid_equals_and_hash_code_on_mutable_classes: ignore
+    inference_failure_on_function_return_type: ignore
+    inference_failure_on_untyped_parameter: ignore
+    flutter_style_todos: ignore
+    specify_nonobvious_property_types: ignore
+    unnecessary_null_checks: ignore
+    sort_constructors_first: ignore
+    unawaited_futures: ignore
+    avoid_positional_boolean_parameters: ignore
+    use_setters_to_change_properties: ignore
+    prefer_asserts_with_message: ignore
+    document_ignores: ignore
+    one_member_abstracts: ignore
+    avoid_bool_literals_in_conditional_expressions: ignore
diff --git a/android/gradle.properties b/android/gradle.properties
index ff22b9ee..7cf4d885 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,4 +1,5 @@
 org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true
-kotlin.jvm.target.validation.mode=IGNORE
\ No newline at end of file
+kotlin.jvm.target.validation.mode=IGNORE
+org.gradle.caching=true
\ No newline at end of file
diff --git a/lib/main.dart b/lib/main.dart
index 0e8ef2f8..d4641b33 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -3,44 +3,36 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart' as riverpod;
-import 'package:flutter_native_splash/flutter_native_splash.dart';
 import 'package:fvp/fvp.dart' as fvp;
 
-import 'src/core/di/service_locator.dart';
-import 'src/core/theme/data/models/app_theme.dart';
-import 'src/core/utils/logging/logging.dart';
-import 'src/core/utils/logging/riverpod_logger.dart';
-import 'src/sprk_app.dart';
+import 'package:sparksocial/src/core/di/service_locator.dart';
+import 'package:sparksocial/src/core/theme/data/models/app_theme.dart';
+import 'package:sparksocial/src/core/utils/logging/logging.dart';
+import 'package:sparksocial/src/core/utils/logging/riverpod_logger.dart';
+import 'package:sparksocial/src/sprk_app.dart';
 
 // Global RouteObserver instance
 final RouteObserver<ModalRoute<void>> routeObserver = RouteObserver<ModalRoute<void>>();
 
 void main() async {
-  // Preserve the native splash screen
-  WidgetsBinding widgetsBinding = WidgetsFlutterBinding.ensureInitialized();
-  FlutterNativeSplash.preserve(widgetsBinding: widgetsBinding);
-  
-  await dotenv.load(fileName: ".env");
-  SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp, DeviceOrientation.portraitDown]);
+  WidgetsFlutterBinding.ensureInitialized();
 
-  // Initialize IMGLY Video Editor SDK
-  // Note: You need to add a license file to assets folder and reference it in pubspec.yaml
-  // VESDK.unlockWithLicense("assets/licenses/vesdk_license");
+  await dotenv.load();
+  SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp, DeviceOrientation.portraitDown]);
 
   // Force dark status bar and navigation bar
   SystemChrome.setSystemUIOverlayStyle(AppTheme.darkSystemUiStyle);
 
   fvp.registerWith();
 
-  // Initialize dependencies for new architecture
-  await configureDependencies();
+  await initServiceLocator();
 
   // Setup logging for production/debug
   _setupLogging();
 
   // Create a ProviderContainer with the Riverpod logger
   final container = riverpod.ProviderContainer(observers: [SparkRiverpodLogger()]);
-  runApp(riverpod.UncontrolledProviderScope(container: container, child: SprkApp()));
+  runApp(riverpod.UncontrolledProviderScope(container: container, child: const SprkApp()));
 }
 
 /// Setup logging framework based on environment
diff --git a/lib/src/core/auth/data/models/login_result.dart b/lib/src/core/auth/data/models/login_result.dart
index 3387aaa7..b5b36837 100644
--- a/lib/src/core/auth/data/models/login_result.dart
+++ b/lib/src/core/auth/data/models/login_result.dart
@@ -6,17 +6,16 @@ part 'login_result.freezed.dart';
 /// Result of a login attempt
 @freezed
 class LoginResult with _$LoginResult {
-  const LoginResult._();
   const factory LoginResult({
     required LoginStatus status,
     String? error,
   }) = _LoginResult;
+  const LoginResult._();
 
   factory LoginResult.success() => const LoginResult(status: LoginStatus.success);
   factory LoginResult.failed(String error) => LoginResult(status: LoginStatus.failed, error: error);
   factory LoginResult.codeRequired(String error) => LoginResult(status: LoginStatus.codeRequired, error: error);
 
-
   bool get isSuccess => status == LoginStatus.success;
   bool get isCodeRequired => status == LoginStatus.codeRequired;
-} 
\ No newline at end of file
+}
diff --git a/lib/src/core/auth/data/repositories/auth_repository_impl.dart b/lib/src/core/auth/data/repositories/auth_repository_impl.dart
index 353ca8f4..165de4ae 100644
--- a/lib/src/core/auth/data/repositories/auth_repository_impl.dart
+++ b/lib/src/core/auth/data/repositories/auth_repository_impl.dart
@@ -1,24 +1,30 @@
-import 'dart:convert';
 import 'dart:async';
+import 'dart:convert';
 
 import 'package:atproto/atproto.dart';
 import 'package:atproto/core.dart';
 import 'package:get_it/get_it.dart';
 import 'package:http/http.dart' as http;
+
 import 'package:sparksocial/src/core/auth/data/models/login_result.dart';
 import 'package:sparksocial/src/core/auth/data/repositories/auth_repository.dart';
 import 'package:sparksocial/src/core/config/app_config.dart';
 import 'package:sparksocial/src/core/storage/storage.dart';
 import 'package:sparksocial/src/core/utils/logging/log_service.dart';
+import 'package:sparksocial/src/core/utils/logging/logger.dart';
 
 /// Implementation of the authentication repository for AT Protocol
 class AuthRepositoryImpl implements AuthRepository {
+  AuthRepositoryImpl() {
+    _logger.i('Initializing AuthRepository');
+    _initialize();
+  }
   Session? _session;
   ATProto? _atProto;
   String? _dmAccessToken;
   String? _dmRefreshToken;
 
-  final _logger = GetIt.instance<LogService>().getLogger('AuthRepository');
+  final SparkLogger _logger = GetIt.instance<LogService>().getLogger('AuthRepository');
 
   final Completer<void> _initCompleter = Completer<void>();
   Future<void> get initializationComplete => _initCompleter.future;
@@ -38,11 +44,6 @@ class AuthRepositoryImpl implements AuthRepository {
   @override
   String? get dmRefreshToken => _dmRefreshToken;
 
-  AuthRepositoryImpl() {
-    _logger.i('Initializing AuthRepository');
-    _initialize();
-  }
-
   Future<void> _initialize() async {
     try {
       await _loadSavedSession();
@@ -63,9 +64,9 @@ class AuthRepositoryImpl implements AuthRepository {
       return null;
     }
 
-    final pdsService = services.firstWhere((s) => s['id'] == '#atproto_pds', orElse: () => {});
+    final pdsService = services.firstWhere((s) => s['id'] == '#atproto_pds');
 
-    final String? pdsUrl = pdsService['serviceEndpoint'] as String?;
+    final pdsUrl = pdsService['serviceEndpoint'] as String?;
     if (pdsUrl == null) {
       return null;
     }
@@ -91,8 +92,8 @@ class AuthRepositoryImpl implements AuthRepository {
 
       if (response.statusCode == 200) {
         final data = jsonDecode(response.body);
-        _dmAccessToken = data['accessJwt'];
-        _dmRefreshToken = data['refreshJwt'];
+        _dmAccessToken = data['accessJwt'] as String?;
+        _dmRefreshToken = data['refreshJwt'] as String?;
         await StorageManager.instance.secure.setString(StorageKeys.dmAccessToken, _dmAccessToken!);
         await StorageManager.instance.secure.setString(StorageKeys.dmRefreshToken, _dmRefreshToken!);
         _logger.i('Logged in to message service successfully');
@@ -115,7 +116,7 @@ class AuthRepositoryImpl implements AuthRepository {
         return;
       }
 
-      _session = Session.fromJson(json.decode(savedSessionJson));
+      _session = Session.fromJson(json.decode(savedSessionJson) as Map<String, dynamic>);
       if (_session == null) {
         _logger.w('Failed to parse saved session');
         return;
@@ -147,8 +148,8 @@ class AuthRepositoryImpl implements AuthRepository {
 
         if (response.statusCode == 200) {
           final data = jsonDecode(response.body);
-          _dmAccessToken = data['access_token'];
-          _dmRefreshToken = data['refresh_token'];
+          _dmAccessToken = data['access_token'] as String?;
+          _dmRefreshToken = data['refresh_token'] as String?;
         } else {
           if (!await refreshDMToken()) {
             throw Exception('Failed to refresh DM token');
@@ -178,10 +179,10 @@ class AuthRepositoryImpl implements AuthRepository {
 
     if (response.statusCode == 200) {
       final data = jsonDecode(response.body);
-      await StorageManager.instance.secure.setString(StorageKeys.dmAccessToken, data['access_token']);
-      _dmAccessToken = data['access_token'];
-      _dmRefreshToken = data['refresh_token'];
-      await StorageManager.instance.secure.setString(StorageKeys.dmRefreshToken, data['refresh_token']);
+      await StorageManager.instance.secure.setString(StorageKeys.dmAccessToken, data['access_token'] as String? ?? '');
+      _dmAccessToken = data['access_token'] as String?;
+      _dmRefreshToken = data['refresh_token'] as String?;
+      await StorageManager.instance.secure.setString(StorageKeys.dmRefreshToken, data['refresh_token'] as String? ?? '');
       return true;
     }
     _logger.e('Failed to refresh DM token: ${response.statusCode} - ${response.body}');
@@ -196,13 +197,13 @@ class AuthRepositoryImpl implements AuthRepository {
       }
 
       _logger.i('Refreshing session for user: ${_session!.handle}');
-      String? service = _session!.didDoc != null ? _extractPdsDomain(_session!.didDoc!) : null;
+      var service = _session!.didDoc != null ? _extractPdsDomain(_session!.didDoc!) : null;
 
       if (service == null) {
         _logger.d('Fetching DID document from PLC directory');
         final didDocResponse = await http.get(Uri.parse('https://plc.directory/${_session!.did}'));
         if (didDocResponse.statusCode == 200) {
-          service = _extractPdsDomain(json.decode(didDocResponse.body));
+          service = _extractPdsDomain(json.decode(didDocResponse.body) as Map<String, dynamic>);
         }
       }
 
@@ -263,13 +264,13 @@ class AuthRepositoryImpl implements AuthRepository {
   Future<LoginResult> login(String handle, String password, {String? authCode}) async {
     try {
       _logger.i('Login attempt for user: $handle');
-      ATProto at = ATProto.anonymous(service: 'pds.sprk.so');
+      final at = ATProto.anonymous(service: 'pds.sprk.so');
       _logger.d('Resolving handle: $handle');
       final didRes = await at.identity.resolveHandle(handle: handle);
-      String did = didRes.data.did;
-      _logger.d('Resolved DID: $did');
-
-      _logger.d('Fetching DID document');
+      final did = didRes.data.did;
+      _logger
+        ..d('Resolved DID: $did')
+        ..d('Fetching DID document');
       final didDocResponse = await http.get(Uri.parse('https://plc.directory/$did'));
 
       if (didDocResponse.statusCode != 200) {
@@ -279,8 +280,8 @@ class AuthRepositoryImpl implements AuthRepository {
 
       final didDoc = json.decode(didDocResponse.body);
 
-      String? pdsUrl =
-          (didDoc['service'] as List<dynamic>).firstWhere((s) => s['id'] == '#atproto_pds', orElse: () => {})['serviceEndpoint']
+      final pdsUrl =
+          (didDoc['service'] as List<dynamic>).firstWhere((s) => s['id'] == '#atproto_pds', orElse: () => '')['serviceEndpoint']
               as String?;
 
       if (pdsUrl == null) {
@@ -288,7 +289,7 @@ class AuthRepositoryImpl implements AuthRepository {
         throw Exception('PDS endpoint not found in DID document');
       }
 
-      String pdsDomain = Uri.parse(pdsUrl).host;
+      final pdsDomain = Uri.parse(pdsUrl).host;
       _logger.d('Using PDS domain: $pdsDomain');
 
       try {
@@ -332,7 +333,7 @@ class AuthRepositoryImpl implements AuthRepository {
   Future<({bool success, String? error})> register(String handle, String email, String password, String? inviteCode) async {
     try {
       _logger.i('Registration attempt for handle: $handle, email: $email');
-      ATProto at = ATProto.anonymous(service: 'pds.sprk.so');
+      final at = ATProto.anonymous(service: 'pds.sprk.so');
       _logger.d('Creating account');
       final createResponse = await at.server.createAccount(
         handle: handle,
diff --git a/lib/src/core/auth/data/repositories/identity_repository_impl.dart b/lib/src/core/auth/data/repositories/identity_repository_impl.dart
index beec7a72..e608c580 100644
--- a/lib/src/core/auth/data/repositories/identity_repository_impl.dart
+++ b/lib/src/core/auth/data/repositories/identity_repository_impl.dart
@@ -8,9 +8,14 @@ import 'package:http/http.dart' as http;
 import 'package:sparksocial/src/core/auth/data/repositories/identity_repository.dart';
 import 'package:sparksocial/src/core/storage/storage.dart';
 import 'package:sparksocial/src/core/utils/logging/log_service.dart';
+import 'package:sparksocial/src/core/utils/logging/logger.dart';
 
 /// Implementation of [IdentityRepository] with caching capabilities
 class IdentityRepositoryImpl implements IdentityRepository {
+  /// Creates a new [IdentityRepositoryImpl] instance and loads the cache
+  IdentityRepositoryImpl(this._storageManager) {
+    _loadCache();
+  }
   final Map<String, String> _didToHandleCache = {};
   final Map<String, String> _handleToDidCache = {};
   final Map<String, Map<String, dynamic>> _didDocCache = {};
@@ -18,12 +23,7 @@ class IdentityRepositoryImpl implements IdentityRepository {
   static const Duration _cacheExpiration = Duration(hours: 2);
 
   final StorageManager _storageManager;
-  final _logger = GetIt.instance<LogService>().getLogger('IdentityRepository');
-
-  /// Creates a new [IdentityRepositoryImpl] instance and loads the cache
-  IdentityRepositoryImpl(this._storageManager) {
-    _loadCache();
-  }
+  final SparkLogger _logger = GetIt.instance<LogService>().getLogger('IdentityRepository');
 
   Future<void> _loadCache() async {
     try {
@@ -55,7 +55,7 @@ class IdentityRepositoryImpl implements IdentityRepository {
   }
 
   void _loadDidToHandleCache(String jsonData) {
-    final Map<String, dynamic> data = json.decode(jsonData);
+    final data = json.decode(jsonData) as Map<String, dynamic>;
     _didToHandleCache.clear();
 
     data.forEach((key, value) {
@@ -66,7 +66,7 @@ class IdentityRepositoryImpl implements IdentityRepository {
   }
 
   void _loadHandleToDidCache(String jsonData) {
-    final Map<String, dynamic> data = json.decode(jsonData);
+    final data = json.decode(jsonData) as Map<String, dynamic>;
     _handleToDidCache.clear();
 
     data.forEach((key, value) {
@@ -77,7 +77,7 @@ class IdentityRepositoryImpl implements IdentityRepository {
   }
 
   void _loadDidDocCache(String jsonData) {
-    final Map<String, dynamic> data = json.decode(jsonData);
+    final data = json.decode(jsonData) as Map<String, dynamic>;
     _didDocCache.clear();
 
     data.forEach((key, value) {
@@ -147,7 +147,7 @@ class IdentityRepositoryImpl implements IdentityRepository {
       return null;
     }
 
-    for (var aka in alsoKnownAs) {
+    for (final aka in alsoKnownAs) {
       if (aka is String && aka.startsWith('at://')) {
         final handle = aka.replaceFirst('at://', '');
 
@@ -187,7 +187,7 @@ class IdentityRepositoryImpl implements IdentityRepository {
     }
 
     final didDoc = json.decode(response.body);
-    _didDocCache[did] = didDoc;
+    _didDocCache[did] = didDoc as Map<String, dynamic>;
     await _saveCache();
 
     return didDoc;
@@ -195,7 +195,7 @@ class IdentityRepositoryImpl implements IdentityRepository {
 
   @override
   Future<Map<String, dynamic>?> resolveHandleToDidDoc(String handle) async {
-    String? did = _handleToDidCache[handle];
+    var did = _handleToDidCache[handle];
 
     if (did == null) {
       did = await resolveHandleToDid(handle);
@@ -204,7 +204,7 @@ class IdentityRepositoryImpl implements IdentityRepository {
       }
     }
 
-    return await resolveDidToDidDoc(did);
+    return resolveDidToDidDoc(did);
   }
 
   @override
@@ -237,7 +237,7 @@ class IdentityRepositoryImpl implements IdentityRepository {
   @override
   Future<Map<String, String?>> resolveDidsToHandles(List<String> dids) async {
     final results = <String, String?>{};
-    final futures = <Future>[];
+    final futures = <Future<String?>>[];
 
     for (final did in dids) {
       if (_didToHandleCache.containsKey(did)) {
@@ -248,6 +248,7 @@ class IdentityRepositoryImpl implements IdentityRepository {
       futures.add(
         resolveDidToHandle(did).then((handle) {
           results[did] = handle;
+          return null;
         }),
       );
     }
@@ -262,7 +263,7 @@ class IdentityRepositoryImpl implements IdentityRepository {
   @override
   Future<Map<String, String?>> resolveHandlesToDids(List<String> handles) async {
     final results = <String, String?>{};
-    final futures = <Future>[];
+    final futures = <Future<String?>>[];
 
     for (final handle in handles) {
       if (_handleToDidCache.containsKey(handle)) {
@@ -273,6 +274,7 @@ class IdentityRepositoryImpl implements IdentityRepository {
       futures.add(
         resolveHandleToDid(handle).then((did) {
           results[handle] = did;
+          return null;
         }),
       );
     }
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 915cbedc..b2a2ee47 100644
--- a/lib/src/core/auth/data/repositories/onboarding_repository_impl.dart
+++ b/lib/src/core/auth/data/repositories/onboarding_repository_impl.dart
@@ -4,22 +4,21 @@ import 'package:atproto/atproto.dart';
 import 'package:atproto/core.dart';
 import 'package:bluesky/bluesky.dart' as bs;
 import 'package:get_it/get_it.dart';
+import 'package:sparksocial/src/core/auth/data/repositories/auth_repository.dart';
+import 'package:sparksocial/src/core/auth/data/repositories/onboarding_repository.dart';
 import 'package:sparksocial/src/core/network/atproto/data/models/actor_models.dart';
 import 'package:sparksocial/src/core/network/atproto/data/models/graph_models.dart';
-
 import 'package:sparksocial/src/core/network/atproto/data/repositories/repo_repository.dart';
 import 'package:sparksocial/src/core/utils/logging/log_service.dart';
-import 'package:sparksocial/src/core/auth/data/repositories/auth_repository.dart';
-import 'onboarding_repository.dart';
+import 'package:sparksocial/src/core/utils/logging/logger.dart';
 
 class OnboardingRepositoryImpl implements OnboardingRepository {
-  final RepoRepository _repoRepository;
-  final AuthRepository _authRepository;
-  final _logger = GetIt.instance<LogService>().getLogger('OnboardingRepository');
-
   OnboardingRepositoryImpl({required RepoRepository repoRepository, required AuthRepository authRepository})
     : _repoRepository = repoRepository,
       _authRepository = authRepository;
+  final RepoRepository _repoRepository;
+  final AuthRepository _authRepository;
+  final SparkLogger _logger = GetIt.instance<LogService>().getLogger('OnboardingRepository');
 
   Session? get _session => _authRepository.session;
   ATProto? get _atproto => _authRepository.atproto;
@@ -87,7 +86,7 @@ class OnboardingRepositoryImpl implements OnboardingRepository {
     }
 
     final record = <String, dynamic>{
-      '\$type': 'so.sprk.actor.profile',
+      r'$type': 'so.sprk.actor.profile',
       'displayName': displayName,
       'description': description,
       if (avatarField != null) 'avatar': avatarField,
@@ -112,11 +111,11 @@ class OnboardingRepositoryImpl implements OnboardingRepository {
 
     // Convert raw data to our structured model
     final rawData = response.data.toJson();
-    final List<dynamic> rawFollows = rawData['follows'] as List<dynamic>;
+    final rawFollows = rawData['follows'] as List<dynamic>;
 
     final follows = rawFollows
         .map(
-          (followData) => ProfileView.fromJson(followData),
+          (followData) => ProfileView.fromJson(followData as Map<String, dynamic>),
         )
         .toList();
 
@@ -126,7 +125,7 @@ class OnboardingRepositoryImpl implements OnboardingRepository {
   @override
   Future<void> createSparkFollow(String subject) async {
     final record = <String, dynamic>{
-      '\$type': 'so.sprk.graph.follow',
+      r'$type': 'so.sprk.graph.follow',
       'subject': subject,
       'createdAt': DateTime.now().toUtc().toIso8601String(),
     };
diff --git a/lib/src/core/config/app_config.dart b/lib/src/core/config/app_config.dart
index 69630b13..26103193 100644
--- a/lib/src/core/config/app_config.dart
+++ b/lib/src/core/config/app_config.dart
@@ -23,7 +23,7 @@ class AppConfig {
   static int get apiTimeoutSeconds => _getIntValue('API_TIMEOUT_SECONDS', 30);
 
   /// Maximum upload file size in MB.
-  static double get maxUploadSizeMB => _getDoubleValue('MAX_UPLOAD_SIZE_MB', 100.0);
+  static double get maxUploadSizeMB => _getDoubleValue('MAX_UPLOAD_SIZE_MB', 100);
 
   /// The current application environment (development, production, etc.)
   static String get environment => _getStringValue('ENVIRONMENT', 'development');
diff --git a/lib/src/core/di/service_locator.dart b/lib/src/core/di/service_locator.dart
index 4ef741c1..bd714698 100644
--- a/lib/src/core/di/service_locator.dart
+++ b/lib/src/core/di/service_locator.dart
@@ -1,23 +1,23 @@
 import 'package:get_it/get_it.dart';
 import 'package:sparksocial/src/core/auth/data/repositories/auth_repository_impl.dart';
+import 'package:sparksocial/src/core/auth/data/repositories/onboarding_repository.dart';
+import 'package:sparksocial/src/core/auth/data/repositories/onboarding_repository_impl.dart';
+import 'package:sparksocial/src/core/network/atproto/atproto.dart';
+import 'package:sparksocial/src/core/network/atproto/data/repositories/actor_repository_impl.dart';
+import 'package:sparksocial/src/core/network/atproto/data/repositories/graph_repository_impl.dart';
+import 'package:sparksocial/src/core/network/atproto/data/repositories/sprk_repository_impl.dart';
 import 'package:sparksocial/src/core/network/messages/data/repository/messages_repository.dart';
 import 'package:sparksocial/src/core/network/messages/data/repository/messages_repository_impl.dart';
 import 'package:sparksocial/src/core/storage/cache/cache_manager_impl.dart';
 import 'package:sparksocial/src/core/storage/cache/download_manager_interface.dart';
 import 'package:sparksocial/src/core/storage/cache/sql_cache_interface.dart';
-import 'package:sparksocial/src/core/theme/data/repositories/theme_repository.dart';
-import 'package:sparksocial/src/core/theme/data/repositories/theme_repository_impl.dart';
 import 'package:sparksocial/src/core/storage/preferences/settings_repository.dart';
-import 'package:sparksocial/src/features/auth/auth.dart';
+import 'package:sparksocial/src/core/storage/preferences/settings_repository_impl.dart';
 import 'package:sparksocial/src/core/storage/storage.dart';
-import 'package:sparksocial/src/core/network/atproto/atproto.dart';
+import 'package:sparksocial/src/core/theme/data/repositories/theme_repository.dart';
+import 'package:sparksocial/src/core/theme/data/repositories/theme_repository_impl.dart';
 import 'package:sparksocial/src/core/utils/logging/logging.dart';
-import 'package:sparksocial/src/core/network/atproto/data/repositories/sprk_repository_impl.dart';
-import 'package:sparksocial/src/core/storage/preferences/settings_repository_impl.dart';
-import 'package:sparksocial/src/core/auth/data/repositories/onboarding_repository.dart';
-import 'package:sparksocial/src/core/auth/data/repositories/onboarding_repository_impl.dart';
-import 'package:sparksocial/src/core/network/atproto/data/repositories/actor_repository_impl.dart';
-import 'package:sparksocial/src/core/network/atproto/data/repositories/graph_repository_impl.dart';
+import 'package:sparksocial/src/features/auth/auth.dart';
 
 // This is the ONLY PLACE IN THE ENTIRE APP where implementations are imported
 // All the other files should import interfaces only (polymorphism) to keep everything decoupled
diff --git a/lib/src/core/feed_algorithms/feed_following.dart b/lib/src/core/feed_algorithms/feed_following.dart
index b44282fe..ef511e47 100644
--- a/lib/src/core/feed_algorithms/feed_following.dart
+++ b/lib/src/core/feed_algorithms/feed_following.dart
@@ -1,8 +1,8 @@
-import 'package:bluesky/bluesky.dart' as bsky;
 import 'package:atproto_core/atproto_core.dart';
+import 'package:bluesky/bluesky.dart' as bsky;
 import 'package:get_it/get_it.dart';
-import 'package:sparksocial/src/core/network/atproto/data/repositories/sprk_repository.dart';
 import 'package:sparksocial/src/core/network/atproto/data/models/feed_models.dart';
+import 'package:sparksocial/src/core/network/atproto/data/repositories/sprk_repository.dart';
 
 Future<FeedSkeleton> followingSkeletonFunction({int? limit, String? cursor}) async {
   limit ??= 10;
diff --git a/lib/src/core/feed_algorithms/feed_for_you.dart b/lib/src/core/feed_algorithms/feed_for_you.dart
index 51b3c797..80c385ad 100644
--- a/lib/src/core/feed_algorithms/feed_for_you.dart
+++ b/lib/src/core/feed_algorithms/feed_for_you.dart
@@ -1,5 +1,5 @@
-import 'package:bluesky/bluesky.dart' as bsky;
 import 'package:atproto_core/atproto_core.dart';
+import 'package:bluesky/bluesky.dart' as bsky;
 import 'package:get_it/get_it.dart';
 import 'package:sparksocial/src/core/network/atproto/data/models/feed_models.dart';
 import 'package:sparksocial/src/core/network/atproto/data/repositories/sprk_repository.dart';
diff --git a/lib/src/core/feed_algorithms/feed_latest_sprk.dart b/lib/src/core/feed_algorithms/feed_latest_sprk.dart
index fbfd8d7c..11a181e1 100644
--- a/lib/src/core/feed_algorithms/feed_latest_sprk.dart
+++ b/lib/src/core/feed_algorithms/feed_latest_sprk.dart
@@ -1,8 +1,8 @@
 import 'dart:convert';
 
 import 'package:atproto_core/atproto_core.dart';
-import 'package:sparksocial/src/core/network/atproto/data/models/feed_models.dart';
 import 'package:get_it/get_it.dart';
+import 'package:sparksocial/src/core/network/atproto/data/models/feed_models.dart';
 import 'package:sparksocial/src/core/network/atproto/data/repositories/sprk_repository.dart';
 
 Future<FeedSkeleton> latestSprkSkeletonFunction({int? limit, String? cursor}) async {
@@ -21,7 +21,7 @@ Future<FeedSkeleton> latestSprkSkeletonFunction({int? limit, String? cursor}) as
     }, // need to call the API directly because latest-sprk is not a parsable AtUri
     service: 'feeds.sprk.so',
     to: (jsonMap) => jsonMap,
-    adaptor: (uint8) => jsonDecode(utf8.decode(uint8)),
+    adaptor: (uint8) => jsonDecode(utf8.decode(uint8 as List<int>)) as Map<String, dynamic>,
   );
   final feedData = feedGenRes.data['feed'] as List<dynamic>?;
   final uris = feedData?.map((item) => item['post'] as String).toList() ?? [];
diff --git a/lib/src/core/feed_algorithms/feed_mutuals.dart b/lib/src/core/feed_algorithms/feed_mutuals.dart
index df386445..26c5fe50 100644
--- a/lib/src/core/feed_algorithms/feed_mutuals.dart
+++ b/lib/src/core/feed_algorithms/feed_mutuals.dart
@@ -2,5 +2,7 @@ import 'package:sparksocial/src/core/network/atproto/data/models/feed_models.dar
 
 Future<FeedSkeleton> mutualsSkeletonFunction({int? limit, String? cursor}) async {
   limit ??= 10;
-  return FeedSkeleton(feed: [],); // TODO: implement
+  return const FeedSkeleton(
+    feed: [],
+  ); // TODO: implement
 }
diff --git a/lib/src/core/feed_algorithms/feed_shared.dart b/lib/src/core/feed_algorithms/feed_shared.dart
index 63deaf03..51eb2a53 100644
--- a/lib/src/core/feed_algorithms/feed_shared.dart
+++ b/lib/src/core/feed_algorithms/feed_shared.dart
@@ -3,7 +3,7 @@ import 'package:sparksocial/src/core/network/atproto/data/models/feed_models.dar
 
 Future<FeedSkeleton> sharedSkeletonFunction({int? limit, String? cursor}) async {
   limit ??= 10;
-  return FeedSkeleton(feed: []); // TODO: implement
+  return const FeedSkeleton(feed: []); // TODO: implement
 }
 
 Future<Map<AtUri, HardcodedFeedExtraInfoShared>> sharedExtraInfoFunction(List<AtUri> uris) async {
diff --git a/lib/src/core/feed_algorithms/hardcoded_feed_algorithm.dart b/lib/src/core/feed_algorithms/hardcoded_feed_algorithm.dart
index 5b80ace8..a80edca3 100644
--- a/lib/src/core/feed_algorithms/hardcoded_feed_algorithm.dart
+++ b/lib/src/core/feed_algorithms/hardcoded_feed_algorithm.dart
@@ -1,10 +1,10 @@
 import 'package:atproto/core.dart';
-import 'package:sparksocial/src/core/network/atproto/data/models/feed_models.dart';
 import 'package:sparksocial/src/core/feed_algorithms/feed_following.dart';
 import 'package:sparksocial/src/core/feed_algorithms/feed_for_you.dart';
-import 'package:sparksocial/src/core/feed_algorithms/feed_mutuals.dart';
 import 'package:sparksocial/src/core/feed_algorithms/feed_latest_sprk.dart';
+import 'package:sparksocial/src/core/feed_algorithms/feed_mutuals.dart';
 import 'package:sparksocial/src/core/feed_algorithms/feed_shared.dart';
+import 'package:sparksocial/src/core/network/atproto/data/models/feed_models.dart';
 
 typedef SkeletonFunction = Future<FeedSkeleton> Function({int? limit, String? cursor});
 typedef ExtraInfoFunction = Future<Map<AtUri, HardcodedFeedExtraInfo>> Function(List<AtUri> uris);
@@ -36,7 +36,10 @@ class HardCodedFeedAlgorithm {
     switch (feed) {
       case HardCodedFeedEnum.shared:
         return sharedExtraInfo;
-      default:
+      case HardCodedFeedEnum.following:
+      case HardCodedFeedEnum.mutuals:
+      case HardCodedFeedEnum.forYou:
+      case HardCodedFeedEnum.latestSprk:
         return null;
     }
   }
diff --git a/lib/src/core/network/atproto/atproto.dart b/lib/src/core/network/atproto/atproto.dart
index 12a45031..1fa230bf 100644
--- a/lib/src/core/network/atproto/atproto.dart
+++ b/lib/src/core/network/atproto/atproto.dart
@@ -1,8 +1,6 @@
-library;
-
 export 'data/models/models.dart';
-export 'data/repositories/sprk_repository.dart';
 export 'data/repositories/actor_repository.dart';
-export 'data/repositories/repo_repository.dart';
 export 'data/repositories/feed_repository.dart';
 export 'data/repositories/graph_repository.dart';
+export 'data/repositories/repo_repository.dart';
+export 'data/repositories/sprk_repository.dart';
diff --git a/lib/src/core/network/atproto/data/models/actor_models.dart b/lib/src/core/network/atproto/data/models/actor_models.dart
index a596bac9..3f41edfd 100644
--- a/lib/src/core/network/atproto/data/models/actor_models.dart
+++ b/lib/src/core/network/atproto/data/models/actor_models.dart
@@ -7,7 +7,6 @@ part 'actor_models.g.dart';
 
 @freezed
 class ActorViewer with _$ActorViewer {
-  const ActorViewer._();
   @JsonSerializable(explicitToJson: true)
   const factory ActorViewer({
     bool? muted,
@@ -19,18 +18,19 @@ class ActorViewer with _$ActorViewer {
     @AtUriConverter() AtUri? followedBy,
     KnownFollowers? followers,
   }) = _ActorViewer;
+  const ActorViewer._();
 
   factory ActorViewer.fromJson(Map<String, dynamic> json) => _$ActorViewerFromJson(json);
 }
 
 @freezed
 class KnownFollowers with _$KnownFollowers {
-  const KnownFollowers._();
   @JsonSerializable(explicitToJson: true)
   const factory KnownFollowers({
     required int count,
     required List<String> followersDids, // to avoid circular dependency
   }) = _KnownFollowers;
+  const KnownFollowers._();
 
   factory KnownFollowers.fromJson(Map<String, dynamic> json) => switch (json) {
     {'followers': final List<ProfileViewBasic> profiles, 'count': final int count} => _$KnownFollowersFromJson({
@@ -43,7 +43,6 @@ class KnownFollowers with _$KnownFollowers {
 
 @freezed
 class ProfileViewBasic with _$ProfileViewBasic {
-  const ProfileViewBasic._();
   @JsonSerializable(explicitToJson: true)
   const factory ProfileViewBasic({
     required String did,
@@ -54,13 +53,13 @@ class ProfileViewBasic with _$ProfileViewBasic {
     ActorViewer? viewer,
     List<StrongRef>? stories,
   }) = _ProfileViewBasic;
+  const ProfileViewBasic._();
 
   factory ProfileViewBasic.fromJson(Map<String, dynamic> json) => _$ProfileViewBasicFromJson(json);
 }
 
 @freezed
 class ProfileView with _$ProfileView {
-  const ProfileView._();
   @JsonSerializable(explicitToJson: true)
   const factory ProfileView({
     required String did,
@@ -74,6 +73,7 @@ class ProfileView with _$ProfileView {
     List<Label>? labels,
     // no stories here for some reason
   }) = _ProfileView;
+  const ProfileView._();
 
   factory ProfileView.fromJson(Map<String, dynamic> json) => _$ProfileViewFromJson(json);
 }
@@ -82,12 +82,6 @@ class ProfileView with _$ProfileView {
 class SearchActorsResponse {
   SearchActorsResponse({required this.actors, this.cursor});
 
-  /// 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;
-
   /// Create a [SearchActorsResponse] from JSON.
   factory SearchActorsResponse.fromJson(Map<String, dynamic> json) {
     final actorsJson = json['actors'] as List<dynamic>? ?? <dynamic>[];
@@ -97,13 +91,18 @@ class SearchActorsResponse {
     );
   }
 
+  /// 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};
 }
 
 @freezed
 class ProfileViewDetailed with _$ProfileViewDetailed {
-  const ProfileViewDetailed._();
   @JsonSerializable(explicitToJson: true)
   const factory ProfileViewDetailed({
     required String did,
@@ -123,6 +122,7 @@ class ProfileViewDetailed with _$ProfileViewDetailed {
     StrongRef? pinnedPost, // this is a list if the backend implements https://github.com/sprksocial/spark-back-end/issues/13
     List<StrongRef>? 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 9769ae78..727e942e 100644
--- a/lib/src/core/network/atproto/data/models/feed_models.dart
+++ b/lib/src/core/network/atproto/data/models/feed_models.dart
@@ -67,6 +67,7 @@ class CustomFeed with _$CustomFeed {
 /// HardCoded feeds are "fake" and completely generated in the frontend
 @freezed
 class Feed with _$Feed {
+  factory Feed.fromJson(Map<String, dynamic> json) => _$FeedFromJson(json);
   const Feed._();
   @JsonSerializable(explicitToJson: true)
   const factory Feed.custom({required String name, @AtUriConverter() required AtUri uri}) = FeedCustom;
@@ -81,8 +82,6 @@ class Feed with _$Feed {
 
   String get identifier =>
       when(custom: (name, uri) => uri.toString(), hardCoded: (hardCodedFeed) => 'hardcoded:${hardCodedFeed.name}');
-
-  factory Feed.fromJson(Map<String, dynamic> json) => _$FeedFromJson(json);
 }
 
 /// Skeleton of a FeedView. Needs to be hydrated.
@@ -111,7 +110,6 @@ sealed class HardcodedFeedExtraInfo with _$HardcodedFeedExtraInfo {
 /// GetTimeline returns a FeedViewPost array
 @freezed
 class FeedViewPost with _$FeedViewPost {
-  const FeedViewPost._();
   @JsonSerializable(explicitToJson: true)
   const factory FeedViewPost({
     required PostView post,
@@ -119,19 +117,20 @@ class FeedViewPost with _$FeedViewPost {
     // "reason": { "type": "union", "refs": ["#reasonRepost", "#reasonPin"] } i think we don't have to use this value for now
     // there's also a String feedContext "Context provided by feed generator that may be passed back alongside interactions."
   }) = _FeedViewPostPost;
+  const FeedViewPost._();
 
   factory FeedViewPost.fromJson(Map<String, dynamic> json) => _$FeedViewPostFromJson(json);
 }
 
 @freezed
 class ReplyRef with _$ReplyRef {
-  const 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);
 }
@@ -166,25 +165,24 @@ sealed class ReplyRefPostReference with _$ReplyRefPostReference {
 
 @freezed
 class BlockedAuthor with _$BlockedAuthor {
-  const BlockedAuthor._();
   @JsonSerializable(explicitToJson: true)
   const factory BlockedAuthor({required String did, Viewer? viewer}) = _BlockedAuthor;
+  const BlockedAuthor._();
 
   factory BlockedAuthor.fromJson(Map<String, dynamic> json) => _$BlockedAuthorFromJson(json);
 }
 
 @freezed
 class PostThread with _$PostThread {
-  const 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);
 }
 
 @freezed
 class Viewer with _$Viewer {
-  const Viewer._();
   @JsonSerializable(explicitToJson: true)
   const factory Viewer({
     @AtUriConverter() AtUri? repost,
@@ -195,21 +193,21 @@ class Viewer with _$Viewer {
     bool? embeddingDisabled,
     bool? pinned,
   }) = _Viewer;
+  const Viewer._();
 
   factory Viewer.fromJson(Map<String, dynamic> json) => _$ViewerFromJson(json);
 }
 
 @freezed
 class PostView with _$PostView {
-  const PostView._();
   @JsonSerializable(explicitToJson: true)
   const factory PostView({
     @AtUriConverter() required AtUri uri,
     required String cid,
     required ProfileViewBasic author,
     required PostRecord record,
-    @Default(false) bool isRepost,
     required DateTime indexedAt,
+    @Default(false) bool isRepost,
     int? likeCount,
     int? replyCount,
     int? repostCount,
@@ -219,6 +217,7 @@ class PostView with _$PostView {
     //SoundView? sound,
     EmbedView? embed, // aturi
   }) = _PostView;
+  const PostView._();
 
   factory PostView.fromJson(Map<String, dynamic> json) => _$PostViewFromJson(json);
 
@@ -423,8 +422,6 @@ sealed class EmbedView with _$EmbedView {
 
 @freezed
 class EmbedViewExternal with _$EmbedViewExternal {
-  const EmbedViewExternal._();
-
   @JsonSerializable(explicitToJson: true)
   const factory EmbedViewExternal({
     required String uri,
@@ -432,25 +429,26 @@ class EmbedViewExternal with _$EmbedViewExternal {
     @Default('') String description,
     @AtUriConverter() AtUri? thumb,
   }) = _EmbedViewExternal;
+  const EmbedViewExternal._();
 
   factory EmbedViewExternal.fromJson(Map<String, dynamic> json) => _$EmbedViewExternalFromJson(json);
 }
 
 @freezed
 class FeedSkeleton with _$FeedSkeleton {
-  const 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
 class ImageUploadResult with _$ImageUploadResult {
-  const ImageUploadResult._();
   @JsonSerializable(explicitToJson: true)
   const factory ImageUploadResult({required String fullsize, required String alt, required Map<String, dynamic> image}) =
       _ImageUploadResult;
+  const ImageUploadResult._();
 
   factory ImageUploadResult.fromJson(Map<String, dynamic> json) => _$ImageUploadResultFromJson(json);
 }
@@ -458,8 +456,6 @@ class ImageUploadResult with _$ImageUploadResult {
 /// Represents the index range for a facet in the text
 @freezed
 class FacetIndex with _$FacetIndex {
-  const FacetIndex._();
-
   @JsonSerializable(explicitToJson: true)
   const factory FacetIndex({
     /// Start index (inclusive)
@@ -468,6 +464,7 @@ class FacetIndex with _$FacetIndex {
     /// End index (exclusive)
     required int byteEnd,
   }) = _FacetIndex;
+  const FacetIndex._();
 
   /// Create a FacetIndex from JSON
   factory FacetIndex.fromJson(Map<String, dynamic> json) => _$FacetIndexFromJson(json);
@@ -517,8 +514,6 @@ class FacetFeature with _$FacetFeature {
 /// Represents a richtext facet for text formatting, mentions, links, etc.
 @freezed
 class Facet with _$Facet {
-  const Facet._();
-
   @JsonSerializable(explicitToJson: true)
   const factory Facet({
     /// Index range for the facet in the text
@@ -527,6 +522,7 @@ class Facet with _$Facet {
     /// Features represented by this facet (mention, link, hashtag, etc.)
     required List<FacetFeature> features,
   }) = _Facet;
+  const Facet._();
 
   /// Create a Facet from JSON
   factory Facet.fromJson(Map<String, dynamic> json) => _$FacetFromJson(json);
@@ -534,8 +530,6 @@ class Facet with _$Facet {
 
 @freezed
 class ViewImage with _$ViewImage {
-  const ViewImage._();
-
   @JsonSerializable(explicitToJson: true)
   const factory ViewImage({
     @AtUriConverter() required AtUri thumb,
@@ -543,6 +537,7 @@ class ViewImage with _$ViewImage {
     String? alt,
     // aspectRatio: {width: int, height: int}
   }) = _ViewImage;
+  const ViewImage._();
 
   factory ViewImage.fromJson(Map<String, dynamic> json) => _$ViewImageFromJson(json);
 }
@@ -574,7 +569,7 @@ class Thread with _$Thread {
     switch (thread) {
       case bsky.UPostThreadViewRecord(:final data):
         try {
-          bsky.EmbedView? embed = data.post.embed;
+          var embed = data.post.embed;
           if (data.post.embed is bsky.UEmbedViewExternal) {
             embed = null;
           }
@@ -645,9 +640,9 @@ class Thread with _$Thread {
                 // Check nested embeds array in the record value
                 if (recordJson['embeds'] != null && recordJson['embeds'] is List) {
                   final embedsList = recordJson['embeds'] as List;
-                  bool shouldRemoveEmbed = false;
+                  var shouldRemoveEmbed = false;
 
-                  for (var nestedEmbed in embedsList) {
+                  for (final nestedEmbed in embedsList) {
                     if (nestedEmbed is Map<String, dynamic>) {
                       // Check external embeds in the nested embeds
                       if (nestedEmbed[r'$type'] == 'app.bsky.embed.external#view' && nestedEmbed['cid'] == null) {
@@ -671,11 +666,13 @@ class Thread with _$Thread {
                 final recordEmbedJson = embedJson['record'] as Map<String, dynamic>;
                 if (recordEmbedJson['record'] != null) {
                   final recordJson = recordEmbedJson['record'] as Map<String, dynamic>;
-                  
+
                   // Check if it's a viewRecord and has required fields
                   if (recordJson[r'$type'] == 'app.bsky.embed.record#viewRecord') {
-                    if (recordJson['uri'] == null || recordJson['cid'] == null || 
-                        recordJson['author'] == null || recordJson['value'] == null || 
+                    if (recordJson['uri'] == null ||
+                        recordJson['cid'] == null ||
+                        recordJson['author'] == null ||
+                        recordJson['value'] == null ||
                         recordJson['indexedAt'] == null) {
                       postViewJson.remove('embed');
                     }
@@ -687,22 +684,24 @@ class Thread with _$Thread {
             // Additional safety check - if we have any embed that might contain a record view, validate it
             void validateRecordViewInEmbed(Map<String, dynamic> embedData, String path) {
               if (embedData[r'$type'] == 'app.bsky.embed.record#viewRecord') {
-                if (embedData['uri'] == null || embedData['cid'] == null || 
-                    embedData['author'] == null || embedData['value'] == null || 
+                if (embedData['uri'] == null ||
+                    embedData['cid'] == null ||
+                    embedData['author'] == null ||
+                    embedData['value'] == null ||
                     embedData['indexedAt'] == null) {
                   postViewJson.remove('embed');
                   return;
                 }
               }
-              
+
               // Recursively check nested structures
               embedData.forEach((key, value) {
                 if (value is Map<String, dynamic>) {
                   validateRecordViewInEmbed(value, '$path.$key');
                 } else if (value is List) {
-                  for (int i = 0; i < value.length; i++) {
+                  for (var i = 0; i < value.length; i++) {
                     if (value[i] is Map<String, dynamic>) {
-                      validateRecordViewInEmbed(value[i], '$path.$key[$i]');
+                      validateRecordViewInEmbed(value[i] as Map<String, dynamic>, '$path.$key[$i]');
                     }
                   }
                 }
@@ -738,7 +737,6 @@ class Thread with _$Thread {
                 })
                 .whereType<Thread>()
                 .toList(),
-            context: null,
           );
           return thread;
         } catch (e) {
@@ -756,16 +754,15 @@ class Thread with _$Thread {
 
 @freezed
 class ThreadContext with _$ThreadContext {
-  const ThreadContext._();
   @JsonSerializable(explicitToJson: true)
   const factory ThreadContext({@AtUriConverter() AtUri? rootAuthorLike}) = _ThreadContext;
+  const ThreadContext._();
 
   factory ThreadContext.fromJson(Map<String, dynamic> json) => _$ThreadContextFromJson(json);
 }
 
 @freezed
 class StoryView with _$StoryView {
-  const StoryView._();
   @JsonSerializable(explicitToJson: true)
   const factory StoryView({
     required String cid,
@@ -776,6 +773,7 @@ class StoryView with _$StoryView {
     EmbedView? media,
     // 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/labeler_models.dart b/lib/src/core/network/atproto/data/models/labeler_models.dart
index bda78c5c..811eae0d 100644
--- a/lib/src/core/network/atproto/data/models/labeler_models.dart
+++ b/lib/src/core/network/atproto/data/models/labeler_models.dart
@@ -7,17 +7,17 @@ part 'labeler_models.freezed.dart';
 part 'labeler_models.g.dart';
 
 const defaultLabels = [
-  "!hide",
-  "!no-promote",
-  "!warn",
-  "!no-unauthenticated",
-  "dmca-violation",
-  "doxxing",
-  "porn",
-  "sexual",
-  "nudity",
-  "nsfl",
-  "gore",
+  '!hide',
+  '!no-promote',
+  '!warn',
+  '!no-unauthenticated',
+  'dmca-violation',
+  'doxxing',
+  'porn',
+  'sexual',
+  'nudity',
+  'nsfl',
+  'gore',
 ];
 
 enum Blurs {
@@ -70,7 +70,6 @@ enum Setting {
 
 @freezed
 abstract class LabelPreference with _$LabelPreference {
-  const LabelPreference._();
   @JsonSerializable(explicitToJson: true)
   factory LabelPreference({
     required String value,
@@ -80,13 +79,13 @@ abstract class LabelPreference with _$LabelPreference {
     required Setting setting,
     required bool adultOnly,
   }) = _LabelPreference;
+  const LabelPreference._();
 
   factory LabelPreference.fromJson(Map<String, dynamic> json) => _$LabelPreferenceFromJson(json);
 }
 
 @freezed
 abstract class LabelerView with _$LabelerView {
-  const LabelerView._();
   @JsonSerializable(explicitToJson: true)
   factory LabelerView({
     @AtUriConverter() required AtUri uri,
@@ -98,13 +97,13 @@ abstract class LabelerView with _$LabelerView {
     LabelerViewerState? labelerViewer,
     List<Label>? labels,
   }) = _LabelerView;
+  const LabelerView._();
 
   factory LabelerView.fromJson(Map<String, dynamic> json) => _$LabelerViewFromJson(json);
 }
 
 @freezed
 abstract class LabelerViewDetailed with _$LabelerViewDetailed {
-  const LabelerViewDetailed._();
   @JsonSerializable(explicitToJson: true)
   factory LabelerViewDetailed({
     @AtUriConverter() required AtUri uri,
@@ -117,29 +116,30 @@ abstract class LabelerViewDetailed with _$LabelerViewDetailed {
     LabelerPolicies? policies,
     List<Label>? labels,
   }) = _LabelerViewDetailed;
+  const LabelerViewDetailed._();
 
   factory LabelerViewDetailed.fromJson(Map<String, dynamic> json) => _$LabelerViewDetailedFromJson(json);
 }
 
 @freezed
 abstract class LabelerViewerState with _$LabelerViewerState {
-  const LabelerViewerState._();
   @JsonSerializable(explicitToJson: true)
   factory LabelerViewerState({@AtUriConverter() required AtUri like, @AtUriConverter() required AtUri look}) =
       _LabelerViewerState;
+  const LabelerViewerState._();
 
   factory LabelerViewerState.fromJson(Map<String, dynamic> json) => _$LabelerViewerStateFromJson(json);
 }
 
 @freezed
 abstract class LabelerPolicies with _$LabelerPolicies {
-  const LabelerPolicies._();
   @JsonSerializable(explicitToJson: true)
   factory LabelerPolicies({
     required List<String>
     labelValues, // knownValues (array of strings, optional): a set of suggested or common values for this field. 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 0690896e..f64396ba 100644
--- a/lib/src/core/network/atproto/data/models/models.dart
+++ b/lib/src/core/network/atproto/data/models/models.dart
@@ -2,4 +2,4 @@ export 'package:sparksocial/src/core/network/atproto/data/models/actor_models.da
 export 'package:sparksocial/src/core/network/atproto/data/models/feed_models.dart';
 export 'package:sparksocial/src/core/network/atproto/data/models/graph_models.dart';
 export 'package:sparksocial/src/core/network/atproto/data/models/labeler_models.dart';
-export 'package:sparksocial/src/core/network/atproto/data/models/records.dart';
\ No newline at end of file
+export 'package:sparksocial/src/core/network/atproto/data/models/records.dart';
diff --git a/lib/src/core/network/atproto/data/models/records.dart b/lib/src/core/network/atproto/data/models/records.dart
index 42305037..4f6f1a39 100644
--- a/lib/src/core/network/atproto/data/models/records.dart
+++ b/lib/src/core/network/atproto/data/models/records.dart
@@ -8,6 +8,7 @@ part 'records.g.dart';
 
 @Freezed(unionKey: r'$type')
 class Record with _$Record {
+  factory Record.fromJson(Map<String, dynamic> json) => _$RecordFromJson(json);
   const Record._();
   @JsonSerializable(explicitToJson: true)
   @FreezedUnionValue('so.sprk.feed.post')
@@ -27,10 +28,10 @@ class Record with _$Record {
   @FreezedUnionValue('so.sprk.feed.story')
   const factory Record.story({
     required Embed media,
+    required DateTime createdAt,
     StrongRef? sound,
     List<SelfLabel>? selfLabels,
     List<String>? tags,
-    required DateTime createdAt,
   }) = StoryRecord;
 
   @JsonSerializable(explicitToJson: true)
@@ -75,16 +76,14 @@ class Record with _$Record {
     final regex = RegExp(r'#(\w+)');
     return regex.allMatches(text).map((match) => match.group(1)!).toList();
   }
-
-  factory Record.fromJson(Map<String, dynamic> json) => _$RecordFromJson(json);
 }
 
 /// Skeleton of a ReplyRef. Needs to be hydrated.
 @freezed
 class RecordReplyRef with _$RecordReplyRef {
-  const RecordReplyRef._();
   @JsonSerializable(explicitToJson: true)
   const factory RecordReplyRef({required StrongRef root, required StrongRef parent}) = _RecordReplyRef;
+  const RecordReplyRef._();
 
   factory RecordReplyRef.fromJson(Map<String, dynamic> json) => _$RecordReplyRefFromJson(json);
 }
@@ -143,8 +142,6 @@ sealed class Embed with _$Embed {
 
 @freezed
 class EmbedExternal with _$EmbedExternal {
-  const EmbedExternal._();
-
   @JsonSerializable(explicitToJson: true)
   const factory EmbedExternal({
     required String uri,
@@ -152,20 +149,20 @@ class EmbedExternal with _$EmbedExternal {
     @Default('') String description,
     Blob? thumb,
   }) = _EmbedExternal;
+  const EmbedExternal._();
 
   factory EmbedExternal.fromJson(Map<String, dynamic> json) => _$EmbedExternalFromJson(json);
 }
 
 @freezed
 class Image with _$Image {
-  const Image._();
-
   @JsonSerializable(explicitToJson: true)
   const factory Image({
     required Blob image,
     String? alt,
     // aspectRatio: {width: int, height: int}
   }) = _Image;
+  const Image._();
 
   factory Image.fromJson(Map<String, dynamic> json) => _$ImageFromJson(json);
 }
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 84abab31..48f65023 100644
--- a/lib/src/core/network/atproto/data/repositories/actor_repository.dart
+++ b/lib/src/core/network/atproto/data/repositories/actor_repository.dart
@@ -9,7 +9,7 @@ abstract class ActorRepository {
   Future<ProfileViewDetailed> getProfile(String did);
 
   /// Get multiple profiles by their DIDs
-  /// 
+  ///
   /// [dids] A list of DIDs to fetch profiles for
   Future<List<ProfileViewDetailed>> getProfiles(List<String> dids);
 
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 d2519328..d0a3bccd 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
@@ -6,17 +6,17 @@ import 'package:get_it/get_it.dart';
 import 'package:http/http.dart' as http;
 import 'package:sparksocial/src/core/network/atproto/data/models/models.dart';
 import 'package:sparksocial/src/core/network/atproto/data/repositories/actor_repository.dart';
-import 'package:sparksocial/src/core/utils/logging/log_service.dart';
 import 'package:sparksocial/src/core/network/atproto/data/repositories/sprk_repository.dart';
+import 'package:sparksocial/src/core/utils/logging/log_service.dart';
+import 'package:sparksocial/src/core/utils/logging/logger.dart';
 
 /// Actor-related API endpoints implementation
 class ActorRepositoryImpl implements ActorRepository {
-  final SprkRepository _client;
-  final _logger = GetIt.instance<LogService>().getLogger('ActorAPI');
-
   ActorRepositoryImpl(this._client) {
     _logger.v('ActorAPI initialized');
   }
+  final SprkRepository _client;
+  final SparkLogger _logger = GetIt.instance<LogService>().getLogger('ActorAPI');
 
   @override
   Future<ProfileViewDetailed> getProfile(String did) async {
@@ -38,12 +38,12 @@ class ActorRepositoryImpl implements ActorRepository {
           parameters: {'actor': did},
           headers: {'atproto-proxy': _client.sprkDid},
           to: (jsonMap) => jsonMap,
-          adaptor: (uint8) => jsonDecode(utf8.decode(uint8)),
+          adaptor: (uint8) => jsonDecode(utf8.decode(uint8 as List<int>)) as Map<String, dynamic>,
         );
         return ProfileViewDetailed.fromJson(result.data as Map<String, dynamic>);
       } catch (e) {
-        _logger.e('Failed to retrieve profile for DID: $did', error: e);
-        _logger.i('Trying to get profile from bluesky');
+        _logger..e('Failed to retrieve profile for DID: $did', error: e)
+        ..i('Trying to get profile from bluesky');
         final bluesky = bsky.Bluesky.fromSession(_client.authRepository.session!);
         final profile = await bluesky.actor.getProfile(actor: did);
         _logger.d('Profile retrieved successfully from bluesky');
@@ -77,7 +77,7 @@ class ActorRepositoryImpl implements ActorRepository {
         parameters: parameters,
         headers: {'atproto-proxy': _client.sprkDid},
         to: (jsonMap) => jsonMap,
-        adaptor: (uint8) => jsonDecode(utf8.decode(uint8)),
+        adaptor: (uint8) => jsonDecode(utf8.decode(uint8 as List<int>)) as Map<String, dynamic>,
       );
 
       _logger.d('Actor search completed successfully');
@@ -118,7 +118,7 @@ class ActorRepositoryImpl implements ActorRepository {
       final response = await http.get(Uri.parse('https://spark-match.sparksplatforms.workers.dev/?did=$did'));
       if (response.statusCode == 200) {
         final data = jsonDecode(response.body);
-        final bool isSupporter = data['found'] == true;
+        final isSupporter = data['found'] == true;
         _logger.d('Early supporter status for $did: $isSupporter');
         return isSupporter;
       }
@@ -149,7 +149,7 @@ class ActorRepositoryImpl implements ActorRepository {
         NSID.parse('so.sprk.actor.getPreferences'),
         headers: {'atproto-proxy': _client.sprkDid},
         to: (jsonMap) => jsonMap,
-        adaptor: (uint8) => jsonDecode(utf8.decode(uint8)),
+        adaptor: (uint8) => jsonDecode(utf8.decode(uint8 as List<int>)) as Map<String, dynamic>,
       );
 
       if (result.status != HttpStatus.ok) {
@@ -213,12 +213,12 @@ class ActorRepositoryImpl implements ActorRepository {
           parameters: {'actors': dids},
           headers: {'atproto-proxy': _client.sprkDid},
           to: (jsonMap) => jsonMap,
-          adaptor: (uint8) => jsonDecode(utf8.decode(uint8)),
+          adaptor: (uint8) => jsonDecode(utf8.decode(uint8 as List<int>)) as Map<String, dynamic>,
         );
-        return (result.data["profiles"] as List).map((json) => ProfileViewDetailed.fromJson(json)).toList();
+        return (result.data['profiles']! as List).map((json) => ProfileViewDetailed.fromJson(json as Map<String, dynamic>)).toList();
       } catch (e) {
-        _logger.e('Failed to retrieve profile for DIDs: $dids', error: e);
-        _logger.i('Trying to get profiles from bluesky');
+        _logger..e('Failed to retrieve profile for DIDs: $dids', error: e)
+        ..i('Trying to get profiles from bluesky');
         final bluesky = bsky.Bluesky.fromSession(_client.authRepository.session!);
         final profiles = await bluesky.actor.getProfiles(actors: dids);
         _logger.d('Profiles retrieved successfully from bluesky');
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 2698d6ea..e8ce4892 100644
--- a/lib/src/core/network/atproto/data/repositories/feed_repository.dart
+++ b/lib/src/core/network/atproto/data/repositories/feed_repository.dart
@@ -1,6 +1,6 @@
+import 'package:atproto/atproto.dart';
 import 'package:atproto_core/atproto_core.dart';
 import 'package:image_picker/image_picker.dart';
-import 'package:atproto/atproto.dart';
 import 'package:sparksocial/src/core/network/atproto/data/models/models.dart';
 
 /// Interface for Feed-related API endpoints
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 1555402e..b7680dd5 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
@@ -2,31 +2,32 @@ import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
 
-import 'package:atproto/core.dart';
 import 'package:atproto/atproto.dart';
+import 'package:atproto/core.dart';
 import 'package:bluesky/bluesky.dart' as bsky;
+/// embed converter 
+// ignore: implementation_imports
+import 'package:bluesky/src/services/entities/converter/embed_converter.dart';
 import 'package:get_it/get_it.dart';
 import 'package:http/http.dart' as http;
 import 'package:image/image.dart' as img;
 import 'package:image_picker/image_picker.dart';
 import 'package:path/path.dart' as path;
 import 'package:sparksocial/src/core/config/app_config.dart';
+import 'package:sparksocial/src/core/feed_algorithms/hardcoded_feed_algorithm.dart';
 import 'package:sparksocial/src/core/network/atproto/data/models/models.dart';
 import 'package:sparksocial/src/core/network/atproto/data/repositories/feed_repository.dart';
-import 'package:sparksocial/src/core/feed_algorithms/hardcoded_feed_algorithm.dart';
 import 'package:sparksocial/src/core/network/atproto/data/repositories/sprk_repository.dart';
 import 'package:sparksocial/src/core/utils/logging/log_service.dart';
-// ignore: implementation_imports
-import 'package:bluesky/src/services/entities/converter/embed_converter.dart';
+import 'package:sparksocial/src/core/utils/logging/logger.dart';
 
 /// Implementation of Feed-related API endpoints
 class FeedRepositoryImpl implements FeedRepository {
-  final SprkRepository _client;
-  final _logger = GetIt.instance<LogService>().getLogger('FeedRepository');
-
   FeedRepositoryImpl(this._client) {
     _logger.v('FeedRepository initialized');
   }
+  final SprkRepository _client;
+  final SparkLogger _logger = GetIt.instance<LogService>().getLogger('FeedRepository');
 
   List<T> _parseAndFilterPosts<T>({
     required List<dynamic> rawPosts,
@@ -41,7 +42,7 @@ class FeedRepositoryImpl implements FeedRepository {
         if (postData['reply'] != null) {
           continue;
         }
-        final parsedPost = fromJson(postData);
+        final parsedPost = fromJson(postData as Map<String, dynamic>);
         final postView = getPostView(parsedPost);
 
         if (postView.hasSupportedMedia) {
@@ -81,8 +82,8 @@ class FeedRepositoryImpl implements FeedRepository {
             NSID.parse('so.sprk.feed.getFeedSkeleton'),
             parameters: {'feed': feed, 'limit': limit, 'cursor': cursor},
             service: 'feeds.sprk.so',
-            to: (jsonMap) => FeedSkeleton.fromJson(jsonMap),
-            adaptor: (uint8) => jsonDecode(utf8.decode(uint8)),
+            to: FeedSkeleton.fromJson,
+            adaptor: (uint8) => jsonDecode(utf8.decode(uint8 as List<int>)) as Map<String, dynamic>,
           );
           _logger.d('Feed skeleton retrieved successfully');
           return result.data;
@@ -126,7 +127,7 @@ class FeedRepositoryImpl implements FeedRepository {
         parameters: {'uris': uris},
         headers: {'atproto-proxy': _client.sprkDid},
         to: (jsonMap) {
-          final posts = jsonMap['posts'] as List<dynamic>;
+          final posts = jsonMap['posts']! as List<dynamic>;
           return _parseAndFilterPosts<PostView>(
             rawPosts: posts,
             fromJson: PostView.fromJson,
@@ -134,7 +135,7 @@ class FeedRepositoryImpl implements FeedRepository {
             source: 'sprk',
           );
         },
-        adaptor: (uint8) => jsonDecode(utf8.decode(uint8)),
+        adaptor: (uint8) => jsonDecode(utf8.decode(uint8 as List<int>)) as Map<String, dynamic>,
       );
       _logger.d('Posts retrieved successfully');
 
@@ -196,7 +197,7 @@ class FeedRepositoryImpl implements FeedRepository {
           parameters: parameters,
           headers: {'atproto-proxy': _client.sprkDid},
           to: (jsonMap) {
-            final rawFeed = jsonMap['feed'] as List<dynamic>;
+            final rawFeed = jsonMap['feed']! as List<dynamic>;
             final feedPosts = _parseAndFilterPosts<FeedViewPost>(
               rawPosts: rawFeed,
               fromJson: FeedViewPost.fromJson,
@@ -205,7 +206,7 @@ class FeedRepositoryImpl implements FeedRepository {
             );
             return (posts: feedPosts, cursor: jsonMap['cursor'] as String?);
           },
-          adaptor: (uint8) => jsonDecode(utf8.decode(uint8)),
+          adaptor: (uint8) => jsonDecode(utf8.decode(uint8 as List<int>)) as Map<String, dynamic>,
         );
         _logger.d('Author feed retrieved successfully from Sprk');
         return result.data;
@@ -270,9 +271,9 @@ class FeedRepositoryImpl implements FeedRepository {
 
       final likeRecord = {
         // eventually use a like record class here for consistency
-        "\$type": "so.sprk.feed.like",
-        "subject": {"cid": postCid, "uri": postUri.toString()},
-        "createdAt": DateTime.now().toUtc().toIso8601String(),
+        r'$type': 'so.sprk.feed.like',
+        'subject': {'cid': postCid, 'uri': postUri.toString()},
+        'createdAt': DateTime.now().toUtc().toIso8601String(),
       };
 
       final result = await atproto.repo.createRecord(collection: NSID.parse('so.sprk.feed.like'), record: likeRecord);
@@ -332,21 +333,21 @@ class FeedRepositoryImpl implements FeedRepository {
 
           // Upload images if provided
           Map<String, dynamic>? embedJson;
-          if (imageFiles case List<XFile> files when files.isNotEmpty) {
+          if (imageFiles case final List<XFile> files when files.isNotEmpty) {
             _logger.d('Uploading ${files.length} images for comment');
-            final List<Image> uploadedImageMaps = await uploadImages(imageFiles: files, altTexts: altTexts);
+            final uploadedImageMaps = await uploadImages(imageFiles: files, altTexts: altTexts);
             embedJson = EmbedImage(images: uploadedImageMaps).toJson();
           }
 
           // Create the correct record JSON depending on the target platform.
-          final bool isSprk = parentUri.toString().contains('sprk');
+          final isSprk = parentUri.toString().contains('sprk');
 
           final Map<String, dynamic> recordJson;
           final NSID collection;
 
           if (isSprk) {
             // Sprk comment
-            final PostRecord sprkRecord = PostRecord(
+            final sprkRecord = PostRecord(
               text: text,
               reply: RecordReplyRef(
                 root: StrongRef(uri: effectiveRootUri, cid: effectiveRootCid),
@@ -359,7 +360,7 @@ class FeedRepositoryImpl implements FeedRepository {
             collection = NSID.parse('so.sprk.feed.post');
           } else {
             // Bluesky comment
-            final bsky.PostRecord bskyRecord = bsky.PostRecord(
+            final bskyRecord = bsky.PostRecord(
               text: text,
               createdAt: DateTime.now(),
               reply: bsky.ReplyRef(
@@ -391,7 +392,7 @@ class FeedRepositoryImpl implements FeedRepository {
     _logger.d('Creating image post with ${imageFiles.length} images, crosspost: $crosspostToBsky');
 
     switch (imageFiles) {
-      case List<XFile> files when files.isEmpty:
+      case final List<XFile> files when files.isEmpty:
         _logger.e('No images provided for image post');
         throw ArgumentError('At least one image is required for an image post.');
       default:
@@ -402,7 +403,7 @@ class FeedRepositoryImpl implements FeedRepository {
           }
 
           if (_client.authRepository.atproto case final atproto?) {
-            final List<Image> uploadedImageMaps = await uploadImages(imageFiles: imageFiles, altTexts: altTexts);
+            final uploadedImageMaps = await uploadImages(imageFiles: imageFiles, altTexts: altTexts);
 
             // Create Sprk post first
             final record = PostRecord(
@@ -439,7 +440,7 @@ class FeedRepositoryImpl implements FeedRepository {
   Future<List<Image>> uploadImages({required List<XFile> imageFiles, Map<String, String>? altTexts}) async {
     _logger.d('Processing ${imageFiles.length} images for upload');
 
-    final List<Image> uploadedImageMaps = [];
+    final uploadedImageMaps = <Image>[];
     for (final imageFile in imageFiles) {
       try {
         _logger.d('Processing image: ${imageFile.name}');
@@ -469,7 +470,6 @@ class FeedRepositoryImpl implements FeedRepository {
 
                     // Add the uploaded image to our result list
                     uploadedImageMaps.add(Image(alt: altTexts?[imageFile.path] ?? '', image: response.data.blob));
-                    break;
                   default:
                     _logger.e('Failed to upload image blob: ${response.status.code}');
                     throw Exception('Blob upload failed for ${imageFile.name}: ${response.status.code}');
@@ -501,14 +501,14 @@ class FeedRepositoryImpl implements FeedRepository {
       }
 
       // Handle file:// URL scheme
-      String cleanVideoPath = videoPath;
+      var cleanVideoPath = videoPath;
       if (videoPath.startsWith('file://')) {
         cleanVideoPath = videoPath.replaceFirst('file://', '');
       }
 
       // Validate the video file
       final file = File(cleanVideoPath);
-      if (!await file.exists()) {
+      if (!file.existsSync()) {
         throw Exception('Video file not found: $cleanVideoPath');
       }
 
@@ -539,10 +539,8 @@ class FeedRepositoryImpl implements FeedRepository {
 
       // Parse the response
       final responseData = jsonDecode(response.body);
-      Blob blob;
       //{'jobStatus': {'blob': blob}} = responseData; this is how it should work in the lexicon
-      blob = Blob.fromJson(responseData['blobRef']);
-      return blob;
+      return Blob.fromJson(responseData['blobRef'] as Map<String, dynamic>);
     });
   }
 
@@ -556,8 +554,8 @@ class FeedRepositoryImpl implements FeedRepository {
     _logger.d('Crossposting to Bluesky with ${sparkImages.length} images');
 
     // Convert Spark images to Bluesky images and handle 4-image limit
-    final List<bsky.Image> bskyImages = [];
-    final maxBskyImages = 4;
+    final bskyImages = <bsky.Image>[];
+    const maxBskyImages = 4;
     final imagesToUse = sparkImages.take(maxBskyImages).toList();
 
     for (final sparkImage in imagesToUse) {
@@ -570,8 +568,8 @@ class FeedRepositoryImpl implements FeedRepository {
     }
 
     // Determine final text for Bluesky post
-    String finalText = text;
-    List<bsky.Facet> facets = [];
+    var finalText = text;
+    final facets = <bsky.Facet>[];
 
     // If more than 4 images, add link to Spark post
     if (sparkImages.length > maxBskyImages) {
@@ -603,7 +601,7 @@ class FeedRepositoryImpl implements FeedRepository {
             ),
           );
         } else {
-          final ellipsis = '...';
+          const ellipsis = '...';
           final croppedTextLength = availableTextLength - ellipsis.length;
           final croppedText = text.substring(0, croppedTextLength);
           finalText = '$croppedText$ellipsis$linkWithNewlines';
@@ -657,7 +655,7 @@ class FeedRepositoryImpl implements FeedRepository {
 
         switch (response.status.code) {
           case 200:
-            _logger.i('Post deleted successfully: ${postUri.toString()}');
+            _logger.i('Post deleted successfully: $postUri');
             return true;
           default:
             _logger.e('Failed to delete post: ${response.status.code}');
@@ -703,13 +701,12 @@ class FeedRepositoryImpl implements FeedRepository {
         record: record.toJson(),
       );
 
-      switch (response.status) {
-        case HttpStatus.ok:
-          _logger.i('Video posted successfully: ${response.data.uri}');
-          return response.data;
-        default:
-          _logger.e('Failed to post video: ${response.status} ${response.data}');
-          throw Exception('Failed to post video: ${response.status} ${response.data}');
+      if (response.status == HttpStatus.ok) {
+        _logger.i('Video posted successfully: ${response.data.uri}');
+        return response.data;
+      } else {
+        _logger.e('Failed to post video: ${response.status} ${response.data}');
+        throw Exception('Failed to post video: ${response.status} ${response.data}');
       }
     });
   }
@@ -736,13 +733,13 @@ class FeedRepositoryImpl implements FeedRepository {
         final response = await bluesky.feed.getPostThread(uri: uri, depth: depth, parentHeight: parentHeight);
         return Thread.fromBsky(thread: response.data.thread, uri: uri);
       }
-      final source = 'so.sprk.feed.getPostThread';
+      const source = 'so.sprk.feed.getPostThread';
       final response = await atproto.get(
         NSID.parse(source),
         parameters: {'uri': uri.toString(), 'depth': depth, 'parentHeight': parentHeight},
         headers: {'atproto-proxy': _client.sprkDid},
         to: (jsonMap) {
-          return Thread.fromJson(jsonMap['thread'] as Map<String, dynamic>);
+          return Thread.fromJson(jsonMap['thread']! as Map<String, dynamic>);
         },
       );
 
@@ -769,9 +766,9 @@ class FeedRepositoryImpl implements FeedRepository {
         throw Exception('AtProto not initialized');
       }
 
-      List<Label> labels = [];
+      final labels = <Label>[];
 
-      final List<String> labelers = sources?.isNotEmpty == true ? sources! : ['did:plc:pbgyr67hftvpoqtvaurpsctc'];
+      final labelers = sources?.isNotEmpty ?? true ? sources! : ['did:plc:pbgyr67hftvpoqtvaurpsctc'];
 
       final parameters = {'uriPatterns': uris, 'sources': labelers, 'limit': limit, 'cursor': cursor};
 
@@ -780,18 +777,19 @@ class FeedRepositoryImpl implements FeedRepository {
         headers: {'atproto-proxy': 'did:plc:pbgyr67hftvpoqtvaurpsctc#atproto_labeler'},
         parameters: parameters,
         to: (jsonMap) => jsonMap,
-        adaptor: (uint8) => jsonDecode(utf8.decode(uint8)),
+        adaptor: (uint8) => jsonDecode(utf8.decode(uint8 as List<int>)) as Map<String, dynamic>,
       );
-      _logger.d('parameters: $parameters');
-      _logger.d('Labels retrieved: ${response.data}');
-
-      for (final label in response.data['labels'] as List<dynamic>) {
-        final cleanLabel = label as Map<String, Object?>;
-        cleanLabel.remove('sig'); // i am NOT going to convert that sig string into a UInt8List i am going to PASS OUT and DIE
-        cleanLabel.putIfAbsent(
-          'src',
-          () => 'did:plc:pbgyr67hftvpoqtvaurpsctc',
-        ); // fix this when there's multiple labelers support. for now idgaf. src is null for some reason in the response
+      _logger
+        ..d('parameters: $parameters')
+        ..d('Labels retrieved: ${response.data}');
+
+      for (final label in response.data['labels']! as List<dynamic>) {
+        final cleanLabel = label as Map<String, Object?>
+          ..remove('sig') // i am NOT going to convert that sig string into a UInt8List i am going to PASS OUT and DIE
+          ..putIfAbsent(
+            'src',
+            () => 'did:plc:pbgyr67hftvpoqtvaurpsctc',
+          ); // fix this when there's multiple labelers support. for now idgaf. src is null for some reason in the response
         labels.add(Label.fromJson(cleanLabel));
       }
 
@@ -823,7 +821,7 @@ class FeedRepositoryImpl implements FeedRepository {
         to: (jsonMap) {
           final storiesByAuthorMap = <ProfileViewBasic, List<StoryView>>{};
 
-          final storiesByAuthorArray = jsonMap['storiesByAuthor'] as List<dynamic>;
+          final storiesByAuthorArray = jsonMap['storiesByAuthor']! as List<dynamic>;
           for (final item in storiesByAuthorArray) {
             final itemMap = item as Map<String, dynamic>;
             final author = ProfileViewBasic.fromJson(itemMap['author'] as Map<String, dynamic>);
@@ -859,7 +857,8 @@ class FeedRepositoryImpl implements FeedRepository {
         NSID.parse('so.sprk.feed.getStories'),
         parameters: {'uris': storyUris},
         headers: {'atproto-proxy': _client.sprkDid},
-        to: (jsonMap) => (jsonMap['stories'] as List<dynamic>).map((story) => StoryView.fromJson(story)).toList(),
+        to: (jsonMap) =>
+            (jsonMap['stories']! as List<dynamic>).map((story) => StoryView.fromJson(story as Map<String, dynamic>)).toList(),
       );
 
       return response.data;
@@ -881,13 +880,12 @@ class FeedRepositoryImpl implements FeedRepository {
         record: record.toJson(),
       );
 
-      switch (response.status) {
-        case HttpStatus.ok:
-          _logger.i('Story posted successfully: ${response.data.uri}');
-          return response.data;
-        default:
-          _logger.e('Failed to post story: ${response.status} ${response.data}');
-          throw Exception('Failed to post story: ${response.status} ${response.data}');
+      if (response.status == HttpStatus.ok) {
+        _logger.i('Story posted successfully: ${response.data.uri}');
+        return response.data;
+      } else {
+        _logger.e('Failed to post story: ${response.status} ${response.data}');
+        throw Exception('Failed to post story: ${response.status} ${response.data}');
       }
     });
   }
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 cb1dcf8a..d2643121 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
@@ -2,22 +2,22 @@ import 'dart:convert';
 
 import 'package:atproto/core.dart';
 import 'package:get_it/get_it.dart';
+import 'package:sparksocial/src/core/network/atproto/data/models/graph_models.dart';
 import 'package:sparksocial/src/core/network/atproto/data/repositories/graph_repository.dart';
 import 'package:sparksocial/src/core/network/atproto/data/repositories/sprk_repository.dart';
 import 'package:sparksocial/src/core/storage/preferences/settings_repository.dart';
 import 'package:sparksocial/src/core/utils/logging/log_service.dart';
-import 'package:sparksocial/src/core/network/atproto/data/models/graph_models.dart';
+import 'package:sparksocial/src/core/utils/logging/logger.dart';
 import 'package:sparksocial/src/features/settings/ui/pages/profile_settings_page.dart';
 
 /// Implementation of Graph-related API endpoints
 class GraphRepositoryImpl implements GraphRepository {
-  final SprkRepository _client;
-  late final SettingsRepository _settingsRepository;
-  final _logger = GetIt.instance<LogService>().getLogger('GraphRepository');
-
   GraphRepositoryImpl(this._client) {
     _logger.v('GraphRepository initialized');
   }
+  final SprkRepository _client;
+  late final SettingsRepository _settingsRepository;
+  final SparkLogger _logger = GetIt.instance<LogService>().getLogger('GraphRepository');
 
   @override
   Future<FollowersResponse> getFollowers(String did) async {
@@ -39,7 +39,7 @@ class GraphRepositoryImpl implements GraphRepository {
         parameters: {'actor': did},
         headers: {'atproto-proxy': _client.sprkDid},
         to: (jsonMap) => jsonMap,
-        adaptor: (uint8) => jsonDecode(utf8.decode(uint8)),
+        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>);
@@ -66,7 +66,7 @@ class GraphRepositoryImpl implements GraphRepository {
         parameters: {'actor': did},
         headers: {'atproto-proxy': _client.sprkDid},
         to: (jsonMap) => jsonMap,
-        adaptor: (uint8) => jsonDecode(utf8.decode(uint8)),
+        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>);
@@ -94,6 +94,8 @@ class GraphRepositoryImpl implements GraphRepository {
         throw Exception('Session DID not available');
       }
       try {
+        /// goofy late check to ensure settings repository is initialized
+        // ignore: unnecessary_statements
         _settingsRepository; // goofy late check
       } catch (e) {
         _settingsRepository = GetIt.instance<SettingsRepository>();
@@ -116,7 +118,7 @@ class GraphRepositoryImpl implements GraphRepository {
           throw Exception('Already following this user');
         }
 
-        final followRecord = {"\$type": recordType, "subject": did, "createdAt": DateTime.now().toUtc().toIso8601String()};
+        final followRecord = {r'$type': recordType, 'subject': did, 'createdAt': DateTime.now().toUtc().toIso8601String()};
 
         final result = await atproto.repo.createRecord(collection: collection, record: followRecord);
 
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 825f462f..2e092aaf 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,20 +1,19 @@
 import 'dart:convert';
 
 import 'package:atproto_core/atproto_core.dart';
+import 'package:get_it/get_it.dart';
 import 'package:sparksocial/src/core/network/atproto/data/models/labeler_models.dart';
 import 'package:sparksocial/src/core/network/atproto/data/repositories/labeler_repository.dart';
 import 'package:sparksocial/src/core/network/atproto/data/repositories/sprk_repository.dart';
 import 'package:sparksocial/src/core/utils/logging/log_service.dart';
-import 'package:get_it/get_it.dart';
-
+import 'package:sparksocial/src/core/utils/logging/logger.dart';
 
 class LabelerRepositoryImpl extends LabelerRepository {
-  final SprkRepository _client;
-  final _logger = GetIt.instance<LogService>().getLogger('LabelerAPI');
-
   LabelerRepositoryImpl(this._client) {
     _logger.v('LabelerAPI initialized');
   }
+  final SprkRepository _client;
+  final SparkLogger _logger = GetIt.instance<LogService>().getLogger('LabelerAPI');
 
   @override
   Future<LabelerView> getServices(List<String> dids) async {
@@ -35,8 +34,8 @@ class LabelerRepositoryImpl extends LabelerRepository {
         NSID.parse('so.sprk.labeler.getServices'),
         parameters: {'dids': dids, 'detailed': false},
         headers: {'atproto-proxy': _client.sprkDid},
-        to: (jsonMap) => LabelerView.fromJson(jsonMap),
-        adaptor: (uint8) => jsonDecode(utf8.decode(uint8)),
+        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');
@@ -66,8 +65,8 @@ class LabelerRepositoryImpl extends LabelerRepository {
         NSID.parse('so.sprk.labeler.getServices'),
         parameters: {'dids': dids, 'detailed': true},
         headers: {'atproto-proxy': _client.sprkDid},
-        to: (jsonMap) => LabelerViewDetailed.fromJson(jsonMap),
-        adaptor: (uint8) => jsonDecode(utf8.decode(uint8)),
+        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');
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 51748c2e..9dbc2cf0 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
@@ -1,22 +1,22 @@
-import 'dart:typed_data';
 import 'dart:convert';
+import 'dart:typed_data';
 
-import 'package:atproto/core.dart';
 import 'package:atproto/atproto.dart';
+import 'package:atproto/core.dart';
 import 'package:get_it/get_it.dart';
 import 'package:http/http.dart' as http;
 import 'package:sparksocial/src/core/network/atproto/data/repositories/repo_repository.dart';
-import 'package:sparksocial/src/core/utils/logging/log_service.dart';
 import 'package:sparksocial/src/core/network/atproto/data/repositories/sprk_repository_impl.dart';
+import 'package:sparksocial/src/core/utils/logging/log_service.dart';
+import 'package:sparksocial/src/core/utils/logging/logger.dart';
 
 /// Repository-related API endpoints implementation
 class RepoRepositoryImpl implements RepoRepository {
-  final SprkRepositoryImpl _client;
-  final _logger = GetIt.instance<LogService>().getLogger('RepoAPI');
-
   RepoRepositoryImpl(this._client) {
     _logger.v('RepoAPI initialized');
   }
+  final SprkRepositoryImpl _client;
+  final SparkLogger _logger = GetIt.instance<LogService>().getLogger('RepoAPI');
 
   @override
   Future<({Record record, StrongRef strongRef})> getRecord({required AtUri uri}) async {
@@ -97,9 +97,9 @@ class RepoRepositoryImpl implements RepoRepository {
 
       // Delete cross-posted Bluesky counterpart if it exists
       try {
-        final String did = uri.hostname;
-        final String rkey = uri.rkey;
-        final AtUri blueskyUri = AtUri.parse('at://$did/app.bsky.feed.post/$rkey');
+        final did = uri.hostname;
+        final rkey = uri.rkey;
+        final blueskyUri = AtUri.parse('at://$did/app.bsky.feed.post/$rkey');
 
         _logger.d('Attempting to delete Bluesky counterpart post: $blueskyUri');
 
@@ -214,12 +214,12 @@ class RepoRepositoryImpl implements RepoRepository {
         if (subjectData is StrongRef) {
           final strongRef = subjectData.toJson();
           body = {
-            'subject': {'\$type': 'com.atproto.repo.strongRef', 'uri': strongRef['uri'], 'cid': strongRef['cid']},
+            'subject': {r'$type': 'com.atproto.repo.strongRef', 'uri': strongRef['uri'], 'cid': strongRef['cid']},
             'reasonType': reasonType.value,
           };
         } else if (subjectData is RepoRef) {
           body = {
-            'subject': {'\$type': 'com.atproto.admin.defs.repoRef', 'did': subjectData.did},
+            'subject': {r'$type': 'com.atproto.admin.defs.repoRef', 'did': subjectData.did},
             'reasonType': reasonType.value,
           };
         } else {
diff --git a/lib/src/core/network/atproto/data/repositories/sprk_repository.dart b/lib/src/core/network/atproto/data/repositories/sprk_repository.dart
index a6c456a9..09be9ae4 100644
--- a/lib/src/core/network/atproto/data/repositories/sprk_repository.dart
+++ b/lib/src/core/network/atproto/data/repositories/sprk_repository.dart
@@ -1,9 +1,9 @@
-import 'package:sparksocial/src/features/auth/auth.dart';
 import 'package:sparksocial/src/core/network/atproto/data/repositories/actor_repository.dart';
-import 'package:sparksocial/src/core/network/atproto/data/repositories/repo_repository.dart';
 import 'package:sparksocial/src/core/network/atproto/data/repositories/feed_repository.dart';
 import 'package:sparksocial/src/core/network/atproto/data/repositories/graph_repository.dart';
 import 'package:sparksocial/src/core/network/atproto/data/repositories/labeler_repository.dart';
+import 'package:sparksocial/src/core/network/atproto/data/repositories/repo_repository.dart';
+import 'package:sparksocial/src/features/auth/auth.dart';
 
 // All possible endpoints for the Sprk API should be in this contract
 // The implementation should be in each feature's repository
diff --git a/lib/src/core/network/atproto/data/repositories/sprk_repository_impl.dart b/lib/src/core/network/atproto/data/repositories/sprk_repository_impl.dart
index 068ed606..f12c9f97 100644
--- a/lib/src/core/network/atproto/data/repositories/sprk_repository_impl.dart
+++ b/lib/src/core/network/atproto/data/repositories/sprk_repository_impl.dart
@@ -1,26 +1,29 @@
 import 'package:get_it/get_it.dart';
+import 'package:sparksocial/src/core/auth/data/repositories/auth_repository.dart';
 import 'package:sparksocial/src/core/config/app_config.dart';
 import 'package:sparksocial/src/core/network/atproto/data/repositories/actor_repository.dart';
+import 'package:sparksocial/src/core/network/atproto/data/repositories/actor_repository_impl.dart';
 import 'package:sparksocial/src/core/network/atproto/data/repositories/feed_repository.dart';
+import 'package:sparksocial/src/core/network/atproto/data/repositories/feed_repository_impl.dart';
 import 'package:sparksocial/src/core/network/atproto/data/repositories/graph_repository.dart';
+// Feature-specific repositories
+import 'package:sparksocial/src/core/network/atproto/data/repositories/graph_repository_impl.dart';
 import 'package:sparksocial/src/core/network/atproto/data/repositories/labeler_repository.dart';
+import 'package:sparksocial/src/core/network/atproto/data/repositories/labeler_repository_impl.dart';
 import 'package:sparksocial/src/core/network/atproto/data/repositories/repo_repository.dart';
-import 'package:sparksocial/src/core/utils/logging/log_service.dart';
-import 'package:sparksocial/src/core/auth/data/repositories/auth_repository.dart';
-import 'package:sparksocial/src/core/network/atproto/data/repositories/sprk_repository.dart';
 import 'package:sparksocial/src/core/network/atproto/data/repositories/repo_repository_impl.dart';
-import 'package:sparksocial/src/core/network/atproto/data/repositories/feed_repository_impl.dart';
-import 'package:sparksocial/src/core/network/atproto/data/repositories/actor_repository_impl.dart';
-import 'package:sparksocial/src/core/network/atproto/data/repositories/labeler_repository_impl.dart';
-
-// Feature-specific repositories
-import 'package:sparksocial/src/core/network/atproto/data/repositories/graph_repository_impl.dart';
+import 'package:sparksocial/src/core/network/atproto/data/repositories/sprk_repository.dart';
+import 'package:sparksocial/src/core/utils/logging/log_service.dart';
+import 'package:sparksocial/src/core/utils/logging/logger.dart';
 
 /// Client for interacting with Spark API endpoints
 class SprkRepositoryImpl implements SprkRepository {
+  SprkRepositoryImpl(this._authRepository) : _sprkDid = _getSprkDid() {
+    _logger.d('SprkRepository initialized with DID: $_sprkDid');
+  }
   final AuthRepository _authRepository;
   final String _sprkDid;
-  final _logger = GetIt.instance<LogService>().getLogger('SprkRepository');
+  final SparkLogger _logger = GetIt.instance<LogService>().getLogger('SprkRepository');
 
   /// Get the authentication service
   @override
@@ -30,13 +33,9 @@ class SprkRepositoryImpl implements SprkRepository {
   @override
   String get sprkDid => _sprkDid;
 
-  SprkRepositoryImpl(this._authRepository) : _sprkDid = _getSprkDid() {
-    _logger.d('SprkRepository initialized with DID: $_sprkDid');
-  }
-
   static String _getSprkDid() {
     final sprkAppView = Uri.parse(AppConfig.appViewUrl);
-    return "did:web:${sprkAppView.host}#sprk_appview";
+    return 'did:web:${sprkAppView.host}#sprk_appview';
   }
 
   /// Execute API request with token expiration handling
@@ -58,7 +57,7 @@ class SprkRepositoryImpl implements SprkRepository {
 
         _logger.i('Token refreshed successfully, retrying API call');
         // Retry the call with the new token
-        return await apiCall();
+        return apiCall();
       }
 
       _logger.e('API call failed', error: e);
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 139b08b5..191fd0a6 100644
--- a/lib/src/core/network/messages/data/models/message_models.dart
+++ b/lib/src/core/network/messages/data/models/message_models.dart
@@ -5,10 +5,9 @@ part 'message_models.g.dart';
 
 @freezed
 class Embed with _$Embed {
-  const Embed._();
-
   @JsonSerializable(explicitToJson: true)
   const factory Embed({String? url, String? type, String? preview}) = _Embed;
+  const Embed._();
 
   factory Embed.fromJson(Map<String, dynamic> json) => _$EmbedFromJson(json);
 
@@ -18,7 +17,6 @@ class Embed with _$Embed {
 
 @freezed
 class Message with _$Message {
-  const Message._();
   @JsonSerializable(explicitToJson: true)
   const factory Message({
     required int id,
@@ -28,6 +26,7 @@ class Message with _$Message {
     @JsonKey(name: 'timestampz') required DateTime timestamp,
     List<Embed>? embed,
   }) = _Message;
+  const Message._();
 
   factory Message.fromJson(Map<String, dynamic> json) => _$MessageFromJson(json);
 }
diff --git a/lib/src/core/network/messages/data/repository/messages_repository_impl.dart b/lib/src/core/network/messages/data/repository/messages_repository_impl.dart
index f6113450..61e7f1f8 100644
--- a/lib/src/core/network/messages/data/repository/messages_repository_impl.dart
+++ b/lib/src/core/network/messages/data/repository/messages_repository_impl.dart
@@ -1,26 +1,26 @@
 import 'dart:convert';
+
 import 'package:get_it/get_it.dart';
 import 'package:http/http.dart' as http;
 import 'package:sparksocial/src/core/config/app_config.dart';
 import 'package:sparksocial/src/core/network/atproto/atproto.dart' hide Embed;
+import 'package:sparksocial/src/core/network/messages/data/models/message_models.dart';
+import 'package:sparksocial/src/core/network/messages/data/repository/messages_repository.dart';
 import 'package:sparksocial/src/core/utils/utils.dart';
 import 'package:sparksocial/src/features/auth/auth.dart';
-import 'messages_repository.dart';
-import '../models/message_models.dart';
 
 class MessagesRepositoryImpl implements MessagesRepository {
-  final AuthRepository _authRepository;
-  late final SparkLogger _logger;
-
   MessagesRepositoryImpl(this._authRepository) {
     _logger = GetIt.I<LogService>().getLogger('MessagesRepository');
   }
+  final AuthRepository _authRepository;
+  late final SparkLogger _logger;
 
   String? get accessToken => _authRepository.dmAccessToken;
 
   Map<String, String> get _headers => {
     'Content-Type': 'application/json',
-    if (accessToken?.isNotEmpty == true) 'Authorization': 'Bearer $accessToken',
+    if (accessToken?.isNotEmpty ?? true) 'Authorization': 'Bearer $accessToken',
   };
 
   Future<void> _refreshIfExpired() async {
@@ -50,7 +50,7 @@ class MessagesRepositoryImpl implements MessagesRepository {
 
       if (response.statusCode == 200) {
         final data = jsonDecode(response.body) as Map<String, dynamic>;
-        final messagesList = (data['messages'] as List).map((json) => Message.fromJson(json)).toList();
+        final messagesList = (data['messages'] as List).map((json) => Message.fromJson(json as Map<String, dynamic>)).toList();
 
         return (messages: messagesList, cursor: data['cursor'] as String?);
       } else if (response.statusCode == 401) {
@@ -89,7 +89,7 @@ class MessagesRepositoryImpl implements MessagesRepository {
       if (response.statusCode == 200) {
         final userDid = _authRepository.session?.did;
         final data = jsonDecode(response.body) as Map<String, dynamic>;
-        final messages = (data['conversations'] as List).map((json) => Message.fromJson(json)).toList();
+        final messages = (data['conversations'] as List).map((json) => Message.fromJson(json as Map<String, dynamic>)).toList();
         final profileDids = (data['conversations'] as List)
             .map((json) => json['sender_did'] != userDid ? json['sender_did'] as String : json['receiver_did'] as String)
             .where((did) => did.startsWith('did:plc:'))
@@ -125,12 +125,13 @@ class MessagesRepositoryImpl implements MessagesRepository {
       final uri = Uri.parse('${AppConfig.messagesServiceUrl}/messages/send');
 
       final response = await http.post(uri, headers: _headers, body: jsonEncode(requestBody), encoding: utf8);
-      _logger.d('Response status code: ${response.statusCode}');
-      _logger.d('Response body: ${response.body}');
+      _logger
+        ..d('Response status code: ${response.statusCode}')
+        ..d('Response body: ${response.body}');
 
       if (response.statusCode == 200 || response.statusCode == 201) {
         final data = jsonDecode(response.body) as Map<String, dynamic>;
-        return Message.fromJson(data['message']);
+        return Message.fromJson(data['message'] as Map<String, dynamic>);
       } else if (response.statusCode == 401) {
         await _refreshIfExpired();
 
diff --git a/lib/src/core/routing/app_router.dart b/lib/src/core/routing/app_router.dart
index 0fee03a1..50ba2fc8 100644
--- a/lib/src/core/routing/app_router.dart
+++ b/lib/src/core/routing/app_router.dart
@@ -1,10 +1,10 @@
 import 'package:auto_route/auto_route.dart';
+import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
-import 'package:sparksocial/src/core/routing/pages.dart';
+import 'package:image_picker/image_picker.dart';
 import 'package:sparksocial/src/core/network/atproto/atproto.dart';
+import 'package:sparksocial/src/core/routing/pages.dart';
 import 'package:video_player/video_player.dart';
-import 'package:image_picker/image_picker.dart';
-import 'package:collection/collection.dart';
 
 part 'app_router.gr.dart';
 
@@ -14,7 +14,7 @@ part 'app_router.gr.dart';
 @AutoRouterConfig()
 class AppRouter extends RootStackRouter {
   @override
-  RouteType get defaultRouteType => RouteType.adaptive();
+  RouteType get defaultRouteType => const RouteType.adaptive();
 
   @override
   List<AutoRoute> get routes => [
@@ -110,8 +110,6 @@ class AppRouter extends RootStackRouter {
       isScrollControlled: true,
       backgroundColor: Colors.transparent,
       useSafeArea: true,
-      enableDrag: true,
-      isDismissible: true,
     );
   }
 
@@ -122,7 +120,6 @@ class AppRouter extends RootStackRouter {
       isScrollControlled: true,
       backgroundColor: Colors.transparent,
       useSafeArea: true,
-      enableDrag: true,
     );
   }
 }
diff --git a/lib/src/core/routing/pages.dart b/lib/src/core/routing/pages.dart
index 5126d934..ae5a4f96 100644
--- a/lib/src/core/routing/pages.dart
+++ b/lib/src/core/routing/pages.dart
@@ -1,37 +1,35 @@
-library;
-
 export 'package:sparksocial/src/features/auth/ui/pages/auth_prompt_page.dart';
 export 'package:sparksocial/src/features/auth/ui/pages/login_page.dart';
-export 'package:sparksocial/src/features/auth/ui/pages/register_page.dart';
 export 'package:sparksocial/src/features/auth/ui/pages/onboarding_page.dart';
-export 'package:sparksocial/src/features/profile/ui/pages/profile_page.dart';
-export 'package:sparksocial/src/features/profile/ui/pages/edit_profile_page.dart';
-export 'package:sparksocial/src/features/profile/ui/pages/profile_videos_page.dart';
-export 'package:sparksocial/src/features/profile/ui/pages/profile_photos_page.dart';
-export 'package:sparksocial/src/features/profile/ui/pages/standalone_profile_feed_page.dart';
+export 'package:sparksocial/src/features/auth/ui/pages/register_page.dart';
+export 'package:sparksocial/src/features/comments/ui/pages/comments_page.dart';
+export 'package:sparksocial/src/features/comments/ui/pages/replies_page.dart';
 export 'package:sparksocial/src/features/feed/ui/pages/feed_page.dart';
 export 'package:sparksocial/src/features/feed/ui/pages/feeds_page.dart';
+export 'package:sparksocial/src/features/feed/ui/pages/standalone_post_page.dart';
+export 'package:sparksocial/src/features/home/ui/pages/empty_page.dart';
 export 'package:sparksocial/src/features/home/ui/pages/main_page.dart';
-export 'package:sparksocial/src/features/messages/ui/pages/messages_page.dart';
+export 'package:sparksocial/src/features/home/ui/pages/placeholder_page.dart';
 export 'package:sparksocial/src/features/messages/ui/pages/chat_page.dart';
+export 'package:sparksocial/src/features/messages/ui/pages/messages_page.dart';
 export 'package:sparksocial/src/features/messages/ui/pages/new_chat_search_page.dart';
+export 'package:sparksocial/src/features/posting/ui/pages/create_video_page.dart';
+export 'package:sparksocial/src/features/posting/ui/pages/image_review_page.dart';
+export 'package:sparksocial/src/features/posting/ui/pages/story_review_page.dart';
+export 'package:sparksocial/src/features/posting/ui/pages/video_playback_page.dart';
+export 'package:sparksocial/src/features/posting/ui/pages/video_review_page.dart';
+export 'package:sparksocial/src/features/profile/ui/pages/edit_profile_page.dart';
+export 'package:sparksocial/src/features/profile/ui/pages/profile_page.dart';
+export 'package:sparksocial/src/features/profile/ui/pages/profile_photos_page.dart';
+export 'package:sparksocial/src/features/profile/ui/pages/profile_videos_page.dart';
+export 'package:sparksocial/src/features/profile/ui/pages/standalone_profile_feed_page.dart';
+export 'package:sparksocial/src/features/profile/ui/pages/user_profile_page.dart';
 export 'package:sparksocial/src/features/search/ui/pages/search_page.dart';
-export 'package:sparksocial/src/features/splash/ui/pages/splash_page.dart';
-export 'package:sparksocial/src/features/home/ui/pages/empty_page.dart';
-export 'package:sparksocial/src/features/settings/ui/pages/feed_settings_page.dart';
-export 'package:sparksocial/src/features/home/ui/pages/placeholder_page.dart';
 export 'package:sparksocial/src/features/settings/ui/pages/feed_list_page.dart';
+export 'package:sparksocial/src/features/settings/ui/pages/feed_settings_page.dart';
 export 'package:sparksocial/src/features/settings/ui/pages/label_settings_page.dart';
-export 'package:sparksocial/src/features/comments/ui/pages/comments_page.dart';
-export 'package:sparksocial/src/features/feed/ui/pages/standalone_post_page.dart';
-export 'package:sparksocial/src/features/comments/ui/pages/replies_page.dart';
-export 'package:sparksocial/src/features/profile/ui/pages/user_profile_page.dart';
-export 'package:sparksocial/src/features/stories/ui/pages/all_stories_page.dart';
-export 'package:sparksocial/src/features/posting/ui/pages/video_playback_page.dart';
-export 'package:sparksocial/src/features/posting/ui/pages/video_review_page.dart';
-export 'package:sparksocial/src/features/posting/ui/pages/story_review_page.dart';
-export 'package:sparksocial/src/features/posting/ui/pages/create_video_page.dart';
-export 'package:sparksocial/src/features/posting/ui/pages/image_review_page.dart';
 export 'package:sparksocial/src/features/settings/ui/pages/profile_settings_page.dart';
+export 'package:sparksocial/src/features/splash/ui/pages/splash_page.dart';
+export 'package:sparksocial/src/features/stories/ui/pages/all_stories_page.dart';
 export 'package:sparksocial/src/features/stories/ui/pages/author_stories_page.dart';
 export 'package:sparksocial/src/features/stories/ui/pages/story_page.dart';
diff --git a/lib/src/core/storage/cache/cache_manager_impl.dart b/lib/src/core/storage/cache/cache_manager_impl.dart
index 38ef3586..18f7245e 100644
--- a/lib/src/core/storage/cache/cache_manager_impl.dart
+++ b/lib/src/core/storage/cache/cache_manager_impl.dart
@@ -1,24 +1,16 @@
 import 'dart:io';
 import 'dart:typed_data';
+
 import 'package:atproto/core.dart';
-import 'package:path_provider/path_provider.dart';
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
-import 'package:sparksocial/src/core/storage/cache/cache_manager_interface.dart';
 import 'package:get_it/get_it.dart';
+import 'package:path_provider/path_provider.dart';
 import 'package:sparksocial/src/core/network/atproto/data/repositories/sprk_repository.dart';
+import 'package:sparksocial/src/core/storage/cache/cache_manager_interface.dart';
 import 'package:sparksocial/src/core/utils/logging/logging.dart';
 
 /// Manages temporary cache files for the application
 class CacheManagerImpl implements CacheManagerInterface {
-  /// Singleton instance
-  static final CacheManagerImpl _instance = CacheManagerImpl._();
-
-  /// Default cache manager for most files
-  late final CacheManager cacheManager;
-
-  /// Logger for debugging
-  late final SparkLogger _logger;
-
   /// Private constructor
   CacheManagerImpl._() {
     cacheManager = CacheManager(
@@ -30,6 +22,15 @@ class CacheManagerImpl implements CacheManagerInterface {
     _logger = GetIt.instance<LogService>().getLogger('CacheManager');
   }
 
+  /// Singleton instance
+  static final CacheManagerImpl _instance = CacheManagerImpl._();
+
+  /// Default cache manager for most files
+  late final CacheManager cacheManager;
+
+  /// Logger for debugging
+  late final SparkLogger _logger;
+
   /// Get the singleton instance
   static CacheManagerImpl get instance => _instance;
 
@@ -48,7 +49,7 @@ class CacheManagerImpl implements CacheManagerInterface {
     return null;
   }
 
-    /// Download blob from AT Protocol API
+  /// Download blob from AT Protocol API
   Future<Uint8List> _downloadAtProtocolBlob(String did, String cid) async {
     try {
       final sprkRepository = GetIt.instance<SprkRepository>();
@@ -151,7 +152,7 @@ class CacheManagerImpl implements CacheManagerInterface {
   @override
   Future<int> getCacheSize() async {
     final cacheDir = await getTemporaryDirectory();
-    return await _calculateDirSize(cacheDir);
+    return _calculateDirSize(cacheDir);
   }
 
   /// Clear all cached files
@@ -178,7 +179,7 @@ class CacheManagerImpl implements CacheManagerInterface {
 
   /// Helper method to calculate directory size
   Future<int> _calculateDirSize(Directory dir) async {
-    int totalSize = 0;
+    var totalSize = 0;
     try {
       if (dir.existsSync()) {
         dir.listSync(recursive: true, followLinks: false).forEach((FileSystemEntity entity) {
diff --git a/lib/src/core/storage/cache/cache_manager_interface.dart b/lib/src/core/storage/cache/cache_manager_interface.dart
index 7059a161..ed685efa 100644
--- a/lib/src/core/storage/cache/cache_manager_interface.dart
+++ b/lib/src/core/storage/cache/cache_manager_interface.dart
@@ -11,7 +11,7 @@ abstract class CacheManagerInterface {
   Future<File?> getCachedFile(String url);
 
   /// Store a file in the cache with the given key
-  Future<void> putFile(String url, Uint8List fileBytes);  
+  Future<void> putFile(String url, Uint8List fileBytes);
 
   /// Remove a specific file from cache
   Future<void> removeFile(String url);
diff --git a/lib/src/core/storage/cache/download_manager_impl.dart b/lib/src/core/storage/cache/download_manager_impl.dart
index c1707712..8abd015f 100644
--- a/lib/src/core/storage/cache/download_manager_impl.dart
+++ b/lib/src/core/storage/cache/download_manager_impl.dart
@@ -1,4 +1,5 @@
 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:sparksocial/src/core/network/atproto/data/models/feed_models.dart';
@@ -8,7 +9,6 @@ import 'package:sparksocial/src/core/storage/preferences/settings_repository.dar
 import 'package:sparksocial/src/core/storage/storage.dart';
 import 'package:sparksocial/src/core/utils/logging/logging.dart';
 import 'package:sparksocial/src/features/feed/providers/feed_state.dart';
-import 'package:collection/collection.dart';
 
 class DownloadManagerImpl implements DownloadManagerInterface {
   DownloadManagerImpl() : _pool = Pool(FeedState.poolSize) {
@@ -75,7 +75,7 @@ class DownloadManagerImpl implements DownloadManagerInterface {
     final newTasks = <DownloadTask>[];
 
     while (_tasks.isNotEmpty) {
-      var task = _tasks.removeFirst();
+      final task = _tasks.removeFirst();
       if (task.status == DownloadTaskStatus.pending) {
         // Try to acquire a pool resource. If pool is full, withResource will wait.
         // We want to submit to the pool and let it manage, not block _processQueue.
@@ -83,7 +83,7 @@ class DownloadManagerImpl implements DownloadManagerInterface {
         // that would make _processQueue sequential for task submission to pool.
         // Instead, we launch it and let the pool handle concurrency.
 
-        _pool
+        await _pool
             .withResource(() => _executeTask(task))
             .then((_) {
               // This 'then' block executes after _executeTask is fully done
@@ -93,7 +93,7 @@ class DownloadManagerImpl implements DownloadManagerInterface {
             .catchError((e, s) {
               // This catchError is for unexpected errors from _pool.withResource itself,
               // or if _executeTask re-throws an error not caught internally.
-              _logger.e('Error from pool for task ${task.uri}: $e', error: e, stackTrace: s);
+              _logger.e('Error from pool for task ${task.uri}: $e', error: e, stackTrace: s as StackTrace);
               // Ensure task is marked as failed and removed if not already
               if (task.status != DownloadTaskStatus.failed && task.status != DownloadTaskStatus.completed) {
                 task.status = DownloadTaskStatus.failed;
@@ -163,16 +163,14 @@ class DownloadManagerImpl implements DownloadManagerInterface {
               throw Exception('Video file was not properly cached after download: ${task.post.videoUrl}');
             }
             _logger.d('Video file successfully cached: ${task.post.videoUrl}');
-            break;
           case EmbedViewImage():
-            for (String url in task.post.imageUrls) {
+            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');
               }
             }
-            break;
           case EmbedViewBskyRecordWithMedia(:final media):
             // Handle nested media in record with media embeds
             switch (media) {
@@ -190,20 +188,17 @@ class DownloadManagerImpl implements DownloadManagerInterface {
                   throw Exception('Video file was not properly cached after download: ${task.post.videoUrl}');
                 }
                 _logger.d('Video file successfully cached: ${task.post.videoUrl}');
-                break;
               case EmbedViewImage() || EmbedViewBskyImages():
-                for (String url in task.post.imageUrls) {
+                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');
                   }
                 }
-                break;
               case _:
                 throw Exception('Unsupported media type: ${media.runtimeType}');
             }
-            break;
           case _:
             throw Exception('Unsupported media type: ${task.post.embed.runtimeType}');
         }
diff --git a/lib/src/core/storage/cache/download_manager_interface.dart b/lib/src/core/storage/cache/download_manager_interface.dart
index d89e75d3..0273f9c9 100644
--- a/lib/src/core/storage/cache/download_manager_interface.dart
+++ b/lib/src/core/storage/cache/download_manager_interface.dart
@@ -50,7 +50,6 @@ class DownloadTask {
 }
 
 abstract class DownloadManagerInterface {
-
   /// Sets the currently active feed. Tasks related to the active feed
   /// may be prioritized.
   ///
diff --git a/lib/src/core/storage/cache/sql_cache_impl.dart b/lib/src/core/storage/cache/sql_cache_impl.dart
index 94ee00aa..f668b836 100644
--- a/lib/src/core/storage/cache/sql_cache_impl.dart
+++ b/lib/src/core/storage/cache/sql_cache_impl.dart
@@ -2,16 +2,15 @@ import 'dart:async';
 import 'dart:convert';
 
 import 'package:atproto/atproto.dart';
+import 'package:atproto_core/atproto_core.dart';
 import 'package:get_it/get_it.dart';
 import 'package:path/path.dart';
+import 'package:sparksocial/src/core/network/atproto/data/models/models.dart';
 import 'package:sparksocial/src/core/storage/cache/sql_cache_interface.dart';
 import 'package:sparksocial/src/core/storage/storage.dart';
 import 'package:sparksocial/src/core/utils/logging/logging.dart';
 import 'package:sqflite/sqflite.dart';
 
-import 'package:sparksocial/src/core/network/atproto/data/models/models.dart';
-import 'package:atproto_core/atproto_core.dart';
-
 // --- Post Table ---
 const String _tablePosts = 'cached_posts';
 const String _columnUri = 'uri'; // TEXT PRIMARY KEY (post.uri.toString())
@@ -43,12 +42,11 @@ const String _columnPostUriFK = 'post_uri_fk'; // TEXT, Foreign Key to cached_po
 const String _columnAssociationOrder = 'association_order'; // INTEGER, for ordering posts within a feed
 
 class SQLCacheImpl implements SQLCacheInterface {
-  static Database? _database;
-  late final SparkLogger _logger;
-
   SQLCacheImpl() {
     _logger = GetIt.instance<LogService>().getLogger('SQLCacheImpl');
   }
+  static Database? _database;
+  late final SparkLogger _logger;
 
   Future<Database> get database async {
     if (_database != null) return _database!;
@@ -57,8 +55,8 @@ class SQLCacheImpl implements SQLCacheInterface {
   }
 
   Future<Database> _initDB() async {
-    String path = join(await getDatabasesPath(), 'sparksocial_sql_cache.db');
-    return await openDatabase(
+    final path = join(await getDatabasesPath(), 'sparksocial_sql_cache.db');
+    return openDatabase(
       path,
       version: 2, // Increment this if you change the schema
       onCreate: _onCreate,
@@ -67,7 +65,7 @@ class SQLCacheImpl implements SQLCacheInterface {
   }
 
   Future<void> _onCreate(Database db, int version) async {
-    Batch batch = db.batch();
+    final batch = db.batch();
     // Posts Table
     batch.execute('''
       CREATE TABLE $_tablePosts (
@@ -194,7 +192,7 @@ class SQLCacheImpl implements SQLCacheInterface {
       whereArgs: uris.map((uri) => uri.toString()).toList(),
     );
 
-    return maps.map((map) => _mapToPostView(map)).toList();
+    return maps.map(_mapToPostView).toList();
   }
 
   /// Given a list of AtUris, returns a sub-list containing only those URIs
@@ -226,7 +224,7 @@ class SQLCacheImpl implements SQLCacheInterface {
       limit: limit,
       offset: offset,
     );
-    return maps.map((map) => _mapToPostView(map)).toList();
+    return maps.map(_mapToPostView).toList();
   }
 
   /// Converts a Map from SQLite back to a PostView.
@@ -235,22 +233,21 @@ class SQLCacheImpl implements SQLCacheInterface {
     return PostView(
       uri: AtUri.parse(map[_columnUri] as String),
       cid: map[_columnString] as String,
-      author: ProfileViewBasic.fromJson(jsonDecode(map[_columnAuthor] as String)),
-      record: PostRecord.fromJson(jsonDecode(map[_columnRecord] as String)),
+      author: ProfileViewBasic.fromJson(jsonDecode(map[_columnAuthor] as String) as Map<String, dynamic>),
+      record: PostRecord.fromJson(jsonDecode(map[_columnRecord] as String) as Map<String, dynamic>),
       isRepost: (map[_columnIsRepost] as int) == 1,
       indexedAt: DateTime.parse(map[_columnIndexedAt] as String),
       likeCount: map[_columnLikeCount] as int?,
       replyCount: map[_columnReplyCount] as int?,
       repostCount: map[_columnRepostCount] as int?,
       quoteCount: map[_columnQuoteCount] as int?,
-      labels:
-          map[_columnLabels] != null
-              ? (jsonDecode(map[_columnLabels] as String) as List<dynamic>)
-                  .map((e) => Label.fromJson(e as Map<String, dynamic>))
-                  .toList()
-              : null,
-      viewer: map[_columnViewer] != null ? Viewer.fromJson(jsonDecode(map[_columnViewer] as String)) : null,
-      embed: map[_columnEmbed] != null ? EmbedView.fromJson(jsonDecode(map[_columnEmbed] as String)) : null,
+      labels: map[_columnLabels] != null
+          ? (jsonDecode(map[_columnLabels] as String) as List<dynamic>)
+                .map((e) => Label.fromJson(e as Map<String, dynamic>))
+                .toList()
+          : null,
+      viewer: map[_columnViewer] != null ? Viewer.fromJson(jsonDecode(map[_columnViewer] as String) as Map<String, dynamic>) : null,
+      embed: map[_columnEmbed] != null ? EmbedView.fromJson(jsonDecode(map[_columnEmbed] as String) as Map<String, dynamic>) : null,
     );
   }
 
@@ -301,7 +298,7 @@ class SQLCacheImpl implements SQLCacheInterface {
 
       // 2. Add new associations in order
       final batch = txn.batch();
-      for (int i = 0; i < postUris.length; i++) {
+      for (var i = 0; i < postUris.length; i++) {
         batch.insert(
           _tableFeedPostAssociations,
           {
@@ -341,8 +338,8 @@ class SQLCacheImpl implements SQLCacheInterface {
   Future<List<PostView>> getPostsForFeed(Feed feed, {int? limit, int? offset}) async {
     final feedIdentifier = feed.identifier;
     final db = await database;
-    List<dynamic> arguments = [feedIdentifier];
-    String limitClause = '';
+    final arguments = <dynamic>[feedIdentifier];
+    var limitClause = '';
 
     if (limit != null) {
       limitClause += ' LIMIT ?';
@@ -359,7 +356,8 @@ class SQLCacheImpl implements SQLCacheInterface {
       arguments.add(offset);
     }
 
-    final String sql = '''
+    final sql =
+        '''
       SELECT p.*
       FROM $_tablePosts p
       INNER JOIN $_tableFeedPostAssociations fpa ON p.$_columnUri = fpa.$_columnPostUriFK
@@ -369,7 +367,7 @@ class SQLCacheImpl implements SQLCacheInterface {
     ''';
 
     final List<Map<String, dynamic>> maps = await db.rawQuery(sql, arguments);
-    return maps.map((map) => _mapToPostView(map)).toList();
+    return maps.map(_mapToPostView).toList();
   }
 
   /// Retrieves post URIs for a specific feed, ordered by their association order
@@ -377,15 +375,15 @@ class SQLCacheImpl implements SQLCacheInterface {
   ///
   /// Does NOT update the `lastAccessed` timestamp of any posts.
   ///
-  /// - [feedIdentifier]: The identifier of the feed.
+  /// - [feed]: The identifier of the feed.
   /// - [limit]: The maximum number of URIs to retrieve. If null, no limit.
   /// - [offset]: The number of URIs to skip before starting to retrieve. Requires [limit] to be set.
   @override
   Future<List<String>> getUrisForFeed(Feed feed, {int? limit, int? offset}) async {
     final feedIdentifier = feed.identifier;
     final db = await database;
-    List<dynamic> arguments = [feedIdentifier];
-    String limitClause = '';
+    final arguments = <dynamic>[feedIdentifier];
+    var limitClause = '';
 
     if (limit != null) {
       limitClause += ' LIMIT ?';
@@ -399,7 +397,8 @@ class SQLCacheImpl implements SQLCacheInterface {
       arguments.add(offset);
     }
 
-    final String sql = '''
+    final sql =
+        '''
       SELECT p.$_columnUri
       FROM $_tablePosts p
       INNER JOIN $_tableFeedPostAssociations fpa ON p.$_columnUri = fpa.$_columnPostUriFK
@@ -429,14 +428,14 @@ class SQLCacheImpl implements SQLCacheInterface {
         whereArgs: [feedIdentifier],
       );
 
-      int currentMaxOrder = -1; // Start before 0 if feed is empty
+      var currentMaxOrder = -1; // Start before 0 if feed is empty
       if (maxOrderResult.isNotEmpty && maxOrderResult.first['max_order'] != null) {
         currentMaxOrder = maxOrderResult.first['max_order'] as int;
       }
 
       // 2. Add new associations with incrementing order
       final batch = txn.batch();
-      for (int i = 0; i < postUris.length; i++) {
+      for (var i = 0; i < postUris.length; i++) {
         batch.insert(_tableFeedPostAssociations, {
           _columnFeedIdentifierFK: feedIdentifier,
           _columnPostUriFK: postUris[i],
@@ -472,11 +471,11 @@ class SQLCacheImpl implements SQLCacheInterface {
     final db = await database;
     final cacheManager = GetIt.instance<CacheManagerInterface>();
     final countResult = await db.rawQuery('SELECT COUNT(*) FROM $_tablePosts');
-    final int currentSize = Sqflite.firstIntValue(countResult) ?? 0;
-    int deletedCount = 0;
+    final currentSize = Sqflite.firstIntValue(countResult) ?? 0;
+    var deletedCount = 0;
 
     if (currentSize > postsToKeep) {
-      final int numToDelete = currentSize - postsToKeep;
+      final numToDelete = currentSize - postsToKeep;
       // Find the URIs of the posts to delete (oldest ones)
       final List<Map<String, dynamic>> toDeleteMaps = await db.query(
         _tablePosts,
@@ -487,11 +486,11 @@ class SQLCacheImpl implements SQLCacheInterface {
 
       if (toDeleteMaps.isNotEmpty) {
         for (final map in toDeleteMaps) {
-          final String uri = map[_columnUri] as String;
+          final uri = map[_columnUri] as String;
           await cacheManager.removeFile(uri);
         }
 
-        final List<String> urisToDelete = toDeleteMaps.map((map) => map[_columnUri] as String).toList();
+        final urisToDelete = toDeleteMaps.map((map) => map[_columnUri] as String).toList();
         final placeholders = List.generate(urisToDelete.length, (index) => '?').join(',');
         deletedCount = await db.delete(_tablePosts, where: '$_columnUri IN ($placeholders)', whereArgs: urisToDelete);
       }
@@ -514,11 +513,11 @@ class SQLCacheImpl implements SQLCacheInterface {
       whereArgs: [cutoffTimestamp],
     );
     for (final map in toDeleteMaps) {
-      final String uri = map[_columnUri];
+      final uri = map[_columnUri] as String;
       await cacheManager.removeFile(uri);
     }
 
-    return await db.delete(_tablePosts, where: '$_columnLastAccessed < ?', whereArgs: [cutoffTimestamp]);
+    return db.delete(_tablePosts, where: '$_columnLastAccessed < ?', whereArgs: [cutoffTimestamp]);
   }
 
   /// Clears the entire PostView cache from the database.
diff --git a/lib/src/core/storage/cache/sql_cache_interface.dart b/lib/src/core/storage/cache/sql_cache_interface.dart
index a8dc1291..05a0de33 100644
--- a/lib/src/core/storage/cache/sql_cache_interface.dart
+++ b/lib/src/core/storage/cache/sql_cache_interface.dart
@@ -1,8 +1,8 @@
 import 'dart:async';
 
+import 'package:atproto_core/atproto_core.dart'; // For AtUri
 // We need models for method signatures
 import 'package:sparksocial/src/core/network/atproto/data/models/models.dart';
-import 'package:atproto_core/atproto_core.dart'; // For AtUri
 
 abstract class SQLCacheInterface {
   /// Caches a single [PostView]. If it already exists, it's updated.
@@ -72,7 +72,6 @@ abstract class SQLCacheInterface {
   /// It's assumed that the [PostView]s corresponding to `postUris` are already cached.
   Future<void> appendPostsToFeed(Feed feed, List<String> postUris);
 
-
   /// Clears all associations with a specific [Feed] from the cache.
   /// Neither the feed metadata nor the posts are removed, only the associations.
   Future<void> clearPostsFromFeed(Feed feed);
diff --git a/lib/src/core/storage/preferences/secure_storage.dart b/lib/src/core/storage/preferences/secure_storage.dart
index ce92b872..2d7e2503 100644
--- a/lib/src/core/storage/preferences/secure_storage.dart
+++ b/lib/src/core/storage/preferences/secure_storage.dart
@@ -1,17 +1,17 @@
 import 'dart:convert';
+
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+import 'package:sparksocial/src/core/storage/preferences/local_storage_interface.dart';
 import 'package:synchronized/synchronized.dart';
-import 'local_storage_interface.dart';
 
 /// Implementation of LocalStorageInterface using FlutterSecureStorage
 /// for storing sensitive data like tokens, credentials, etc.
 class SecureStorage implements LocalStorageInterface {
-  final FlutterSecureStorage _secureStorage;
-  final Lock _lock = Lock();
-
   /// Creates a new SecureStorage instance
   /// If no secureStorage is provided, a default one will be created
   SecureStorage({FlutterSecureStorage? secureStorage}) : _secureStorage = secureStorage ?? const FlutterSecureStorage();
+  final FlutterSecureStorage _secureStorage;
+  final Lock _lock = Lock();
 
   @override
   Future<void> setString(String key, String value) async {
diff --git a/lib/src/core/storage/preferences/settings_repository_impl.dart b/lib/src/core/storage/preferences/settings_repository_impl.dart
index b59e4721..df8954aa 100644
--- a/lib/src/core/storage/preferences/settings_repository_impl.dart
+++ b/lib/src/core/storage/preferences/settings_repository_impl.dart
@@ -1,21 +1,16 @@
 import 'package:get_it/get_it.dart';
+import 'package:sparksocial/src/core/network/atproto/data/models/actor_models.dart';
+import 'package:sparksocial/src/core/network/atproto/data/models/feed_models.dart';
 import 'package:sparksocial/src/core/network/atproto/data/models/labeler_models.dart';
+import 'package:sparksocial/src/core/network/atproto/data/repositories/sprk_repository.dart';
 import 'package:sparksocial/src/core/storage/cache/sql_cache_interface.dart';
 import 'package:sparksocial/src/core/storage/preferences/settings_repository.dart';
-import 'package:sparksocial/src/core/network/atproto/data/models/feed_models.dart';
 import 'package:sparksocial/src/core/storage/storage.dart';
 import 'package:sparksocial/src/core/utils/logging/log_service.dart';
 import 'package:sparksocial/src/core/utils/logging/logger.dart';
 import 'package:sparksocial/src/features/settings/ui/pages/profile_settings_page.dart';
-import 'package:sparksocial/src/core/network/atproto/data/repositories/sprk_repository.dart';
-import 'package:sparksocial/src/core/network/atproto/data/models/actor_models.dart';
 
 class SettingsRepositoryImpl implements SettingsRepository {
-  late final SQLCacheInterface _sqlCache;
-  late final StorageManager _storageManager;
-  late final SparkLogger _logger;
-  late final SprkRepository _sprkRepository;
-
   SettingsRepositoryImpl() {
     _sqlCache = GetIt.instance<SQLCacheInterface>();
     _storageManager = GetIt.instance<StorageManager>();
@@ -23,6 +18,10 @@ class SettingsRepositoryImpl implements SettingsRepository {
     _sprkRepository = GetIt.instance<SprkRepository>();
     _setupDefaultLabelPreferences();
   }
+  late final SQLCacheInterface _sqlCache;
+  late final StorageManager _storageManager;
+  late final SparkLogger _logger;
+  late final SprkRepository _sprkRepository;
 
   Future<void> _setupDefaultLabelPreferences() async {
     if (await _storageManager.preferences.getObject<bool>(StorageKeys.defaultLabelsAreSetupKey) ?? false) {
@@ -211,9 +210,9 @@ class SettingsRepositoryImpl implements SettingsRepository {
     if (feedsJson == null) {
       _logger.d('No feeds found in storage, using defaults');
       final defaultFeeds = [
-        Feed.hardCoded(hardCodedFeed: HardCodedFeedEnum.following),
-        Feed.hardCoded(hardCodedFeed: HardCodedFeedEnum.forYou),
-        Feed.hardCoded(hardCodedFeed: HardCodedFeedEnum.latestSprk),
+        const Feed.hardCoded(hardCodedFeed: HardCodedFeedEnum.following),
+        const Feed.hardCoded(hardCodedFeed: HardCodedFeedEnum.forYou),
+        const Feed.hardCoded(hardCodedFeed: HardCodedFeedEnum.latestSprk),
       ];
       await setFeeds(defaultFeeds);
       return defaultFeeds;
@@ -228,9 +227,9 @@ class SettingsRepositoryImpl implements SettingsRepository {
       _logger.e('Error deserializing feeds: $e');
       // If deserialization fails, return defaults
       final defaultFeeds = [
-        Feed.hardCoded(hardCodedFeed: HardCodedFeedEnum.following),
-        Feed.hardCoded(hardCodedFeed: HardCodedFeedEnum.forYou),
-        Feed.hardCoded(hardCodedFeed: HardCodedFeedEnum.latestSprk),
+        const Feed.hardCoded(hardCodedFeed: HardCodedFeedEnum.following),
+        const Feed.hardCoded(hardCodedFeed: HardCodedFeedEnum.forYou),
+        const Feed.hardCoded(hardCodedFeed: HardCodedFeedEnum.latestSprk),
       ];
       await setFeeds(defaultFeeds);
       return defaultFeeds;
@@ -243,7 +242,7 @@ class SettingsRepositoryImpl implements SettingsRepository {
     final activeFeedJson = await _storageManager.preferences.getObject<Map<String, dynamic>>(StorageKeys.activeFeedKey);
     if (activeFeedJson == null) {
       _logger.d('No active feed found in storage, using default (Latest)');
-      return Feed.hardCoded(hardCodedFeed: HardCodedFeedEnum.latestSprk);
+      return const Feed.hardCoded(hardCodedFeed: HardCodedFeedEnum.latestSprk);
     }
 
     try {
@@ -253,7 +252,7 @@ class SettingsRepositoryImpl implements SettingsRepository {
     } catch (e) {
       _logger.e('Error deserializing active feed: $e');
       // If deserialization fails, return default
-      return Feed.hardCoded(hardCodedFeed: HardCodedFeedEnum.latestSprk);
+      return const Feed.hardCoded(hardCodedFeed: HardCodedFeedEnum.latestSprk);
     }
   }
 
@@ -296,7 +295,7 @@ class SettingsRepositoryImpl implements SettingsRepository {
       labelers.add('did:plc:pbgyr67hftvpoqtvaurpsctc');
     }
     await _storageManager.preferences.setObject<List<String>>(StorageKeys.followedLabelers, labelers);
-    for (var labelPreference in labelPreferences) {
+    for (final labelPreference in labelPreferences) {
       await _storageManager.preferences.setObject<Map<String, dynamic>>(
         '${StorageKeys.labelPreferenceKey}_${labelPreference.value}',
         labelPreference.toJson(),
@@ -312,7 +311,7 @@ class SettingsRepositoryImpl implements SettingsRepository {
     if (rawJson == null) {
       throw Exception('Label preference not found');
     }
-    
+
     try {
       return LabelPreference.fromJson(rawJson);
     } catch (e) {
@@ -321,15 +320,13 @@ class SettingsRepositoryImpl implements SettingsRepository {
     }
   }
 
-
-
   @override
   Future<void> setLabelPreference(String value, Blurs blurs, Severity severity, bool adultOnly, Setting setting) async {
     // Check if a preference already exists
     final existingRawJson = await _storageManager.preferences.getObject<Map<String, dynamic>>(
       '${StorageKeys.labelPreferenceKey}_$value',
     );
-    
+
     if (existingRawJson != null) {
       try {
         // Update existing preference
diff --git a/lib/src/core/storage/preferences/shared_prefs_storage.dart b/lib/src/core/storage/preferences/shared_prefs_storage.dart
index fcc7d453..61a7ae4a 100644
--- a/lib/src/core/storage/preferences/shared_prefs_storage.dart
+++ b/lib/src/core/storage/preferences/shared_prefs_storage.dart
@@ -1,12 +1,11 @@
 import 'dart:convert';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'local_storage_interface.dart';
+import 'package:sparksocial/src/core/storage/preferences/local_storage_interface.dart';
 
 /// Implementation of LocalStorageInterface using SharedPreferences
 class SharedPrefsStorage implements LocalStorageInterface {
-  final SharedPreferences _prefs;
-
   SharedPrefsStorage(this._prefs);
+  final SharedPreferences _prefs;
 
   /// Factory constructor to create a SharedPrefsStorage instance
   static Future<SharedPrefsStorage> create() async {
diff --git a/lib/src/core/storage/preferences/storage_constants.dart b/lib/src/core/storage/preferences/storage_constants.dart
index 98309f1c..fd026ae4 100644
--- a/lib/src/core/storage/preferences/storage_constants.dart
+++ b/lib/src/core/storage/preferences/storage_constants.dart
@@ -1,5 +1,7 @@
 /// Storage keys used throughout the application
 class StorageKeys {
+  // Private constructor to prevent instantiation
+  StorageKeys._();
   static const String userSession = 'user_session';
   static const String dmAccessToken = 'dm_access_token';
   static const String dmRefreshToken = 'dm_refresh_token';
@@ -27,7 +29,4 @@ class StorageKeys {
 
   /// Post to Bluesky
   static const String postToBskyKey = 'post_to_bsky_enabled';
-
-  // Private constructor to prevent instantiation
-  StorageKeys._();
 }
diff --git a/lib/src/core/storage/preferences/storage_manager.dart b/lib/src/core/storage/preferences/storage_manager.dart
index 8b168b30..510db5c8 100644
--- a/lib/src/core/storage/preferences/storage_manager.dart
+++ b/lib/src/core/storage/preferences/storage_manager.dart
@@ -1,15 +1,14 @@
-import 'local_storage_interface.dart';
-import 'shared_prefs_storage.dart';
-import 'secure_storage.dart';
+import 'package:sparksocial/src/core/storage/preferences/local_storage_interface.dart';
+import 'package:sparksocial/src/core/storage/preferences/secure_storage.dart';
+import 'package:sparksocial/src/core/storage/preferences/shared_prefs_storage.dart';
 
 /// Storage manager providing centralized access to different storage implementations
 /// This is the one that should be used to store and retrieve data from the app
 class StorageManager {
-  late final LocalStorageInterface _preferences;
-  late final LocalStorageInterface _secureStorage;
-
   /// Private constructor
   StorageManager._();
+  late final LocalStorageInterface _preferences;
+  late final LocalStorageInterface _secureStorage;
 
   /// Singleton instance
   static final StorageManager _instance = StorageManager._();
@@ -28,5 +27,4 @@ class StorageManager {
 
   /// Access to secure storage for sensitive data
   LocalStorageInterface get secure => _secureStorage;
-
 }
diff --git a/lib/src/core/storage/storage.dart b/lib/src/core/storage/storage.dart
index 0bdde764..1870dd02 100644
--- a/lib/src/core/storage/storage.dart
+++ b/lib/src/core/storage/storage.dart
@@ -1,8 +1,6 @@
-library;
-
-export 'preferences/local_storage_interface.dart';
-export 'preferences/storage_manager.dart';
-export 'preferences/storage_constants.dart';
 export 'cache/cache_manager_interface.dart';
-export 'cache/sql_cache_impl.dart';
 export 'cache/download_manager_impl.dart';
+export 'cache/sql_cache_impl.dart';
+export 'preferences/local_storage_interface.dart';
+export 'preferences/storage_constants.dart';
+export 'preferences/storage_manager.dart';
diff --git a/lib/src/core/theme/data/models/app_theme.dart b/lib/src/core/theme/data/models/app_theme.dart
index 5b4c728f..a8ad0320 100644
--- a/lib/src/core/theme/data/models/app_theme.dart
+++ b/lib/src/core/theme/data/models/app_theme.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'colors.dart';
+import 'package:sparksocial/src/core/theme/data/models/colors.dart';
 
 /// Application theme management class that provides theme data
 /// for both light and dark themes.
@@ -61,13 +61,10 @@ class AppTheme {
       primary: AppColors.primary,
       secondary: AppColors.secondary,
       tertiary: AppColors.accent,
-      surface: AppColors.background,
       error: AppColors.error,
-      onPrimary: AppColors.white,
       onSecondary: AppColors.white,
       onTertiary: AppColors.white,
       onSurface: AppColors.textPrimary,
-      onError: AppColors.white,
     ),
     primaryColor: AppColors.primary,
     useMaterial3: true,
@@ -129,7 +126,7 @@ class AppTheme {
       ),
       enabledBorder: OutlineInputBorder(
         borderRadius: BorderRadius.circular(12),
-        borderSide: const BorderSide(color: AppColors.border, width: 1),
+        borderSide: const BorderSide(color: AppColors.border),
       ),
       focusedBorder: OutlineInputBorder(
         borderRadius: BorderRadius.circular(12),
@@ -250,7 +247,7 @@ class AppTheme {
       ),
       enabledBorder: OutlineInputBorder(
         borderRadius: BorderRadius.circular(12),
-        borderSide: const BorderSide(color: AppColors.border, width: 1),
+        borderSide: const BorderSide(color: AppColors.border),
       ),
       focusedBorder: OutlineInputBorder(
         borderRadius: BorderRadius.circular(12),
diff --git a/lib/src/core/theme/data/models/colors.dart b/lib/src/core/theme/data/models/colors.dart
index 09f5be8d..f438ead3 100644
--- a/lib/src/core/theme/data/models/colors.dart
+++ b/lib/src/core/theme/data/models/colors.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
 /// Application color constants.
-/// 
+///
 /// These colors are used throughout the application to ensure consistency
 /// and maintainability.
 class AppColors {
@@ -19,7 +19,7 @@ class AppColors {
   static const Color deepPurple = Color(0xFF28232D);
   static const Color richPurple = Color(0xFF330072);
   static const Color brightPurple = Color(0xFFB20AFF);
-  
+
   // Core colors
   static const Color pink = Color(0xFFFF2696); // Main app color for buttons and highlights
   static const Color white = Color(0xFFFFFFFF);
@@ -70,4 +70,4 @@ class AppColors {
   static const Color unselectedIconLight = darkPurple;
   static const Color selectedIconDark = white;
   static const Color unselectedIconDark = darkPurple;
-} 
\ No newline at end of file
+}
diff --git a/lib/src/core/theme/data/repositories/theme_repository_impl.dart b/lib/src/core/theme/data/repositories/theme_repository_impl.dart
index 0ee1e0e3..f93d6332 100644
--- a/lib/src/core/theme/data/repositories/theme_repository_impl.dart
+++ b/lib/src/core/theme/data/repositories/theme_repository_impl.dart
@@ -1,13 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:sparksocial/src/core/storage/storage.dart';
+import 'package:sparksocial/src/core/theme/data/repositories/theme_repository.dart';
 import 'package:sparksocial/src/core/theme/domain/theme_provider.dart';
-import 'theme_repository.dart';
 
 /// Implementation of ThemeRepository using SharedPreferences
 class ThemeRepositoryImpl implements ThemeRepository {
-  final StorageManager _storageManager;
-
   const ThemeRepositoryImpl(this._storageManager);
+  final StorageManager _storageManager;
 
   @override
   Future<ThemeMode?> getThemeMode() async {
diff --git a/lib/src/core/theme/domain/theme_provider.dart b/lib/src/core/theme/domain/theme_provider.dart
index 718e2dd8..4ea32c24 100644
--- a/lib/src/core/theme/domain/theme_provider.dart
+++ b/lib/src/core/theme/domain/theme_provider.dart
@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:get_it/get_it.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
-import 'package:sparksocial/src/core/theme/domain/theme_state.dart';
 import 'package:sparksocial/src/core/theme/data/repositories/theme_repository.dart';
+import 'package:sparksocial/src/core/theme/domain/theme_state.dart';
 
 part 'theme_provider.g.dart';
 
diff --git a/lib/src/core/theme/theme.dart b/lib/src/core/theme/theme.dart
index e3a52329..6102c29f 100644
--- a/lib/src/core/theme/theme.dart
+++ b/lib/src/core/theme/theme.dart
@@ -1,6 +1,4 @@
-library;
-
-export 'data/models/colors.dart';
-export 'domain/theme_state.dart';
 export 'data/models/app_theme.dart';
+export 'data/models/colors.dart';
 export 'domain/theme_provider.dart';
+export 'domain/theme_state.dart';
diff --git a/lib/src/core/utils/label_utils.dart b/lib/src/core/utils/label_utils.dart
index 7441f1a7..1aaeab50 100644
--- a/lib/src/core/utils/label_utils.dart
+++ b/lib/src/core/utils/label_utils.dart
@@ -6,9 +6,9 @@ import 'package:sparksocial/src/core/storage/preferences/settings_repository.dar
 class LabelUtils {
   static Future<bool> shouldShowWarning(List<Label> labels) async {
     if (labels.isEmpty) return false;
-    
+
     final settingsRepository = GetIt.instance<SettingsRepository>();
-    
+
     for (final label in labels) {
       try {
         final preference = await settingsRepository.getLabelPreference(label.value);
@@ -20,15 +20,15 @@ class LabelUtils {
         continue;
       }
     }
-    
+
     return false;
   }
 
   static Future<bool> shouldBlurContent(List<Label> labels) async {
     if (labels.isEmpty) return false;
-    
+
     final settingsRepository = GetIt.instance<SettingsRepository>();
-    
+
     for (final label in labels) {
       try {
         final preference = await settingsRepository.getLabelPreference(label.value);
@@ -43,13 +43,13 @@ class LabelUtils {
 
     return false;
   }
-  
+
   static Future<List<String>> getWarningLabels(List<Label> labels) async {
     if (labels.isEmpty) return [];
-    
+
     final settingsRepository = GetIt.instance<SettingsRepository>();
     final warningLabels = <String>[];
-    
+
     for (final label in labels) {
       try {
         final preference = await settingsRepository.getLabelPreference(label.value);
@@ -61,16 +61,16 @@ class LabelUtils {
         continue;
       }
     }
-    
+
     return warningLabels;
   }
 
   static Future<List<String>> getInformLabels(List<Label> labels) async {
     if (labels.isEmpty) return [];
-    
+
     final settingsRepository = GetIt.instance<SettingsRepository>();
     final informLabels = <String>[];
-    
+
     for (final label in labels) {
       try {
         final preference = await settingsRepository.getLabelPreference(label.value);
@@ -82,7 +82,7 @@ class LabelUtils {
         continue;
       }
     }
-    
+
     return informLabels;
   }
-} 
\ No newline at end of file
+}
diff --git a/lib/src/core/utils/logging/console_output.dart b/lib/src/core/utils/logging/console_output.dart
index a829d104..87e0fc4b 100644
--- a/lib/src/core/utils/logging/console_output.dart
+++ b/lib/src/core/utils/logging/console_output.dart
@@ -1,11 +1,14 @@
 import 'dart:developer' as developer;
 
 import 'package:flutter/foundation.dart';
-import 'log_level.dart';
-import 'log_output.dart';
+import 'package:sparksocial/src/core/utils/logging/log_level.dart';
+import 'package:sparksocial/src/core/utils/logging/log_output.dart';
 
 /// Outputs logs to the console
 class ConsoleOutput implements LogOutput {
+  /// Constructor
+  ConsoleOutput({this.useColors = true});
+
   /// Color codes for different log levels
   static const Map<LogLevel, String> _colorCodes = {
     LogLevel.verbose: '\x1B[37m', // White
@@ -23,16 +26,13 @@ class ConsoleOutput implements LogOutput {
   /// Whether to use colors in the output
   final bool useColors;
 
-  /// Constructor
-  ConsoleOutput({this.useColors = true});
-
   @override
   void output(LogLevel level, String message, DateTime timestamp, Object? error, StackTrace? stackTrace) {
     final timeString = _formatTime(timestamp);
     final levelString = '[${level.name}]'.padRight(9);
     final prefix = '$timeString $levelString';
 
-    String formattedMessage = '$prefix $message';
+    var formattedMessage = '$prefix $message';
 
     if (error != null) {
       formattedMessage += '\nError: $error';
diff --git a/lib/src/core/utils/logging/file_output.dart b/lib/src/core/utils/logging/file_output.dart
index a970bb43..8f5e7cd8 100644
--- a/lib/src/core/utils/logging/file_output.dart
+++ b/lib/src/core/utils/logging/file_output.dart
@@ -1,14 +1,21 @@
 // ignore_for_file: avoid_print
 
 import 'dart:io';
+
 import 'package:path_provider/path_provider.dart';
+import 'package:sparksocial/src/core/utils/logging/log_level.dart';
+import 'package:sparksocial/src/core/utils/logging/log_output.dart';
 import 'package:synchronized/synchronized.dart';
 
-import 'log_level.dart';
-import 'log_output.dart';
-
 /// Outputs logs to a file
 class FileOutput implements LogOutput {
+  /// Constructor
+  FileOutput({
+    String fileName = 'spark_app.log',
+    int maxFileSize = 10 * 1024 * 1024, // 10 MB
+  }) : _fileName = fileName,
+       _maxFileSize = maxFileSize;
+
   /// The file to write logs to
   File? _file;
 
@@ -24,13 +31,6 @@ class FileOutput implements LogOutput {
   /// Whether the file has been initialized
   bool _initialized = false;
 
-  /// Constructor
-  FileOutput({
-    String fileName = 'spark_app.log',
-    int maxFileSize = 10 * 1024 * 1024, // 10 MB
-  }) : _fileName = fileName,
-       _maxFileSize = maxFileSize;
-
   /// Initialize the file output
   Future<void> initialize() async {
     if (_initialized) return;
@@ -103,7 +103,7 @@ class FileOutput implements LogOutput {
     if (_file == null) return false;
 
     try {
-      final fileStats = await _file!.stat();
+      final fileStats = _file!.statSync();
       return fileStats.size > _maxFileSize;
     } catch (e) {
       return false;
diff --git a/lib/src/core/utils/logging/log_output.dart b/lib/src/core/utils/logging/log_output.dart
index 93339693..535b259d 100644
--- a/lib/src/core/utils/logging/log_output.dart
+++ b/lib/src/core/utils/logging/log_output.dart
@@ -1,4 +1,4 @@
-import 'log_level.dart';
+import 'package:sparksocial/src/core/utils/logging/log_level.dart';
 
 /// Interface for log outputs
 abstract class LogOutput {
diff --git a/lib/src/core/utils/logging/log_service.dart b/lib/src/core/utils/logging/log_service.dart
index c331ca51..231bfc7c 100644
--- a/lib/src/core/utils/logging/log_service.dart
+++ b/lib/src/core/utils/logging/log_service.dart
@@ -1,6 +1,6 @@
-import 'log_level.dart';
-import 'logger.dart';
-import 'logger_factory.dart';
+import 'package:sparksocial/src/core/utils/logging/log_level.dart';
+import 'package:sparksocial/src/core/utils/logging/logger.dart';
+import 'package:sparksocial/src/core/utils/logging/logger_factory.dart';
 
 /// Log service for dependency injection
 class LogService {
diff --git a/lib/src/core/utils/logging/logger.dart b/lib/src/core/utils/logging/logger.dart
index 06118cea..def36940 100644
--- a/lib/src/core/utils/logging/logger.dart
+++ b/lib/src/core/utils/logging/logger.dart
@@ -1,8 +1,19 @@
-import 'log_level.dart';
-import 'log_output.dart';
+import 'package:sparksocial/src/core/utils/logging/log_level.dart';
+import 'package:sparksocial/src/core/utils/logging/log_output.dart';
 
 /// A flexible and customizable logging system for Spark Social
 class SparkLogger {
+  /// Constructor
+  SparkLogger({
+    String name = '',
+    LogLevel minLevel = LogLevel.info,
+    List<LogOutput> outputs = const [],
+    bool includeStackTrace = true,
+  }) : _name = name,
+       _minLevel = minLevel,
+       _outputs = List.from(outputs),
+       _includeStackTrace = includeStackTrace;
+
   /// The minimum log level that will be output
   final LogLevel _minLevel;
 
@@ -15,17 +26,6 @@ class SparkLogger {
   /// Whether to include stack traces for errors
   final bool _includeStackTrace;
 
-  /// Constructor
-  SparkLogger({
-    String name = '',
-    LogLevel minLevel = LogLevel.info,
-    List<LogOutput> outputs = const [],
-    bool includeStackTrace = true,
-  }) : _name = name,
-       _minLevel = minLevel,
-       _outputs = List.from(outputs),
-       _includeStackTrace = includeStackTrace;
-
   /// Log a verbose message
   void v(String message, {Object? error, StackTrace? stackTrace}) {
     _log(LogLevel.verbose, message, error, stackTrace);
@@ -64,10 +64,10 @@ class SparkLogger {
     }
 
     // Add name prefix if provided
-    final String prefixedMessage = _name.isNotEmpty ? '[$_name] $message' : message;
+    final prefixedMessage = _name.isNotEmpty ? '[$_name] $message' : message;
 
     // Get stack trace if requested and not provided
-    StackTrace? trace = stackTrace;
+    var trace = stackTrace;
     if (error != null && trace == null && _includeStackTrace) {
       trace = StackTrace.current;
     }
diff --git a/lib/src/core/utils/logging/logger_factory.dart b/lib/src/core/utils/logging/logger_factory.dart
index 721eae7c..ea3c8def 100644
--- a/lib/src/core/utils/logging/logger_factory.dart
+++ b/lib/src/core/utils/logging/logger_factory.dart
@@ -1,10 +1,10 @@
 import 'package:flutter/foundation.dart';
 
-import 'console_output.dart';
-import 'file_output.dart';
-import 'log_level.dart';
-import 'log_output.dart';
-import 'logger.dart';
+import 'package:sparksocial/src/core/utils/logging/console_output.dart';
+import 'package:sparksocial/src/core/utils/logging/file_output.dart';
+import 'package:sparksocial/src/core/utils/logging/log_level.dart';
+import 'package:sparksocial/src/core/utils/logging/log_output.dart';
+import 'package:sparksocial/src/core/utils/logging/logger.dart';
 
 /// Factory for creating logger instances
 class LoggerFactory {
diff --git a/lib/src/core/utils/logging/riverpod_logger.dart b/lib/src/core/utils/logging/riverpod_logger.dart
index 6f333c67..7ed4956b 100644
--- a/lib/src/core/utils/logging/riverpod_logger.dart
+++ b/lib/src/core/utils/logging/riverpod_logger.dart
@@ -1,17 +1,16 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:get_it/get_it.dart';
 
-import 'logging.dart';
+import 'package:sparksocial/src/core/utils/logging/logging.dart';
 
 /// A ProviderObserver that logs provider changes
 class SparkRiverpodLogger extends ProviderObserver {
-  final LogService _logService;
-  late final SparkLogger _logger;
-
   /// Constructor
   SparkRiverpodLogger({LogService? logService}) : _logService = logService ?? GetIt.instance<LogService>() {
     _logger = _logService.getLogger('Riverpod');
   }
+  final LogService _logService;
+  late final SparkLogger _logger;
 
   @override
   void didAddProvider(ProviderBase<Object?> provider, Object? value, ProviderContainer container) {
@@ -98,7 +97,7 @@ class SparkRiverpodLogger extends ProviderObserver {
   /// Generates diff for List objects
   String _generateListDiff(List previous, List current) {
     final changes = <String>[];
-    
+
     // Find added items (items in current but not in previous)
     final added = <dynamic>[];
     for (final item in current) {
@@ -106,7 +105,7 @@ class SparkRiverpodLogger extends ProviderObserver {
         added.add(item);
       }
     }
-    
+
     // Find removed items (items in previous but not in current)
     final removed = <dynamic>[];
     for (final item in previous) {
@@ -114,12 +113,12 @@ class SparkRiverpodLogger extends ProviderObserver {
         removed.add(item);
       }
     }
-    
+
     // Add length change if different
     if (previous.length != current.length) {
       changes.add('length: ${previous.length} → ${current.length}');
     }
-    
+
     // Add removed items
     if (removed.isNotEmpty) {
       if (removed.length <= 3) {
@@ -128,7 +127,7 @@ class SparkRiverpodLogger extends ProviderObserver {
         changes.add('removed: ${removed.length} items');
       }
     }
-    
+
     // Add added items
     if (added.isNotEmpty) {
       if (added.length <= 3) {
@@ -137,12 +136,14 @@ class SparkRiverpodLogger extends ProviderObserver {
         changes.add('added: ${added.length} items');
       }
     }
-    
+
     // If no adds/removes but lists are different, check for positional changes
     if (changes.isEmpty && previous.length == current.length) {
-      for (int i = 0; i < previous.length; i++) {
+      for (var i = 0; i < previous.length; i++) {
         if (previous[i] != current[i]) {
-          changes.add('[$i]: ${_truncateIfNeeded(previous[i].toString(), maxLength: 50)} → ${_truncateIfNeeded(current[i].toString(), maxLength: 50)}');
+          changes.add(
+            '[$i]: ${_truncateIfNeeded(previous[i].toString(), maxLength: 50)} → ${_truncateIfNeeded(current[i].toString(), maxLength: 50)}',
+          );
           if (changes.length >= 3) {
             changes.add('... and ${previous.length - i - 1} more changes');
             break;
@@ -154,13 +155,13 @@ class SparkRiverpodLogger extends ProviderObserver {
     return changes.isEmpty ? 'No changes' : changes.join(', ');
   }
 
-    /// Tries to parse structured objects like ClassName(field1: value1, field2: value2)
+  /// Tries to parse structured objects like ClassName(field1: value1, field2: value2)
   String? _tryParseStructuredObjectDiff(String previous, String current) {
     final prevFields = _parseStructuredObject(previous);
     final currFields = _parseStructuredObject(current);
-    
+
     if (prevFields == null || currFields == null) return null;
-    
+
     final changes = <String>[];
     final allKeys = {...prevFields.keys, ...currFields.keys};
 
@@ -182,7 +183,9 @@ class SparkRiverpodLogger extends ProviderObserver {
           if (listDiff != null) {
             changes.add('$key: $listDiff');
           } else {
-            changes.add('$key: ${_truncateIfNeeded(prevValue, maxLength: 100)} → ${_truncateIfNeeded(currValue, maxLength: 100)}');
+            changes.add(
+              '$key: ${_truncateIfNeeded(prevValue, maxLength: 100)} → ${_truncateIfNeeded(currValue, maxLength: 100)}',
+            );
           }
         }
       }
@@ -222,24 +225,24 @@ class SparkRiverpodLogger extends ProviderObserver {
     return fields.isEmpty ? null : fields;
   }
 
-    /// Splits field strings by comma, handling nested structures
+  /// Splits field strings by comma, handling nested structures
   List<String> _splitFields(String content) {
     final parts = <String>[];
     final buffer = StringBuffer();
-    int depth = 0;
-    bool inString = false;
+    var depth = 0;
+    var inString = false;
     String? currentQuote;
-    
-    for (int i = 0; i < content.length; i++) {
+
+    for (var i = 0; i < content.length; i++) {
       final char = content[i];
-      
+
       // Handle string literals
       if (!inString && (char == '"' || char == "'")) {
         inString = true;
         currentQuote = char;
       } else if (inString && char == currentQuote) {
         // Check if it's not escaped
-        if (i == 0 || content[i - 1] != '\\') {
+        if (i == 0 || content[i - 1] != r'\') {
           inString = false;
           currentQuote = null;
         }
@@ -259,43 +262,42 @@ class SparkRiverpodLogger extends ProviderObserver {
           continue;
         }
       }
-      
+
       buffer.write(char);
     }
-    
+
     // Add the last part
     final lastPart = buffer.toString().trim();
     if (lastPart.isNotEmpty) {
       parts.add(lastPart);
     }
-    
+
     return parts;
   }
 
   /// Tries to parse field values as lists and generate list diffs
   String? _tryParseFieldAsListDiff(String prevValue, String currValue) {
     // Check if both values look like lists [...]
-    if (!prevValue.startsWith('[') || !prevValue.endsWith(']') ||
-        !currValue.startsWith('[') || !currValue.endsWith(']')) {
+    if (!prevValue.startsWith('[') || !prevValue.endsWith(']') || !currValue.startsWith('[') || !currValue.endsWith(']')) {
       return null;
     }
 
     // Parse the list contents
     final prevList = _parseListString(prevValue);
     final currList = _parseListString(currValue);
-    
+
     if (prevList == null || currList == null) return null;
-    
+
     return _generateListDiff(prevList, currList);
   }
 
   /// Parses a list string like "[item1, item2, item3]" into a List
   List<String>? _parseListString(String listStr) {
     if (!listStr.startsWith('[') || !listStr.endsWith(']')) return null;
-    
+
     final content = listStr.substring(1, listStr.length - 1).trim();
     if (content.isEmpty) return <String>[];
-    
+
     // Split by comma, handling nested structures
     return _splitFields(content);
   }
diff --git a/lib/src/core/utils/text_formatter.dart b/lib/src/core/utils/text_formatter.dart
index cab5bb8a..7c33c373 100644
--- a/lib/src/core/utils/text_formatter.dart
+++ b/lib/src/core/utils/text_formatter.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
-import '../theme/data/models/colors.dart';
-import '../widgets/mentioned_text.dart';
+import 'package:sparksocial/src/core/theme/data/models/colors.dart';
+import 'package:sparksocial/src/core/widgets/mentioned_text.dart';
 
 /// Utility class for text formatting and processing
 class TextFormatter {
@@ -30,19 +30,19 @@ class TextFormatter {
 
   /// Finds username matches in a text string
   static List<Match> findUsernameMatches(String text) {
-    final RegExp usernameRegex = RegExp(r'@([a-zA-Z0-9_.-]+\.[a-zA-Z]{2,}|[a-zA-Z0-9_]+)', caseSensitive: false);
+    final usernameRegex = RegExp(r'@([a-zA-Z0-9_.-]+\.[a-zA-Z]{2,}|[a-zA-Z0-9_]+)', caseSensitive: false);
 
     return usernameRegex.allMatches(text).toList();
   }
 
   /// Extracts URLs from a text string
   static List<String> extractUrls(String text) {
-    final RegExp urlRegex = RegExp(
+    final urlRegex = RegExp(
       r'(https?:\/\/(?:www\.|(?!www))[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\.[^\s]{2,}|www\.[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\.[^\s]{2,}|https?:\/\/(?:www\.|(?!www))[a-zA-Z0-9]+\.[^\s]{2,}|www\.[a-zA-Z0-9]+\.[^\s]{2,})',
       caseSensitive: false,
     );
 
-    final List<String> urls = [];
+    final urls = <String>[];
     for (final Match match in urlRegex.allMatches(text)) {
       final url = match.group(0)!;
       if (url.startsWith('@')) continue;
@@ -78,7 +78,6 @@ class TextFormatter {
       onUsernameTap: onUsernameTap,
       expandText: expandDescription,
       maxLines: expandDescription ? null : 2,
-      overflow: TextOverflow.ellipsis,
       textStyle: TextStyle(color: Theme.of(context).colorScheme.onSurface, fontSize: 14),
       mentionStyle: const TextStyle(color: AppColors.primary, fontWeight: FontWeight.bold),
     );
diff --git a/lib/src/core/utils/utils.dart b/lib/src/core/utils/utils.dart
index f57a3338..71acb32c 100644
--- a/lib/src/core/utils/utils.dart
+++ b/lib/src/core/utils/utils.dart
@@ -1,4 +1,2 @@
-library;
-
-export 'text_formatter.dart';
 export 'logging/logging.dart';
+export 'text_formatter.dart';
diff --git a/lib/src/core/widgets/action_button.dart b/lib/src/core/widgets/action_button.dart
index fece881c..8a7b6900 100644
--- a/lib/src/core/widgets/action_button.dart
+++ b/lib/src/core/widgets/action_button.dart
@@ -1,24 +1,23 @@
 import 'package:flutter/material.dart';
 
 class ActionButton extends StatelessWidget {
-  final IconData icon;
-  final String label;
-  final VoidCallback? onPressed;
-  final Color? color;
-  final bool isAnimating;
-  final double scale;
-  final bool showLabel;
-
   const ActionButton({
-    super.key,
     required this.icon,
     required this.label,
+    super.key,
     this.onPressed,
     this.color,
     this.isAnimating = false,
     this.scale = 1.0,
     this.showLabel = true,
   });
+  final IconData icon;
+  final String label;
+  final VoidCallback? onPressed;
+  final Color? color;
+  final bool isAnimating;
+  final double scale;
+  final bool showLabel;
 
   @override
   Widget build(BuildContext context) {
@@ -67,8 +66,8 @@ class ActionButton extends StatelessWidget {
               color: Colors.white,
               fontSize: 12,
               shadows: <Shadow>[
-                Shadow(offset: Offset(0, 0), blurRadius: 20.0, color: Color(0xFF000000)),
-                Shadow(offset: Offset(1, 1), blurRadius: 8.0, color: Colors.black87),
+                Shadow(blurRadius: 20),
+                Shadow(offset: Offset(1, 1), blurRadius: 8, color: Colors.black87),
               ],
             ),
           ),
diff --git a/lib/src/core/widgets/alt_text_editor_dialog.dart b/lib/src/core/widgets/alt_text_editor_dialog.dart
index b1b70454..762bcec4 100644
--- a/lib/src/core/widgets/alt_text_editor_dialog.dart
+++ b/lib/src/core/widgets/alt_text_editor_dialog.dart
@@ -6,11 +6,10 @@ import 'package:image_picker/image_picker.dart';
 import 'package:sparksocial/src/core/theme/data/models/colors.dart';
 
 class AltTextEditorDialog extends StatefulWidget {
+  const AltTextEditorDialog({required this.initialAltText, super.key, this.imageFile});
   final XFile? imageFile;
   final String initialAltText;
 
-  const AltTextEditorDialog({super.key, this.imageFile, required this.initialAltText});
-
   @override
   State<AltTextEditorDialog> createState() => _AltTextEditorDialogState();
 }
@@ -45,11 +44,10 @@ class _AltTextEditorDialogState extends State<AltTextEditorDialog> {
       insetPadding: const EdgeInsets.symmetric(horizontal: 24, vertical: 40),
       shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
       child: Padding(
-        padding: const EdgeInsets.all(16.0),
+        padding: const EdgeInsets.all(16),
         child: SingleChildScrollView(
           child: Column(
             mainAxisSize: MainAxisSize.min,
-            crossAxisAlignment: CrossAxisAlignment.center,
             children: [
               if (widget.imageFile != null)
                 ClipRRect(
@@ -63,7 +61,7 @@ class _AltTextEditorDialogState extends State<AltTextEditorDialog> {
                 decoration: BoxDecoration(
                   color: inputBackgroundColor,
                   borderRadius: BorderRadius.circular(10),
-                  border: Border.all(color: borderColor, width: 1),
+                  border: Border.all(color: borderColor),
                 ),
                 child: TextField(
                   controller: _controller,
diff --git a/lib/src/core/widgets/content_warning_overlay.dart b/lib/src/core/widgets/content_warning_overlay.dart
index b8ddf57d..3f1a0b0f 100644
--- a/lib/src/core/widgets/content_warning_overlay.dart
+++ b/lib/src/core/widgets/content_warning_overlay.dart
@@ -5,9 +5,9 @@ import 'package:sparksocial/src/core/theme/data/models/colors.dart';
 
 class ContentWarningOverlay extends StatelessWidget {
   const ContentWarningOverlay({
-    super.key,
     required this.onViewContent,
     required this.warningLabels,
+    super.key,
     this.shouldBlur = false,
     this.child,
   });
@@ -22,12 +22,12 @@ class ContentWarningOverlay extends StatelessWidget {
       children: [
         // Original content (blurred/hidden)
         if (child != null)
-          if (shouldBlur) ImageFiltered(imageFilter: ImageFilter.blur(sigmaX: 40.0, sigmaY: 40.0), child: child!) else child!,
+          if (shouldBlur) ImageFiltered(imageFilter: ImageFilter.blur(sigmaX: 40, sigmaY: 40), child: child) else child!,
         // Warning overlay
         Positioned.fill(
           child: Center(
             child: Padding(
-              padding: const EdgeInsets.all(24.0),
+              padding: const EdgeInsets.all(24),
               child: Column(
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: [
diff --git a/lib/src/core/widgets/custom_text_field.dart b/lib/src/core/widgets/custom_text_field.dart
index c17cfdfd..33dec2bd 100644
--- a/lib/src/core/widgets/custom_text_field.dart
+++ b/lib/src/core/widgets/custom_text_field.dart
@@ -2,22 +2,21 @@ import 'package:flutter/material.dart';
 
 /// A custom styled text field with optional undo functionality.
 class CustomTextField extends StatelessWidget {
-  final TextEditingController controller;
-  final String hintText;
-  final Color? fillColor;
-  final int maxLines;
-  final VoidCallback? onUndo;
-  final String? Function(String?)? validator;
-
   const CustomTextField({
-    super.key,
     required this.controller,
     required this.hintText,
+    super.key,
     this.fillColor,
     this.maxLines = 1,
     this.onUndo,
     this.validator,
   });
+  final TextEditingController controller;
+  final String hintText;
+  final Color? fillColor;
+  final int maxLines;
+  final VoidCallback? onUndo;
+  final String? Function(String?)? validator;
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/src/core/widgets/fading_list_view.dart b/lib/src/core/widgets/fading_list_view.dart
index 2d987acc..93597b8c 100644
--- a/lib/src/core/widgets/fading_list_view.dart
+++ b/lib/src/core/widgets/fading_list_view.dart
@@ -1,21 +1,12 @@
 import 'package:flutter/material.dart';
 
-import '../theme/data/models/colors.dart';
+import 'package:sparksocial/src/core/theme/data/models/colors.dart';
 
 /// A list view with fading edges for a smooth scrolling experience
 class FadingListView extends StatelessWidget {
-  final List<Widget> children;
-  final bool isHorizontal;
-  final EdgeInsetsGeometry? padding;
-  final double itemSpacing;
-  final double fadeWidth;
-  final ScrollController? controller;
-  final MainAxisAlignment mainAxisAlignment;
-  final CrossAxisAlignment crossAxisAlignment;
-
   const FadingListView({
-    super.key,
     required this.children,
+    super.key,
     this.isHorizontal = true,
     this.padding,
     this.itemSpacing = 8.0,
@@ -24,6 +15,14 @@ class FadingListView extends StatelessWidget {
     this.mainAxisAlignment = MainAxisAlignment.start,
     this.crossAxisAlignment = CrossAxisAlignment.center,
   });
+  final List<Widget> children;
+  final bool isHorizontal;
+  final EdgeInsetsGeometry? padding;
+  final double itemSpacing;
+  final double fadeWidth;
+  final ScrollController? controller;
+  final MainAxisAlignment mainAxisAlignment;
+  final CrossAxisAlignment crossAxisAlignment;
 
   @override
   Widget build(BuildContext context) {
@@ -32,8 +31,8 @@ class FadingListView extends StatelessWidget {
     }
 
     // Add spacing between items
-    final List<Widget> itemsWithSpacing = [];
-    for (int i = 0; i < children.length; i++) {
+    final itemsWithSpacing = <Widget>[];
+    for (var i = 0; i < children.length; i++) {
       itemsWithSpacing.add(children[i]);
       if (i < children.length - 1) {
         itemsWithSpacing.add(isHorizontal ? SizedBox(width: itemSpacing) : SizedBox(height: itemSpacing));
@@ -50,7 +49,6 @@ class FadingListView extends StatelessWidget {
           )
         : SingleChildScrollView(
             controller: controller,
-            scrollDirection: Axis.vertical,
             padding: EdgeInsets.symmetric(vertical: fadeWidth).add(padding ?? EdgeInsets.zero),
             child: Column(
               mainAxisAlignment: mainAxisAlignment,
diff --git a/lib/src/core/widgets/heart_animation.dart b/lib/src/core/widgets/heart_animation.dart
index 3cac472f..dbbeb1c2 100644
--- a/lib/src/core/widgets/heart_animation.dart
+++ b/lib/src/core/widgets/heart_animation.dart
@@ -1,18 +1,17 @@
 import 'package:flutter/material.dart';
 
 class HeartAnimation extends StatefulWidget {
-  final bool isAnimating;
-  final Duration duration;
-  final VoidCallback? onEnd;
-  final Widget child;
-
   const HeartAnimation({
-    super.key,
     required this.isAnimating,
+    required this.child,
+    super.key,
     this.duration = const Duration(milliseconds: 1000),
     this.onEnd,
-    required this.child,
   });
+  final bool isAnimating;
+  final Duration duration;
+  final VoidCallback? onEnd;
+  final Widget child;
 
   @override
   State<HeartAnimation> createState() => _HeartAnimationState();
@@ -28,12 +27,12 @@ class _HeartAnimationState extends State<HeartAnimation> with TickerProviderStat
     super.initState();
     _controller = AnimationController(duration: widget.duration, vsync: this);
 
-    _scaleAnimation = Tween<double>(begin: 0.0, end: 1.4).animate(CurvedAnimation(parent: _controller, curve: Curves.elasticOut));
+    _scaleAnimation = Tween<double>(begin: 0, end: 1.4).animate(CurvedAnimation(parent: _controller, curve: Curves.elasticOut));
 
-    _opacityAnimation = Tween<double>(begin: 0.8, end: 0.0).animate(
+    _opacityAnimation = Tween<double>(begin: 0.8, end: 0).animate(
       CurvedAnimation(
         parent: _controller,
-        curve: const Interval(0.5, 1.0, curve: Curves.easeOut),
+        curve: const Interval(0.5, 1, curve: Curves.easeOut),
       ),
     );
 
@@ -80,7 +79,7 @@ class _HeartAnimationState extends State<HeartAnimation> with TickerProviderStat
                         Icons.favorite,
                         color: Colors.red,
                         size: 100,
-                        shadows: [Shadow(offset: Offset(0, 0), blurRadius: 10, color: Colors.red)],
+                        shadows: [Shadow(blurRadius: 10, color: Colors.red)],
                       ),
                     ),
                   );
diff --git a/lib/src/core/widgets/image_content.dart b/lib/src/core/widgets/image_content.dart
index 571027d1..dad3fef1 100644
--- a/lib/src/core/widgets/image_content.dart
+++ b/lib/src/core/widgets/image_content.dart
@@ -6,7 +6,7 @@ import 'package:sparksocial/src/core/theme/data/models/colors.dart';
 import 'package:sparksocial/src/features/feed/ui/widgets/images/image_carousel.dart';
 
 class ImageContent extends StatelessWidget {
-  const ImageContent({super.key, required this.imageUrls, required this.borderRadius, this.thumbnailSize = 100});
+  const ImageContent({required this.imageUrls, required this.borderRadius, super.key, this.thumbnailSize = 100});
   final List<String> imageUrls;
   final BorderRadius borderRadius;
   final double thumbnailSize;
@@ -63,7 +63,7 @@ class ImageContent extends StatelessWidget {
                   child: SizedBox(width: 20, height: 20, child: CircularProgressIndicator(strokeWidth: 2, color: Colors.white54)),
                 ),
               ),
-              errorWidget: (context, url, error) => Container(
+              errorWidget: (context, url, error) => ColoredBox(
                 color: AppColors.darkPurple.withValues(alpha: 26),
                 child: const Center(child: Icon(FluentIcons.image_off_24_regular, size: 24, color: Colors.white70)),
               ),
diff --git a/lib/src/core/widgets/mentioned_text.dart b/lib/src/core/widgets/mentioned_text.dart
index c7ef14cd..e7bafa4b 100644
--- a/lib/src/core/widgets/mentioned_text.dart
+++ b/lib/src/core/widgets/mentioned_text.dart
@@ -1,10 +1,22 @@
-import 'package:flutter/material.dart';
 import 'package:flutter/gestures.dart';
-import '../theme/data/models/colors.dart';
-import '../utils/text_formatter.dart';
+import 'package:flutter/material.dart';
+import 'package:sparksocial/src/core/theme/data/models/colors.dart';
+import 'package:sparksocial/src/core/utils/text_formatter.dart';
 
 /// A widget that displays text with clickable @mentions
 class MentionedText extends StatelessWidget {
+  /// Creates a text widget with clickable @mentions
+  const MentionedText({
+    required this.text,
+    required this.onUsernameTap,
+    super.key,
+    this.expandText = false,
+    this.maxLines = 2,
+    this.overflow = TextOverflow.ellipsis,
+    this.textStyle,
+    this.mentionStyle,
+  });
+
   /// The text to display, which may contain @mentions
   final String text;
 
@@ -26,18 +38,6 @@ class MentionedText extends StatelessWidget {
   /// Text style to apply to the @mentions, merged with textStyle
   final TextStyle? mentionStyle;
 
-  /// Creates a text widget with clickable @mentions
-  const MentionedText({
-    super.key,
-    required this.text,
-    required this.onUsernameTap,
-    this.expandText = false,
-    this.maxLines = 2,
-    this.overflow = TextOverflow.ellipsis,
-    this.textStyle,
-    this.mentionStyle,
-  });
-
   @override
   Widget build(BuildContext context) {
     final usernameMatches = TextFormatter.findUsernameMatches(text);
@@ -49,8 +49,8 @@ class MentionedText extends StatelessWidget {
     final effectiveMentionStyle = mentionStyle ?? const TextStyle(color: AppColors.primary, fontWeight: FontWeight.bold);
 
     // Build text spans for mentions
-    final List<InlineSpan> spans = [];
-    int lastEnd = 0;
+    final spans = <InlineSpan>[];
+    var lastEnd = 0;
 
     usernameMatches.sort((a, b) => a.start.compareTo(b.start));
 
@@ -75,7 +75,7 @@ class MentionedText extends StatelessWidget {
       spans.add(TextSpan(text: text.substring(lastEnd), style: baseStyle));
     }
 
-    final TextSpan textSpan = TextSpan(children: spans, style: baseStyle);
+    final textSpan = TextSpan(children: spans, style: baseStyle);
 
     return RichText(
       text: textSpan,
diff --git a/lib/src/core/widgets/menu_action_button.dart b/lib/src/core/widgets/menu_action_button.dart
index 7a8a11ae..4d7392b8 100644
--- a/lib/src/core/widgets/menu_action_button.dart
+++ b/lib/src/core/widgets/menu_action_button.dart
@@ -6,15 +6,6 @@ import 'package:sparksocial/src/core/auth/data/repositories/auth_repository.dart
 import 'package:sparksocial/src/core/theme/data/models/colors.dart';
 
 class MenuActionButton extends StatelessWidget {
-  final VoidCallback? onPressed;
-  final VoidCallback? onDeletePressed;
-  final bool isCompact;
-  final Color? backgroundColor;
-  final bool isProfile;
-  final bool isOnVideo;
-  final bool isOwnPost;
-  final String? authorDid;
-
   const MenuActionButton({
     super.key,
     this.onPressed,
@@ -26,6 +17,14 @@ class MenuActionButton extends StatelessWidget {
     this.isOwnPost = false,
     this.authorDid,
   });
+  final VoidCallback? onPressed;
+  final VoidCallback? onDeletePressed;
+  final bool isCompact;
+  final Color? backgroundColor;
+  final bool isProfile;
+  final bool isOnVideo;
+  final bool isOwnPost;
+  final String? authorDid;
 
   void _showOptionsMenu(BuildContext context) {
     final theme = Theme.of(context);
@@ -51,7 +50,7 @@ class MenuActionButton extends StatelessWidget {
               if (isCurrentUserAuthor)
                 ListTile(
                   leading: const Icon(Icons.delete_outline, color: Colors.red),
-                  title: Text('Delete', style: TextStyle(color: Colors.red)),
+                  title: const Text('Delete', style: TextStyle(color: Colors.red)),
                   onTap: () async {
                     await context.router.maybePop();
                     if (onDeletePressed != null) {
@@ -104,13 +103,6 @@ class MenuActionButton extends StatelessWidget {
 }
 
 class CompactMenuButton extends StatelessWidget {
-  final VoidCallback? onPressed;
-  final VoidCallback? onDeletePressed;
-  final Color? backgroundColor;
-  final bool isProfile;
-  final bool isOnVideo;
-  final String? authorDid;
-
   const CompactMenuButton({
     super.key,
     this.onPressed,
@@ -120,6 +112,12 @@ class CompactMenuButton extends StatelessWidget {
     this.isOnVideo = false,
     this.authorDid,
   });
+  final VoidCallback? onPressed;
+  final VoidCallback? onDeletePressed;
+  final Color? backgroundColor;
+  final bool isProfile;
+  final bool isOnVideo;
+  final String? authorDid;
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/src/core/widgets/report_dialog.dart b/lib/src/core/widgets/report_dialog.dart
index 178a5de7..c2587587 100644
--- a/lib/src/core/widgets/report_dialog.dart
+++ b/lib/src/core/widgets/report_dialog.dart
@@ -6,20 +6,20 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:get_it/get_it.dart';
 import 'package:sparksocial/src/core/network/atproto/data/repositories/sprk_repository.dart';
 import 'package:sparksocial/src/core/utils/logging/log_service.dart';
+import 'package:sparksocial/src/core/utils/logging/logger.dart';
 
 class ReportDialog extends ConsumerStatefulWidget {
+  const ReportDialog({required this.postUri, required this.postCid, super.key, this.onSubmit});
   final String postUri;
   final String postCid;
   final Function(ReportSubject subject, ModerationReasonType reasonType, String? reason, ModerationService? service)? onSubmit;
 
-  const ReportDialog({super.key, required this.postUri, required this.postCid, this.onSubmit});
-
   @override
   ConsumerState<ReportDialog> createState() => _ReportDialogState();
 }
 
 class _ReportDialogState extends ConsumerState<ReportDialog> {
-  final _logger = GetIt.instance<LogService>().getLogger('ReportDialog');
+  final SparkLogger _logger = GetIt.instance<LogService>().getLogger('ReportDialog');
   ModerationReasonType _selectedReason = ModerationReasonType.spam;
   final TextEditingController _additionalInfoController = TextEditingController();
   bool _isSubmitting = false;
@@ -131,7 +131,7 @@ class _ReportDialogState extends ConsumerState<ReportDialog> {
 
             if (_errorMessage != null)
               Padding(
-                padding: const EdgeInsets.only(top: 8.0),
+                padding: const EdgeInsets.only(top: 8),
                 child: Container(
                   padding: const EdgeInsets.all(8),
                   decoration: BoxDecoration(
@@ -166,17 +166,16 @@ class _ReportDialogState extends ConsumerState<ReportDialog> {
 }
 
 class _ReasonTile extends StatelessWidget {
-  final ModerationReasonType reason;
-  final ModerationReasonType selectedReason;
-  final Map<String, String> reasonDescription;
-  final ValueChanged<ModerationReasonType?> onChanged;
-
   const _ReasonTile({
     required this.reason,
     required this.selectedReason,
     required this.reasonDescription,
     required this.onChanged,
   });
+  final ModerationReasonType reason;
+  final ModerationReasonType selectedReason;
+  final Map<String, String> reasonDescription;
+  final ValueChanged<ModerationReasonType?> onChanged;
 
   @override
   Widget build(BuildContext context) {
@@ -194,7 +193,7 @@ class _ReasonTile extends StatelessWidget {
       value: reason,
       groupValue: selectedReason,
       activeColor: theme.colorScheme.primary,
-      contentPadding: const EdgeInsets.symmetric(horizontal: 4, vertical: 0),
+      contentPadding: const EdgeInsets.symmetric(horizontal: 4),
       dense: true,
       visualDensity: const VisualDensity(horizontal: -4, vertical: -4),
       onChanged: onChanged,
diff --git a/lib/src/core/widgets/user_avatar.dart b/lib/src/core/widgets/user_avatar.dart
index e11b52af..8ade1bf3 100644
--- a/lib/src/core/widgets/user_avatar.dart
+++ b/lib/src/core/widgets/user_avatar.dart
@@ -4,14 +4,6 @@ import 'package:flutter/material.dart';
 
 /// A customizable user avatar with fallback options when no image is available
 class UserAvatar extends StatelessWidget {
-  final String? imageUrl;
-  final String username;
-  final double size;
-  final Color? borderColor;
-  final double borderWidth;
-  final Color? backgroundColor;
-  final Color? fallbackTextColor;
-
   const UserAvatar({
     super.key,
     this.imageUrl,
@@ -22,6 +14,13 @@ class UserAvatar extends StatelessWidget {
     this.backgroundColor,
     this.fallbackTextColor,
   });
+  final String? imageUrl;
+  final String username;
+  final double size;
+  final Color? borderColor;
+  final double borderWidth;
+  final Color? backgroundColor;
+  final Color? fallbackTextColor;
 
   @override
   Widget build(BuildContext context) {
@@ -65,7 +64,7 @@ class UserAvatar extends StatelessWidget {
       child: CachedNetworkImage(
         imageUrl: imageUrl!,
         fit: BoxFit.cover,
-        placeholder: (context, url) => Container(
+        placeholder: (context, url) => ColoredBox(
           color: effectiveBackgroundColor,
           child: Center(
             child: username.isNotEmpty
@@ -76,7 +75,7 @@ class UserAvatar extends StatelessWidget {
                 : Icon(FluentIcons.person_24_regular, size: size * 0.5, color: effectiveFallbackTextColor),
           ),
         ),
-        errorWidget: (context, url, error) => Container(
+        errorWidget: (context, url, error) => ColoredBox(
           color: effectiveBackgroundColor,
           child: Center(
             child: username.isNotEmpty
diff --git a/lib/src/core/widgets/video_content.dart b/lib/src/core/widgets/video_content.dart
index d2154814..5bd55c27 100644
--- a/lib/src/core/widgets/video_content.dart
+++ b/lib/src/core/widgets/video_content.dart
@@ -4,7 +4,7 @@ import 'package:sparksocial/src/core/theme/data/models/colors.dart';
 import 'package:video_player/video_player.dart';
 
 class VideoContent extends StatefulWidget {
-  const VideoContent({super.key, required this.borderRadius, required this.videoUrl});
+  const VideoContent({required this.borderRadius, required this.videoUrl, super.key});
   final BorderRadius borderRadius;
   final String videoUrl;
 
@@ -13,7 +13,6 @@ class VideoContent extends StatefulWidget {
 }
 
 class _VideoContentState extends State<VideoContent> {
-
   VideoPlayerController? videoController;
 
   @override
diff --git a/lib/src/features/auth/auth.dart b/lib/src/features/auth/auth.dart
index 8b2e92c0..128c7b7e 100644
--- a/lib/src/features/auth/auth.dart
+++ b/lib/src/features/auth/auth.dart
@@ -1,12 +1,9 @@
-library;
-
 // Models
-export 'providers/auth_state.dart';
 export '../../core/auth/data/models/identity_info.dart';
 export '../../core/auth/data/models/login_result.dart';
 export '../../core/auth/data/models/login_status.dart';
-
 // Repositories
 export '../../core/auth/data/repositories/auth_repository.dart';
 export '../../core/auth/data/repositories/identity_repository.dart';
 export '../../core/auth/data/repositories/identity_repository_impl.dart';
+export 'providers/auth_state.dart';
diff --git a/lib/src/features/auth/providers/auth_providers.dart b/lib/src/features/auth/providers/auth_providers.dart
index b0aebac9..ae99fa87 100644
--- a/lib/src/features/auth/providers/auth_providers.dart
+++ b/lib/src/features/auth/providers/auth_providers.dart
@@ -3,11 +3,11 @@ import 'package:atproto/core.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:get_it/get_it.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
-import 'package:sparksocial/src/features/auth/providers/auth_state.dart';
 import 'package:sparksocial/src/core/auth/data/models/login_result.dart';
 import 'package:sparksocial/src/core/auth/data/repositories/auth_repository.dart';
 import 'package:sparksocial/src/core/utils/logging/log_service.dart';
 import 'package:sparksocial/src/core/utils/logging/logger.dart';
+import 'package:sparksocial/src/features/auth/providers/auth_state.dart';
 
 part 'auth_providers.g.dart';
 
@@ -33,8 +33,6 @@ class Auth extends _$Auth {
       isAuthenticated: _authRepository.isAuthenticated,
       session: _authRepository.session,
       atproto: _authRepository.atproto,
-      isLoading: false,
-      error: null,
     );
   }
 
@@ -74,8 +72,8 @@ class Auth extends _$Auth {
       return result;
     } catch (e, stackTrace) {
       _logger.e('Login error', error: e, stackTrace: stackTrace);
-      state = state.copyWith(isLoading: false, error: 'Login failed: ${e.toString()}');
-      return LoginResult.failed('Login failed: ${e.toString()}');
+      state = state.copyWith(isLoading: false, error: 'Login failed: $e');
+      return LoginResult.failed('Login failed: $e');
     }
   }
 
@@ -97,7 +95,7 @@ class Auth extends _$Auth {
       return LoginResult.success();
     } catch (e, stackTrace) {
       _logger.e('Registration error', error: e, stackTrace: stackTrace);
-      final errorMsg = 'Registration failed: ${e.toString()}';
+      final errorMsg = 'Registration failed: $e';
       state = state.copyWith(isLoading: false, error: errorMsg);
       return LoginResult.failed(errorMsg);
     }
@@ -114,7 +112,7 @@ class Auth extends _$Auth {
       state = state.copyWith(isLoading: false);
     } catch (e, stackTrace) {
       _logger.e('Logout error', error: e, stackTrace: stackTrace);
-      state = state.copyWith(isLoading: false, error: 'Logout failed: ${e.toString()}');
+      state = state.copyWith(isLoading: false, error: 'Logout failed: $e');
     }
   }
 
@@ -129,7 +127,7 @@ class Auth extends _$Auth {
       return result;
     } catch (e, stackTrace) {
       _logger.e('Session validation error', error: e, stackTrace: stackTrace);
-      state = state.copyWith(error: 'Session validation failed: ${e.toString()}');
+      state = state.copyWith(error: 'Session validation failed: $e');
       return false;
     }
   }
@@ -145,7 +143,7 @@ class Auth extends _$Auth {
       return result;
     } catch (e, stackTrace) {
       _logger.e('Token refresh error', error: e, stackTrace: stackTrace);
-      state = state.copyWith(error: 'Token refresh failed: ${e.toString()}');
+      state = state.copyWith(error: 'Token refresh failed: $e');
       return false;
     }
   }
diff --git a/lib/src/features/auth/providers/onboarding_notifier.dart b/lib/src/features/auth/providers/onboarding_notifier.dart
index fa8dd26f..19c53952 100644
--- a/lib/src/features/auth/providers/onboarding_notifier.dart
+++ b/lib/src/features/auth/providers/onboarding_notifier.dart
@@ -1,8 +1,8 @@
 import 'dart:typed_data';
+
+import 'package:get_it/get_it.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
-import 'package:get_it/get_it.dart';
-
 import 'package:sparksocial/src/core/auth/data/models/onboarding_screen_state.dart';
 import 'package:sparksocial/src/core/auth/data/repositories/auth_repository.dart';
 import 'package:sparksocial/src/core/auth/data/repositories/onboarding_repository.dart';
@@ -30,12 +30,10 @@ class OnboardingNotifier extends _$OnboardingNotifier {
     try {
       final session = _authRepository.session;
       if (session == null || session.did.isEmpty) {
-        _logger.e("User not authenticated or DID is missing.");
+        _logger.e('User not authenticated or DID is missing.');
         return const OnboardingScreenState(
           isLoading: false,
-          errorMessage: "User not authenticated",
-          displayName: '',
-          description: '',
+          errorMessage: 'User not authenticated',
         );
       }
       final userDid = session.did;
@@ -54,12 +52,11 @@ class OnboardingNotifier extends _$OnboardingNotifier {
         description: profileDataMap?.description ?? '',
         initialAvatarCid: avatarCid,
         initialAvatarUrl: avatarUrl,
-        localAvatarBytes: null,
         userDid: userDid,
       );
     } catch (e, s) {
       _logger.e('Failed to load Bsky profile', error: e, stackTrace: s);
-      return OnboardingScreenState(isLoading: false, errorMessage: "Failed to load profile.", displayName: '', description: '');
+      return const OnboardingScreenState(isLoading: false, errorMessage: 'Failed to load profile.');
     }
   }
 
diff --git a/lib/src/features/auth/providers/onboarding_providers.dart b/lib/src/features/auth/providers/onboarding_providers.dart
index 05620e07..3c3600c9 100644
--- a/lib/src/features/auth/providers/onboarding_providers.dart
+++ b/lib/src/features/auth/providers/onboarding_providers.dart
@@ -2,11 +2,11 @@ import 'package:bluesky/bluesky.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:get_it/get_it.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:sparksocial/src/core/auth/data/repositories/auth_repository.dart';
+import 'package:sparksocial/src/core/auth/data/repositories/onboarding_repository.dart';
+import 'package:sparksocial/src/core/auth/data/repositories/onboarding_repository_impl.dart';
 import 'package:sparksocial/src/core/network/atproto/data/models/graph_models.dart';
-import '../../../core/network/atproto/data/repositories/sprk_repository.dart';
-import '../../../core/auth/data/repositories/auth_repository.dart';
-import '../../../core/auth/data/repositories/onboarding_repository_impl.dart';
-import '../../../core/auth/data/repositories/onboarding_repository.dart';
+import 'package:sparksocial/src/core/network/atproto/data/repositories/sprk_repository.dart';
 
 part 'onboarding_providers.g.dart';
 
@@ -94,7 +94,7 @@ class OnboardingState extends _$OnboardingState {
     try {
       final repository = ref.read(onboardingRepositoryProvider);
       String? cursor;
-      bool hasMore = true;
+      var hasMore = true;
 
       // Loop to get all follows with pagination
       while (hasMore) {
diff --git a/lib/src/features/auth/ui/pages/auth_prompt_page.dart b/lib/src/features/auth/ui/pages/auth_prompt_page.dart
index 92313401..10c72e60 100644
--- a/lib/src/features/auth/ui/pages/auth_prompt_page.dart
+++ b/lib/src/features/auth/ui/pages/auth_prompt_page.dart
@@ -8,9 +8,8 @@ import 'package:sparksocial/src/core/theme/data/models/colors.dart';
 
 @RoutePage()
 class AuthPromptPage extends StatelessWidget {
-  final VoidCallback? onClose;
-
   const AuthPromptPage({super.key, this.onClose});
+  final VoidCallback? onClose;
 
   @override
   Widget build(BuildContext context) {
@@ -36,7 +35,7 @@ class AuthPromptPage extends StatelessWidget {
           SafeArea(
             child: Center(
               child: Padding(
-                padding: const EdgeInsets.all(24.0),
+                padding: const EdgeInsets.all(24),
                 child: Column(
                   mainAxisAlignment: MainAxisAlignment.center,
                   children: [
@@ -46,13 +45,13 @@ class AuthPromptPage extends StatelessWidget {
                       width: 140,
                     ),
                     const SizedBox(height: 21),
-                    Text(
+                    const Text(
                       'Welcome to Spark',
                       style: TextStyle(fontSize: 26, fontWeight: FontWeight.bold, color: AppColors.white),
                       textAlign: TextAlign.center,
                     ),
                     const SizedBox(height: 5),
-                    SizedBox(
+                    const SizedBox(
                       width: 340,
                       child: Text(
                         'Add an account to create videos, connect with friends, and more.',
diff --git a/lib/src/features/auth/ui/pages/login_page.dart b/lib/src/features/auth/ui/pages/login_page.dart
index 3167feb2..b1317a20 100644
--- a/lib/src/features/auth/ui/pages/login_page.dart
+++ b/lib/src/features/auth/ui/pages/login_page.dart
@@ -1,16 +1,15 @@
+import 'package:auto_route/auto_route.dart';
 import 'package:fluentui_system_icons/fluentui_system_icons.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_svg/flutter_svg.dart';
-import 'package:auto_route/auto_route.dart';
 import 'package:sparksocial/src/core/routing/app_router.dart';
-
 import 'package:sparksocial/src/core/theme/data/models/colors.dart';
+import 'package:sparksocial/src/core/utils/uppercase_text_formatter.dart';
 import 'package:sparksocial/src/features/auth/providers/auth_providers.dart';
 import 'package:sparksocial/src/features/auth/providers/onboarding_providers.dart';
 import 'package:sparksocial/src/features/auth/ui/widgets/at_account_dialog.dart';
-import 'package:sparksocial/src/core/utils/uppercase_text_formatter.dart';
 
 @RoutePage()
 class LoginPage extends ConsumerStatefulWidget {
@@ -64,7 +63,7 @@ class _LoginPageState extends ConsumerState<LoginPage> {
       if (!mounted) return;
 
       if (result.isSuccess) {
-        TextInput.finishAutofillContext(shouldSave: true);
+        TextInput.finishAutofillContext();
         final hasSparkProfile = await ref.read(onboardingRepositoryProvider).hasSparkProfile();
 
         if (!mounted) return;
@@ -99,7 +98,7 @@ class _LoginPageState extends ConsumerState<LoginPage> {
           SafeArea(
             child: Center(
               child: SingleChildScrollView(
-                padding: const EdgeInsets.all(24.0),
+                padding: const EdgeInsets.all(24),
                 child: Form(
                   key: _formKey,
                   autovalidateMode: AutovalidateMode.onUserInteraction,
@@ -113,7 +112,7 @@ class _LoginPageState extends ConsumerState<LoginPage> {
                         width: 140,
                       ),
                       const SizedBox(height: 21),
-                      Text(
+                      const Text(
                         'Login to your account',
                         style: TextStyle(color: AppColors.white, fontSize: 26, fontWeight: FontWeight.bold),
                         textAlign: TextAlign.center,
@@ -125,7 +124,7 @@ class _LoginPageState extends ConsumerState<LoginPage> {
                           alignment: WrapAlignment.center,
                           crossAxisAlignment: WrapCrossAlignment.center,
                           children: [
-                            Text(
+                            const Text(
                               'Login using your existing ',
                               style: TextStyle(color: AppColors.white, fontSize: 20, height: 1.7),
                             ),
@@ -145,7 +144,7 @@ class _LoginPageState extends ConsumerState<LoginPage> {
                               focusNode: _handleFocusNode,
                               decoration: InputDecoration(
                                 hintText: 'Handle',
-                                hintStyle: TextStyle(color: AppColors.hintText),
+                                hintStyle: const TextStyle(color: AppColors.hintText),
                                 prefixIcon: const Icon(FluentIcons.person_24_regular, color: AppColors.primary),
                                 filled: true,
                                 fillColor: AppColors.white.withAlpha(255),
@@ -156,7 +155,7 @@ class _LoginPageState extends ConsumerState<LoginPage> {
                               textInputAction: TextInputAction.next,
                               keyboardType: TextInputType.emailAddress,
                               autofillHints: const [AutofillHints.username, AutofillHints.email],
-                              onEditingComplete: () => _passwordFocusNode.requestFocus(),
+                              onEditingComplete: _passwordFocusNode.requestFocus,
                             ),
                             const SizedBox(height: 16),
 
@@ -165,7 +164,7 @@ class _LoginPageState extends ConsumerState<LoginPage> {
                               focusNode: _passwordFocusNode,
                               decoration: InputDecoration(
                                 hintText: 'Password',
-                                hintStyle: TextStyle(color: AppColors.hintText),
+                                hintStyle: const TextStyle(color: AppColors.hintText),
                                 prefixIcon: const Icon(FluentIcons.lock_closed_24_regular, color: AppColors.primary),
                                 suffixIcon: IconButton(
                                   onPressed: () {
@@ -239,8 +238,8 @@ class _LoginPageState extends ConsumerState<LoginPage> {
                           padding: const EdgeInsets.only(bottom: 16),
                           child: Text(
                             switch (error) {
-                              String e when e.contains('must be a valid handle') => 'Invalid handle',
-                              String e when e.contains('identifier or password') => 'Invalid handle or password',
+                              final String e when e.contains('must be a valid handle') => 'Invalid handle',
+                              final String e when e.contains('identifier or password') => 'Invalid handle or password',
                               _ => error,
                             },
                             style: const TextStyle(color: AppColors.error, fontSize: 14),
diff --git a/lib/src/features/auth/ui/pages/onboarding_page.dart b/lib/src/features/auth/ui/pages/onboarding_page.dart
index 9c508497..48f279ba 100644
--- a/lib/src/features/auth/ui/pages/onboarding_page.dart
+++ b/lib/src/features/auth/ui/pages/onboarding_page.dart
@@ -1,13 +1,13 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:sparksocial/src/core/routing/app_router.dart';
 import 'package:sparksocial/src/core/auth/data/models/onboarding_screen_state.dart'; // Import for OnboardingScreenState
+import 'package:sparksocial/src/core/routing/app_router.dart';
+import 'package:sparksocial/src/core/widgets/custom_text_field.dart'; // Corrected path
 import 'package:sparksocial/src/features/auth/providers/onboarding_notifier.dart';
 import 'package:sparksocial/src/features/auth/providers/onboarding_providers.dart';
 import 'package:sparksocial/src/features/settings/providers/settings_provider.dart';
 import 'package:sparksocial/src/features/settings/ui/pages/profile_settings_page.dart';
-import 'package:sparksocial/src/core/widgets/custom_text_field.dart'; // Corrected path
 
 @RoutePage()
 class OnboardingPage extends ConsumerStatefulWidget {
@@ -92,7 +92,7 @@ class _OnboardingPageState extends ConsumerState<OnboardingPage> {
       context.router.replaceAll([const MainRoute()]);
     } catch (e) {
       if (!mounted) return;
-      ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Error completing profile: ${e.toString()}')));
+      ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Error completing profile: $e')));
     } finally {
       if (mounted) {
         setState(() {
@@ -137,9 +137,9 @@ class _OnboardingPageState extends ConsumerState<OnboardingPage> {
           child: Column(
             mainAxisSize: MainAxisSize.min,
             children: [
-              Text('Error: ${err.toString()}'),
+              Text('Error: $err'),
               const SizedBox(height: 8),
-              ElevatedButton(onPressed: () => notifier.reloadProfile(), child: const Text('Retry')),
+              ElevatedButton(onPressed: notifier.reloadProfile, child: const Text('Retry')),
             ],
           ),
         ),
@@ -151,8 +151,8 @@ class _OnboardingPageState extends ConsumerState<OnboardingPage> {
             avatarImageProvider = NetworkImage(notifier.currentAvatarDisplayUrl!);
           }
 
-          final bool hasLocalAvatar = state.localAvatarBytes != null;
-          final bool isAvatarActive = hasLocalAvatar || notifier.currentAvatarDisplayUrl != null;
+          final hasLocalAvatar = state.localAvatarBytes != null;
+          final isAvatarActive = hasLocalAvatar || notifier.currentAvatarDisplayUrl != null;
 
           return Center(
             child: Padding(
@@ -167,7 +167,7 @@ class _OnboardingPageState extends ConsumerState<OnboardingPage> {
                         alignment: Alignment.bottomRight, // Changed alignment for better visibility
                         children: [
                           GestureDetector(
-                            onTap: () => notifier.pickAvatar(),
+                            onTap: notifier.pickAvatar,
                             child: CircleAvatar(
                               radius: 50,
                               backgroundImage: avatarImageProvider,
@@ -186,11 +186,11 @@ class _OnboardingPageState extends ConsumerState<OnboardingPage> {
                               children: [
                                 if (hasLocalAvatar) // Show undo if a local avatar is picked
                                   Padding(
-                                    padding: const EdgeInsets.all(4.0),
+                                    padding: const EdgeInsets.all(4),
                                     child: GestureDetector(
-                                      onTap: () => notifier.revertAvatarToInitial(),
+                                      onTap: notifier.revertAvatarToInitial,
                                       child: Container(
-                                        decoration: BoxDecoration(color: Colors.black54, shape: BoxShape.circle),
+                                        decoration: const BoxDecoration(color: Colors.black54, shape: BoxShape.circle),
                                         padding: const EdgeInsets.all(4),
                                         child: const Icon(Icons.undo, size: 16, color: Colors.white),
                                       ),
@@ -198,11 +198,11 @@ class _OnboardingPageState extends ConsumerState<OnboardingPage> {
                                   ),
                                 if (isAvatarActive) // Show close if any avatar is active
                                   Padding(
-                                    padding: const EdgeInsets.all(4.0),
+                                    padding: const EdgeInsets.all(4),
                                     child: GestureDetector(
-                                      onTap: () => notifier.clearAvatarSelection(),
+                                      onTap: notifier.clearAvatarSelection,
                                       child: Container(
-                                        decoration: BoxDecoration(color: Colors.black54, shape: BoxShape.circle),
+                                        decoration: const BoxDecoration(color: Colors.black54, shape: BoxShape.circle),
                                         padding: const EdgeInsets.all(4),
                                         child: const Icon(Icons.close, size: 16, color: Colors.white),
                                       ),
@@ -227,7 +227,7 @@ class _OnboardingPageState extends ConsumerState<OnboardingPage> {
                             onUndo:
                                 (state.bskyProfileRecord?.displayName != null &&
                                     _displayNameController.text != (state.bskyProfileRecord?.displayName ?? ''))
-                                ? () => notifier.resetDisplayName()
+                                ? notifier.resetDisplayName
                                 : null,
                             validator: (value) {
                               if (value == null || value.trim().isEmpty) return 'Display Name is required';
@@ -244,7 +244,7 @@ class _OnboardingPageState extends ConsumerState<OnboardingPage> {
                             onUndo:
                                 (state.bskyProfileRecord?.description != null &&
                                     _descriptionController.text != (state.bskyProfileRecord?.description ?? ''))
-                                ? () => notifier.resetDescription()
+                                ? notifier.resetDescription
                                 : null,
                             validator: (value) {
                               if (value != null && value.trim().length > 256) return 'Bio cannot exceed 256 characters';
diff --git a/lib/src/features/auth/ui/pages/register_page.dart b/lib/src/features/auth/ui/pages/register_page.dart
index 544865ec..e996f6f0 100644
--- a/lib/src/features/auth/ui/pages/register_page.dart
+++ b/lib/src/features/auth/ui/pages/register_page.dart
@@ -1,8 +1,8 @@
+import 'package:auto_route/auto_route.dart';
 import 'package:fluentui_system_icons/fluentui_system_icons.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_svg/flutter_svg.dart';
-import 'package:auto_route/auto_route.dart';
 import 'package:sparksocial/src/core/config/app_config.dart';
 import 'package:sparksocial/src/core/routing/app_router.dart';
 import 'package:sparksocial/src/core/theme/data/models/colors.dart';
@@ -43,7 +43,7 @@ class _RegisterPageState extends ConsumerState<RegisterPage> {
       _errorMessage = null;
     });
 
-    final String handle = "${_handleController.text}.sprk.so";
+    final handle = '${_handleController.text}.sprk.so';
 
     final authNotifier = ref.read(authProvider.notifier);
     final result = await authNotifier.register(
@@ -93,13 +93,13 @@ class _RegisterPageState extends ConsumerState<RegisterPage> {
             child: GestureDetector(
               onTap: () => FocusScope.of(context).unfocus(),
               child: Padding(
-                padding: const EdgeInsets.symmetric(horizontal: 24.0),
+                padding: const EdgeInsets.symmetric(horizontal: 24),
                 child: ListView(
                   children: [
                     const SizedBox(height: 24),
                     Center(child: SvgPicture.asset('assets/images/logo_dark_mode.svg', height: 140, width: 140)),
                     const SizedBox(height: 21),
-                    Center(
+                    const Center(
                       child: Text(
                         'Create Account',
                         style: TextStyle(color: AppColors.white, fontSize: 26, fontWeight: FontWeight.bold),
@@ -114,7 +114,7 @@ class _RegisterPageState extends ConsumerState<RegisterPage> {
                           alignment: WrapAlignment.center,
                           crossAxisAlignment: WrapCrossAlignment.center,
                           children: [
-                            Text('Create your new ', style: TextStyle(color: AppColors.white, fontSize: 20, height: 1.7)),
+                            const Text('Create your new ', style: TextStyle(color: AppColors.white, fontSize: 20, height: 1.7)),
                             SvgPicture.asset('assets/images/ataccount.svg', height: 25, width: 100),
                             const SizedBox(width: 4),
                             const ATAccountInfoIcon(),
@@ -129,11 +129,11 @@ class _RegisterPageState extends ConsumerState<RegisterPage> {
                       Container(
                         padding: const EdgeInsets.all(16),
                         decoration: BoxDecoration(color: AppColors.error.withAlpha(26), borderRadius: BorderRadius.circular(12)),
-                        child: Row(
+                        child: const Row(
                           children: [
-                            const Icon(FluentIcons.warning_24_regular, color: AppColors.error),
-                            const SizedBox(width: 8),
-                            const Expanded(
+                            Icon(FluentIcons.warning_24_regular, color: AppColors.error),
+                            SizedBox(width: 8),
+                            Expanded(
                               child: Text(
                                 'New account registration is currently disabled while we correct issues in our system. We will try to re-enable it as soon as possible.',
                                 style: TextStyle(color: AppColors.error),
@@ -144,7 +144,7 @@ class _RegisterPageState extends ConsumerState<RegisterPage> {
                       ),
                       const SizedBox(height: 24),
                     ],
-                    Text(
+                    const Text(
                       'Email',
                       style: TextStyle(fontSize: 16, fontWeight: FontWeight.w500, color: AppColors.white),
                     ),
@@ -154,7 +154,7 @@ class _RegisterPageState extends ConsumerState<RegisterPage> {
                       keyboardType: TextInputType.emailAddress,
                       decoration: InputDecoration(
                         hintText: 'Your email address',
-                        hintStyle: TextStyle(color: AppColors.hintText),
+                        hintStyle: const TextStyle(color: AppColors.hintText),
                         filled: true,
                         fillColor: AppColors.white.withAlpha(255),
                         border: OutlineInputBorder(borderRadius: BorderRadius.circular(16), borderSide: BorderSide.none),
@@ -166,7 +166,7 @@ class _RegisterPageState extends ConsumerState<RegisterPage> {
                     ),
 
                     const SizedBox(height: 24),
-                    Text(
+                    const Text(
                       'Username',
                       style: TextStyle(fontSize: 16, fontWeight: FontWeight.w500, color: AppColors.white),
                     ),
@@ -175,7 +175,7 @@ class _RegisterPageState extends ConsumerState<RegisterPage> {
                       controller: _handleController,
                       decoration: InputDecoration(
                         hintText: 'username',
-                        hintStyle: TextStyle(color: AppColors.hintText),
+                        hintStyle: const TextStyle(color: AppColors.hintText),
                         filled: true,
                         fillColor: AppColors.white.withAlpha(255),
                         border: OutlineInputBorder(borderRadius: BorderRadius.circular(16), borderSide: BorderSide.none),
@@ -183,7 +183,7 @@ class _RegisterPageState extends ConsumerState<RegisterPage> {
                         suffixIcon: Padding(
                           padding: const EdgeInsets.only(right: 16),
                           child: Center(
-                            widthFactor: 1.0,
+                            widthFactor: 1,
                             child: Text('.sprk.so', style: TextStyle(fontSize: 16, color: colorScheme.primary)),
                           ),
                         ),
@@ -195,7 +195,7 @@ class _RegisterPageState extends ConsumerState<RegisterPage> {
 
                     const SizedBox(height: 24),
 
-                    Text(
+                    const Text(
                       'Password',
                       style: TextStyle(fontSize: 16, fontWeight: FontWeight.w500, color: AppColors.white),
                     ),
@@ -205,7 +205,7 @@ class _RegisterPageState extends ConsumerState<RegisterPage> {
                       obscureText: !_isPasswordVisible,
                       decoration: InputDecoration(
                         hintText: 'Your password',
-                        hintStyle: TextStyle(color: AppColors.hintText),
+                        hintStyle: const TextStyle(color: AppColors.hintText),
                         filled: true,
                         fillColor: AppColors.white.withAlpha(255),
                         border: OutlineInputBorder(borderRadius: BorderRadius.circular(16), borderSide: BorderSide.none),
@@ -272,7 +272,7 @@ class _RegisterPageState extends ConsumerState<RegisterPage> {
                     Row(
                       mainAxisAlignment: MainAxisAlignment.center,
                       children: [
-                        Text('Already have an account?', style: TextStyle(color: AppColors.white)),
+                        const Text('Already have an account?', style: TextStyle(color: AppColors.white)),
                         TextButton(
                           onPressed: () => context.router.push(const LoginRoute()),
                           child: const Text(
diff --git a/lib/src/features/auth/ui/widgets/at_account_dialog.dart b/lib/src/features/auth/ui/widgets/at_account_dialog.dart
index c9f4ea66..e8d3ff53 100644
--- a/lib/src/features/auth/ui/widgets/at_account_dialog.dart
+++ b/lib/src/features/auth/ui/widgets/at_account_dialog.dart
@@ -1,9 +1,8 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
-import 'package:url_launcher/url_launcher.dart';
-
 import 'package:sparksocial/src/core/theme/data/models/colors.dart';
+import 'package:url_launcher/url_launcher.dart';
 
 /// A widget that displays an information icon for AT Accounts.
 /// When tapped, it shows a dialog explaining what an AT Account is.
@@ -40,13 +39,13 @@ class _ATAccountDialog extends StatelessWidget {
     return AlertDialog(
       backgroundColor: AppColors.deepPurple,
       shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
-      titlePadding: const EdgeInsets.only(top: 32, left: 24, right: 24, bottom: 0),
+      titlePadding: const EdgeInsets.only(top: 32, left: 24, right: 24),
       contentPadding: const EdgeInsets.fromLTRB(24, 12, 24, 0),
       title: Column(
         children: [
           SvgPicture.asset('assets/images/ataccount.svg', height: 40),
           const SizedBox(height: 18),
-          Text(
+          const Text(
             'What is an AT Account?',
             style: TextStyle(color: AppColors.lightLavender, fontWeight: FontWeight.bold, fontSize: 20),
             textAlign: TextAlign.center,
@@ -77,11 +76,10 @@ class _ATAccountDialog extends StatelessWidget {
 
 /// Actions for the AT Account dialog.
 class _ATAccountDialogActions extends StatelessWidget {
+  const _ATAccountDialogActions({required this.onGotIt, required this.onLearnMore});
   final VoidCallback onGotIt;
   final VoidCallback onLearnMore;
 
-  const _ATAccountDialogActions({required this.onGotIt, required this.onLearnMore});
-
   @override
   Widget build(BuildContext context) {
     return Row(
@@ -89,7 +87,7 @@ class _ATAccountDialogActions extends StatelessWidget {
         Expanded(
           child: TextButton(
             onPressed: onLearnMore,
-            child: Text(
+            child: const Text(
               'Learn more',
               style: TextStyle(color: AppColors.primary, fontWeight: FontWeight.bold, fontSize: 16),
             ),
diff --git a/lib/src/features/comments/providers/comment_input_provider.dart b/lib/src/features/comments/providers/comment_input_provider.dart
index d2023004..1b3aeeee 100644
--- a/lib/src/features/comments/providers/comment_input_provider.dart
+++ b/lib/src/features/comments/providers/comment_input_provider.dart
@@ -16,13 +16,11 @@ class CommentInput extends _$CommentInput {
     ref.onDispose(() {
       textController.dispose();
     });
-    textController.addListener(() {
-      updateCanSubmit();
-    });
+    textController.addListener(updateCanSubmit);
     return CommentInputState(textController: textController, imagePicker: imagePicker);
   }
 
-  late final _logger = GetIt.instance.get<LogService>().getLogger('CommentInputNotifier');
+  late final SparkLogger _logger = GetIt.instance.get<LogService>().getLogger('CommentInputNotifier');
 
   void updateCanSubmit() {
     final textIsNotEmpty = state.textController.text.trim().isNotEmpty;
@@ -61,12 +59,12 @@ class CommentInput extends _$CommentInput {
     final currentImageCount = state.selectedImages.length;
     if (currentImageCount >= maxImages) {
       if (!context.mounted) return;
-      ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('You can select up to $maxImages images.')));
+      ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('You can select up to $maxImages images.')));
       return;
     }
 
     try {
-      final List<XFile> pickedFiles = await state.imagePicker.pickMultiImage(limit: maxImages - currentImageCount);
+      final pickedFiles = await state.imagePicker.pickMultiImage(limit: maxImages - currentImageCount);
       if (pickedFiles.isNotEmpty) {
         state = state.copyWith(selectedImages: [...state.selectedImages, ...pickedFiles]);
         updateCanSubmit();
@@ -114,10 +112,10 @@ class CommentInput extends _$CommentInput {
     } catch (e) {
       // If posting fails, just reset isPosting but keep the form data
       state = state.copyWith(isPosting: false);
-      
+
       // Log the error for debugging
       _logger.e('Error posting comment: $e');
-      
+
       rethrow;
     }
   }
diff --git a/lib/src/features/comments/providers/comment_input_state.dart b/lib/src/features/comments/providers/comment_input_state.dart
index d1a582bb..f3c16612 100644
--- a/lib/src/features/comments/providers/comment_input_state.dart
+++ b/lib/src/features/comments/providers/comment_input_state.dart
@@ -7,11 +7,11 @@ part 'comment_input_state.freezed.dart';
 @freezed
 class CommentInputState with _$CommentInputState {
   const factory CommentInputState({
+    required TextEditingController textController,
+    required ImagePicker imagePicker,
     @Default(false) bool canSubmit,
     @Default(false) bool isPosting,
     @Default([]) List<XFile> selectedImages,
     @Default({}) Map<String, String> altTexts,
-    required TextEditingController textController,
-    required ImagePicker imagePicker,
   }) = _CommentInputState;
 }
diff --git a/lib/src/features/comments/providers/comment_provider.dart b/lib/src/features/comments/providers/comment_provider.dart
index 6ecc5d8b..0e85ebdf 100644
--- a/lib/src/features/comments/providers/comment_provider.dart
+++ b/lib/src/features/comments/providers/comment_provider.dart
@@ -33,12 +33,12 @@ class CommentNotifier extends _$CommentNotifier {
   Future<void> toggleLike() async {
     final wasLiked = state.isLiked;
     final currentLikeCount = state.thread.post.likeCount ?? 0;
-    
+
     try {
       if (wasLiked) {
         // Capture the like reference before optimistic update
         final likeUri = state.thread.post.viewer!.like!;
-        
+
         // Optimistically update UI for unlike
         final updatedPost = state.thread.post.copyWith(
           viewer: state.thread.post.viewer?.copyWith(like: null),
@@ -47,34 +47,33 @@ class CommentNotifier extends _$CommentNotifier {
         state = state.copyWith(
           thread: state.thread.copyWith(post: updatedPost),
         );
-        
+
         // Perform the actual unlike using the captured reference
         await _feedRepository.unlikePost(likeUri);
-        
+
         // Trigger UI updates
         ref.read(postUpdateProvider(state.thread.post.uri.toString()).notifier).state++;
       } else {
         // Optimistically update UI for like
         final response = await _feedRepository.likePost(state.thread.post.cid, state.thread.post.uri);
-        
+
         final updatedPost = state.thread.post.copyWith(
-          viewer: state.thread.post.viewer?.copyWith(like: response.uri) ?? 
-                  Viewer(like: response.uri),
+          viewer: state.thread.post.viewer?.copyWith(like: response.uri) ?? Viewer(like: response.uri),
           likeCount: currentLikeCount + 1,
         );
         state = state.copyWith(
           thread: state.thread.copyWith(post: updatedPost),
         );
-        
+
         // Trigger UI updates
         ref.read(postUpdateProvider(state.thread.post.uri.toString()).notifier).state++;
       }
     } catch (e) {
       // Revert optimistic update on error
       final revertedPost = state.thread.post.copyWith(
-        viewer: wasLiked 
-          ? state.thread.post.viewer?.copyWith(like: state.thread.post.viewer?.like)
-          : state.thread.post.viewer?.copyWith(like: null),
+        viewer: wasLiked
+            ? state.thread.post.viewer?.copyWith(like: state.thread.post.viewer?.like)
+            : state.thread.post.viewer?.copyWith(like: null),
         likeCount: currentLikeCount,
       );
       state = state.copyWith(
@@ -102,7 +101,7 @@ Future<StrongRef> postComment(
   Map<String, String>? altTexts,
 }) async {
   final feedRepository = GetIt.instance<SprkRepository>().feed;
-  return await feedRepository.postComment(
+  return feedRepository.postComment(
     text,
     parentCid,
     AtUri.parse(parentUri),
diff --git a/lib/src/features/comments/providers/comment_state.dart b/lib/src/features/comments/providers/comment_state.dart
index 9039a48b..6fb457f2 100644
--- a/lib/src/features/comments/providers/comment_state.dart
+++ b/lib/src/features/comments/providers/comment_state.dart
@@ -5,18 +5,17 @@ part 'comment_state.freezed.dart';
 
 @freezed
 class CommentState with _$CommentState {
-  const CommentState._();
-  
   const factory CommentState({
     required ThreadViewPost thread,
     @Default(false) bool isVideoInitialized,
     @Default(false) bool isFirstImagePrecached,
     String? videoUrl,
   }) = _CommentState;
-  
+  const CommentState._();
+
   // Derive isLiked from the viewer state
   bool get isLiked => thread.post.viewer?.like != null;
-  
+
   // Get the actual like count, potentially adjusted for optimistic UI updates
   int get likeCount => thread.post.likeCount ?? 0;
 }
diff --git a/lib/src/features/comments/ui/pages/comments_page.dart b/lib/src/features/comments/ui/pages/comments_page.dart
index 11a4cf40..2f630f50 100644
--- a/lib/src/features/comments/ui/pages/comments_page.dart
+++ b/lib/src/features/comments/ui/pages/comments_page.dart
@@ -11,12 +11,11 @@ import 'package:sparksocial/src/features/comments/ui/widgets/comment_item.dart';
 
 @RoutePage()
 class CommentsPage extends ConsumerStatefulWidget {
+  const CommentsPage({required this.postUri, required this.isSprk, super.key, this.post});
   final String postUri;
   final bool isSprk;
   final PostView? post;
 
-  const CommentsPage({super.key, required this.postUri, required this.isSprk, this.post});
-
   @override
   ConsumerState<CommentsPage> createState() => _CommentsPageState();
 }
@@ -56,8 +55,8 @@ class _CommentsPageState extends ConsumerState<CommentsPage> with SingleTickerPr
             color: backgroundColor,
             borderRadius: const BorderRadius.only(topLeft: Radius.circular(12), topRight: Radius.circular(12)),
           ),
-          child: ClipRRect(
-            borderRadius: const BorderRadius.only(topLeft: Radius.circular(12), topRight: Radius.circular(12)),
+          child: const ClipRRect(
+            borderRadius: BorderRadius.only(topLeft: Radius.circular(12), topRight: Radius.circular(12)),
             child: AutoRouter(),
           ),
         ),
@@ -195,7 +194,7 @@ class _CommentsListPageState extends ConsumerState<CommentsListPage> {
                 padding: const EdgeInsets.only(bottom: 16),
                 itemCount: data.thread.replies?.length ?? 0,
                 itemBuilder: (context, index) {
-                  final comment = data.thread.replies?[index] as ThreadViewPost;
+                  final comment = data.thread.replies![index] as ThreadViewPost;
                   return CommentItem(key: ValueKey('comment-${comment.post.cid}'), thread: comment, mainPostUri: _postAtUri);
                 },
               );
@@ -222,12 +221,6 @@ class _CommentsListPageState extends ConsumerState<CommentsListPage> {
 
 // Separate widget to handle keyboard awareness without rebuilding the provider
 class _KeyboardAwareCommentInput extends StatelessWidget {
-  final String videoId;
-  final String postCid;
-  final String postUri;
-  final bool isSprk;
-  final FocusNode focusNode;
-
   const _KeyboardAwareCommentInput({
     required this.videoId,
     required this.postCid,
@@ -235,6 +228,11 @@ class _KeyboardAwareCommentInput extends StatelessWidget {
     required this.isSprk,
     required this.focusNode,
   });
+  final String videoId;
+  final String postCid;
+  final String postUri;
+  final bool isSprk;
+  final FocusNode focusNode;
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/src/features/comments/ui/pages/replies_page.dart b/lib/src/features/comments/ui/pages/replies_page.dart
index d0ee560d..6213d53a 100644
--- a/lib/src/features/comments/ui/pages/replies_page.dart
+++ b/lib/src/features/comments/ui/pages/replies_page.dart
@@ -10,10 +10,9 @@ import 'package:sparksocial/src/features/comments/ui/widgets/comment_item.dart';
 
 @RoutePage()
 class RepliesPage extends ConsumerStatefulWidget {
+  const RepliesPage({required this.postUri, super.key});
   final String postUri;
 
-  const RepliesPage({super.key, required this.postUri});
-
   @override
   ConsumerState<RepliesPage> createState() => _RepliesPageState();
 }
@@ -84,8 +83,8 @@ class _RepliesPageState extends ConsumerState<RepliesPage> {
             children: [
               if (data.thread.parent is ThreadViewPost)
                 CommentItem(
-                  key: ValueKey('comment-${(data.thread.parent as ThreadViewPost).post.uri}'),
-                  thread: data.thread.parent as ThreadViewPost,
+                  key: ValueKey('comment-${(data.thread.parent! as ThreadViewPost).post.uri}'),
+                  thread: data.thread.parent! as ThreadViewPost,
                   mainPostUri: AtUri.parse(widget.postUri),
                 ),
               Expanded(
@@ -96,7 +95,7 @@ class _RepliesPageState extends ConsumerState<RepliesPage> {
                   ),
                   itemCount: data.thread.replies?.length ?? 0,
                   itemBuilder: (context, index) {
-                    final comment = data.thread.replies?[index] as ThreadViewPost;
+                    final comment = data.thread.replies![index] as ThreadViewPost;
                     return CommentItem(
                       key: ValueKey('comment-${comment.post.cid}'),
                       thread: comment,
diff --git a/lib/src/features/comments/ui/widgets/comment_input.dart b/lib/src/features/comments/ui/widgets/comment_input.dart
index 938f8e8a..03a55b7d 100644
--- a/lib/src/features/comments/ui/widgets/comment_input.dart
+++ b/lib/src/features/comments/ui/widgets/comment_input.dart
@@ -4,16 +4,25 @@ import 'package:fluentui_system_icons/fluentui_system_icons.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:image_picker/image_picker.dart'; // Import image_picker
-import 'package:sparksocial/src/features/auth/providers/auth_providers.dart';
-import 'package:sparksocial/src/features/comments/providers/comment_input_state.dart';
-import 'package:sparksocial/src/features/comments/providers/comment_input_provider.dart';
 import 'package:sparksocial/src/core/widgets/alt_text_editor_dialog.dart';
 import 'package:sparksocial/src/core/widgets/user_avatar.dart';
+import 'package:sparksocial/src/features/auth/providers/auth_providers.dart';
+import 'package:sparksocial/src/features/comments/providers/comment_input_provider.dart';
+import 'package:sparksocial/src/features/comments/providers/comment_input_state.dart';
+import 'package:sparksocial/src/features/comments/ui/widgets/emoji_picker.dart';
 import 'package:sparksocial/src/features/profile/providers/profile_provider.dart';
 
-import 'emoji_picker.dart';
-
 class CommentInputWidget extends ConsumerStatefulWidget {
+  const CommentInputWidget({
+    required this.videoId,
+    required this.postCid,
+    required this.postUri,
+    required this.isSprk,
+    super.key,
+    this.focusNode,
+    this.rootCid,
+    this.rootUri,
+  });
   final String videoId;
   // Video post info
   final String postCid;
@@ -24,17 +33,6 @@ class CommentInputWidget extends ConsumerStatefulWidget {
   final FocusNode? focusNode;
   final bool isSprk;
 
-  const CommentInputWidget({
-    super.key,
-    required this.videoId,
-    required this.postCid,
-    required this.postUri,
-    this.focusNode,
-    required this.isSprk,
-    this.rootCid,
-    this.rootUri,
-  });
-
   @override
   ConsumerState<CommentInputWidget> createState() => _CommentInputState();
 }
@@ -72,7 +70,6 @@ class _CommentInputState extends ConsumerState<CommentInputWidget> {
             decoration: BoxDecoration(color: Theme.of(context).colorScheme.surface, borderRadius: BorderRadius.circular(32)),
             padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 4),
             child: Row(
-              crossAxisAlignment: CrossAxisAlignment.center,
               children: [
                 UserAvatar(
                   imageUrl: ref
@@ -84,7 +81,6 @@ class _CommentInputState extends ConsumerState<CommentInputWidget> {
                       ),
                   username: session?.handle ?? '',
                   size: 28,
-                  borderWidth: 0,
                 ),
                 const SizedBox(width: 8),
                 _AttachmentButton(
@@ -112,7 +108,7 @@ class _CommentInputState extends ConsumerState<CommentInputWidget> {
           // Selected Images Preview (only show if images are selected)
           if (state.selectedImages.isNotEmpty)
             Padding(
-              padding: const EdgeInsets.only(top: 8.0),
+              padding: const EdgeInsets.only(top: 8),
               child: _SelectedImagesPreview(state: state, notifier: notifier),
             ),
         ],
@@ -140,7 +136,7 @@ class _TextField extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    String hint = 'Add a comment...';
+    const hint = 'Add a comment...';
 
     return TextField(
       controller: state.textController,
@@ -216,8 +212,8 @@ class _AttachmentButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final bool canAddMoreImages = state.selectedImages.length < 4;
-    final bool enabled = !state.isPosting && canAddMoreImages;
+    final canAddMoreImages = state.selectedImages.length < 4;
+    final enabled = !state.isPosting && canAddMoreImages;
 
     return IconButton(
       padding: EdgeInsets.zero,
@@ -247,7 +243,7 @@ class _SelectedImagesPreview extends StatelessWidget {
           final imageFile = state.selectedImages[index];
           final alt = state.altTexts[imageFile.path];
           return Padding(
-            padding: const EdgeInsets.only(right: 8.0),
+            padding: const EdgeInsets.only(right: 8),
             child: Stack(
               alignment: Alignment.bottomRight,
               children: [
@@ -280,13 +276,13 @@ class _SelectedImagesPreview extends StatelessWidget {
                         }
                       },
                       borderRadius: BorderRadius.circular(8),
-                      child: Padding(
-                        padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+                      child: const Padding(
+                        padding: EdgeInsets.symmetric(horizontal: 8, vertical: 4),
                         child: Row(
                           children: [
                             Icon(FluentIcons.image_alt_text_20_regular, color: Colors.white, size: 14),
-                            const SizedBox(width: 2),
-                            const Text(
+                            SizedBox(width: 2),
+                            Text(
                               'ALT',
                               style: TextStyle(color: Colors.white, fontSize: 10, fontWeight: FontWeight.bold),
                             ),
diff --git a/lib/src/features/comments/ui/widgets/comment_item.dart b/lib/src/features/comments/ui/widgets/comment_item.dart
index 67ca6c7e..ae9ab1b1 100644
--- a/lib/src/features/comments/ui/widgets/comment_item.dart
+++ b/lib/src/features/comments/ui/widgets/comment_item.dart
@@ -18,9 +18,9 @@ import 'package:sparksocial/src/features/comments/providers/comment_state.dart';
 import 'package:sparksocial/src/features/comments/providers/comments_page_provider.dart';
 
 class CommentItem extends ConsumerStatefulWidget {
+  const CommentItem({required this.thread, required this.mainPostUri, super.key});
   final ThreadViewPost thread;
   final AtUri mainPostUri;
-  const CommentItem({super.key, required this.thread, required this.mainPostUri});
 
   @override
   ConsumerState<CommentItem> createState() => _CommentItemState();
@@ -103,11 +103,11 @@ class _CommentItemState extends ConsumerState<CommentItem> {
   @override
   Widget build(BuildContext context) {
     commentState = ref.watch(commentNotifierProvider(widget.thread));
-    const double thumbnailSize = 120.0;
+    const double thumbnailSize = 120;
 
     final borderRadius = BorderRadius.circular(8);
-    final bool hasImages = commentState.thread.post.embed is EmbedViewImage;
-    final bool hasVideo = commentState.thread.post.embed is EmbedViewVideo;
+    final hasImages = commentState.thread.post.embed is EmbedViewImage;
+    final hasVideo = commentState.thread.post.embed is EmbedViewVideo;
 
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
@@ -133,7 +133,6 @@ class _CommentItemState extends ConsumerState<CommentItem> {
                           child: GestureDetector(
                             onTap: _navigateToProfile,
                             child: Row(
-                              crossAxisAlignment: CrossAxisAlignment.center,
                               children: [
                                 Text(
                                   commentState.thread.post.author.handle,
@@ -152,15 +151,10 @@ class _CommentItemState extends ConsumerState<CommentItem> {
                           ),
                         ),
                         MenuActionButton(
-                          onPressed: () {
-                            _handleReportComment();
-                          },
-                          onDeletePressed: () {
-                            _handleDeleteComment();
-                          },
+                          onPressed: _handleReportComment,
+                          onDeletePressed: _handleDeleteComment,
                           isCompact: true,
                           backgroundColor: Theme.of(context).colorScheme.surface,
-                          isProfile: false,
                           authorDid: commentState.thread.post.author.did,
                         ),
                       ],
@@ -236,7 +230,7 @@ class _RepliesSection extends StatelessWidget {
         margin: const EdgeInsets.only(left: 64),
         padding: const EdgeInsets.only(top: 4, bottom: 8),
         decoration: BoxDecoration(
-          border: Border(left: BorderSide(color: Theme.of(context).colorScheme.surface, width: 1)),
+          border: Border(left: BorderSide(color: Theme.of(context).colorScheme.surface)),
         ),
         child: Text('Show ${commentState.thread.post.replyCount} replies'),
       ),
@@ -305,7 +299,6 @@ class _Avatar extends StatelessWidget {
       imageUrl: widget.thread.post.author.avatar.toString(),
       username: widget.thread.post.author.handle,
       size: 36,
-      borderWidth: 0,
     );
   }
 }
diff --git a/lib/src/features/comments/ui/widgets/emoji_picker.dart b/lib/src/features/comments/ui/widgets/emoji_picker.dart
index 9055c5d1..a4c9e557 100644
--- a/lib/src/features/comments/ui/widgets/emoji_picker.dart
+++ b/lib/src/features/comments/ui/widgets/emoji_picker.dart
@@ -1,14 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:sparksocial/src/core/theme/data/models/colors.dart';
 
-
 class EmojiPicker extends StatelessWidget {
+  const EmojiPicker({required this.onEmojiSelected, required this.isDarkMode, super.key});
   final Function(String) onEmojiSelected;
   final bool isDarkMode;
   static const List<String> _emojis = ['❤️', '😂', '👍', '🔥', '😍', '🙌', '👏', '🎉', '😮', '🤔', '👀', '💯', '🤣', '😊', '🙏'];
 
-  const EmojiPicker({super.key, required this.onEmojiSelected, required this.isDarkMode});
-
   // Common emojis list
   @override
   Widget build(BuildContext context) {
@@ -43,7 +41,6 @@ class _EmojiItem extends StatelessWidget {
   final String emoji;
   final Function(String) onEmojiSelected;
 
-
   @override
   Widget build(BuildContext context) {
     return Material(
diff --git a/lib/src/features/feed/providers/delete_post.dart b/lib/src/features/feed/providers/delete_post.dart
index 890db019..42358fbc 100644
--- a/lib/src/features/feed/providers/delete_post.dart
+++ b/lib/src/features/feed/providers/delete_post.dart
@@ -23,4 +23,4 @@ Future<void> deletePost(Ref ref, AtUri postUri) async {
   } catch (e) {
     throw Exception('Failed to delete post: $e');
   }
-}
\ No newline at end of file
+}
diff --git a/lib/src/features/feed/providers/feed_provider.dart b/lib/src/features/feed/providers/feed_provider.dart
index e0786a1f..ef349c21 100644
--- a/lib/src/features/feed/providers/feed_provider.dart
+++ b/lib/src/features/feed/providers/feed_provider.dart
@@ -5,10 +5,12 @@ import 'package:atproto/atproto.dart';
 import 'package:atproto/core.dart';
 import 'package:get_it/get_it.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
-import 'package:sparksocial/src/core/network/atproto/data/models/feed_models.dart';
 import 'package:sparksocial/src/core/feed_algorithms/hardcoded_feed_algorithm.dart';
+import 'package:sparksocial/src/core/network/atproto/data/models/feed_models.dart';
+import 'package:sparksocial/src/core/network/atproto/data/models/labeler_models.dart';
 import 'package:sparksocial/src/core/network/atproto/data/repositories/feed_repository.dart';
 import 'package:sparksocial/src/core/network/atproto/data/repositories/sprk_repository.dart';
+import 'package:sparksocial/src/core/storage/cache/cache_manager_interface.dart';
 import 'package:sparksocial/src/core/storage/cache/download_manager_interface.dart';
 import 'package:sparksocial/src/core/storage/cache/sql_cache_interface.dart';
 import 'package:sparksocial/src/core/storage/preferences/settings_repository.dart';
@@ -16,8 +18,6 @@ import 'package:sparksocial/src/core/utils/logging/log_service.dart';
 import 'package:sparksocial/src/core/utils/logging/logger.dart';
 import 'package:sparksocial/src/features/feed/providers/feed_state.dart';
 import 'package:sparksocial/src/features/settings/providers/settings_provider.dart';
-import 'package:sparksocial/src/core/storage/cache/cache_manager_interface.dart';
-import 'package:sparksocial/src/core/network/atproto/data/models/labeler_models.dart';
 
 part 'feed_provider.g.dart';
 
@@ -60,14 +60,14 @@ class FeedNotifier extends _$FeedNotifier {
       // If we were waiting at the end of the feed and new posts have arrived
       if (_isWaitingForFreshPostsAtEnd && next.freshPostCount > 0) {
         _logger.d('New posts arrived! Loading...');
-        Future.microtask(() => load()); // Prevent synchronous execution during state change
+        Future.microtask(load); // Prevent synchronous execution during state change
       }
 
       // Update preserved state whenever state changes
       _preservedState = next;
     });
 
-    var isActive = ref.watch(settingsProvider).activeFeed == feed;
+    final isActive = ref.watch(settingsProvider).activeFeed == feed;
 
     // If this notifier has been built before and we have preserved state, use it
     if (_hasBeenBuilt && _preservedState != null) {
@@ -101,6 +101,7 @@ class FeedNotifier extends _$FeedNotifier {
   bool _isInitialized() {
     try {
       // Try to access one of the late final fields
+      // ignore: unnecessary_statements
       _feedRepository;
       return true;
     } catch (e) {
@@ -148,8 +149,8 @@ class FeedNotifier extends _$FeedNotifier {
 
       // gets ONLY the first f cached posts from the database (not all)
       final uriStrings = await _sqlCache.getUrisForFeed(_feed, limit: FeedState.firstLoadLimit);
-      final uris = uriStrings.map((e) => AtUri.parse(e)).toList();
-      List<Label> labels = <Label>[];
+      final uris = uriStrings.map(AtUri.parse).toList();
+      final labels = <Label>[];
 
       // adds the initial uris to the list of initial uris so that they are not fetched again
       _initialUris.addAll(uris);
@@ -158,7 +159,7 @@ class FeedNotifier extends _$FeedNotifier {
       if (uris.isNotEmpty) {
         // Get existing cached posts to preserve viewer information (like status)
         final cachedPosts = await _sqlCache.getPostsByUris(uris);
-        final cachedPostsMap = {for (var post in cachedPosts) post.uri: post};
+        final cachedPostsMap = {for (final post in cachedPosts) post.uri: post};
 
         // gets the subscribed labels for the posts
         final followedLabelers = await _settingsRepository.getFollowedLabelers();
@@ -168,8 +169,8 @@ class FeedNotifier extends _$FeedNotifier {
         final updatedPostViews = await _feedRepository.getPosts(uris, bluesky: _shouldUseBlueskyAPI());
 
         // Preserve viewer information from cached posts when updating with fresh data
-        final List<PostView> mergedPosts = [];
-        for (var freshPost in updatedPostViews) {
+        final mergedPosts = <PostView>[];
+        for (final freshPost in updatedPostViews) {
           final cachedPost = cachedPostsMap[freshPost.uri];
           PostView finalPost;
 
@@ -183,11 +184,11 @@ class FeedNotifier extends _$FeedNotifier {
           mergedPosts.add(finalPost);
         }
 
-        for (var post in mergedPosts) {
+        for (final post in mergedPosts) {
           labels.addAll(post.labels ?? []); // labels from the post
           if (post.record.selfLabels != null) {
             final recordLabels = <Label>[];
-            for (SelfLabel selfLabel in post.record.selfLabels!) {
+            for (final selfLabel in post.record.selfLabels!) {
               recordLabels.add(
                 Label(uri: post.uri.toString(), value: selfLabel.value, src: post.uri.toString(), createdAt: post.indexedAt),
               );
@@ -200,12 +201,12 @@ class FeedNotifier extends _$FeedNotifier {
       }
 
       // Store the cursor from the initial fetch
-      String? newCursor = state.cursor;
-      int fetchedCount = 0;
+      // String? newCursor = state.cursor;
+      var fetchedCount = 0;
       // starts fetching and storing new posts
       if (!state.isEndOfNetworkFeed) {
         final (int count, List<AtUri> fetchedUris, String? cursor) = await fetch();
-        newCursor = cursor;
+        // newCursor = cursor;
         fetchedCount = count;
         if (count > 0) {
           await store(fetchedUris);
@@ -219,7 +220,7 @@ class FeedNotifier extends _$FeedNotifier {
         state.extraInfo,
       );
 
-      for (Label newLabel in labels) {
+      for (final newLabel in labels) {
         final uri = AtUri.parse(newLabel.uri);
         extraInfo.update(uri, (value) {
           final existingLabels = value.postLabels;
@@ -261,7 +262,7 @@ class FeedNotifier extends _$FeedNotifier {
         loadedPosts: filteredUris,
         freshPostCount: 0, // Set to 0 as per strategy
         extraInfo: extraInfo,
-        cursor: newCursor, // Store the cursor from fetch
+        // cursor: newCursor, // Store the cursor from fetch
         loadingFirstLoad: loadingFirstLoad,
       );
       _isWaitingForFreshPostsAtEnd = state.length <= 1;
@@ -293,7 +294,7 @@ class FeedNotifier extends _$FeedNotifier {
   Future<void> store(List<AtUri> uris) async {
     _logger.d('Store called with ${uris.length} URIs. Current freshPostCount: ${state.freshPostCount}');
     _isCaching = true; // Set caching flag immediately
-    int updatedPostCount = 0;
+    var updatedPostCount = 0;
     state = state.copyWith(error: false);
     try {
       // checks if the posts have already been cached
@@ -304,13 +305,13 @@ class FeedNotifier extends _$FeedNotifier {
 
         // Get existing cached posts to preserve viewer information (like status)
         final cachedPosts = await _sqlCache.getPostsByUris(existingUris);
-        final cachedPostsMap = {for (var post in cachedPosts) post.uri: post};
+        final cachedPostsMap = {for (final post in cachedPosts) post.uri: post};
 
         final posts = await _feedRepository.getPosts(existingUris, bluesky: _shouldUseBlueskyAPI());
 
         // Preserve viewer information from cached posts when updating with fresh data
-        final List<PostView> mergedPosts = [];
-        for (var freshPost in posts) {
+        final mergedPosts = <PostView>[];
+        for (final freshPost in posts) {
           final cachedPost = cachedPostsMap[freshPost.uri];
           PostView finalPost;
 
@@ -353,7 +354,7 @@ class FeedNotifier extends _$FeedNotifier {
 
       // gets the subscribed labels for the new posts
       final followedLabelers = await _settingsRepository.getFollowedLabelers();
-      List<Label> newPostLabels = [];
+      var newPostLabels = <Label>[];
       try {
         final (cursor: _, labels: fetchedLabels) = await _feedRepository.getLabels(nonExistingUris, sources: followedLabelers);
         newPostLabels = fetchedLabels;
@@ -362,12 +363,12 @@ class FeedNotifier extends _$FeedNotifier {
         newPostLabels = [];
       }
 
-      List<PostView> postsWithLabels = [];
-      for (var post in nonExistingPosts) {
+      final postsWithLabels = <PostView>[];
+      for (final post in nonExistingPosts) {
         newPostLabels.addAll(post.labels ?? []); // labels from the post
         if (post.record.selfLabels != null) {
           final recordLabels = <Label>[];
-          for (SelfLabel selfLabel in post.record.selfLabels!) {
+          for (final selfLabel in post.record.selfLabels!) {
             recordLabels.add(
               Label(uri: post.uri.toString(), value: selfLabel.value, src: post.uri.toString(), createdAt: post.indexedAt),
             );
@@ -377,9 +378,9 @@ class FeedNotifier extends _$FeedNotifier {
         postsWithLabels.add(post.copyWith(labels: newPostLabels));
       }
 
-      int newPostsCached = 0;
-      int errorCount = 0;
-      for (PostView post in postsWithLabels) {
+      var newPostsCached = 0;
+      var errorCount = 0;
+      for (final post in postsWithLabels) {
         // concurrent execution
         _downloadManager.submitTask(
           DownloadTask(
@@ -445,7 +446,7 @@ class FeedNotifier extends _$FeedNotifier {
 
       // gets the subscribed labels for the posts
       final followedLabelers = await _settingsRepository.getFollowedLabelers();
-      List<Label> labels = [];
+      var labels = <Label>[];
       try {
         final (cursor: _, labels: fetchedLabels) = await _feedRepository.getLabels(uris, sources: followedLabelers);
         labels = fetchedLabels;
@@ -456,11 +457,11 @@ class FeedNotifier extends _$FeedNotifier {
 
       // Get the post data for the new URIs
       final newPosts = posts.where((post) => uris.contains(post.uri)).toList();
-      for (var post in newPosts) {
+      for (final post in newPosts) {
         labels.addAll(post.labels ?? []); // labels from the post
         if (post.record.selfLabels != null) {
           final recordLabels = <Label>[];
-          for (SelfLabel selfLabel in post.record.selfLabels!) {
+          for (final selfLabel in post.record.selfLabels!) {
             recordLabels.add(
               Label(uri: post.uri.toString(), value: selfLabel.value, src: post.uri.toString(), createdAt: post.indexedAt),
             );
@@ -491,7 +492,7 @@ class FeedNotifier extends _$FeedNotifier {
         state.extraInfo,
       );
 
-      for (Label newLabel in labels) {
+      for (final newLabel in labels) {
         final uri = AtUri.parse(newLabel.uri);
         extraInfo.update(uri, (value) {
           final existingLabels = value.postLabels;
@@ -592,7 +593,7 @@ class FeedNotifier extends _$FeedNotifier {
     final updatedPosts = state.loadedPosts.where((e) => e != uri).toList();
 
     // Adjust the index if necessary
-    int newIndex = currentIndex;
+    var newIndex = currentIndex;
     if (postIndex != -1) {
       if (postIndex < currentIndex) {
         // Post was deleted before current position, adjust index down
@@ -611,7 +612,7 @@ class FeedNotifier extends _$FeedNotifier {
       }
     }
 
-    _logger.d('Removing post ${uri.toString()}, adjusting index from $currentIndex to $newIndex');
+    _logger.d('Removing post $uri, adjusting index from $currentIndex to $newIndex');
     state = state.copyWith(loadedPosts: updatedPosts, index: newIndex);
   }
 
@@ -622,7 +623,7 @@ class FeedNotifier extends _$FeedNotifier {
       try {
         final labelPreference = await _settingsRepository.getLabelPreference(label.value);
         if (labelPreference.setting == Setting.hide || (labelPreference.adultOnly && hideAdultContent)) {
-          _logger.d('Hiding post ${uri.toString()} due to label: ${label.value}');
+          _logger.d('Hiding post $uri due to label: ${label.value}');
           return true;
         }
       } catch (e) {
diff --git a/lib/src/features/feed/providers/feed_refresh_trigger_provider.dart b/lib/src/features/feed/providers/feed_refresh_trigger_provider.dart
new file mode 100644
index 00000000..6e7c59d8
--- /dev/null
+++ b/lib/src/features/feed/providers/feed_refresh_trigger_provider.dart
@@ -0,0 +1,15 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:sparksocial/src/core/network/atproto/data/models/feed_models.dart';
+
+class FeedRefreshTrigger extends StateNotifier<int> {
+  FeedRefreshTrigger() : super(0);
+
+  void trigger() {
+    state++;
+  }
+}
+
+final StateNotifierProviderFamily<FeedRefreshTrigger, int, Feed> feedRefreshTriggerProvider =
+    StateNotifierProvider.family<FeedRefreshTrigger, int, Feed>(
+      (ref, feed) => FeedRefreshTrigger(),
+    );
diff --git a/lib/src/features/feed/providers/feed_state.dart b/lib/src/features/feed/providers/feed_state.dart
index a8336720..6220fddb 100644
--- a/lib/src/features/feed/providers/feed_state.dart
+++ b/lib/src/features/feed/providers/feed_state.dart
@@ -9,7 +9,6 @@ part 'feed_state.freezed.dart';
 
 @freezed
 abstract class FeedState with _$FeedState {
-  const FeedState._();
   const factory FeedState({
     required bool active,
     required List<AtUri> loadedPosts,
@@ -21,6 +20,7 @@ abstract class FeedState with _$FeedState {
     required bool error,
     required LinkedHashMap<AtUri, ({List<Label> postLabels, HardcodedFeedExtraInfo? hardcodedFeedExtraInfo})> extraInfo,
   }) = _FeedState;
+  const FeedState._();
 
   int get length => loadedPosts.length;
 
diff --git a/lib/src/features/feed/providers/like_post.dart b/lib/src/features/feed/providers/like_post.dart
index bcb9a07e..daf72136 100644
--- a/lib/src/features/feed/providers/like_post.dart
+++ b/lib/src/features/feed/providers/like_post.dart
@@ -25,4 +25,4 @@ Future<void> unlikePost(Ref ref, AtUri likeUri) async {
   } catch (e) {
     throw Exception('Failed to unlike post: $e');
   }
-}
\ No newline at end of file
+}
diff --git a/lib/src/features/feed/providers/post_updates.dart b/lib/src/features/feed/providers/post_updates.dart
index fc89c85c..151dcbda 100644
--- a/lib/src/features/feed/providers/post_updates.dart
+++ b/lib/src/features/feed/providers/post_updates.dart
@@ -1,4 +1,4 @@
 // Provider to track post updates by URI - when a post gets updated, this gets incremented
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
-final postUpdateProvider = StateProvider.family<int, String>((ref, postUri) => 0);
+final StateProviderFamily<int, String> postUpdateProvider = StateProvider.family<int, String>((ref, postUri) => 0);
diff --git a/lib/src/features/feed/ui/pages/feed_page.dart b/lib/src/features/feed/ui/pages/feed_page.dart
index a0408452..d7817826 100644
--- a/lib/src/features/feed/ui/pages/feed_page.dart
+++ b/lib/src/features/feed/ui/pages/feed_page.dart
@@ -2,15 +2,15 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:sparksocial/src/core/network/atproto/data/models/feed_models.dart';
 import 'package:sparksocial/src/core/theme/data/models/colors.dart';
-
 import 'package:sparksocial/src/features/feed/providers/feed_provider.dart';
+import 'package:sparksocial/src/features/feed/providers/feed_refresh_trigger_provider.dart';
+import 'package:sparksocial/src/features/feed/ui/widgets/feed/cacheable_page_view.dart';
 import 'package:sparksocial/src/features/feed/ui/widgets/post/feed_post_widget.dart';
 import 'package:sparksocial/src/features/feed/ui/widgets/post/no_more_posts.dart';
-import 'package:sparksocial/src/features/feed/ui/widgets/feed/cacheable_page_view.dart';
 import 'package:sparksocial/src/features/settings/providers/settings_provider.dart';
 
 class FeedPage extends ConsumerStatefulWidget {
-  const FeedPage({super.key, required this.feed});
+  const FeedPage({required this.feed, super.key});
 
   final Feed feed;
 
@@ -20,6 +20,7 @@ class FeedPage extends ConsumerStatefulWidget {
 
 class _FeedPageState extends ConsumerState<FeedPage> with AutomaticKeepAliveClientMixin {
   late final PageController pageController;
+  final _refreshIndicatorKey = GlobalKey<RefreshIndicatorState>();
   bool _hasInitialized = false;
   bool _isRefreshing = false;
 
@@ -46,6 +47,12 @@ class _FeedPageState extends ConsumerState<FeedPage> with AutomaticKeepAliveClie
     final notifier = ref.read(feedNotifierProvider(widget.feed).notifier);
     final shouldBeActive = ref.watch(settingsProvider.select((settings) => settings.activeFeed == widget.feed));
 
+    ref.listen(feedRefreshTriggerProvider(widget.feed), (previous, next) {
+      if (previous != next) {
+        _refreshIndicatorKey.currentState?.show();
+      }
+    });
+
     // Initialize feed when it becomes active for the first time
     WidgetsBinding.instance.addPostFrameCallback((_) {
       if (!_hasInitialized && !state.loadingFirstLoad && state.length == 0 && !state.isEndOfNetworkFeed && !_isRefreshing) {
@@ -61,7 +68,7 @@ class _FeedPageState extends ConsumerState<FeedPage> with AutomaticKeepAliveClie
       }
     });
 
-    onRefresh() async {
+    Future<void> onRefresh() async {
       if (_isRefreshing) return;
 
       setState(() {
@@ -82,15 +89,19 @@ class _FeedPageState extends ConsumerState<FeedPage> with AutomaticKeepAliveClie
     }
 
     return RefreshIndicator(
+      key: _refreshIndicatorKey,
       onRefresh: onRefresh,
       child: state.loadingFirstLoad
           ? const Center(child: CircularProgressIndicator())
           : state.error
-          ? Column(
-              children: [
-                const Text('Error loading feed'),
-                TextButton(onPressed: onRefresh, child: const Text('Try again')),
-              ],
+          ? Center(
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  const Text('Error loading feed'),
+                  TextButton(onPressed: onRefresh, child: const Text('Try again')),
+                ],
+              ),
             )
           : CacheablePageView.builder(
               cachePageExtent: 1,
@@ -98,7 +109,6 @@ class _FeedPageState extends ConsumerState<FeedPage> with AutomaticKeepAliveClie
               key: PageStorageKey(widget.feed.identifier),
               itemCount: state.length + (state.isEndOfNetworkFeed ? 1 : 0),
               scrollDirection: Axis.vertical,
-              pageSnapping: true,
               restorationId: widget.feed.identifier,
               physics: shouldBeActive ? const PageScrollPhysics() : const NeverScrollableScrollPhysics(),
               onPageChanged: (index) {
diff --git a/lib/src/features/feed/ui/pages/feeds_page.dart b/lib/src/features/feed/ui/pages/feeds_page.dart
index 2ffa9ce3..fe794a3f 100644
--- a/lib/src/features/feed/ui/pages/feeds_page.dart
+++ b/lib/src/features/feed/ui/pages/feeds_page.dart
@@ -1,15 +1,13 @@
-// ignore_for_file: dead_code
-
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:sparksocial/src/core/network/atproto/data/models/feed_models.dart';
 import 'package:sparksocial/src/core/theme/data/models/colors.dart';
+import 'package:sparksocial/src/features/feed/providers/feed_provider.dart';
 import 'package:sparksocial/src/features/feed/providers/feed_state.dart';
 import 'package:sparksocial/src/features/feed/ui/pages/feed_page.dart';
 import 'package:sparksocial/src/features/feed/ui/widgets/feed/feeds_bar.dart';
 import 'package:sparksocial/src/features/settings/providers/settings_provider.dart';
-import 'package:sparksocial/src/features/feed/providers/feed_provider.dart';
 
 @RoutePage()
 class FeedsPage extends ConsumerStatefulWidget {
@@ -91,9 +89,8 @@ class _FeedsPageState extends ConsumerState<FeedsPage> {
     // Check if we need to initialize or update the page controller
     final needsInitialization = !_isInitialized;
     final activeFeedChanged = _lastActiveFeed != activeFeed;
-    final feedsListChanged = _lastFeedsList == null ||
-        _lastFeedsList!.length != feeds.length ||
-        !_lastFeedsList!.every((feed) => feeds.contains(feed));
+    final feedsListChanged =
+        _lastFeedsList == null || _lastFeedsList!.length != feeds.length || !_lastFeedsList!.every(feeds.contains);
 
     if (needsInitialization || activeFeedChanged || feedsListChanged) {
       _updatePageController(feeds, activeFeed);
@@ -115,7 +112,6 @@ class _FeedsPageState extends ConsumerState<FeedsPage> {
           PageView.builder(
             controller: _pageController,
             itemCount: feeds.length,
-            pageSnapping: true,
             onPageChanged: (index) {
               // Prevent recursive updates
               if (_isPageControllerUpdating) return;
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 629c068b..074ea04e 100644
--- a/lib/src/features/feed/ui/pages/standalone_post_page.dart
+++ b/lib/src/features/feed/ui/pages/standalone_post_page.dart
@@ -1,23 +1,23 @@
+import 'package:atproto_core/atproto_core.dart';
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:get_it/get_it.dart';
 import 'package:sparksocial/src/core/network/atproto/data/models/feed_models.dart';
 import 'package:sparksocial/src/core/network/atproto/data/repositories/sprk_repository.dart';
+import 'package:sparksocial/src/core/routing/app_router.dart';
 import 'package:sparksocial/src/core/storage/cache/sql_cache_interface.dart';
+import 'package:sparksocial/src/core/utils/label_utils.dart';
+import 'package:sparksocial/src/core/widgets/content_warning_overlay.dart';
 import 'package:sparksocial/src/features/feed/providers/post_updates.dart';
 import 'package:sparksocial/src/features/feed/ui/widgets/action_buttons/side_action_bar.dart';
-import 'package:sparksocial/src/features/feed/ui/widgets/post/info_bar.dart';
 import 'package:sparksocial/src/features/feed/ui/widgets/images/image_carousel.dart';
+import 'package:sparksocial/src/features/feed/ui/widgets/post/info_bar.dart';
 import 'package:sparksocial/src/features/feed/ui/widgets/videos/video_player.dart';
-import 'package:sparksocial/src/core/routing/app_router.dart';
-import 'package:atproto_core/atproto_core.dart';
-import 'package:sparksocial/src/core/widgets/content_warning_overlay.dart';
-import 'package:sparksocial/src/core/utils/label_utils.dart';
 
 @RoutePage()
 class StandalonePostPage extends ConsumerStatefulWidget {
-  const StandalonePostPage({super.key, required this.postUri});
+  const StandalonePostPage({required this.postUri, super.key});
 
   final String postUri;
 
@@ -53,11 +53,11 @@ class _StandalonePostPageState extends ConsumerState<StandalonePostPage> {
       // If cache fails, fetch from network
       final feedRepository = GetIt.instance<SprkRepository>().feed;
       final uri = AtUri.parse(widget.postUri);
-      bool isBlueskyPost = false;
+      var isBlueskyPost = false;
       // try {
-        isBlueskyPost = uri.collection.toString().startsWith('app.bsky.feed.post');
+      isBlueskyPost = uri.collection.toString().startsWith('app.bsky.feed.post');
       // } catch (e) {
-        // what
+      // what
       // }
       final networkPost = await feedRepository.getPosts([uri], bluesky: isBlueskyPost);
 
@@ -74,7 +74,7 @@ class _StandalonePostPageState extends ConsumerState<StandalonePostPage> {
 
   Future<void> _checkContentWarning(PostView postData) async {
     final labels = postData.labels ?? [];
-    
+
     if (labels.isNotEmpty) {
       final shouldShowWarning = await LabelUtils.shouldShowWarning(labels);
       final shouldBlurContent = await LabelUtils.shouldBlurContent(labels);
@@ -108,9 +108,7 @@ class _StandalonePostPageState extends ConsumerState<StandalonePostPage> {
       _lastUpdateCount = updateCount;
       WidgetsBinding.instance.addPostFrameCallback((_) {
         if (mounted) {
-          setState(() {
-            _loadPost();
-          });
+          setState(_loadPost);
         }
       });
     }
diff --git a/lib/src/features/feed/ui/widgets/action_buttons/bookmark_action_button.dart b/lib/src/features/feed/ui/widgets/action_buttons/bookmark_action_button.dart
index 71ea5b8a..2bf3a867 100644
--- a/lib/src/features/feed/ui/widgets/action_buttons/bookmark_action_button.dart
+++ b/lib/src/features/feed/ui/widgets/action_buttons/bookmark_action_button.dart
@@ -1,14 +1,13 @@
-import 'package:flutter/material.dart';
 import 'package:fluentui_system_icons/fluentui_system_icons.dart';
+import 'package:flutter/material.dart';
 import 'package:sparksocial/src/core/theme/data/models/colors.dart';
 
 class BookmarkActionButton extends StatefulWidget {
+  const BookmarkActionButton({required this.count, super.key, this.isBookmarked = false, this.onPressed});
   final String count;
   final bool isBookmarked;
   final VoidCallback? onPressed;
 
-  const BookmarkActionButton({super.key, required this.count, this.isBookmarked = false, this.onPressed});
-
   @override
   State<BookmarkActionButton> createState() => _BookmarkActionButtonState();
 }
@@ -26,8 +25,8 @@ class _BookmarkActionButtonState extends State<BookmarkActionButton> with Single
     _animationController = AnimationController(duration: const Duration(milliseconds: 300), vsync: this);
 
     _scaleAnimation = TweenSequence([
-      TweenSequenceItem(tween: Tween<double>(begin: 1.0, end: 1.2), weight: 50),
-      TweenSequenceItem(tween: Tween<double>(begin: 1.2, end: 1.0), weight: 50),
+      TweenSequenceItem(tween: Tween<double>(begin: 1, end: 1.2), weight: 50),
+      TweenSequenceItem(tween: Tween<double>(begin: 1.2, end: 1), weight: 50),
     ]).animate(CurvedAnimation(parent: _animationController, curve: Curves.easeInOut));
   }
 
diff --git a/lib/src/features/feed/ui/widgets/action_buttons/comment_action_button.dart b/lib/src/features/feed/ui/widgets/action_buttons/comment_action_button.dart
index f5913f19..0cef9590 100644
--- a/lib/src/features/feed/ui/widgets/action_buttons/comment_action_button.dart
+++ b/lib/src/features/feed/ui/widgets/action_buttons/comment_action_button.dart
@@ -1,17 +1,16 @@
 import 'package:fluentui_system_icons/fluentui_system_icons.dart';
 import 'package:flutter/material.dart';
-import 'package:sparksocial/src/core/widgets/action_button.dart';
 import 'package:sparksocial/src/core/theme/data/models/colors.dart';
+import 'package:sparksocial/src/core/widgets/action_button.dart';
 
 class CommentActionButton extends StatelessWidget {
-  final String count;
-  final VoidCallback? onPressed;
-
   const CommentActionButton({
-    super.key,
     required this.count,
+    super.key,
     this.onPressed,
   });
+  final String count;
+  final VoidCallback? onPressed;
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/src/features/feed/ui/widgets/action_buttons/like_action_button.dart b/lib/src/features/feed/ui/widgets/action_buttons/like_action_button.dart
index cc4ff2e0..474272d3 100644
--- a/lib/src/features/feed/ui/widgets/action_buttons/like_action_button.dart
+++ b/lib/src/features/feed/ui/widgets/action_buttons/like_action_button.dart
@@ -1,16 +1,15 @@
 import 'package:fluentui_system_icons/fluentui_system_icons.dart';
 import 'package:flutter/material.dart';
 
-import '../../../../../core/theme/data/models/colors.dart';
+import 'package:sparksocial/src/core/theme/data/models/colors.dart';
 import 'package:sparksocial/src/core/widgets/action_button.dart';
 
 class LikeActionButton extends StatefulWidget {
+  const LikeActionButton({required this.count, super.key, this.isLiked = false, this.onPressed});
   final String count;
   final bool isLiked;
   final VoidCallback? onPressed;
 
-  const LikeActionButton({super.key, required this.count, this.isLiked = false, this.onPressed});
-
   @override
   State<LikeActionButton> createState() => _LikeActionButtonState();
 }
@@ -28,8 +27,8 @@ class _LikeActionButtonState extends State<LikeActionButton> with SingleTickerPr
     _animationController = AnimationController(duration: const Duration(milliseconds: 400), vsync: this);
 
     _scaleAnimation = TweenSequence([
-      TweenSequenceItem(tween: Tween<double>(begin: 1.0, end: 1.4), weight: 50),
-      TweenSequenceItem(tween: Tween<double>(begin: 1.4, end: 1.0), weight: 50),
+      TweenSequenceItem(tween: Tween<double>(begin: 1, end: 1.4), weight: 50),
+      TweenSequenceItem(tween: Tween<double>(begin: 1.4, end: 1), weight: 50),
     ]).animate(CurvedAnimation(parent: _animationController, curve: Curves.easeInOut));
   }
 
diff --git a/lib/src/features/feed/ui/widgets/action_buttons/profile_action_button.dart b/lib/src/features/feed/ui/widgets/action_buttons/profile_action_button.dart
index dc96cb93..9e4e0c61 100644
--- a/lib/src/features/feed/ui/widgets/action_buttons/profile_action_button.dart
+++ b/lib/src/features/feed/ui/widgets/action_buttons/profile_action_button.dart
@@ -5,18 +5,6 @@ import 'package:flutter/material.dart';
 import 'package:sparksocial/src/core/theme/data/models/colors.dart';
 
 class ProfileActionButton extends StatefulWidget {
-  final String? profileImageUrl;
-  final VoidCallback? onPressed;
-  final VoidCallback? onFollowPressed;
-  final double size;
-  final BoxBorder? border;
-  final bool showFollowButton;
-  final bool isFollowing;
-  final double followButtonBottomOffset;
-  final double followButtonRightOffset;
-  final double verticalOffset;
-  final bool debugHitboxes;
-
   const ProfileActionButton({
     super.key,
     this.profileImageUrl,
@@ -31,6 +19,17 @@ class ProfileActionButton extends StatefulWidget {
     this.verticalOffset = 0,
     this.debugHitboxes = false,
   });
+  final String? profileImageUrl;
+  final VoidCallback? onPressed;
+  final VoidCallback? onFollowPressed;
+  final double size;
+  final BoxBorder? border;
+  final bool showFollowButton;
+  final bool isFollowing;
+  final double followButtonBottomOffset;
+  final double followButtonRightOffset;
+  final double verticalOffset;
+  final bool debugHitboxes;
 
   @override
   State<ProfileActionButton> createState() => _ProfileActionButtonState();
@@ -60,12 +59,11 @@ class _ProfileActionButtonState extends State<ProfileActionButton> {
   @override
   Widget build(BuildContext context) {
     final followButtonSize = widget.size * 0.5;
-    final bool hasValidImage =
+    final hasValidImage =
         widget.profileImageUrl != null && widget.profileImageUrl!.isNotEmpty && !widget.profileImageUrl!.contains('undefined');
 
     return Material(
       color: Colors.transparent,
-      elevation: 0,
       child: SizedBox(
         width: widget.size,
         height: widget.size,
@@ -88,22 +86,24 @@ class _ProfileActionButtonState extends State<ProfileActionButton> {
                       border: widget.border ?? Border.all(color: AppColors.white, width: 2),
                     ),
                     child: ClipOval(
-                      child:
-                          hasValidImage
-                              ? CachedNetworkImage(
-                                imageUrl: widget.profileImageUrl!,
-                                fit: BoxFit.cover,
-                                placeholder: (context, url) => Container(color: AppColors.deepPurple),
-                                errorWidget:
-                                    (context, url, error) => Container(
-                                      color: AppColors.deepPurple,
-                                      child: Center(child: Icon(Icons.person, color: AppColors.white, size: widget.size * 0.5)),
-                                    ),
-                              )
-                              : Container(
+                      child: hasValidImage
+                          ? CachedNetworkImage(
+                              imageUrl: widget.profileImageUrl!,
+                              fit: BoxFit.cover,
+                              placeholder: (context, url) => Container(color: AppColors.deepPurple),
+                              errorWidget: (context, url, error) => ColoredBox(
                                 color: AppColors.deepPurple,
-                                child: Center(child: Icon(Icons.person, color: AppColors.white, size: widget.size * 0.5)),
+                                child: Center(
+                                  child: Icon(Icons.person, color: AppColors.white, size: widget.size * 0.5),
+                                ),
+                              ),
+                            )
+                          : ColoredBox(
+                              color: AppColors.deepPurple,
+                              child: Center(
+                                child: Icon(Icons.person, color: AppColors.white, size: widget.size * 0.5),
                               ),
+                            ),
                     ),
                   ),
                 ),
diff --git a/lib/src/features/feed/ui/widgets/action_buttons/share_action_button.dart b/lib/src/features/feed/ui/widgets/action_buttons/share_action_button.dart
index 6f7b4c2d..248fc9c5 100644
--- a/lib/src/features/feed/ui/widgets/action_buttons/share_action_button.dart
+++ b/lib/src/features/feed/ui/widgets/action_buttons/share_action_button.dart
@@ -1,13 +1,12 @@
-import 'package:flutter/material.dart';
 import 'package:fluentui_system_icons/fluentui_system_icons.dart';
+import 'package:flutter/material.dart';
 import 'package:sparksocial/src/core/widgets/action_button.dart';
 
 class ShareActionButton extends StatelessWidget {
+  const ShareActionButton({required this.count, super.key, this.onPressed});
   final String count;
   final VoidCallback? onPressed;
 
-  const ShareActionButton({super.key, required this.count, this.onPressed});
-
   @override
   Widget build(BuildContext context) {
     return ActionButton(icon: FluentIcons.share_24_regular, label: count, onPressed: onPressed, showLabel: false);
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 8b00c802..5f6c568d 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
@@ -1,45 +1,43 @@
 import 'package:atproto/core.dart';
+import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:auto_route/auto_route.dart';
 import 'package:get_it/get_it.dart';
 import 'package:sparksocial/src/core/network/atproto/atproto.dart';
 import 'package:sparksocial/src/core/routing/app_router.dart';
 import 'package:sparksocial/src/core/storage/cache/sql_cache_interface.dart';
-
 import 'package:sparksocial/src/core/widgets/menu_action_button.dart';
 import 'package:sparksocial/src/core/widgets/report_dialog.dart';
 import 'package:sparksocial/src/features/feed/providers/delete_post.dart';
 import 'package:sparksocial/src/features/feed/providers/like_post.dart';
-import 'package:sparksocial/src/features/feed/ui/widgets/action_buttons/profile_action_button.dart';
-import 'package:sparksocial/src/features/feed/ui/widgets/action_buttons/like_action_button.dart';
 import 'package:sparksocial/src/features/feed/ui/widgets/action_buttons/comment_action_button.dart';
+import 'package:sparksocial/src/features/feed/ui/widgets/action_buttons/like_action_button.dart';
+import 'package:sparksocial/src/features/feed/ui/widgets/action_buttons/profile_action_button.dart';
 import 'package:sparksocial/src/features/feed/ui/widgets/action_buttons/share_action_button.dart';
 
 class SideActionBar extends ConsumerStatefulWidget {
-  final String likeCount;
-  final String commentCount;
-  final String shareCount;
-  final bool isLiked;
-  final String? profileImageUrl;
-  final PostView post;
-  // Add flag to identify image content
-  final bool isImage;
-  // Add callback for profile navigation to allow pausing video
-  final VoidCallback? onProfilePressed;
-
   const SideActionBar({
+    required this.post,
     super.key,
     this.likeCount = '0',
     this.commentCount = '0',
     this.shareCount = '0',
     this.isLiked = false,
     this.profileImageUrl,
-    required this.post,
     this.isImage = false,
     this.onProfilePressed,
   });
+  final String likeCount;
+  final String commentCount;
+  final String shareCount;
+  final bool isLiked;
+  final String? profileImageUrl;
+  final PostView post;
+  // Add flag to identify image content
+  final bool isImage;
+  // Add callback for profile navigation to allow pausing video
+  final VoidCallback? onProfilePressed;
 
   @override
   ConsumerState<SideActionBar> createState() => SideActionBarState();
@@ -111,7 +109,7 @@ class SideActionBarState extends ConsumerState<SideActionBar> {
 
           // Update the post's viewer field to remove the like reference
           final updatedPost = currentPost.copyWith(
-            viewer: currentPost.viewer?.copyWith(like: null) ?? Viewer(like: null, repost: currentPost.viewer?.repost),
+            viewer: currentPost.viewer?.copyWith(like: null) ?? Viewer(repost: currentPost.viewer?.repost),
           );
 
           // Update cache with the modified post
@@ -136,10 +134,10 @@ class SideActionBarState extends ConsumerState<SideActionBar> {
 
   void _handleShare() {
     final currentPost = _currentPost ?? widget.post;
-    String postUri = currentPost.uri.toString();
+    var postUri = currentPost.uri.toString();
     String shareUrl;
-    String embedCode = '';
-    bool showEmbed = true;
+    var embedCode = '';
+    var showEmbed = true;
 
     // Special case for Bluesky posts
     if (postUri.contains('/app.bsky.feed.post/')) {
@@ -297,12 +295,11 @@ class SideActionBarState extends ConsumerState<SideActionBar> {
 }
 
 class SharePanel extends StatefulWidget {
+  const SharePanel({required this.shareUrl, required this.embedCode, super.key, this.showEmbed = true});
   final String shareUrl;
   final String embedCode;
   final bool showEmbed;
 
-  const SharePanel({super.key, required this.shareUrl, required this.embedCode, this.showEmbed = true});
-
   @override
   State<SharePanel> createState() => _SharePanelState();
 }
@@ -363,7 +360,7 @@ class _SharePanelState extends State<SharePanel> {
       decoration: BoxDecoration(
         color: theme.colorScheme.surface,
         borderRadius: const BorderRadius.only(topLeft: Radius.circular(20), topRight: Radius.circular(20)),
-        boxShadow: [BoxShadow(color: theme.colorScheme.shadow.withValues(alpha: 0.2), blurRadius: 10, spreadRadius: 0)],
+        boxShadow: [BoxShadow(color: theme.colorScheme.shadow.withValues(alpha: 0.2), blurRadius: 10)],
       ),
       child: DraggableScrollableSheet(
         initialChildSize: 0.4,
@@ -435,16 +432,7 @@ class _SharePanelState extends State<SharePanel> {
 }
 
 class CopyField extends StatelessWidget {
-  final String text;
-  final BuildContext context;
-  final Color bgColor;
-  final Color textColor;
-  final bool isLink;
-  final bool isCopied;
-  final Function(String, BuildContext, bool) onCopy;
-
   const CopyField({
-    super.key,
     required this.text,
     required this.context,
     required this.bgColor,
@@ -452,7 +440,15 @@ class CopyField extends StatelessWidget {
     required this.isLink,
     required this.isCopied,
     required this.onCopy,
+    super.key,
   });
+  final String text;
+  final BuildContext context;
+  final Color bgColor;
+  final Color textColor;
+  final bool isLink;
+  final bool isCopied;
+  final Function(String, BuildContext, bool) onCopy;
 
   @override
   Widget build(BuildContext context) {
@@ -490,7 +486,7 @@ class CopyField extends StatelessWidget {
                     return ScaleTransition(scale: animation, child: child);
                   },
                   child: isCopied
-                      ? Icon(Icons.check_circle, key: const ValueKey('copied'), color: Colors.green, size: 20)
+                      ? const Icon(Icons.check_circle, key: ValueKey('copied'), color: Colors.green, size: 20)
                       : Icon(Icons.content_copy_rounded, key: const ValueKey('copy'), color: accentColor, size: 20),
                 ),
               ),
diff --git a/lib/src/features/feed/ui/widgets/feed/cacheable_page_view.dart b/lib/src/features/feed/ui/widgets/feed/cacheable_page_view.dart
index c377d8ab..e392c415 100644
--- a/lib/src/features/feed/ui/widgets/feed/cacheable_page_view.dart
+++ b/lib/src/features/feed/ui/widgets/feed/cacheable_page_view.dart
@@ -26,10 +26,11 @@ class CacheablePageView extends StatefulWidget {
     this.clipBehavior = Clip.hardEdge,
     this.scrollBehavior,
     this.padEnds = true,
-  })  : controller = controller ?? _defaultPageController,
-        childrenDelegate = SliverChildListDelegate(children);
+  }) : controller = controller ?? _defaultPageController,
+       childrenDelegate = SliverChildListDelegate(children);
 
   CacheablePageView.builder({
+    required NullableIndexedWidgetBuilder itemBuilder,
     super.key,
     this.scrollDirection = Axis.horizontal,
     this.reverse = false,
@@ -37,7 +38,6 @@ class CacheablePageView extends StatefulWidget {
     this.physics,
     this.pageSnapping = true,
     this.onPageChanged,
-    required NullableIndexedWidgetBuilder itemBuilder,
     ChildIndexGetter? findChildIndexCallback,
     int? itemCount,
     this.dragStartBehavior = DragStartBehavior.start,
@@ -47,14 +47,15 @@ class CacheablePageView extends StatefulWidget {
     this.clipBehavior = Clip.hardEdge,
     this.scrollBehavior,
     this.padEnds = true,
-  })  : controller = controller ?? _defaultPageController,
-        childrenDelegate = SliverChildBuilderDelegate(
-          itemBuilder,
-          findChildIndexCallback: findChildIndexCallback,
-          childCount: itemCount,
-        );
+  }) : controller = controller ?? _defaultPageController,
+       childrenDelegate = SliverChildBuilderDelegate(
+         itemBuilder,
+         findChildIndexCallback: findChildIndexCallback,
+         childCount: itemCount,
+       );
 
   CacheablePageView.custom({
+    required this.childrenDelegate,
     super.key,
     this.scrollDirection = Axis.horizontal,
     this.reverse = false,
@@ -62,7 +63,6 @@ class CacheablePageView extends StatefulWidget {
     this.physics,
     this.pageSnapping = true,
     this.onPageChanged,
-    required this.childrenDelegate,
     this.dragStartBehavior = DragStartBehavior.start,
     this.cachePageExtent = 0,
     this.allowImplicitScrolling = false,
@@ -117,12 +117,9 @@ class _CacheablePageViewState extends State<CacheablePageView> {
     switch (widget.scrollDirection) {
       case Axis.horizontal:
         assert(debugCheckHasDirectionality(context));
-        final TextDirection textDirection = Directionality.of(context);
-        final AxisDirection axisDirection =
-            textDirectionToAxisDirection(textDirection);
-        return widget.reverse
-            ? flipAxisDirection(axisDirection)
-            : axisDirection;
+        final textDirection = Directionality.of(context);
+        final axisDirection = textDirectionToAxisDirection(textDirection);
+        return widget.reverse ? flipAxisDirection(axisDirection) : axisDirection;
       case Axis.vertical:
         return widget.reverse ? AxisDirection.up : AxisDirection.down;
     }
@@ -130,23 +127,21 @@ class _CacheablePageViewState extends State<CacheablePageView> {
 
   @override
   Widget build(BuildContext context) {
-    final AxisDirection axisDirection = _getDirection(context);
-    final ScrollPhysics physics = _ForceImplicitScrollPhysics(
-      allowImplicitScrolling: widget.allowImplicitScrolling,
-    ).applyTo(
-      widget.pageSnapping
-          ? _kPagePhysics.applyTo(widget.physics ??
-              widget.scrollBehavior?.getScrollPhysics(context))
-          : widget.physics ?? widget.scrollBehavior?.getScrollPhysics(context),
-    );
+    final axisDirection = _getDirection(context);
+    final ScrollPhysics physics =
+        _ForceImplicitScrollPhysics(
+          allowImplicitScrolling: widget.allowImplicitScrolling,
+        ).applyTo(
+          widget.pageSnapping
+              ? _kPagePhysics.applyTo(widget.physics ?? widget.scrollBehavior?.getScrollPhysics(context))
+              : widget.physics ?? widget.scrollBehavior?.getScrollPhysics(context),
+        );
 
     return NotificationListener<ScrollNotification>(
       onNotification: (ScrollNotification notification) {
-        if (notification.depth == 0 &&
-            widget.onPageChanged != null &&
-            notification is ScrollUpdateNotification) {
-          final PageMetrics metrics = notification.metrics as PageMetrics;
-          final int currentPage = metrics.page!.round();
+        if (notification.depth == 0 && widget.onPageChanged != null && notification is ScrollUpdateNotification) {
+          final metrics = notification.metrics as PageMetrics;
+          final currentPage = metrics.page!.round();
           if (currentPage != _lastReportedPage) {
             _lastReportedPage = currentPage;
             widget.onPageChanged!(currentPage);
@@ -160,35 +155,33 @@ class _CacheablePageViewState extends State<CacheablePageView> {
         controller: widget.controller,
         physics: physics,
         restorationId: widget.restorationId,
-        scrollBehavior: widget.scrollBehavior ??
-            ScrollConfiguration.of(context).copyWith(scrollbars: false),
+        scrollBehavior: widget.scrollBehavior ?? ScrollConfiguration.of(context).copyWith(scrollbars: false),
         viewportBuilder: (BuildContext context, ViewportOffset position) {
           return LayoutBuilder(
-              builder: (BuildContext context, BoxConstraints constraints) {
-            double cacheExtent;
-
-            switch (widget.scrollDirection) {
-              case Axis.vertical:
-                cacheExtent = constraints.maxHeight * widget.cachePageExtent;
-                break;
-
-              case Axis.horizontal:
-                cacheExtent = constraints.maxWidth * widget.cachePageExtent;
-                break;
-            }
-
-            return Viewport(
-              cacheExtent: cacheExtent,
-              axisDirection: axisDirection,
-              offset: position,
-              slivers: <Widget>[
-                SliverFillViewport(
-                  viewportFraction: widget.controller.viewportFraction,
-                  delegate: widget.childrenDelegate,
-                ),
-              ],
-            );
-          });
+            builder: (BuildContext context, BoxConstraints constraints) {
+              double cacheExtent;
+
+              switch (widget.scrollDirection) {
+                case Axis.vertical:
+                  cacheExtent = constraints.maxHeight * widget.cachePageExtent;
+
+                case Axis.horizontal:
+                  cacheExtent = constraints.maxWidth * widget.cachePageExtent;
+              }
+
+              return Viewport(
+                cacheExtent: cacheExtent,
+                axisDirection: axisDirection,
+                offset: position,
+                slivers: <Widget>[
+                  SliverFillViewport(
+                    viewportFraction: widget.controller.viewportFraction,
+                    delegate: widget.childrenDelegate,
+                  ),
+                ],
+              );
+            },
+          );
         },
       ),
     );
@@ -197,21 +190,14 @@ class _CacheablePageViewState extends State<CacheablePageView> {
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder description) {
     super.debugFillProperties(description);
-    description
-        .add(EnumProperty<Axis>('scrollDirection', widget.scrollDirection));
+    description.add(EnumProperty<Axis>('scrollDirection', widget.scrollDirection));
+    description.add(FlagProperty('reverse', value: widget.reverse, ifTrue: 'reversed'));
+    description.add(DiagnosticsProperty<PageController>('controller', widget.controller, showName: false));
+    description.add(DiagnosticsProperty<ScrollPhysics>('physics', widget.physics, showName: false));
+    description.add(FlagProperty('pageSnapping', value: widget.pageSnapping, ifFalse: 'snapping disabled'));
     description.add(
-        FlagProperty('reverse', value: widget.reverse, ifTrue: 'reversed'));
-    description.add(DiagnosticsProperty<PageController>(
-        'controller', widget.controller,
-        showName: false));
-    description.add(DiagnosticsProperty<ScrollPhysics>(
-        'physics', widget.physics,
-        showName: false));
-    description.add(FlagProperty('pageSnapping',
-        value: widget.pageSnapping, ifFalse: 'snapping disabled'));
-    description.add(FlagProperty('allowImplicitScrolling',
-        value: widget.allowImplicitScrolling,
-        ifTrue: 'allow implicit scrolling'));
+      FlagProperty('allowImplicitScrolling', value: widget.allowImplicitScrolling, ifTrue: 'allow implicit scrolling'),
+    );
   }
 }
 
diff --git a/lib/src/features/feed/ui/widgets/feed/feeds_bar.dart b/lib/src/features/feed/ui/widgets/feed/feeds_bar.dart
index 2e573818..da6afdf0 100644
--- a/lib/src/features/feed/ui/widgets/feed/feeds_bar.dart
+++ b/lib/src/features/feed/ui/widgets/feed/feeds_bar.dart
@@ -1,15 +1,17 @@
+import 'dart:ui' show lerpDouble;
+
+import 'package:auto_route/auto_route.dart';
+import 'package:fluentui_system_icons/fluentui_system_icons.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:get_it/get_it.dart';
-import 'dart:ui' show lerpDouble;
+import 'package:sparksocial/src/core/routing/app_router.dart';
 import 'package:sparksocial/src/core/utils/logging/logging.dart';
+import 'package:sparksocial/src/features/feed/providers/feed_refresh_trigger_provider.dart';
 import 'package:sparksocial/src/features/settings/providers/settings_provider.dart';
-import 'package:fluentui_system_icons/fluentui_system_icons.dart';
-import 'package:auto_route/auto_route.dart';
-import 'package:sparksocial/src/core/routing/app_router.dart';
 
 class FeedsBar extends ConsumerStatefulWidget implements PreferredSizeWidget {
-  const FeedsBar({super.key, required this.pageController});
+  const FeedsBar({required this.pageController, super.key});
 
   final PageController pageController;
 
@@ -70,7 +72,7 @@ class _FeedsBarState extends ConsumerState<FeedsBar> {
         builder: (context, constraints) {
           final availableWidth = constraints.maxWidth;
           // Account for the leading widget (back button) - approximately 56px
-          final leadingWidth = 56.0;
+          const leadingWidth = 56.0;
           final centeringWidth = availableWidth - leadingWidth;
           final horizontalPadding = leadingWidth + (centeringWidth - totalWidth) / 2.0;
 
@@ -140,10 +142,14 @@ class _FeedsBarState extends ConsumerState<FeedsBar> {
                   onTap: _isReordering
                       ? null
                       : () {
-                          ref.read(settingsProvider.notifier).setActiveFeed(feed);
-                          final feedIndex = settings.feeds.indexOf(feed);
-                          if (feedIndex != -1 && widget.pageController.hasClients) {
-                            widget.pageController.jumpToPage(feedIndex);
+                          if (settings.activeFeed == feed) {
+                            ref.read(feedRefreshTriggerProvider(feed).notifier).trigger();
+                          } else {
+                            ref.read(settingsProvider.notifier).setActiveFeed(feed);
+                            final feedIndex = settings.feeds.indexOf(feed);
+                            if (feedIndex != -1 && widget.pageController.hasClients) {
+                              widget.pageController.jumpToPage(feedIndex);
+                            }
                           }
                         },
                   borderRadius: BorderRadius.circular(25),
diff --git a/lib/src/features/feed/ui/widgets/images/image_carousel.dart b/lib/src/features/feed/ui/widgets/images/image_carousel.dart
index 4b0f95a8..b34f76e9 100644
--- a/lib/src/features/feed/ui/widgets/images/image_carousel.dart
+++ b/lib/src/features/feed/ui/widgets/images/image_carousel.dart
@@ -6,7 +6,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:sparksocial/src/core/theme/data/models/colors.dart';
 
 class ImageCarousel extends ConsumerStatefulWidget {
-  const ImageCarousel({super.key, required this.imageUrls, this.alts});
+  const ImageCarousel({required this.imageUrls, super.key, this.alts});
   final List<String> imageUrls;
   final List<String>? alts;
 
@@ -35,7 +35,7 @@ class _ImageCarouselState extends ConsumerState<ImageCarousel> {
             return Stack(
               children: [
                 DecoratedBox(
-                  decoration: BoxDecoration(color: AppColors.black),
+                  decoration: const BoxDecoration(color: AppColors.black),
                   child: CachedNetworkImage(
                     imageUrl: widget.imageUrls[realIndex],
                     fit: BoxFit.contain,
@@ -50,9 +50,6 @@ class _ImageCarouselState extends ConsumerState<ImageCarousel> {
             );
           },
           options: CarouselOptions(
-            initialPage: 0,
-            pageSnapping: true,
-            scrollDirection: Axis.horizontal,
             aspectRatio: 0.5,
             height: MediaQuery.of(context).size.height,
             viewportFraction: 1,
@@ -82,21 +79,20 @@ class _ImageCarouselState extends ConsumerState<ImageCarousel> {
             ),
           ),
         ),
-        
+
         Positioned(
           bottom: 10,
           left: 0,
           right: 0,
           child: Row(
             mainAxisAlignment: MainAxisAlignment.center,
-            crossAxisAlignment: CrossAxisAlignment.center,
             children: [
               ...List.generate(
                 widget.imageUrls.length,
                 (index) => Container(
-                  width: 8.0,
-                  height: 8.0,
-                  margin: const EdgeInsets.symmetric(horizontal: 4.0),
+                  width: 8,
+                  height: 8,
+                  margin: const EdgeInsets.symmetric(horizontal: 4),
                   decoration: BoxDecoration(
                     shape: BoxShape.circle,
                     color: currentIndex == index ? Colors.white : Colors.white.withAlpha(128),
diff --git a/lib/src/features/feed/ui/widgets/post/alt_text_dialog.dart b/lib/src/features/feed/ui/widgets/post/alt_text_dialog.dart
index 4e84d60e..2327251f 100644
--- a/lib/src/features/feed/ui/widgets/post/alt_text_dialog.dart
+++ b/lib/src/features/feed/ui/widgets/post/alt_text_dialog.dart
@@ -2,10 +2,9 @@ import 'package:flutter/material.dart';
 
 /// A dialog that displays the alt text (image description) for an image.
 class AltTextDialog extends StatelessWidget {
+  const AltTextDialog({required this.altText, super.key});
   final String altText;
 
-  const AltTextDialog({super.key, required this.altText});
-
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
diff --git a/lib/src/features/feed/ui/widgets/post/description.dart b/lib/src/features/feed/ui/widgets/post/description.dart
index d1c721d7..91fae3e5 100644
--- a/lib/src/features/feed/ui/widgets/post/description.dart
+++ b/lib/src/features/feed/ui/widgets/post/description.dart
@@ -2,13 +2,12 @@ import 'package:flutter/material.dart';
 import 'package:sparksocial/src/core/theme/data/models/colors.dart';
 
 class Description extends StatefulWidget {
+  const Description({required this.text, super.key, this.style, this.maxLines = 2, this.onExpandToggle});
   final String text;
   final TextStyle? style;
   final int maxLines;
   final Function(bool isExpanded)? onExpandToggle;
 
-  const Description({super.key, required this.text, this.style, this.maxLines = 2, this.onExpandToggle});
-
   @override
   State<Description> createState() => _DescriptionState();
 }
@@ -24,8 +23,8 @@ class _DescriptionState extends State<Description> with SingleTickerProviderStat
     _animationController = AnimationController(vsync: this, duration: const Duration(milliseconds: 300));
 
     _scaleAnimation = TweenSequence<double>([
-      TweenSequenceItem(tween: Tween<double>(begin: 1.0, end: 1.03), weight: 30),
-      TweenSequenceItem(tween: Tween<double>(begin: 1.03, end: 1.0), weight: 70),
+      TweenSequenceItem(tween: Tween<double>(begin: 1, end: 1.03), weight: 30),
+      TweenSequenceItem(tween: Tween<double>(begin: 1.03, end: 1), weight: 70),
     ]).animate(CurvedAnimation(parent: _animationController, curve: Curves.easeInOut));
   }
 
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 f276e7d9..c16e5c39 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
@@ -1,26 +1,26 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:atproto/atproto.dart';
+import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:get_it/get_it.dart';
 import 'package:sparksocial/src/core/network/atproto/data/models/feed_models.dart';
+import 'package:sparksocial/src/core/routing/app_router.dart';
 import 'package:sparksocial/src/core/storage/cache/sql_cache_interface.dart';
 import 'package:sparksocial/src/core/theme/data/models/colors.dart';
+import 'package:sparksocial/src/core/utils/label_utils.dart';
+import 'package:sparksocial/src/core/widgets/content_warning_overlay.dart';
+import 'package:sparksocial/src/core/widgets/heart_animation.dart';
 import 'package:sparksocial/src/features/feed/providers/feed_provider.dart';
-import 'package:sparksocial/src/features/feed/providers/post_updates.dart';
 import 'package:sparksocial/src/features/feed/providers/like_post.dart';
+import 'package:sparksocial/src/features/feed/providers/post_updates.dart';
 import 'package:sparksocial/src/features/feed/ui/widgets/action_buttons/side_action_bar.dart';
-import 'package:sparksocial/src/features/feed/ui/widgets/post/info_bar.dart';
 import 'package:sparksocial/src/features/feed/ui/widgets/images/image_carousel.dart';
+import 'package:sparksocial/src/features/feed/ui/widgets/post/info_bar.dart';
 import 'package:sparksocial/src/features/feed/ui/widgets/videos/video_player.dart';
 import 'package:sparksocial/src/features/home/providers/navigation_provider.dart';
-import 'package:sparksocial/src/core/routing/app_router.dart';
-import 'package:sparksocial/src/core/widgets/heart_animation.dart';
-import 'package:sparksocial/src/core/widgets/content_warning_overlay.dart';
-import 'package:sparksocial/src/core/utils/label_utils.dart';
 
 class FeedPostWidget extends ConsumerStatefulWidget {
-  const FeedPostWidget({super.key, required this.index, required this.feed});
+  const FeedPostWidget({required this.index, required this.feed, super.key});
 
   final int index;
   final Feed feed;
@@ -103,7 +103,7 @@ class _FeedPostWidgetState extends ConsumerState<FeedPostWidget> {
     if (widget.index < feedState.loadedPosts.length) {
       final uri = feedState.loadedPosts[widget.index];
       final extraInfo = feedState.extraInfo[uri];
-      
+
       if (extraInfo != null && extraInfo.postLabels.isNotEmpty && !_userDismissedWarning) {
         final shouldShowWarning = await LabelUtils.shouldShowWarning(extraInfo.postLabels);
         if (shouldShowWarning) {
@@ -147,9 +147,7 @@ class _FeedPostWidgetState extends ConsumerState<FeedPostWidget> {
         _lastUpdateCount = updateCount;
         WidgetsBinding.instance.addPostFrameCallback((_) {
           if (mounted) {
-            setState(() {
-              _loadPost();
-            });
+            setState(_loadPost);
             _checkContentWarning(currentUri);
           }
         });
@@ -251,8 +249,8 @@ class _FeedPostWidgetState extends ConsumerState<FeedPostWidget> {
                     child: Builder(
                       builder: (context) {
                         final feedState = ref.read(feedNotifierProvider(widget.feed));
-                        List<Label> labels = [];
-                        
+                        var labels = <Label>[];
+
                         if (widget.index < feedState.loadedPosts.length) {
                           final uri = feedState.loadedPosts[widget.index];
                           final extraInfo = feedState.extraInfo[uri];
@@ -260,7 +258,7 @@ class _FeedPostWidgetState extends ConsumerState<FeedPostWidget> {
                             labels = extraInfo.postLabels;
                           }
                         }
-                        
+
                         return FutureBuilder<List<String>>(
                           future: LabelUtils.getInformLabels(labels),
                           builder: (context, snapshot) {
@@ -305,15 +303,15 @@ class _FeedPostWidgetState extends ConsumerState<FeedPostWidget> {
         }
         if (snapshot.hasError) {
           return DecoratedBox(
-            decoration: BoxDecoration(color: AppColors.black),
+            decoration: const BoxDecoration(color: AppColors.black),
             child: Center(
               child: Text('Error loading post: ${snapshot.error}', style: const TextStyle(color: Colors.white)),
             ),
           );
         }
-        return DecoratedBox(
+        return const DecoratedBox(
           decoration: BoxDecoration(color: AppColors.black),
-          child: const Center(child: CircularProgressIndicator(color: AppColors.white)),
+          child: Center(child: CircularProgressIndicator(color: AppColors.white)),
         );
       },
     );
diff --git a/lib/src/features/feed/ui/widgets/post/hashtag_list.dart b/lib/src/features/feed/ui/widgets/post/hashtag_list.dart
index f78ff057..4c2fd807 100644
--- a/lib/src/features/feed/ui/widgets/post/hashtag_list.dart
+++ b/lib/src/features/feed/ui/widgets/post/hashtag_list.dart
@@ -3,12 +3,11 @@ import 'package:sparksocial/src/core/theme/data/models/colors.dart';
 import 'package:sparksocial/src/core/widgets/fading_list_view.dart';
 
 class HashtagList extends StatelessWidget {
+  const HashtagList({required this.hashtags, super.key, this.style, this.onHashtagTap});
   final List<String> hashtags;
   final TextStyle? style;
   final Function(String)? onHashtagTap;
 
-  const HashtagList({super.key, required this.hashtags, this.style, this.onHashtagTap});
-
   @override
   Widget build(BuildContext context) {
     if (hashtags.isEmpty) {
@@ -16,23 +15,20 @@ class HashtagList extends StatelessWidget {
     }
 
     return FadingListView(
-      isHorizontal: true,
-      fadeWidth: 16.0,
-      itemSpacing: 8.0,
-      children:
-          hashtags.map((tag) {
-            return GestureDetector(
-              onTap: onHashtagTap != null ? () => onHashtagTap!(tag) : null,
-              child: Container(
-                padding: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 4.0),
-                decoration: BoxDecoration(color: AppColors.white.withAlpha(50), borderRadius: BorderRadius.circular(12.0)),
-                child: Text(
-                  '#$tag',
-                  style: style ?? const TextStyle(color: AppColors.white, fontWeight: FontWeight.w500, fontSize: 13),
-                ),
-              ),
-            );
-          }).toList(),
+      fadeWidth: 16,
+      children: hashtags.map((tag) {
+        return GestureDetector(
+          onTap: onHashtagTap != null ? () => onHashtagTap!(tag) : null,
+          child: Container(
+            padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+            decoration: BoxDecoration(color: AppColors.white.withAlpha(50), borderRadius: BorderRadius.circular(12)),
+            child: Text(
+              '#$tag',
+              style: style ?? const TextStyle(color: AppColors.white, fontWeight: FontWeight.w500, fontSize: 13),
+            ),
+          ),
+        );
+      }).toList(),
     );
   }
 }
diff --git a/lib/src/features/feed/ui/widgets/post/info_bar.dart b/lib/src/features/feed/ui/widgets/post/info_bar.dart
index ccd34a6c..bfe54197 100644
--- a/lib/src/features/feed/ui/widgets/post/info_bar.dart
+++ b/lib/src/features/feed/ui/widgets/post/info_bar.dart
@@ -2,27 +2,16 @@ import 'package:fluentui_system_icons/fluentui_system_icons.dart';
 import 'package:flutter/material.dart';
 import 'package:sparksocial/src/core/theme/data/models/colors.dart';
 import 'package:sparksocial/src/features/feed/ui/widgets/post/alt_text_dialog.dart';
-
-import 'hashtag_list.dart';
-import 'post_source.dart';
-import 'description.dart';
+import 'package:sparksocial/src/features/feed/ui/widgets/post/description.dart';
+import 'package:sparksocial/src/features/feed/ui/widgets/post/hashtag_list.dart';
+import 'package:sparksocial/src/features/feed/ui/widgets/post/post_source.dart';
 
 class InfoBar extends StatelessWidget {
-  final String username;
-  final String description;
-  final List<String> hashtags;
-  final List<String> informLabels;
-  final bool isSprk;
-  final String? altText;
-  final VoidCallback? onUsernameTap;
-  final Function(String)? onHashtagTap;
-  final Function(bool isExpanded)? onDescriptionExpandToggle;
-
   const InfoBar({
-    super.key,
     required this.username,
     required this.description,
     required this.hashtags,
+    super.key,
     this.informLabels = const [],
     this.isSprk = false,
     this.altText,
@@ -30,6 +19,15 @@ class InfoBar extends StatelessWidget {
     this.onHashtagTap,
     this.onDescriptionExpandToggle,
   });
+  final String username;
+  final String description;
+  final List<String> hashtags;
+  final List<String> informLabels;
+  final bool isSprk;
+  final String? altText;
+  final VoidCallback? onUsernameTap;
+  final Function(String)? onHashtagTap;
+  final Function(bool isExpanded)? onDescriptionExpandToggle;
 
   @override
   Widget build(BuildContext context) {
@@ -41,9 +39,13 @@ class InfoBar extends StatelessWidget {
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         Row(
-          crossAxisAlignment: CrossAxisAlignment.center,
           children: [
-            Expanded(child: GestureDetector(onTap: onUsernameTap, child: PostSource(username: username, isSprk: isSprk))),
+            Expanded(
+              child: GestureDetector(
+                onTap: onUsernameTap,
+                child: PostSource(username: username, isSprk: isSprk),
+              ),
+            ),
             if (altText != null && altText!.trim().isNotEmpty) _AltButton(altText: altText!),
           ],
         ),
@@ -54,7 +56,11 @@ class InfoBar extends StatelessWidget {
 
         if (hasDescription && hasHashtags) const SizedBox(height: 6),
 
-        if (hasHashtags) SizedBox(height: 25, child: HashtagList(hashtags: hashtags, onHashtagTap: onHashtagTap)),
+        if (hasHashtags)
+          SizedBox(
+            height: 25,
+            child: HashtagList(hashtags: hashtags, onHashtagTap: onHashtagTap),
+          ),
 
         if (hasInformLabels && (hasHashtags || hasDescription)) const SizedBox(height: 6),
 
@@ -65,9 +71,8 @@ class InfoBar extends StatelessWidget {
 }
 
 class _AltButton extends StatelessWidget {
-  final String altText;
-
   const _AltButton({required this.altText});
+  final String altText;
 
   @override
   Widget build(BuildContext context) {
@@ -84,14 +89,17 @@ class _AltButton extends StatelessWidget {
             builder: (_) => AltTextDialog(altText: altText),
           );
         },
-        child: Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
+        child: const Padding(
+          padding: EdgeInsets.symmetric(horizontal: 10, vertical: 6),
           child: Row(
             mainAxisSize: MainAxisSize.min,
-            children: const [
+            children: [
               Icon(FluentIcons.image_alt_text_20_regular, color: AppColors.white, size: 18),
               SizedBox(width: 6),
-              Text('ALT', style: TextStyle(color: AppColors.white, fontWeight: FontWeight.bold, fontSize: 12)),
+              Text(
+                'ALT',
+                style: TextStyle(color: AppColors.white, fontWeight: FontWeight.bold, fontSize: 12),
+              ),
             ],
           ),
         ),
@@ -101,9 +109,8 @@ class _AltButton extends StatelessWidget {
 }
 
 class _InformLabels extends StatelessWidget {
-  final List<String> labels;
-
   const _InformLabels({required this.labels});
+  final List<String> labels;
 
   @override
   Widget build(BuildContext context) {
@@ -116,9 +123,8 @@ class _InformLabels extends StatelessWidget {
 }
 
 class _InformLabelChip extends StatelessWidget {
-  final String label;
-
   const _InformLabelChip({required this.label});
+  final String label;
 
   @override
   Widget build(BuildContext context) {
@@ -127,12 +133,12 @@ class _InformLabelChip extends StatelessWidget {
       decoration: BoxDecoration(
         color: AppColors.blue.withAlpha(150),
         borderRadius: BorderRadius.circular(12),
-        border: Border.all(color: AppColors.blue.withAlpha(100), width: 1),
+        border: Border.all(color: AppColors.blue.withAlpha(100)),
       ),
       child: Row(
         mainAxisSize: MainAxisSize.min,
         children: [
-          Icon(
+          const Icon(
             FluentIcons.info_16_regular,
             color: AppColors.white,
             size: 12,
diff --git a/lib/src/features/feed/ui/widgets/post/no_more_posts.dart b/lib/src/features/feed/ui/widgets/post/no_more_posts.dart
index 55639247..a6905061 100644
--- a/lib/src/features/feed/ui/widgets/post/no_more_posts.dart
+++ b/lib/src/features/feed/ui/widgets/post/no_more_posts.dart
@@ -6,9 +6,11 @@ class NoMorePosts extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return DecoratedBox(
+    return const DecoratedBox(
       decoration: BoxDecoration(color: AppColors.black),
-      child: const Center(child: Text('No more posts in this feed.', style: TextStyle(color: AppColors.white))),
+      child: Center(
+        child: Text('No more posts in this feed.', style: TextStyle(color: AppColors.white)),
+      ),
     );
   }
 }
diff --git a/lib/src/features/feed/ui/widgets/post/post_source.dart b/lib/src/features/feed/ui/widgets/post/post_source.dart
index 2764f9c2..02664f34 100644
--- a/lib/src/features/feed/ui/widgets/post/post_source.dart
+++ b/lib/src/features/feed/ui/widgets/post/post_source.dart
@@ -3,11 +3,10 @@ import 'package:flutter_svg/flutter_svg.dart';
 import 'package:sparksocial/src/core/theme/data/models/colors.dart';
 
 class PostSource extends StatelessWidget {
+  const PostSource({required this.username, super.key, this.isSprk = false});
   final String username;
   final bool isSprk;
 
-  const PostSource({super.key, required this.username, this.isSprk = false});
-
   @override
   Widget build(BuildContext context) {
     return Row(
@@ -26,7 +25,7 @@ class PostSource extends StatelessWidget {
           decoration: BoxDecoration(
             borderRadius: BorderRadius.circular(42),
             boxShadow: [
-              BoxShadow(color: AppColors.black.withAlpha(30), blurRadius: 4, spreadRadius: 1, offset: const Offset(0, 0)),
+              BoxShadow(color: AppColors.black.withAlpha(30), blurRadius: 4, spreadRadius: 1),
             ],
           ),
           child: isSprk
diff --git a/lib/src/features/feed/ui/widgets/videos/slider.dart b/lib/src/features/feed/ui/widgets/videos/slider.dart
index 9beccebd..319d1491 100644
--- a/lib/src/features/feed/ui/widgets/videos/slider.dart
+++ b/lib/src/features/feed/ui/widgets/videos/slider.dart
@@ -37,7 +37,7 @@ class BottomAlignedSliderTrackShape extends RoundedRectSliderTrackShape {
     // 1. Calculate the visual track rectangle, aligned to the bottom.
     // We use the `getPreferredRect` from the superclass to get the correct
     // horizontal dimensions and offsets.
-    final Rect preferredRect = super.getPreferredRect(
+    final preferredRect = super.getPreferredRect(
       parentBox: parentBox,
       offset: offset,
       sliderTheme: sliderTheme,
@@ -45,10 +45,10 @@ class BottomAlignedSliderTrackShape extends RoundedRectSliderTrackShape {
       isDiscrete: isDiscrete,
     );
 
-    final double trackHeight = sliderTheme.trackHeight!;
+    final trackHeight = sliderTheme.trackHeight!;
     // The visual track is at the bottom of the parentBox.
     // We subtract the track height to get the top of our visual track.
-    final Rect trackRect = Rect.fromLTRB(
+    final trackRect = Rect.fromLTRB(
       preferredRect.left,
       parentBox.size.height - trackHeight,
       preferredRect.right,
@@ -58,47 +58,43 @@ class BottomAlignedSliderTrackShape extends RoundedRectSliderTrackShape {
     // 2. Adjust the thumb's vertical position to match our new visual track.
     // The incoming `thumbCenter` is for the centered hitbox, so we create a
     // new Offset for painting.
-    final Offset adjustedThumbCenter = Offset(
+    final adjustedThumbCenter = Offset(
       thumbCenter.dx,
       trackRect.center.dy, // Center of our bottom-aligned track
     );
 
     // 3. Adjust the secondary offset's vertical position as well.
-    final Offset? adjustedSecondaryOffset = secondaryOffset != null
-        ? Offset(secondaryOffset.dx, trackRect.center.dy)
-        : null;
+    final adjustedSecondaryOffset = secondaryOffset != null ? Offset(secondaryOffset.dx, trackRect.center.dy) : null;
 
     // --- End of Custom Logic ---
 
-
     // The rest of this method is a copy of the original
     // `RoundedRectSliderTrackShape.paint` method, but it uses our
     // new `trackRect`, `adjustedThumbCenter`, and `adjustedSecondaryOffset` values.
 
-    final ColorTween activeTrackColorTween = ColorTween(
+    final activeTrackColorTween = ColorTween(
       begin: sliderTheme.disabledActiveTrackColor,
       end: sliderTheme.activeTrackColor,
     );
-    final ColorTween inactiveTrackColorTween = ColorTween(
+    final inactiveTrackColorTween = ColorTween(
       begin: sliderTheme.disabledInactiveTrackColor,
       end: sliderTheme.inactiveTrackColor,
     );
-    final Paint activePaint = Paint()..color = activeTrackColorTween.evaluate(enableAnimation)!;
-    final Paint inactivePaint = Paint()..color = inactiveTrackColorTween.evaluate(enableAnimation)!;
+    final activePaint = Paint()..color = activeTrackColorTween.evaluate(enableAnimation)!;
+    final inactivePaint = Paint()..color = inactiveTrackColorTween.evaluate(enableAnimation)!;
     final (Paint leftTrackPaint, Paint rightTrackPaint) = switch (textDirection) {
       TextDirection.ltr => (activePaint, inactivePaint),
       TextDirection.rtl => (inactivePaint, activePaint),
     };
 
-    final Radius trackRadius = Radius.circular(trackRect.height / 2);
-    final Radius activeTrackRadius = Radius.circular(
+    final trackRadius = Radius.circular(trackRect.height / 2);
+    final activeTrackRadius = Radius.circular(
       (trackRect.height + additionalActiveTrackHeight) / 2,
     );
-    final bool isLTR = textDirection == TextDirection.ltr;
-    final bool isRTL = textDirection == TextDirection.rtl;
+    final isLTR = textDirection == TextDirection.ltr;
+    final isRTL = textDirection == TextDirection.rtl;
 
-    final bool drawInactiveTrack =
-        adjustedThumbCenter.dx < (trackRect.right - (sliderTheme.trackHeight! / 2));
+    final drawInactiveTrack = adjustedThumbCenter.dx < (trackRect.right - (sliderTheme.trackHeight! / 2));
     if (drawInactiveTrack) {
       // Draw the inactive track segment.
       context.canvas.drawRRect(
@@ -112,7 +108,7 @@ class BottomAlignedSliderTrackShape extends RoundedRectSliderTrackShape {
         rightTrackPaint,
       );
     }
-    final bool drawActiveTrack = adjustedThumbCenter.dx > (trackRect.left + (sliderTheme.trackHeight! / 2));
+    final drawActiveTrack = adjustedThumbCenter.dx > (trackRect.left + (sliderTheme.trackHeight! / 2));
     if (drawActiveTrack) {
       // Draw the active track segment.
       context.canvas.drawRRect(
@@ -127,17 +123,16 @@ class BottomAlignedSliderTrackShape extends RoundedRectSliderTrackShape {
       );
     }
 
-    final bool showSecondaryTrack =
+    final showSecondaryTrack =
         (adjustedSecondaryOffset != null) &&
         (isLTR ? (adjustedSecondaryOffset.dx > adjustedThumbCenter.dx) : (adjustedSecondaryOffset.dx < adjustedThumbCenter.dx));
 
     if (showSecondaryTrack) {
-      final ColorTween secondaryTrackColorTween = ColorTween(
+      final secondaryTrackColorTween = ColorTween(
         begin: sliderTheme.disabledSecondaryActiveTrackColor,
         end: sliderTheme.secondaryActiveTrackColor,
       );
-      final Paint secondaryTrackPaint =
-          Paint()..color = secondaryTrackColorTween.evaluate(enableAnimation)!;
+      final secondaryTrackPaint = Paint()..color = secondaryTrackColorTween.evaluate(enableAnimation)!;
       if (isLTR) {
         context.canvas.drawRRect(
           RRect.fromLTRBAndCorners(
@@ -165,4 +160,4 @@ class BottomAlignedSliderTrackShape extends RoundedRectSliderTrackShape {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/lib/src/features/feed/ui/widgets/videos/time_display.dart b/lib/src/features/feed/ui/widgets/videos/time_display.dart
index 459d98fd..656afec6 100644
--- a/lib/src/features/feed/ui/widgets/videos/time_display.dart
+++ b/lib/src/features/feed/ui/widgets/videos/time_display.dart
@@ -2,11 +2,10 @@ import 'package:flutter/material.dart';
 import 'package:sparksocial/src/core/theme/data/models/colors.dart';
 
 class TimeDisplay extends StatelessWidget {
+  const TimeDisplay({required this.position, required this.duration, super.key});
   final Duration position;
   final Duration duration;
 
-  const TimeDisplay({super.key, required this.position, required this.duration});
-
   String _formatDuration(Duration duration) {
     final minutes = duration.inMinutes.remainder(60).toString().padLeft(2, '0');
     final seconds = duration.inSeconds.remainder(60).toString().padLeft(2, '0');
@@ -19,7 +18,7 @@ class TimeDisplay extends StatelessWidget {
       child: Container(
         padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
         decoration: BoxDecoration(
-          color: AppColors.black.withAlpha(180), 
+          color: AppColors.black.withAlpha(180),
           borderRadius: BorderRadius.circular(12),
           boxShadow: [
             BoxShadow(
@@ -32,8 +31,8 @@ class TimeDisplay extends StatelessWidget {
         child: Text(
           '${_formatDuration(position)} / ${_formatDuration(duration)}',
           style: const TextStyle(
-            color: AppColors.white, 
-            fontWeight: FontWeight.bold, 
+            color: AppColors.white,
+            fontWeight: FontWeight.bold,
             fontSize: 16,
             letterSpacing: 0.5,
           ),
diff --git a/lib/src/features/feed/ui/widgets/videos/video_player.dart b/lib/src/features/feed/ui/widgets/videos/video_player.dart
index 2a2c5be2..764e9a32 100644
--- a/lib/src/features/feed/ui/widgets/videos/video_player.dart
+++ b/lib/src/features/feed/ui/widgets/videos/video_player.dart
@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:get_it/get_it.dart';
@@ -7,13 +9,12 @@ import 'package:sparksocial/src/core/storage/storage.dart';
 import 'package:sparksocial/src/core/theme/data/models/colors.dart';
 import 'package:sparksocial/src/features/feed/providers/feed_provider.dart';
 import 'package:sparksocial/src/features/feed/ui/widgets/videos/slider.dart';
-import 'package:sparksocial/src/features/home/providers/navigation_provider.dart';
 import 'package:sparksocial/src/features/feed/ui/widgets/videos/time_display.dart';
+import 'package:sparksocial/src/features/home/providers/navigation_provider.dart';
 import 'package:video_player/video_player.dart';
-import 'dart:async';
 
 class PostVideoPlayer extends ConsumerStatefulWidget {
-  const PostVideoPlayer({super.key, required this.videoUrl, this.feed, this.index, required this.isSparkPost});
+  const PostVideoPlayer({required this.videoUrl, required this.isSparkPost, super.key, this.feed, this.index});
 
   final String videoUrl;
   final Feed? feed;
@@ -58,7 +59,7 @@ class PostVideoPlayerState extends ConsumerState<PostVideoPlayer> with TickerPro
     super.initState();
     _bounceController = AnimationController(duration: const Duration(milliseconds: 300), vsync: this);
     _bounceAnimation = Tween<double>(
-      begin: 1.0,
+      begin: 1,
       end: 1.3,
     ).animate(CurvedAnimation(parent: _bounceController, curve: Curves.elasticOut));
     initVideoPlayer();
@@ -170,7 +171,7 @@ class PostVideoPlayerState extends ConsumerState<PostVideoPlayer> with TickerPro
     if (!isInitialized) return;
     _isSeeking = true;
     videoController.pause();
-    videoController.setVolume(0.0);
+    videoController.setVolume(0);
   }
 
   void _onSeekChanged(double value) {
@@ -184,7 +185,7 @@ class PostVideoPlayerState extends ConsumerState<PostVideoPlayer> with TickerPro
   void _onSeekEnd(double value) {
     if (!isInitialized) return;
     _isSeeking = false;
-    videoController.setVolume(1.0);
+    videoController.setVolume(1);
     videoController.play();
   }
 
@@ -217,7 +218,7 @@ class PostVideoPlayerState extends ConsumerState<PostVideoPlayer> with TickerPro
       _lastFeedIndex = feedState.index;
       WidgetsBinding.instance.addPostFrameCallback((_) {
         if (mounted && !_userInteracted) {
-          bool shouldPlay = feedState.index == widget.index && isOnFeedsTab;
+          final shouldPlay = feedState.index == widget.index && isOnFeedsTab;
           _handleAutoPlayPause(shouldPlay);
         }
       });
@@ -252,7 +253,6 @@ class PostVideoPlayerState extends ConsumerState<PostVideoPlayer> with TickerPro
             children: [
               SizedBox.expand(
                 child: FittedBox(
-                  fit: BoxFit.contain,
                   child: SizedBox(
                     width: videoController.value.size.width,
                     height: videoController.value.size.height,
@@ -326,7 +326,6 @@ class PostVideoPlayerState extends ConsumerState<PostVideoPlayer> with TickerPro
                       ),
                       child: Slider(
                         value: position.inMilliseconds.toDouble(),
-                        min: 0,
                         max: duration.inMilliseconds.toDouble(),
                         onChanged: _onSeekChanged,
                         onChangeStart: _onSeekStart,
diff --git a/lib/src/features/home/ui/pages/main_page.dart b/lib/src/features/home/ui/pages/main_page.dart
index 45e65d4f..ffebe9b8 100644
--- a/lib/src/features/home/ui/pages/main_page.dart
+++ b/lib/src/features/home/ui/pages/main_page.dart
@@ -1,5 +1,3 @@
-// ignore_for_file: dead_code
-
 import 'package:auto_route/auto_route.dart';
 import 'package:fluentui_system_icons/fluentui_system_icons.dart';
 import 'package:flutter/material.dart';
@@ -7,7 +5,9 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import 'package:sparksocial/src/core/routing/app_router.dart';
 import 'package:sparksocial/src/core/theme/data/models/colors.dart';
+import 'package:sparksocial/src/features/feed/providers/feed_refresh_trigger_provider.dart';
 import 'package:sparksocial/src/features/home/providers/navigation_provider.dart';
+import 'package:sparksocial/src/features/settings/providers/settings_provider.dart';
 
 @RoutePage()
 class MainPage extends ConsumerStatefulWidget {
@@ -27,13 +27,7 @@ class _MainPageState extends ConsumerState<MainPage> {
   Widget build(BuildContext context) {
     return AutoTabsRouter(
       key: const ValueKey('mainTabsRouter'),
-      routes: [
-        const FeedsRoute(),
-        const SearchRoute(),
-        const EmptyRoute(),
-        const MessagesRoute(),
-        UserProfileRoute()
-      ],
+      routes: const [FeedsRoute(), SearchRoute(), EmptyRoute(), MessagesRoute(), UserProfileRoute()],
       transitionBuilder: (context, child, animation) => child,
       builder: (context, child) {
         final tabsRouter = AutoTabsRouter.of(context);
@@ -46,10 +40,15 @@ class _MainPageState extends ConsumerState<MainPage> {
             onDestinationSelected: (index) {
               if (index == 2) {
                 // Special case for Create button - navigate to create video page
-                context.router.push(CreateVideoRoute(isStoryMode: false));
+                context.router.push(CreateVideoRoute());
               } else {
-                tabsRouter.setActiveIndex(index);
-                ref.read(navigationProvider.notifier).updateIndex(index);
+                if (tabsRouter.activeIndex == index && index == 0) {
+                  final activeFeed = ref.read(settingsProvider).activeFeed;
+                  ref.read(feedRefreshTriggerProvider(activeFeed).notifier).trigger();
+                } else {
+                  tabsRouter.setActiveIndex(index);
+                  ref.read(navigationProvider.notifier).updateIndex(index);
+                }
               }
             },
             destinations: [
diff --git a/lib/src/features/messages/providers/conversation_provider.dart b/lib/src/features/messages/providers/conversation_provider.dart
index 32076d51..886e12db 100644
--- a/lib/src/features/messages/providers/conversation_provider.dart
+++ b/lib/src/features/messages/providers/conversation_provider.dart
@@ -22,16 +22,16 @@ class Conversation extends _$Conversation {
   Future<Message> sendMessage(String otherDid, String message, {List<Embed>? embed, String? currentUserDid}) async {
     final other = state.value?.other ?? await GetIt.I<SprkRepository>().actor.getProfile(otherDid);
     final messages = state.value?.messages ?? [];
-    
+
     try {
       // Send message to server and get the actual result
       final sentMessage = await GetIt.I<MessagesRepository>().sendMessage(otherDid, message, embed: embed);
-      
+
       // Update state with the new message
       state = AsyncValue.data(
         ConversationState(other, [...messages, sentMessage]),
       );
-      
+
       return sentMessage;
     } catch (e) {
       // If sending fails, keep the current state and rethrow
@@ -44,12 +44,13 @@ class Conversation extends _$Conversation {
     final otherDid = state.value!.other.did;
     final (cursor: _, messages: newBatch) = await GetIt.I<MessagesRepository>().getConversation(otherDid, cursor: cursor);
     final newestMessage = newBatch.isNotEmpty ? newBatch.last : null;
-    if (newestMessage != null && (state.value!.messages.isEmpty || newestMessage.timestamp.compareTo(state.value!.messages.last.timestamp) > 0)) {
+    if (newestMessage != null &&
+        (state.value!.messages.isEmpty || newestMessage.timestamp.compareTo(state.value!.messages.last.timestamp) > 0)) {
       // only new messages from the new batch
       final newMessages = newBatch.where((msg) => !state.value!.messages.any((m) => m.id == msg.id)).toList();
       final updatedMessages = [...state.value!.messages, ...newMessages];
       state = AsyncValue.data(ConversationState(state.value!.other, updatedMessages));
-    } 
+    }
   }
 
   // TODO: loadmore
diff --git a/lib/src/features/messages/providers/polling_timer.dart b/lib/src/features/messages/providers/polling_timer.dart
index c1847032..801ac624 100644
--- a/lib/src/features/messages/providers/polling_timer.dart
+++ b/lib/src/features/messages/providers/polling_timer.dart
@@ -12,7 +12,5 @@ void pollingTrigger(Ref ref, String otherDid) {
     ref.read(conversationProvider(otherDid).notifier).checkForNewMessages();
   });
 
-  ref.onDispose(() {
-    timer.cancel();
-  });
+  ref.onDispose(timer.cancel);
 }
diff --git a/lib/src/features/messages/ui/pages/chat_page.dart b/lib/src/features/messages/ui/pages/chat_page.dart
index 53823aba..26d69be4 100644
--- a/lib/src/features/messages/ui/pages/chat_page.dart
+++ b/lib/src/features/messages/ui/pages/chat_page.dart
@@ -1,8 +1,8 @@
 import 'dart:async';
 
 import 'package:auto_route/auto_route.dart';
-import 'package:flutter/material.dart';
 import 'package:fluentui_system_icons/fluentui_system_icons.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:sparksocial/src/core/network/messages/data/models/message_models.dart';
@@ -17,13 +17,12 @@ import 'package:sparksocial/src/features/messages/ui/widgets/messages_list.dart'
 
 @RoutePage()
 class ChatPage extends ConsumerStatefulWidget {
+  const ChatPage({required this.otherUserDid, super.key, this.otherUserHandle, this.otherUserDisplayName, this.otherUserAvatar});
   final String otherUserDid;
   final String? otherUserHandle;
   final String? otherUserDisplayName;
   final String? otherUserAvatar;
 
-  const ChatPage({super.key, required this.otherUserDid, this.otherUserHandle, this.otherUserDisplayName, this.otherUserAvatar});
-
   @override
   ConsumerState<ChatPage> createState() => _ChatPageState();
 }
@@ -52,13 +51,12 @@ class _ChatPageState extends ConsumerState<ChatPage> {
     final urlRegex = RegExp(
       r'https?://(?:www\.)?[a-zA-Z0-9-]+(?:\.[a-zA-Z]+)+\S*|www\.[a-zA-Z0-9-]+(?:\.[a-zA-Z]+)+\S*',
       caseSensitive: false,
-      multiLine: false,
     );
     return urlRegex.allMatches(text).map((match) => match.group(0)!).toList();
   }
 
   Future<void> _sendMessage() async {
-    String content = _messageController.text.trim();
+    var content = _messageController.text.trim();
     final links = _extractLinks(content);
 
     // remove links from content
@@ -84,7 +82,7 @@ class _ChatPageState extends ConsumerState<ChatPage> {
       _scrollToBottom();
     } catch (e) {
       if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Failed to send message: ${e.toString()}')));
+        ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Failed to send message: $e')));
       }
     }
   }
diff --git a/lib/src/features/messages/ui/pages/messages_page.dart b/lib/src/features/messages/ui/pages/messages_page.dart
index 7a365039..df23a546 100644
--- a/lib/src/features/messages/ui/pages/messages_page.dart
+++ b/lib/src/features/messages/ui/pages/messages_page.dart
@@ -3,9 +3,9 @@ import 'package:fluentui_system_icons/fluentui_system_icons.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:get_it/get_it.dart';
+import 'package:sparksocial/src/core/routing/app_router.dart';
 import 'package:sparksocial/src/core/utils/logging/log_service.dart';
 import 'package:sparksocial/src/core/utils/logging/logging.dart';
-import 'package:sparksocial/src/core/routing/app_router.dart';
 import 'package:sparksocial/src/core/widgets/user_avatar.dart';
 import 'package:sparksocial/src/features/messages/providers/conversations_provider.dart';
 
@@ -98,11 +98,10 @@ class _MessagesPageState extends ConsumerState<MessagesPage> {
 }
 
 class CustomTabBar extends StatelessWidget {
+  const CustomTabBar({required this.selectedTabIndex, required this.onTabChanged, super.key});
   final int selectedTabIndex;
   final Function(int) onTabChanged;
 
-  const CustomTabBar({super.key, required this.selectedTabIndex, required this.onTabChanged});
-
   @override
   Widget build(BuildContext context) {
     return SizedBox(
@@ -122,12 +121,11 @@ class CustomTabBar extends StatelessWidget {
 }
 
 class TabItem extends StatelessWidget {
+  const TabItem({required this.isSelected, required this.label, required this.onTap, super.key});
   final bool isSelected;
   final String label;
   final VoidCallback onTap;
 
-  const TabItem({super.key, required this.isSelected, required this.label, required this.onTap});
-
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
@@ -165,10 +163,9 @@ class TabItem extends StatelessWidget {
 }
 
 class MessagesTab extends ConsumerWidget {
+  const MessagesTab({required this.onRefresh, super.key});
   final VoidCallback onRefresh;
 
-  const MessagesTab({super.key, required this.onRefresh});
-
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final state = ref.watch(conversationsProvider);
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 878bc4df..e9037a06 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
@@ -1,11 +1,11 @@
 import 'package:auto_route/auto_route.dart';
+import 'package:fluentui_system_icons/fluentui_system_icons.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:fluentui_system_icons/fluentui_system_icons.dart';
+import 'package:sparksocial/src/core/network/atproto/data/models/actor_models.dart';
 import 'package:sparksocial/src/core/routing/app_router.dart';
 import 'package:sparksocial/src/features/search/providers/search_provider.dart';
 import 'package:sparksocial/src/features/search/ui/widgets/suggested_account_card.dart';
-import 'package:sparksocial/src/core/network/atproto/data/models/actor_models.dart';
 
 @RoutePage()
 class NewChatSearchPage extends ConsumerStatefulWidget {
@@ -50,7 +50,7 @@ class _NewChatSearchPageState extends ConsumerState<NewChatSearchPage> {
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
               Padding(
-                padding: const EdgeInsets.all(16.0),
+                padding: const EdgeInsets.all(16),
                 child: TextField(
                   controller: _searchController,
                   decoration: InputDecoration(
@@ -77,7 +77,7 @@ class _NewChatSearchPageState extends ConsumerState<NewChatSearchPage> {
                       borderRadius: BorderRadius.circular(8),
                       borderSide: BorderSide(color: colorScheme.outline),
                     ),
-                    contentPadding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 12.0),
+                    contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
                   ),
                 ),
               ),
@@ -111,7 +111,7 @@ class _NewChatSearchPageState extends ConsumerState<NewChatSearchPage> {
                     unselectedLabelColor: theme.textTheme.bodyMedium?.color,
                   ),
                 ),
-                Expanded(child: TabBarView(children: [const _UserResults()])),
+                const Expanded(child: TabBarView(children: [_UserResults()])),
               ],
             ],
           ),
@@ -195,7 +195,7 @@ class _UserResultsState extends ConsumerState<_UserResults> {
         if (index >= state.searchResults.length) {
           // Loading indicator at bottom
           return const Padding(
-            padding: EdgeInsets.all(16.0),
+            padding: EdgeInsets.all(16),
             child: Center(child: CircularProgressIndicator()),
           );
         }
diff --git a/lib/src/features/messages/ui/widgets/conversation_list.dart b/lib/src/features/messages/ui/widgets/conversation_list.dart
index 9c5cf893..e4b6e25f 100644
--- a/lib/src/features/messages/ui/widgets/conversation_list.dart
+++ b/lib/src/features/messages/ui/widgets/conversation_list.dart
@@ -1,15 +1,15 @@
 import 'package:flutter/material.dart';
+
 import 'package:sparksocial/src/core/network/atproto/data/models/models.dart';
 import 'package:sparksocial/src/core/network/messages/data/models/message_models.dart';
-import 'conversation_list_item.dart';
+import 'package:sparksocial/src/features/messages/ui/widgets/conversation_list_item.dart';
 
 class ConversationList extends StatelessWidget {
+  const ConversationList({required this.conversations, super.key, this.onConversationTap, this.onConversationLongPress});
   final List<(ProfileViewDetailed, Message)> conversations;
   final Function((ProfileViewDetailed, Message))? onConversationTap;
   final Function((ProfileViewDetailed, Message))? onConversationLongPress;
 
-  const ConversationList({super.key, required this.conversations, this.onConversationTap, this.onConversationLongPress});
-
   @override
   Widget build(BuildContext context) {
     if (conversations.isEmpty) {
diff --git a/lib/src/features/messages/ui/widgets/conversation_list_item.dart b/lib/src/features/messages/ui/widgets/conversation_list_item.dart
index e84ea998..93fa6cea 100644
--- a/lib/src/features/messages/ui/widgets/conversation_list_item.dart
+++ b/lib/src/features/messages/ui/widgets/conversation_list_item.dart
@@ -5,18 +5,17 @@ import 'package:sparksocial/src/core/theme/data/models/colors.dart';
 import 'package:sparksocial/src/core/widgets/user_avatar.dart';
 
 class ConversationListItem extends StatelessWidget {
-  final Message message;
-  final ProfileViewDetailed otherUserProfile;
-  final VoidCallback? onTap;
-  final VoidCallback? onLongPress;
-
   const ConversationListItem({
-    super.key,
     required this.message,
     required this.otherUserProfile,
+    super.key,
     this.onTap,
     this.onLongPress,
   });
+  final Message message;
+  final ProfileViewDetailed otherUserProfile;
+  final VoidCallback? onTap;
+  final VoidCallback? onLongPress;
 
   @override
   Widget build(BuildContext context) {
@@ -24,7 +23,7 @@ class ConversationListItem extends StatelessWidget {
       onTap: onTap,
       onLongPress: onLongPress,
       child: Container(
-        padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 12.0),
+        padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
         decoration: BoxDecoration(
           color: Theme.of(context).colorScheme.surface,
           border: Border(bottom: BorderSide(color: Theme.of(context).colorScheme.outline, width: 0.5)),
@@ -113,8 +112,8 @@ class ConversationListItem extends StatelessWidget {
 }
 
 class ConversationAvatar extends StatelessWidget {
+  const ConversationAvatar({required this.otherUserProfile, super.key});
   final ProfileViewDetailed otherUserProfile;
-  const ConversationAvatar({super.key, required this.otherUserProfile});
 
   Color _getAvatarColor(int seed) {
     final colors = [
@@ -141,7 +140,7 @@ class ConversationAvatar extends StatelessWidget {
         imageUrl: otherUserProfile.avatar.toString(),
         username: otherUserProfile.handle,
         size: 48,
-        backgroundColor: _getAvatarColor((otherUserProfile.handle).hashCode),
+        backgroundColor: _getAvatarColor(otherUserProfile.handle.hashCode),
       ),
     );
   }
diff --git a/lib/src/features/messages/ui/widgets/message_bubble.dart b/lib/src/features/messages/ui/widgets/message_bubble.dart
index 6743de46..bcdc1cd9 100644
--- a/lib/src/features/messages/ui/widgets/message_bubble.dart
+++ b/lib/src/features/messages/ui/widgets/message_bubble.dart
@@ -5,12 +5,12 @@ import 'package:sparksocial/src/features/messages/ui/widgets/sender_avatar.dart'
 
 class MessageBubble extends StatelessWidget {
   const MessageBubble({
-    super.key,
     required this.message,
     required this.isCurrentUser,
     required this.showAvatar,
     required this.otherUserAvatar,
     required this.otherUserHandle,
+    super.key,
   });
 
   final Message message;
@@ -24,13 +24,11 @@ class MessageBubble extends StatelessWidget {
       r'https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)',
       caseSensitive: false,
     );
-    
-    String cleanedText = text.replaceAll(urlPattern, '').trim();
-    
+
+    var cleanedText = text.replaceAll(urlPattern, '').trim();
+
     // Clean up multiple spaces and newlines that might be left after URL removal
-    cleanedText = cleanedText.replaceAll(RegExp(r'\s+'), ' ').trim();
-    
-    return cleanedText;
+    return cleanedText = cleanedText.replaceAll(RegExp(r'\s+'), ' ').trim();
   }
 
   @override
@@ -57,7 +55,7 @@ class MessageBubble extends StatelessWidget {
               if (cleanedMessage.isEmpty) {
                 return const SizedBox.shrink();
               }
-              
+
               return Container(
                 padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 10),
                 decoration: BoxDecoration(
diff --git a/lib/src/features/messages/ui/widgets/message_input.dart b/lib/src/features/messages/ui/widgets/message_input.dart
index 0577ccc3..40c21976 100644
--- a/lib/src/features/messages/ui/widgets/message_input.dart
+++ b/lib/src/features/messages/ui/widgets/message_input.dart
@@ -1,4 +1,3 @@
-
 import 'package:fluentui_system_icons/fluentui_system_icons.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
@@ -9,7 +8,14 @@ import 'package:sparksocial/src/features/auth/providers/auth_providers.dart';
 import 'package:sparksocial/src/features/profile/providers/profile_provider.dart';
 
 class MessageInput extends ConsumerWidget {
-  const MessageInput({super.key, required this.controller, required this.onSend, this.isLoading = false, required this.otherDid, required this.imagePicker});
+  const MessageInput({
+    required this.controller,
+    required this.onSend,
+    required this.otherDid,
+    required this.imagePicker,
+    super.key,
+    this.isLoading = false,
+  });
 
   final TextEditingController controller;
   final ImagePicker imagePicker;
@@ -30,7 +36,6 @@ class MessageInput extends ConsumerWidget {
         child: Column(
           children: [
             Row(
-              crossAxisAlignment: CrossAxisAlignment.center,
               children: [
                 UserAvatar(
                   imageUrl: ref
@@ -42,7 +47,6 @@ class MessageInput extends ConsumerWidget {
                       ),
                   username: session?.handle ?? '',
                   size: 28,
-                  borderWidth: 0,
                 ),
                 const SizedBox(width: 8),
                 // _AttachmentButton(
diff --git a/lib/src/features/messages/ui/widgets/messages_list.dart b/lib/src/features/messages/ui/widgets/messages_list.dart
index fdf88d13..918f739a 100644
--- a/lib/src/features/messages/ui/widgets/messages_list.dart
+++ b/lib/src/features/messages/ui/widgets/messages_list.dart
@@ -14,12 +14,12 @@ import 'package:url_launcher/url_launcher.dart';
 
 class MessagesList extends StatelessWidget {
   const MessagesList({
-    super.key,
     required this.messages,
     required this.scrollController,
     required this.currentUserDid,
     required this.otherUserHandle,
     required this.otherUserAvatar,
+    super.key,
   });
 
   final List<Message> messages;
@@ -30,7 +30,7 @@ class MessagesList extends StatelessWidget {
 
   Future<void> logLinkMetadata(List<String> links) async {
     if (links.isEmpty) return;
-    for (var link in links) {
+    for (final link in links) {
       try {
         final metadata = await AnyLinkPreview.getMetadata(link: link);
         GetIt.I<LogService>().getLogger('MessagesList').i('Link metadata for $link: $metadata');
@@ -48,8 +48,8 @@ class MessagesList extends StatelessWidget {
       return false;
     }
     if (res.statusCode != 200) return false;
-    Map<String, dynamic> data = res.headers;
-    return checkIfImage(data['content-type']);
+    final Map<String, dynamic> data = res.headers;
+    return checkIfImage(data['content-type'] as String);
   }
 
   bool checkIfImage(String param) {
@@ -72,8 +72,8 @@ class MessagesList extends StatelessWidget {
       return false;
     }
     if (res.statusCode != 200) return false;
-    Map<String, dynamic> data = res.headers;
-    return checkIfVideo(data['content-type']);
+    final Map<String, dynamic> data = res.headers;
+    return checkIfVideo(data['content-type'] as String);
   }
 
   bool checkIfVideo(String param) {
@@ -105,10 +105,10 @@ class MessagesList extends StatelessWidget {
     List<Widget>? embeds;
 
     if (embed?.isNotEmpty ?? false) {
-      List<String> images = [];
-      List<String> videos = [];
-      List<String> links = [];
-      List<String> sprkPosts = [];
+      final images = <String>[];
+      final videos = <String>[];
+      final links = <String>[];
+      final sprkPosts = <String>[];
       for (final embed in embed!) {
         if (embed.type == 'image') {
           if (embed.url?.isNotEmpty ?? false) {
@@ -132,8 +132,8 @@ class MessagesList extends StatelessWidget {
       }
 
       // Check links for images/videos/sprk posts and reclassify them
-      List<String> linksToRemove = [];
-      for (var link in links) {
+      final linksToRemove = <String>[];
+      for (final link in links) {
         if (link.isEmpty) continue;
         if (Uri.tryParse(link)?.hasScheme != true) continue; // Skip invalid links
 
@@ -154,7 +154,7 @@ class MessagesList extends StatelessWidget {
       }
 
       // Remove reclassified links
-      for (var linkToRemove in linksToRemove) {
+      for (final linkToRemove in linksToRemove) {
         links.remove(linkToRemove);
       }
 
@@ -164,13 +164,13 @@ class MessagesList extends StatelessWidget {
       }
       if (videos.isNotEmpty) {
         embeds ??= [];
-        for (var videoUrl in videos) {
+        for (final videoUrl in videos) {
           embeds.add(VideoContent(borderRadius: BorderRadius.circular(12), videoUrl: videoUrl));
         }
       }
       if (sprkPosts.isNotEmpty) {
         embeds ??= [];
-        for (var postUri in sprkPosts) {
+        for (final postUri in sprkPosts) {
           embeds.add(_SprkPostThumbnail(postUri: postUri));
         }
       }
@@ -186,7 +186,7 @@ class MessagesList extends StatelessWidget {
             itemCount: links.length,
             itemBuilder: (context, index) {
               return Padding(
-                padding: const EdgeInsets.only(top: 8.0),
+                padding: const EdgeInsets.only(top: 8),
                 child: _LinkPreview(url: links[index]),
               );
             },
@@ -316,7 +316,7 @@ class _LinkPreview extends StatelessWidget {
       if (await canLaunchUrl(uri)) {
         await launchUrl(uri, mode: LaunchMode.externalApplication);
       } else {
-        await launchUrl(uri, mode: LaunchMode.platformDefault);
+        await launchUrl(uri);
       }
     } catch (e) {
       GetIt.I<LogService>().getLogger('_LinkPreview').e('Failed to launch URL $url: $e');
@@ -385,7 +385,7 @@ class _LinkPreviewError extends StatelessWidget {
           ),
           Expanded(
             child: Padding(
-              padding: const EdgeInsets.all(8.0),
+              padding: const EdgeInsets.all(8),
               child: FittedBox(child: Text(urlStr, style: theme.textTheme.titleSmall)),
             ),
           ),
@@ -404,11 +404,11 @@ class _LinkPreviewText extends StatelessWidget {
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
 
-    final title = metadata.title?.isNotEmpty == true && metadata.title != 'null' ? metadata.title : null;
-    final desc = metadata.desc?.isNotEmpty == true && metadata.desc != 'null' ? metadata.desc : null;
+    final title = metadata.title?.isNotEmpty ?? true && metadata.title != 'null' ? metadata.title : null;
+    final desc = metadata.desc?.isNotEmpty ?? true && metadata.desc != 'null' ? metadata.desc : null;
 
     return Padding(
-      padding: const EdgeInsets.all(8.0),
+      padding: const EdgeInsets.all(8),
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
@@ -503,7 +503,7 @@ class _SprkPostThumbnail extends StatelessWidget {
             ),
             Expanded(
               child: Padding(
-                padding: const EdgeInsets.all(12.0),
+                padding: const EdgeInsets.all(12),
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   mainAxisAlignment: MainAxisAlignment.center,
@@ -538,13 +538,13 @@ class _SprkPostThumbnail extends StatelessWidget {
   void _navigateToPost(BuildContext context) {
     try {
       // Transform the URI format: insert /so.sprk.feed.post before the post ID
-      String transformedUri = postUri;
+      var transformedUri = postUri;
 
       // Find the last slash and insert /so.sprk.feed.post before the post ID
-      int lastSlashIndex = postUri.lastIndexOf('/');
+      final lastSlashIndex = postUri.lastIndexOf('/');
       if (lastSlashIndex != -1) {
-        String beforePostId = postUri.substring(0, lastSlashIndex);
-        String postId = postUri.substring(lastSlashIndex + 1);
+        final beforePostId = postUri.substring(0, lastSlashIndex);
+        final postId = postUri.substring(lastSlashIndex + 1);
         transformedUri = '$beforePostId/so.sprk.feed.post/$postId';
       }
 
diff --git a/lib/src/features/messages/ui/widgets/sender_avatar.dart b/lib/src/features/messages/ui/widgets/sender_avatar.dart
index c72e3000..7d5ed3f9 100644
--- a/lib/src/features/messages/ui/widgets/sender_avatar.dart
+++ b/lib/src/features/messages/ui/widgets/sender_avatar.dart
@@ -4,7 +4,7 @@ import 'package:sparksocial/src/core/widgets/user_avatar.dart';
 import 'package:sparksocial/src/features/messages/ui/pages/chat_page.dart';
 
 class SenderAvatar extends StatelessWidget {
-  const SenderAvatar({super.key, required this.isCurrentUser, required this.otherUserAvatar, required this.otherUserHandle});
+  const SenderAvatar({required this.isCurrentUser, required this.otherUserAvatar, required this.otherUserHandle, super.key});
 
   final bool isCurrentUser;
   final String? otherUserAvatar;
@@ -13,8 +13,7 @@ class SenderAvatar extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     if (isCurrentUser) {
-      return UserAvatar(
-        imageUrl: null, // Current user avatar - can be added later
+      return const UserAvatar(
         username: 'You',
         size: 32,
         backgroundColor: AppColors.primary,
diff --git a/lib/src/features/posting/providers/camera_provider.dart b/lib/src/features/posting/providers/camera_provider.dart
index 146eef1b..ba8b1b5f 100644
--- a/lib/src/features/posting/providers/camera_provider.dart
+++ b/lib/src/features/posting/providers/camera_provider.dart
@@ -16,9 +16,7 @@ class Camera extends _$Camera {
   FutureOr<CameraState> build() async {
     _logger = GetIt.instance<LogService>().getLogger('Camera');
 
-    ref.onDispose(() {
-      _disposeCamera();
-    });
+    ref.onDispose(_disposeCamera);
 
     _logger.i('Initializing camera provider');
 
@@ -55,7 +53,7 @@ class Camera extends _$Camera {
   Future<CameraController> _createCameraController(CameraDescription camera) async {
     _logger.d('Creating camera controller for: ${camera.name}');
 
-    final controller = CameraController(camera, ResolutionPreset.max, enableAudio: true, imageFormatGroup: ImageFormatGroup.jpeg);
+    final controller = CameraController(camera, ResolutionPreset.max, imageFormatGroup: ImageFormatGroup.jpeg);
 
     await controller.initialize();
 
diff --git a/lib/src/features/posting/providers/upload_provider.dart b/lib/src/features/posting/providers/upload_provider.dart
index 97c5ade1..f0b16c9a 100644
--- a/lib/src/features/posting/providers/upload_provider.dart
+++ b/lib/src/features/posting/providers/upload_provider.dart
@@ -2,7 +2,7 @@ import 'dart:async';
 
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
-import 'upload_state.dart';
+import 'package:sparksocial/src/features/posting/providers/upload_state.dart';
 
 part 'upload_provider.g.dart';
 
@@ -21,8 +21,8 @@ class Upload extends _$Upload {
 
   // Register a new upload task
   String registerTask(String type) {
-    final String id = DateTime.now().millisecondsSinceEpoch.toString();
-    final UploadTask newTask = UploadTask(id: id, type: type);
+    final id = DateTime.now().millisecondsSinceEpoch.toString();
+    final newTask = UploadTask(id: id, type: type);
 
     state = state.copyWith(tasks: {...state.tasks, id: newTask});
 
@@ -32,7 +32,7 @@ class Upload extends _$Upload {
   // Start an upload task
   void startTask(String id) {
     if (state.tasks.containsKey(id)) {
-      final UploadTask updatedTask = state.tasks[id]!.copyWith(status: UploadStatus.uploading);
+      final updatedTask = state.tasks[id]!.copyWith(status: UploadStatus.uploading);
 
       state = state.copyWith(tasks: {...state.tasks, id: updatedTask});
 
@@ -43,7 +43,7 @@ class Upload extends _$Upload {
   // Complete an upload task
   void completeTask(String id) {
     if (state.tasks.containsKey(id)) {
-      final UploadTask updatedTask = state.tasks[id]!.copyWith(status: UploadStatus.completed);
+      final updatedTask = state.tasks[id]!.copyWith(status: UploadStatus.completed);
 
       state = state.copyWith(tasks: {...state.tasks, id: updatedTask});
 
@@ -56,7 +56,7 @@ class Upload extends _$Upload {
   // Mark a task as failed
   void failTask(String id, String errorMessage) {
     if (state.tasks.containsKey(id)) {
-      final UploadTask updatedTask = state.tasks[id]!.copyWith(status: UploadStatus.error, errorMessage: errorMessage);
+      final updatedTask = state.tasks[id]!.copyWith(status: UploadStatus.error, errorMessage: errorMessage);
 
       state = state.copyWith(tasks: {...state.tasks, id: updatedTask});
 
@@ -66,7 +66,7 @@ class Upload extends _$Upload {
 
   // Clear all completed tasks
   void clearCompletedTasks() {
-    final Map<String, UploadTask> filteredTasks = Map.fromEntries(
+    final filteredTasks = Map<String, UploadTask>.fromEntries(
       state.tasks.entries.where((entry) => entry.value.status != UploadStatus.completed),
     );
 
@@ -75,13 +75,13 @@ class Upload extends _$Upload {
   }
 
   void _updateActiveStatus() {
-    final bool isAnyTaskActive = state.tasks.values.any((task) => task.status == UploadStatus.uploading);
+    final isAnyTaskActive = state.tasks.values.any((task) => task.status == UploadStatus.uploading);
 
     state = state.copyWith(isAnyTaskActive: isAnyTaskActive);
   }
 
   void _updateCompletedStatus() {
-    final bool isAnyTaskCompleted = state.tasks.values.any((task) => task.status == UploadStatus.completed);
+    final isAnyTaskCompleted = state.tasks.values.any((task) => task.status == UploadStatus.completed);
 
     state = state.copyWith(isAnyTaskCompleted: isAnyTaskCompleted);
   }
@@ -91,8 +91,6 @@ class Upload extends _$Upload {
     _completedTasksTimer?.cancel();
 
     // Set up new timer to clear completed tasks after 3 seconds
-    _completedTasksTimer = Timer(const Duration(seconds: 3), () {
-      clearCompletedTasks();
-    });
+    _completedTasksTimer = Timer(const Duration(seconds: 3), clearCompletedTasks);
   }
 }
diff --git a/lib/src/features/posting/providers/video_upload_provider.dart b/lib/src/features/posting/providers/video_upload_provider.dart
index 1c92d531..6d2a3965 100644
--- a/lib/src/features/posting/providers/video_upload_provider.dart
+++ b/lib/src/features/posting/providers/video_upload_provider.dart
@@ -1,13 +1,11 @@
-
 import 'package:atproto/core.dart';
 import 'package:get_it/get_it.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:sparksocial/src/core/auth/data/repositories/auth_repository.dart';
 import 'package:sparksocial/src/core/network/atproto/atproto.dart';
+import 'package:sparksocial/src/core/utils/logging/log_service.dart';
 import 'package:sparksocial/src/core/utils/logging/logger.dart';
-
-import '../../../core/auth/data/repositories/auth_repository.dart';
-import '../../../core/utils/logging/log_service.dart';
-import 'video_upload_state.dart';
+import 'package:sparksocial/src/features/posting/providers/video_upload_state.dart';
 
 part 'video_upload_provider.g.dart';
 
@@ -134,10 +132,10 @@ class VideoUpload extends _$VideoUpload {
 
     // Create Bluesky video post record using direct JSON structure
     final bskyPostRecord = <String, dynamic>{
-      "\$type": "app.bsky.feed.post",
-      "text": text,
-      "embed": {"\$type": "app.bsky.embed.video", "video": blob.toJson(), "alt": altText},
-      "createdAt": DateTime.now().toUtc().toIso8601String(),
+      r'$type': 'app.bsky.feed.post',
+      'text': text,
+      'embed': {r'$type': 'app.bsky.embed.video', 'video': blob.toJson(), 'alt': altText},
+      'createdAt': DateTime.now().toUtc().toIso8601String(),
     };
 
     final bskyAtProto = _authRepository.atproto!;
diff --git a/lib/src/features/posting/ui/pages/create_video_page.dart b/lib/src/features/posting/ui/pages/create_video_page.dart
index 6cb0ef0b..9403af6f 100644
--- a/lib/src/features/posting/ui/pages/create_video_page.dart
+++ b/lib/src/features/posting/ui/pages/create_video_page.dart
@@ -16,9 +16,8 @@ import 'package:sparksocial/src/features/posting/ui/widgets/recording_bar.dart';
 
 @RoutePage()
 class CreateVideoPage extends ConsumerStatefulWidget {
-  final bool isStoryMode;
-
   const CreateVideoPage({super.key, this.isStoryMode = false});
+  final bool isStoryMode;
 
   @override
   ConsumerState<CreateVideoPage> createState() => _CreateVideoPageState();
@@ -27,7 +26,7 @@ class CreateVideoPage extends ConsumerStatefulWidget {
 class _CreateVideoPageState extends ConsumerState<CreateVideoPage> with WidgetsBindingObserver {
   bool _isVideoMode = true;
   bool _isRecording = false;
-  double _recordingProgress = 0.0;
+  double _recordingProgress = 0;
   String _recordingTimeText = '00:00 / 03:00';
   Timer? _recordingTimer;
   int _recordingSeconds = 0;
@@ -55,9 +54,9 @@ class _CreateVideoPageState extends ConsumerState<CreateVideoPage> with WidgetsB
     super.dispose();
   }
 
-  void _onVideoGalleryPressed() async {
+  Future<void> _onVideoGalleryPressed() async {
     try {
-      final XFile? video = await _picker.pickVideo(source: ImageSource.gallery, maxDuration: const Duration(seconds: 180));
+      final video = await _picker.pickVideo(source: ImageSource.gallery, maxDuration: const Duration(seconds: 180));
 
       if (video != null && mounted) {
         if (widget.isStoryMode) {
@@ -73,7 +72,7 @@ class _CreateVideoPageState extends ConsumerState<CreateVideoPage> with WidgetsB
           builder: (BuildContext context) {
             return AlertDialog(
               title: const Text('Error'),
-              content: Text('Failed to select video: ${e.toString()}'),
+              content: Text('Failed to select video: $e'),
               actions: [TextButton(onPressed: () => context.router.maybePop(), child: const Text('OK'))],
             );
           },
@@ -82,20 +81,20 @@ class _CreateVideoPageState extends ConsumerState<CreateVideoPage> with WidgetsB
     }
   }
 
-  void _onImageGalleryPressed() async {
+  Future<void> _onImageGalleryPressed() async {
     try {
       if (widget.isStoryMode) {
         // For stories, only allow one image
-        final XFile? image = await _picker.pickImage(source: ImageSource.gallery);
+        final image = await _picker.pickImage(source: ImageSource.gallery);
         if (image != null && mounted) {
           context.router.push(StoryReviewRoute(videoPath: '', imageFile: image));
         }
       } else {
         // For regular posts, allow multiple images
         const maxImages = 12;
-        final List<XFile> pickedFiles = await _picker.pickMultiImage(limit: maxImages);
+        final pickedFiles = await _picker.pickMultiImage(limit: maxImages);
         if (pickedFiles.isEmpty) return;
-        final List<XFile> limitedFiles = pickedFiles.length > maxImages ? pickedFiles.sublist(0, maxImages) : pickedFiles;
+        final limitedFiles = pickedFiles.length > maxImages ? pickedFiles.sublist(0, maxImages) : pickedFiles;
         if (!mounted) return;
         context.router.push(ImageReviewRoute(imageFiles: limitedFiles));
       }
@@ -106,7 +105,7 @@ class _CreateVideoPageState extends ConsumerState<CreateVideoPage> with WidgetsB
         builder: (BuildContext context) {
           return AlertDialog(
             title: const Text('Error'),
-            content: Text('Failed to select images: ${e.toString()}'),
+            content: Text('Failed to select images: $e'),
             actions: [TextButton(onPressed: () => context.router.maybePop(), child: const Text('OK'))],
           );
         },
@@ -114,7 +113,7 @@ class _CreateVideoPageState extends ConsumerState<CreateVideoPage> with WidgetsB
     }
   }
 
-  void _onCapturePressed() async {
+  Future<void> _onCapturePressed() async {
     if (!_isVideoMode) {
       await _takePhoto();
     } else {
@@ -123,7 +122,7 @@ class _CreateVideoPageState extends ConsumerState<CreateVideoPage> with WidgetsB
   }
 
   Future<void> _takePhoto() async {
-    final XFile? photo = await ref.read(cameraProvider.notifier).takePhoto();
+    final photo = await ref.read(cameraProvider.notifier).takePhoto();
     if (photo != null) {
       if (widget.isStoryMode) {
         if (mounted) {
@@ -135,7 +134,7 @@ class _CreateVideoPageState extends ConsumerState<CreateVideoPage> with WidgetsB
 
   Future<void> _toggleVideoRecording() async {
     if (_isRecording) {
-      final XFile? video = await ref.read(cameraProvider.notifier).stopVideoRecording();
+      final video = await ref.read(cameraProvider.notifier).stopVideoRecording();
       _stopRecordingTimer();
 
       setState(() {
@@ -155,7 +154,7 @@ class _CreateVideoPageState extends ConsumerState<CreateVideoPage> with WidgetsB
         }
       }
     } else {
-      bool success = await ref.read(cameraProvider.notifier).startVideoRecording();
+      final success = await ref.read(cameraProvider.notifier).startVideoRecording();
       if (success) {
         setState(() {
           _isRecording = true;
@@ -176,10 +175,10 @@ class _CreateVideoPageState extends ConsumerState<CreateVideoPage> with WidgetsB
         _recordingSeconds++;
         _recordingProgress = _recordingSeconds / _maxRecordingSeconds;
 
-        final int minutes = _recordingSeconds ~/ 60;
-        final int seconds = _recordingSeconds % 60;
-        final String minutesStr = minutes.toString().padLeft(2, '0');
-        final String secondsStr = seconds.toString().padLeft(2, '0');
+        final minutes = _recordingSeconds ~/ 60;
+        final seconds = _recordingSeconds % 60;
+        final minutesStr = minutes.toString().padLeft(2, '0');
+        final secondsStr = seconds.toString().padLeft(2, '0');
 
         _recordingTimeText = '$minutesStr:$secondsStr / 03:00';
       });
@@ -219,7 +218,7 @@ class _CreateVideoPageState extends ConsumerState<CreateVideoPage> with WidgetsB
                     ),
                   ),
                 ),
-            
+
                 Positioned(
                   top: 20,
                   left: 0,
@@ -231,7 +230,7 @@ class _CreateVideoPageState extends ConsumerState<CreateVideoPage> with WidgetsB
                     ),
                   ),
                 ),
-            
+
                 Positioned(
                   bottom: 30,
                   left: 0,
@@ -242,7 +241,7 @@ class _CreateVideoPageState extends ConsumerState<CreateVideoPage> with WidgetsB
                         RecordingBar(isRecording: _isRecording, progress: _recordingProgress, timeText: _recordingTimeText),
                         const SizedBox(height: 20),
                       ],
-            
+
                       CameraControls(
                         isVideoMode: _isVideoMode,
                         isRecording: _isRecording,
diff --git a/lib/src/features/posting/ui/pages/image_review_page.dart b/lib/src/features/posting/ui/pages/image_review_page.dart
index 35fbbe84..033a2d03 100644
--- a/lib/src/features/posting/ui/pages/image_review_page.dart
+++ b/lib/src/features/posting/ui/pages/image_review_page.dart
@@ -29,10 +29,9 @@ void showFullscreenImage(BuildContext context, XFile imageFile) {
 
 @RoutePage()
 class ImageReviewPage extends ConsumerStatefulWidget {
+  const ImageReviewPage({required this.imageFiles, super.key});
   final List<XFile> imageFiles;
 
-  const ImageReviewPage({super.key, required this.imageFiles});
-
   @override
   ConsumerState<ImageReviewPage> createState() => _ImageReviewPageState();
 }
@@ -70,7 +69,7 @@ class _ImageReviewPageState extends ConsumerState<ImageReviewPage> {
     super.dispose();
   }
 
-  void _editAltText(XFile imageFile) async {
+  Future<void> _editAltText(XFile imageFile) async {
     final path = imageFile.path;
     final initialText = _altTexts[path] ?? '';
     final result = await showDialog<String>(
@@ -84,10 +83,10 @@ class _ImageReviewPageState extends ConsumerState<ImageReviewPage> {
   }
 
   Future<void> _pickMoreImages() async {
-    final int remaining = _maxImages - _imageFiles.length;
+    final remaining = _maxImages - _imageFiles.length;
     if (remaining <= 0) return;
     try {
-      final List<XFile> pickedFiles = await _picker.pickMultiImage(limit: remaining);
+      final pickedFiles = await _picker.pickMultiImage(limit: remaining);
       if (pickedFiles.isEmpty) return;
       setState(() {
         _imageFiles.addAll(pickedFiles);
@@ -99,7 +98,7 @@ class _ImageReviewPageState extends ConsumerState<ImageReviewPage> {
       if (!mounted) return;
       ScaffoldMessenger.of(
         context,
-      ).showSnackBar(SnackBar(content: Text('Failed to select images: ${e.toString()}'), backgroundColor: Colors.red));
+      ).showSnackBar(SnackBar(content: Text('Failed to select images: $e'), backgroundColor: Colors.red));
     }
   }
 
@@ -127,7 +126,7 @@ class _ImageReviewPageState extends ConsumerState<ImageReviewPage> {
       });
       ScaffoldMessenger.of(
         context,
-      ).showSnackBar(SnackBar(content: Text('Failed to create post: ${e.toString()}'), backgroundColor: Colors.red));
+      ).showSnackBar(SnackBar(content: Text('Failed to create post: $e'), backgroundColor: Colors.red));
       final uploadService = ref.read(uploadProvider.notifier);
       final tasks = uploadService.registerTask('image');
       uploadService.failTask(tasks, e.toString());
@@ -156,13 +155,13 @@ class _ImageReviewPageState extends ConsumerState<ImageReviewPage> {
             Expanded(
               child: SingleChildScrollView(
                 child: Padding(
-                  padding: const EdgeInsets.all(16.0),
+                  padding: const EdgeInsets.all(16),
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
                       if (_imageFiles.isNotEmpty)
                         AspectRatio(
-                          aspectRatio: 1.0,
+                          aspectRatio: 1,
                           child: Stack(
                             alignment: Alignment.bottomCenter,
                             children: [
@@ -176,7 +175,7 @@ class _ImageReviewPageState extends ConsumerState<ImageReviewPage> {
                                     child: Stack(
                                       children: [
                                         Container(
-                                          margin: const EdgeInsets.symmetric(horizontal: 4.0),
+                                          margin: const EdgeInsets.symmetric(horizontal: 4),
                                           decoration: BoxDecoration(
                                             borderRadius: BorderRadius.circular(8),
                                             image: DecorationImage(image: FileImage(File(image.path)), fit: BoxFit.cover),
@@ -194,8 +193,8 @@ class _ImageReviewPageState extends ConsumerState<ImageReviewPage> {
                                                 child: InkWell(
                                                   onTap: () => _editAltText(image),
                                                   borderRadius: BorderRadius.circular(8),
-                                                  child: Padding(
-                                                    padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+                                                  child: const Padding(
+                                                    padding: EdgeInsets.symmetric(horizontal: 8, vertical: 4),
                                                     child: Row(
                                                       children: [
                                                         Icon(
@@ -203,9 +202,9 @@ class _ImageReviewPageState extends ConsumerState<ImageReviewPage> {
                                                           color: Colors.white,
                                                           size: 16,
                                                         ),
-                                                        const SizedBox(width: 2),
+                                                        SizedBox(width: 2),
                                                         Text(
-                                                          "ALT",
+                                                          'ALT',
                                                           style: TextStyle(
                                                             color: Colors.white,
                                                             fontSize: 12,
@@ -294,7 +293,6 @@ class _ImageReviewPageState extends ConsumerState<ImageReviewPage> {
                             crossAxisAlignment: CrossAxisAlignment.start,
                             children: [
                               Material(
-                                elevation: 0,
                                 color: Colors.transparent,
                                 borderRadius: BorderRadius.circular(12),
                                 child: TextField(
@@ -307,11 +305,11 @@ class _ImageReviewPageState extends ConsumerState<ImageReviewPage> {
                                     hintStyle: theme.textTheme.bodyLarge?.copyWith(color: theme.colorScheme.onSurfaceVariant),
                                     border: OutlineInputBorder(
                                       borderRadius: BorderRadius.circular(12),
-                                      borderSide: BorderSide(color: theme.colorScheme.outline, width: 1),
+                                      borderSide: BorderSide(color: theme.colorScheme.outline),
                                     ),
                                     enabledBorder: OutlineInputBorder(
                                       borderRadius: BorderRadius.circular(12),
-                                      borderSide: BorderSide(color: theme.colorScheme.outline, width: 1),
+                                      borderSide: BorderSide(color: theme.colorScheme.outline),
                                     ),
                                     focusedBorder: OutlineInputBorder(
                                       borderRadius: BorderRadius.circular(12),
@@ -376,10 +374,10 @@ class _ImageReviewPageState extends ConsumerState<ImageReviewPage> {
                                     color: Colors.orange.withAlpha(25),
                                     borderRadius: BorderRadius.circular(8),
                                   ),
-                                  child: Row(
+                                  child: const Row(
                                     children: [
-                                      const Icon(Icons.info_outline, color: Colors.orange, size: 20),
-                                      const SizedBox(width: 8),
+                                      Icon(Icons.info_outline, color: Colors.orange, size: 20),
+                                      SizedBox(width: 8),
                                       Expanded(
                                         child: Text(
                                           'Bluesky supports a maximum of 4 images. Your Bluesky post will link to the full Spark post instead.',
@@ -400,7 +398,7 @@ class _ImageReviewPageState extends ConsumerState<ImageReviewPage> {
               ),
             ),
             Padding(
-              padding: const EdgeInsets.all(16.0),
+              padding: const EdgeInsets.all(16),
               child: SizedBox(
                 width: double.infinity,
                 child: ElevatedButton(
diff --git a/lib/src/features/posting/ui/pages/story_review_page.dart b/lib/src/features/posting/ui/pages/story_review_page.dart
index 611408e8..19fb17c2 100644
--- a/lib/src/features/posting/ui/pages/story_review_page.dart
+++ b/lib/src/features/posting/ui/pages/story_review_page.dart
@@ -3,6 +3,7 @@ import 'dart:io';
 import 'package:auto_route/auto_route.dart';
 import 'package:fluentui_system_icons/fluentui_system_icons.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:get_it/get_it.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:sparksocial/src/core/network/atproto/atproto.dart' hide Image;
@@ -14,15 +15,13 @@ import 'package:sparksocial/src/features/posting/providers/video_upload_provider
 import 'package:sparksocial/src/features/posting/providers/video_upload_state.dart';
 import 'package:sparksocial/src/features/posting/ui/widgets/video_thumbnail.dart';
 import 'package:video_player/video_player.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 @RoutePage()
 class StoryReviewPage extends ConsumerStatefulWidget {
+  const StoryReviewPage({required this.videoPath, required this.imageFile, super.key});
   final String videoPath;
   final XFile imageFile;
 
-  const StoryReviewPage({super.key, required this.videoPath, required this.imageFile});
-
   @override
   ConsumerState<StoryReviewPage> createState() => _StoryReviewPageState();
 }
@@ -43,7 +42,7 @@ class _StoryReviewPageState extends ConsumerState<StoryReviewPage> {
   void _initVideoPlayer() {
     if (widget.videoPath.isEmpty) return;
 
-    String videoPath = widget.videoPath;
+    var videoPath = widget.videoPath;
     if (videoPath.startsWith('file://')) {
       videoPath = videoPath.replaceFirst('file://', '');
     }
@@ -94,7 +93,7 @@ class _StoryReviewPageState extends ConsumerState<StoryReviewPage> {
 
         ScaffoldMessenger.of(
           context,
-        ).showSnackBar(SnackBar(content: Text('Failed to post story: ${e.toString()}'), backgroundColor: Colors.red));
+        ).showSnackBar(SnackBar(content: Text('Failed to post story: $e'), backgroundColor: Colors.red));
 
         final uploadService = ref.read(uploadProvider.notifier);
         final taskId = uploadService.registerTask('story');
@@ -157,9 +156,8 @@ class _StoryReviewPageState extends ConsumerState<StoryReviewPage> {
             Expanded(
               child: SingleChildScrollView(
                 child: Padding(
-                  padding: const EdgeInsets.all(16.0),
+                  padding: const EdgeInsets.all(16),
                   child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.center,
                     children: [
                       // Media preview
                       LayoutBuilder(
@@ -203,14 +201,14 @@ class _StoryReviewPageState extends ConsumerState<StoryReviewPage> {
                                             }
                                           },
                                           borderRadius: BorderRadius.circular(8),
-                                          child: Padding(
-                                            padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
+                                          child: const Padding(
+                                            padding: EdgeInsets.symmetric(horizontal: 12, vertical: 6),
                                             child: Row(
                                               mainAxisSize: MainAxisSize.min,
                                               children: [
                                                 Icon(FluentIcons.image_alt_text_20_regular, color: Colors.white, size: 16),
-                                                const SizedBox(width: 4),
-                                                const Text(
+                                                SizedBox(width: 4),
+                                                Text(
                                                   'ALT',
                                                   style: TextStyle(
                                                     color: Colors.white,
@@ -230,10 +228,10 @@ class _StoryReviewPageState extends ConsumerState<StoryReviewPage> {
                             }
 
                             // Fallback loader if neither video nor image is ready
-                            return SizedBox(
+                            return const SizedBox(
                               height: maxHeight,
                               width: double.infinity,
-                              child: const Center(child: CircularProgressIndicator()),
+                              child: Center(child: CircularProgressIndicator()),
                             );
                           }
 
@@ -265,8 +263,8 @@ class _StoryReviewPageState extends ConsumerState<StoryReviewPage> {
                           }
 
                           final aspectRatio = _controller!.value.aspectRatio;
-                          double width = maxWidth;
-                          double height = width / aspectRatio;
+                          var width = maxWidth;
+                          var height = width / aspectRatio;
                           if (height > maxHeight) {
                             height = maxHeight;
                             width = height * aspectRatio;
@@ -317,7 +315,7 @@ class _StoryReviewPageState extends ConsumerState<StoryReviewPage> {
                                         child: Row(
                                           mainAxisSize: MainAxisSize.min,
                                           children: [
-                                            Icon(FluentIcons.image_alt_text_20_regular, color: Colors.white, size: 16),
+                                            const Icon(FluentIcons.image_alt_text_20_regular, color: Colors.white, size: 16),
                                             const SizedBox(width: 4),
                                             Text(
                                               _altText.isEmpty ? 'ALT' : 'ALT',
@@ -344,7 +342,7 @@ class _StoryReviewPageState extends ConsumerState<StoryReviewPage> {
               ),
             ),
             Padding(
-              padding: const EdgeInsets.all(16.0),
+              padding: const EdgeInsets.all(16),
               child: SizedBox(
                 width: double.infinity,
                 child: ElevatedButton(
diff --git a/lib/src/features/posting/ui/pages/video_playback_page.dart b/lib/src/features/posting/ui/pages/video_playback_page.dart
index 1808b510..78288e9d 100644
--- a/lib/src/features/posting/ui/pages/video_playback_page.dart
+++ b/lib/src/features/posting/ui/pages/video_playback_page.dart
@@ -6,10 +6,9 @@ import 'package:video_player/video_player.dart';
 
 @RoutePage()
 class VideoPlaybackPage extends StatefulWidget {
+  const VideoPlaybackPage({required this.controller, super.key});
   final VideoPlayerController controller;
 
-  const VideoPlaybackPage({super.key, required this.controller});
-
   @override
   State<VideoPlaybackPage> createState() => _VideoPlaybackPageState();
 }
@@ -97,7 +96,7 @@ class _VideoPlaybackPageState extends State<VideoPlaybackPage> {
             // Controls overlay
             if (_showControls)
               Positioned.fill(
-                child: Container(
+                child: ColoredBox(
                   color: Colors.black.withAlpha(100),
                   child: Stack(
                     alignment: Alignment.center,
@@ -154,7 +153,6 @@ class _VideoPlaybackPageState extends State<VideoPlaybackPage> {
                               ),
                               child: Slider(
                                 value: position.inMilliseconds.toDouble(),
-                                min: 0,
                                 max: duration.inMilliseconds.toDouble(),
                                 onChanged: (value) {
                                   widget.controller.seekTo(Duration(milliseconds: value.toInt()));
diff --git a/lib/src/features/posting/ui/pages/video_review_page.dart b/lib/src/features/posting/ui/pages/video_review_page.dart
index 2ac67627..e263e3e9 100644
--- a/lib/src/features/posting/ui/pages/video_review_page.dart
+++ b/lib/src/features/posting/ui/pages/video_review_page.dart
@@ -11,15 +11,14 @@ import 'package:sparksocial/src/features/posting/providers/upload_provider.dart'
 import 'package:sparksocial/src/features/posting/providers/video_upload_provider.dart';
 import 'package:sparksocial/src/features/posting/providers/video_upload_state.dart';
 import 'package:sparksocial/src/features/posting/ui/widgets/video_thumbnail.dart';
-import 'package:video_player/video_player.dart';
 import 'package:sparksocial/src/features/settings/providers/settings_provider.dart';
+import 'package:video_player/video_player.dart';
 
 @RoutePage()
 class VideoReviewPage extends ConsumerStatefulWidget {
+  const VideoReviewPage({required this.videoPath, super.key});
   final String videoPath;
 
-  const VideoReviewPage({super.key, required this.videoPath});
-
   @override
   ConsumerState<VideoReviewPage> createState() => _VideoReviewPageState();
 }
@@ -37,7 +36,7 @@ class _VideoReviewPageState extends ConsumerState<VideoReviewPage> {
   }
 
   void _initVideoPlayer() {
-    String videoPath = widget.videoPath;
+    var videoPath = widget.videoPath;
 
     // Handle file:// URL scheme
     if (videoPath.startsWith('file://')) {
@@ -105,7 +104,7 @@ class _VideoReviewPageState extends ConsumerState<VideoReviewPage> {
         // Show error without blocking UI
         ScaffoldMessenger.of(
           context,
-        ).showSnackBar(SnackBar(content: Text('Failed to upload video: ${e.toString()}'), backgroundColor: Colors.red));
+        ).showSnackBar(SnackBar(content: Text('Failed to upload video: $e'), backgroundColor: Colors.red));
 
         // Update upload service with error state
         final uploadNotifier = ref.read(uploadProvider.notifier);
@@ -135,15 +134,14 @@ class _VideoReviewPageState extends ConsumerState<VideoReviewPage> {
             Expanded(
               child: SingleChildScrollView(
                 child: Padding(
-                  padding: const EdgeInsets.all(16.0),
+                  padding: const EdgeInsets.all(16),
                   child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.center,
                     children: [
                       // Video preview big on top with ALT overlay
                       LayoutBuilder(
                         builder: (context, constraints) {
                           final maxWidth = constraints.maxWidth;
-                          final maxHeight = 320.0;
+                          const maxHeight = 320.0;
                           if (!_controller.value.isInitialized) {
                             return SizedBox(
                               height: maxHeight,
@@ -170,8 +168,8 @@ class _VideoReviewPageState extends ConsumerState<VideoReviewPage> {
                             );
                           }
                           final aspectRatio = _controller.value.aspectRatio;
-                          double width = maxWidth;
-                          double height = width / aspectRatio;
+                          var width = maxWidth;
+                          var height = width / aspectRatio;
                           if (height > maxHeight) {
                             height = maxHeight;
                             width = height * aspectRatio;
@@ -201,8 +199,7 @@ class _VideoReviewPageState extends ConsumerState<VideoReviewPage> {
                                         _controller.pause();
                                         final result = await showDialog<String>(
                                           context: context,
-                                          builder: (context) =>
-                                              AltTextEditorDialog(imageFile: null, initialAltText: _videoAltText),
+                                          builder: (context) => AltTextEditorDialog(initialAltText: _videoAltText),
                                         );
                                         if (result != null) {
                                           setState(() {
@@ -219,7 +216,7 @@ class _VideoReviewPageState extends ConsumerState<VideoReviewPage> {
                                         child: Row(
                                           mainAxisSize: MainAxisSize.min,
                                           children: [
-                                            Icon(FluentIcons.image_alt_text_20_regular, color: Colors.white, size: 16),
+                                            const Icon(FluentIcons.image_alt_text_20_regular, color: Colors.white, size: 16),
                                             const SizedBox(width: 4),
                                             Text(
                                               _videoAltText.isEmpty ? 'ALT' : 'ALT',
@@ -251,7 +248,6 @@ class _VideoReviewPageState extends ConsumerState<VideoReviewPage> {
                             crossAxisAlignment: CrossAxisAlignment.start,
                             children: [
                               Material(
-                                elevation: 0,
                                 color: Colors.transparent,
                                 borderRadius: BorderRadius.circular(12),
                                 child: TextField(
@@ -264,11 +260,11 @@ class _VideoReviewPageState extends ConsumerState<VideoReviewPage> {
                                     hintStyle: theme.textTheme.bodyLarge?.copyWith(color: theme.colorScheme.onSurfaceVariant),
                                     border: OutlineInputBorder(
                                       borderRadius: BorderRadius.circular(12),
-                                      borderSide: BorderSide(color: theme.colorScheme.outline, width: 1),
+                                      borderSide: BorderSide(color: theme.colorScheme.outline),
                                     ),
                                     enabledBorder: OutlineInputBorder(
                                       borderRadius: BorderRadius.circular(12),
-                                      borderSide: BorderSide(color: theme.colorScheme.outline, width: 1),
+                                      borderSide: BorderSide(color: theme.colorScheme.outline),
                                     ),
                                     focusedBorder: OutlineInputBorder(
                                       borderRadius: BorderRadius.circular(12),
@@ -333,7 +329,7 @@ class _VideoReviewPageState extends ConsumerState<VideoReviewPage> {
               ),
             ),
             Padding(
-              padding: const EdgeInsets.all(16.0),
+              padding: const EdgeInsets.all(16),
               child: SizedBox(
                 width: double.infinity,
                 child: ElevatedButton(
diff --git a/lib/src/features/posting/ui/widgets/camera_controls.dart b/lib/src/features/posting/ui/widgets/camera_controls.dart
index 7b5f311e..fbce7c41 100644
--- a/lib/src/features/posting/ui/widgets/camera_controls.dart
+++ b/lib/src/features/posting/ui/widgets/camera_controls.dart
@@ -2,30 +2,28 @@ import 'package:fluentui_system_icons/fluentui_system_icons.dart';
 import 'package:flutter/material.dart';
 
 class CameraControls extends StatelessWidget {
-  final bool isVideoMode;
-  final bool isRecording;
-  final VoidCallback onCapturePressed;
-  final VoidCallback onFlipCameraPressed;
-  final VoidCallback onGalleryPressed;
-  final VoidCallback onImageGalleryPressed;
-
   const CameraControls({
-    super.key,
     required this.isVideoMode,
     required this.isRecording,
     required this.onCapturePressed,
     required this.onFlipCameraPressed,
     required this.onGalleryPressed,
     required this.onImageGalleryPressed,
+    super.key,
   });
+  final bool isVideoMode;
+  final bool isRecording;
+  final VoidCallback onCapturePressed;
+  final VoidCallback onFlipCameraPressed;
+  final VoidCallback onGalleryPressed;
+  final VoidCallback onImageGalleryPressed;
 
   @override
   Widget build(BuildContext context) {
     return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 20.0),
+      padding: const EdgeInsets.symmetric(horizontal: 20),
       child: Row(
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        crossAxisAlignment: CrossAxisAlignment.center,
         children: [
           if (isVideoMode)
             TooltipIconButton(icon: FluentIcons.image_multiple_24_regular, onPressed: onGalleryPressed, tooltip: 'Select Video')
@@ -46,7 +44,7 @@ class CameraControls extends StatelessWidget {
 }
 
 class TooltipIconButton extends StatelessWidget {
-  const TooltipIconButton({super.key, required this.icon, required this.onPressed, required this.tooltip});
+  const TooltipIconButton({required this.icon, required this.onPressed, required this.tooltip, super.key});
 
   final IconData icon;
   final VoidCallback onPressed;
@@ -65,7 +63,7 @@ class TooltipIconButton extends StatelessWidget {
 }
 
 class CaptureButton extends StatelessWidget {
-  const CaptureButton({super.key, required this.isRecording, required this.onCapturePressed, required this.isVideoMode});
+  const CaptureButton({required this.isRecording, required this.onCapturePressed, required this.isVideoMode, super.key});
 
   final bool isRecording;
   final VoidCallback onCapturePressed;
@@ -73,9 +71,9 @@ class CaptureButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final double size = isRecording ? 50.0 : 70.0;
-    final double innerPadding = isRecording ? 5.0 : 3.0;
-    final innerShape = isRecording ? BorderRadius.circular(8.0) : null;
+    final size = isRecording ? 50.0 : 70.0;
+    final innerPadding = isRecording ? 5.0 : 3.0;
+    final innerShape = isRecording ? BorderRadius.circular(8) : null;
 
     return GestureDetector(
       onTap: onCapturePressed,
diff --git a/lib/src/features/posting/ui/widgets/camera_view.dart b/lib/src/features/posting/ui/widgets/camera_view.dart
index 7314795c..3b758ba5 100644
--- a/lib/src/features/posting/ui/widgets/camera_view.dart
+++ b/lib/src/features/posting/ui/widgets/camera_view.dart
@@ -1,14 +1,13 @@
 import 'dart:math' as math;
 
-import 'package:flutter/material.dart';
 import 'package:camera/camera.dart';
+import 'package:flutter/material.dart';
 
 class CameraView extends StatefulWidget {
+  const CameraView({required this.cameraController, required this.isInitialized, super.key});
   final CameraController? cameraController;
   final bool isInitialized;
 
-  const CameraView({super.key, required this.cameraController, required this.isInitialized});
-
   @override
   State<CameraView> createState() => _CameraViewState();
 }
@@ -17,9 +16,9 @@ class _CameraViewState extends State<CameraView> {
   @override
   Widget build(BuildContext context) {
     if (!widget.isInitialized || widget.cameraController == null || !widget.cameraController!.value.isInitialized) {
-      return Container(
+      return const ColoredBox(
         color: Colors.black,
-        child: const Center(
+        child: Center(
           child: Column(
             mainAxisSize: MainAxisSize.min,
             children: [
@@ -48,9 +47,9 @@ class _CameraViewState extends State<CameraView> {
         child: CameraPreview(widget.cameraController!),
       );
     } catch (e) {
-      return Container(
+      return const ColoredBox(
         color: Colors.black,
-        child: const Center(
+        child: Center(
           child: Text('Camera preview unavailable', style: TextStyle(color: Colors.red, fontSize: 16)),
         ),
       );
diff --git a/lib/src/features/posting/ui/widgets/mode_selector.dart b/lib/src/features/posting/ui/widgets/mode_selector.dart
index 85de842a..ef476a00 100644
--- a/lib/src/features/posting/ui/widgets/mode_selector.dart
+++ b/lib/src/features/posting/ui/widgets/mode_selector.dart
@@ -1,11 +1,10 @@
 import 'package:flutter/material.dart';
 
 class ModeSelector extends StatelessWidget {
+  const ModeSelector({required this.isVideoMode, required this.onModeSelected, super.key});
   final bool isVideoMode;
   final Function(bool) onModeSelected;
 
-  const ModeSelector({super.key, required this.isVideoMode, required this.onModeSelected});
-
   @override
   Widget build(BuildContext context) {
     return Container(
@@ -23,7 +22,7 @@ class ModeSelector extends StatelessWidget {
 }
 
 class ModeButton extends StatelessWidget {
-  const ModeButton({super.key, required this.label, required this.isSelected, required this.onTap});
+  const ModeButton({required this.label, required this.isSelected, required this.onTap, super.key});
 
   final String label;
   final bool isSelected;
diff --git a/lib/src/features/posting/ui/widgets/permission_requrest.dart b/lib/src/features/posting/ui/widgets/permission_requrest.dart
index 09ac2afc..2b961522 100644
--- a/lib/src/features/posting/ui/widgets/permission_requrest.dart
+++ b/lib/src/features/posting/ui/widgets/permission_requrest.dart
@@ -2,13 +2,12 @@ import 'package:fluentui_system_icons/fluentui_system_icons.dart';
 import 'package:flutter/material.dart';
 
 class CameraPermissionRequest extends StatelessWidget {
+  const CameraPermissionRequest({required this.onRequestPermission, super.key});
   final VoidCallback onRequestPermission;
 
-  const CameraPermissionRequest({super.key, required this.onRequestPermission});
-
   @override
   Widget build(BuildContext context) {
-    return Container(
+    return ColoredBox(
       color: Colors.black,
       child: Center(
         child: Column(
diff --git a/lib/src/features/posting/ui/widgets/recording_bar.dart b/lib/src/features/posting/ui/widgets/recording_bar.dart
index 03e4d6c4..66780fa7 100644
--- a/lib/src/features/posting/ui/widgets/recording_bar.dart
+++ b/lib/src/features/posting/ui/widgets/recording_bar.dart
@@ -1,12 +1,11 @@
 import 'package:flutter/material.dart';
 
 class RecordingBar extends StatelessWidget {
+  const RecordingBar({required this.isRecording, required this.progress, required this.timeText, super.key});
   final bool isRecording;
   final double progress; // 0.0 to 1.0
   final String timeText;
 
-  const RecordingBar({super.key, required this.isRecording, required this.progress, required this.timeText});
-
   @override
   Widget build(BuildContext context) {
     return Column(
diff --git a/lib/src/features/posting/ui/widgets/video_preview_player.dart b/lib/src/features/posting/ui/widgets/video_preview_player.dart
index 4f6b9a98..e2e8f842 100644
--- a/lib/src/features/posting/ui/widgets/video_preview_player.dart
+++ b/lib/src/features/posting/ui/widgets/video_preview_player.dart
@@ -1,12 +1,11 @@
+import 'package:fluentui_system_icons/fluentui_system_icons.dart';
 import 'package:flutter/material.dart';
 import 'package:video_player/video_player.dart';
-import 'package:fluentui_system_icons/fluentui_system_icons.dart';
 
 class VideoPreviewPlayer extends StatefulWidget {
+  const VideoPreviewPlayer({required this.controller, super.key});
   final VideoPlayerController controller;
 
-  const VideoPreviewPlayer({super.key, required this.controller});
-
   @override
   State<VideoPreviewPlayer> createState() => _VideoPreviewPlayerState();
 }
@@ -70,7 +69,7 @@ class _VideoPreviewPlayerState extends State<VideoPreviewPlayer> {
         children: [
           AspectRatio(aspectRatio: widget.controller.value.aspectRatio, child: VideoPlayer(widget.controller)),
           if (_showControls)
-            Container(
+            ColoredBox(
               color: Colors.black.withAlpha(100),
               child: Center(
                 child: IconButton(
diff --git a/lib/src/features/posting/ui/widgets/video_thumbnail.dart b/lib/src/features/posting/ui/widgets/video_thumbnail.dart
index 02b483fb..8ba2c724 100644
--- a/lib/src/features/posting/ui/widgets/video_thumbnail.dart
+++ b/lib/src/features/posting/ui/widgets/video_thumbnail.dart
@@ -5,10 +5,9 @@ import 'package:sparksocial/src/core/routing/app_router.dart';
 import 'package:video_player/video_player.dart';
 
 class VideoThumbnail extends StatefulWidget {
+  const VideoThumbnail({required this.controller, super.key});
   final VideoPlayerController controller;
 
-  const VideoThumbnail({super.key, required this.controller});
-
   @override
   State<VideoThumbnail> createState() => _VideoThumbnailState();
 }
diff --git a/lib/src/features/profile/providers/edit_profile_provider.dart b/lib/src/features/profile/providers/edit_profile_provider.dart
index 84e41638..3588d4bd 100644
--- a/lib/src/features/profile/providers/edit_profile_provider.dart
+++ b/lib/src/features/profile/providers/edit_profile_provider.dart
@@ -1,15 +1,15 @@
 import 'dart:typed_data';
 
 import 'package:atproto/core.dart';
+import 'package:get_it/get_it.dart';
+import 'package:image_picker/image_picker.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:sparksocial/src/core/auth/data/repositories/auth_repository.dart';
 import 'package:sparksocial/src/core/network/atproto/data/models/actor_models.dart';
 import 'package:sparksocial/src/core/network/atproto/data/repositories/actor_repository.dart';
+import 'package:sparksocial/src/core/utils/logging/log_service.dart';
 import 'package:sparksocial/src/core/utils/logging/logger.dart';
 import 'package:sparksocial/src/features/profile/providers/edit_profile_state.dart';
-import 'package:get_it/get_it.dart';
-import 'package:sparksocial/src/core/auth/data/repositories/auth_repository.dart';
-import 'package:sparksocial/src/core/utils/logging/log_service.dart';
-import 'package:image_picker/image_picker.dart';
 import 'package:sparksocial/src/features/profile/providers/profile_provider.dart';
 
 part 'edit_profile_provider.g.dart';
@@ -99,7 +99,7 @@ class EditProfile extends _$EditProfile {
         // Ensure the 'avatar' field exists and is a Map before converting to Blob.
         // If it's null, it means the user had no avatar on the record.
         if (recordData['avatar'] is Map<String, dynamic>) {
-          avatarToSend = Blob.fromJson(recordData['avatar']);
+          avatarToSend = Blob.fromJson(recordData['avatar'] as Map<String, dynamic>);
           logger.d('Blob avatar: $avatarToSend');
         } else {
           // This case handles an inconsistency where localAvatar was a string (URL),
diff --git a/lib/src/features/profile/providers/edit_profile_state.dart b/lib/src/features/profile/providers/edit_profile_state.dart
index a66a193d..ac012a30 100644
--- a/lib/src/features/profile/providers/edit_profile_state.dart
+++ b/lib/src/features/profile/providers/edit_profile_state.dart
@@ -21,4 +21,4 @@ class EditProfileState with _$EditProfileState {
     initialAvatar: profile.avatar,
     localAvatar: profile.avatar,
   );
-} 
\ No newline at end of file
+}
diff --git a/lib/src/features/profile/providers/profile_feed_provider.dart b/lib/src/features/profile/providers/profile_feed_provider.dart
index 30e1f90b..6955f1ca 100644
--- a/lib/src/features/profile/providers/profile_feed_provider.dart
+++ b/lib/src/features/profile/providers/profile_feed_provider.dart
@@ -1,8 +1,10 @@
 import 'dart:collection';
 
+import 'package:atproto/atproto.dart';
 import 'package:atproto_core/atproto_core.dart';
 import 'package:get_it/get_it.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:sparksocial/src/core/network/atproto/data/models/models.dart';
 import 'package:sparksocial/src/core/network/atproto/data/repositories/feed_repository.dart';
 import 'package:sparksocial/src/core/network/atproto/data/repositories/sprk_repository.dart';
 import 'package:sparksocial/src/core/storage/cache/sql_cache_interface.dart';
@@ -10,13 +12,9 @@ import 'package:sparksocial/src/core/storage/preferences/settings_repository.dar
 import 'package:sparksocial/src/core/utils/logging/log_service.dart';
 import 'package:sparksocial/src/core/utils/logging/logger.dart';
 import 'package:sparksocial/src/features/profile/providers/profile_feed_state.dart';
-import 'package:sparksocial/src/core/network/atproto/data/models/models.dart';
-import 'package:atproto/atproto.dart';
 
 part 'profile_feed_provider.g.dart';
 
-typedef _FeedSourceFetcher = Future<({List<FeedViewPost> posts, String? cursor})> Function(String? cursor);
-
 @riverpod
 class ProfileFeed extends _$ProfileFeed {
   late final FeedRepository _feedRepository;
@@ -30,7 +28,7 @@ class ProfileFeed extends _$ProfileFeed {
     _feedRepository = GetIt.instance<SprkRepository>().feed;
     _sqlCache = GetIt.instance<SQLCacheInterface>();
     _settingsRepository = GetIt.instance<SettingsRepository>();
-    _logger = GetIt.instance<LogService>().getLogger('ProfileFeed ${profileUri.toString()}');
+    _logger = GetIt.instance<LogService>().getLogger('ProfileFeed $profileUri');
 
     try {
       final result = await _loadUnifiedFeed(
@@ -66,7 +64,7 @@ class ProfileFeed extends _$ProfileFeed {
     final newPosts = <PostView>[];
 
     final sparkResult = await _fetchFromSource(
-      (cursor) => _feedRepository.getAuthorFeed(profileUri, limit: ProfileFeedState.fetchLimit, cursor: cursor, bluesky: false),
+      (cursor) => _feedRepository.getAuthorFeed(profileUri, limit: ProfileFeedState.fetchLimit, cursor: cursor),
       sparkCursor,
       'Sprk',
     );
@@ -127,7 +125,7 @@ class ProfileFeed extends _$ProfileFeed {
 
     // Filter by video/non-video type first
     final typeFilteredPosts = videosOnly
-        ? allPosts.where((uri) => postTypes[uri] == true).toList()
+        ? allPosts.where((uri) => postTypes[uri] ?? true).toList()
         : allPosts.where((uri) => postTypes[uri] == false).toList();
 
     // Then filter based on label preferences
@@ -152,7 +150,7 @@ class ProfileFeed extends _$ProfileFeed {
   }
 
   Future<({List<FeedViewPost> posts, String? cursor})> _fetchFromSource(
-    _FeedSourceFetcher fetcher,
+    Future<({List<FeedViewPost> posts, String? cursor})> Function(String? cursor) fetcher,
     String? cursor,
     String sourceName,
   ) async {
@@ -182,7 +180,7 @@ class ProfileFeed extends _$ProfileFeed {
   }
 
   Future<void> loadMore() async {
-    if (_isLoading || state.value?.isEndOfNetwork == true) return;
+    if (_isLoading || (state.value?.isEndOfNetwork ?? true)) return;
 
     _isLoading = true;
     final currentState = state.value;
@@ -239,7 +237,7 @@ class ProfileFeed extends _$ProfileFeed {
       try {
         final labelPreference = await _settingsRepository.getLabelPreference(label.value);
         if (labelPreference.setting == Setting.hide || (labelPreference.adultOnly && hideAdultContent)) {
-          _logger.d('Hiding post ${uri.toString()} due to label: ${label.value}');
+          _logger.d('Hiding post $uri due to label: ${label.value}');
           return true;
         }
       } catch (e) {
@@ -270,7 +268,7 @@ class ProfileFeed extends _$ProfileFeed {
 
         // Add self labels from the post record
         if (postView.record.selfLabels != null) {
-          for (SelfLabel selfLabel in postView.record.selfLabels!) {
+          for (final selfLabel in postView.record.selfLabels!) {
             postLabels.add(
               Label(
                 uri: postView.uri.toString(),
diff --git a/lib/src/features/profile/providers/profile_feed_state.dart b/lib/src/features/profile/providers/profile_feed_state.dart
index 435edbd5..940b00be 100644
--- a/lib/src/features/profile/providers/profile_feed_state.dart
+++ b/lib/src/features/profile/providers/profile_feed_state.dart
@@ -9,7 +9,6 @@ part 'profile_feed_state.freezed.dart';
 
 @freezed
 abstract class ProfileFeedState with _$ProfileFeedState {
-  const ProfileFeedState._();
   const factory ProfileFeedState({
     required List<AtUri> loadedPosts,
     required bool isEndOfNetwork,
@@ -21,11 +20,12 @@ abstract class ProfileFeedState with _$ProfileFeedState {
     @Default(<AtUri, PostView>{}) Map<AtUri, PostView> postViews,
     @Default(null) String? blueskyCursor,
   }) = _ProfileFeedState;
+  const ProfileFeedState._();
 
   int get length => loadedPosts.length;
   int get allPostsLength => allPosts.length;
 
-  List<AtUri> get videoPosts => allPosts.where((uri) => postTypes[uri] == true).toList();
+  List<AtUri> get videoPosts => allPosts.where((uri) => postTypes[uri] ?? true).toList();
   List<AtUri> get imagePosts => allPosts.where((uri) => postTypes[uri] == false).toList();
 
   static const int fetchLimit = 16; // number of posts to fetch at a time
diff --git a/lib/src/features/profile/providers/profile_provider.dart b/lib/src/features/profile/providers/profile_provider.dart
index 920c53ba..735e8ce6 100644
--- a/lib/src/features/profile/providers/profile_provider.dart
+++ b/lib/src/features/profile/providers/profile_provider.dart
@@ -2,30 +2,29 @@ import 'dart:async';
 
 import 'package:atproto/atproto.dart' as atp;
 import 'package:atproto_core/atproto_core.dart';
-import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:get_it/get_it.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:sparksocial/src/core/auth/data/repositories/auth_repository.dart';
 import 'package:sparksocial/src/core/network/atproto/atproto.dart';
-import 'package:sparksocial/src/features/profile/providers/profile_state.dart';
 import 'package:sparksocial/src/core/utils/logging/log_service.dart';
 import 'package:sparksocial/src/core/utils/logging/logger.dart';
 import 'package:sparksocial/src/features/profile/providers/profile_feed_provider.dart';
+import 'package:sparksocial/src/features/profile/providers/profile_state.dart';
 
 part 'profile_provider.g.dart';
 
 @riverpod
 class ProfileNotifier extends _$ProfileNotifier {
-  late final AuthRepository authRepository;
-  late final ActorRepository actorRepository;
-  late final SprkRepository sprkRepository;
-  late final SparkLogger logger;
-
   ProfileNotifier() {
     authRepository = GetIt.instance<AuthRepository>();
     actorRepository = GetIt.instance<ActorRepository>();
     sprkRepository = GetIt.instance<SprkRepository>();
     logger = GetIt.instance<LogService>().getLogger('ProfileNotifier');
   }
+  late final AuthRepository authRepository;
+  late final ActorRepository actorRepository;
+  late final SprkRepository sprkRepository;
+  late final SparkLogger logger;
 
   @override
   Future<ProfileState> build({String? did}) async {
@@ -36,7 +35,7 @@ class ProfileNotifier extends _$ProfileNotifier {
   }
 
   Future<void> loadProfileData(String? targetDidArgument, ProfileState currentState) async {
-    final String? effectiveDid = targetDidArgument ?? authRepository.session?.did;
+    final effectiveDid = targetDidArgument ?? authRepository.session?.did;
 
     if (!authRepository.isAuthenticated && effectiveDid == null) {
       logger.i('User not authenticated and no DID provided, showing auth prompt.');
@@ -56,7 +55,7 @@ class ProfileNotifier extends _$ProfileNotifier {
 
       logger.d('Profile loaded successfully for $effectiveDid: ${profile.handle}');
 
-      final bool isEarlySupporter = await actorRepository.isEarlySupporter(effectiveDid);
+      final isEarlySupporter = await actorRepository.isEarlySupporter(effectiveDid);
       logger.d('Early supporter status for $effectiveDid: $isEarlySupporter');
 
       state = AsyncData(
@@ -175,7 +174,7 @@ class ProfileNotifier extends _$ProfileNotifier {
     } catch (e, s) {
       logger.e('Error toggling follow for ${profile.did}', error: e, stackTrace: s);
       state = AsyncData(originalStateValue);
-      throw Exception('Failed to toggle follow: ${e.toString()}');
+      throw Exception('Failed to toggle follow: $e');
     }
   }
 
@@ -197,7 +196,7 @@ class ProfileNotifier extends _$ProfileNotifier {
       return result;
     } catch (e, s) {
       logger.e('Error creating report for $did', error: e, stackTrace: s);
-      throw Exception('Failed to create report: ${e.toString()}');
+      throw Exception('Failed to create report: $e');
     }
   }
 
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 b79e5f4b..843bc008 100644
--- a/lib/src/features/profile/ui/pages/edit_profile_page.dart
+++ b/lib/src/features/profile/ui/pages/edit_profile_page.dart
@@ -1,18 +1,18 @@
 import 'dart:typed_data';
+
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:sparksocial/src/core/network/atproto/data/models/actor_models.dart';
-import 'package:sparksocial/src/features/profile/providers/edit_profile_provider.dart';
 import 'package:sparksocial/src/core/widgets/custom_text_field.dart';
+import 'package:sparksocial/src/features/profile/providers/edit_profile_provider.dart';
 
 /// Edit profile page that allows users to update their profile information
 @RoutePage()
 class EditProfilePage extends ConsumerStatefulWidget {
+  const EditProfilePage({required this.profile, super.key});
   final ProfileViewDetailed profile;
 
-  const EditProfilePage({super.key, required this.profile});
-
   @override
   ConsumerState<EditProfilePage> createState() => _EditProfilePageState();
 }
@@ -77,7 +77,7 @@ class _EditProfilePageState extends ConsumerState<EditProfilePage> {
       context.router.pop();
     } catch (e) {
       if (!mounted) return;
-      ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Error updating profile: ${e.toString()}')));
+      ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Error updating profile: $e')));
     } finally {
       if (mounted) {
         setState(() {
@@ -127,8 +127,7 @@ class _EditProfilePageState extends ConsumerState<EditProfilePage> {
       }
     }
 
-    final bool hasLocalAvatar =
-        editProfileState.localAvatar != null && editProfileState.localAvatar != editProfileState.initialAvatar;
+    final hasLocalAvatar = editProfileState.localAvatar != null && editProfileState.localAvatar != editProfileState.initialAvatar;
 
     return Scaffold(
       backgroundColor: theme.scaffoldBackgroundColor,
@@ -153,7 +152,7 @@ class _EditProfilePageState extends ConsumerState<EditProfilePage> {
                       alignment: Alignment.bottomRight,
                       children: [
                         GestureDetector(
-                          onTap: () => editProfileNotifier.pickAvatar(),
+                          onTap: editProfileNotifier.pickAvatar,
                           child: CircleAvatar(
                             radius: 50,
                             backgroundImage: avatarImageProvider,
@@ -171,9 +170,9 @@ class _EditProfilePageState extends ConsumerState<EditProfilePage> {
                             children: [
                               if (hasLocalAvatar)
                                 Padding(
-                                  padding: const EdgeInsets.all(4.0),
+                                  padding: const EdgeInsets.all(4),
                                   child: GestureDetector(
-                                    onTap: () => editProfileNotifier.revertAvatar(),
+                                    onTap: editProfileNotifier.revertAvatar,
                                     child: Container(
                                       decoration: const BoxDecoration(color: Colors.black54, shape: BoxShape.circle),
                                       padding: const EdgeInsets.all(4),
diff --git a/lib/src/features/profile/ui/pages/profile_page.dart b/lib/src/features/profile/ui/pages/profile_page.dart
index 8c69993a..ee4cdae2 100644
--- a/lib/src/features/profile/ui/pages/profile_page.dart
+++ b/lib/src/features/profile/ui/pages/profile_page.dart
@@ -2,22 +2,21 @@ import 'package:auto_route/auto_route.dart';
 import 'package:fluentui_system_icons/fluentui_system_icons.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:get_it/get_it.dart';
 import 'package:sparksocial/src/core/routing/app_router.dart'; // For EditProfileRoute, LoginRoute
 import 'package:sparksocial/src/core/utils/logging/log_service.dart';
 import 'package:sparksocial/src/core/utils/logging/logger.dart';
 import 'package:sparksocial/src/core/widgets/menu_action_button.dart';
 import 'package:sparksocial/src/core/widgets/report_dialog.dart';
 import 'package:sparksocial/src/features/profile/providers/profile_provider.dart';
-import 'package:sparksocial/src/features/profile/ui/widgets/profile_header.dart';
 import 'package:sparksocial/src/features/profile/ui/widgets/early_supporter_sheet.dart';
+import 'package:sparksocial/src/features/profile/ui/widgets/profile_header.dart';
 import 'package:sparksocial/src/features/profile/ui/widgets/profile_tabs.dart';
-import 'package:get_it/get_it.dart';
 
 @RoutePage()
 class ProfilePage extends ConsumerStatefulWidget {
-  final String did;
-
   const ProfilePage({@PathParam('did') required this.did, super.key});
+  final String did;
 
   @override
   ConsumerState<ProfilePage> createState() => _ProfilePageState();
@@ -37,8 +36,8 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
       context: context,
       isScrollControlled: true,
       backgroundColor: Colors.transparent,
-      builder: (context) => SafeArea(
-        child: Padding(padding: const EdgeInsets.only(top: 20), child: EarlySupporterSheet()),
+      builder: (context) => const SafeArea(
+        child: Padding(padding: EdgeInsets.only(top: 20), child: EarlySupporterSheet()),
       ),
     );
   }
@@ -53,7 +52,7 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
     return profileStateAsync.when(
       data: (state) {
         if (state.showAuthPrompt) {
-          context.router.push(AuthPromptRoute(onClose: () => notifier.hideAuthPrompt()));
+          context.router.push(AuthPromptRoute(onClose: notifier.hideAuthPrompt));
         }
 
         final profile = state.profile;
@@ -65,11 +64,11 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
             context: context,
             message: 'Profile not found',
             stackTrace: null,
-            onRetry: () => notifier.refreshProfile(),
+            onRetry: notifier.refreshProfile,
             theme: theme,
           );
         }
-        final bool isCurrentUser = notifier.isCurrentUser();
+        final isCurrentUser = notifier.isCurrentUser();
 
         return AutoTabsRouter(
           routes: [
@@ -94,18 +93,18 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
                 actions: [
                   if (isCurrentUser)
                     Padding(
-                      padding: const EdgeInsets.only(right: 8.0),
+                      padding: const EdgeInsets.only(right: 8),
                       child: IconButton(
                         padding: EdgeInsets.zero,
                         onPressed: () {
-                          context.router.push(ProfileSettingsRoute());
+                          context.router.push(const ProfileSettingsRoute());
                         },
                         icon: Icon(FluentIcons.options_24_regular, color: Theme.of(context).colorScheme.onSurface),
                       ),
                     )
                   else
                     Padding(
-                      padding: const EdgeInsets.only(right: 8.0),
+                      padding: const EdgeInsets.only(right: 8),
                       child: MenuActionButton(
                         // Assuming this widget is fine
                         onPressed: () => showDialog(
@@ -152,7 +151,7 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
               ),
               body: SafeArea(
                 child: RefreshIndicator(
-                  onRefresh: () => notifier.refreshProfile(),
+                  onRefresh: notifier.refreshProfile,
                   child: CustomScrollView(
                     key: PageStorageKey<String>('profile_${widget.did}'), // Use the passed did
                     slivers: [
@@ -204,7 +203,7 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
                               if (context.mounted) {
                                 ScaffoldMessenger.of(
                                   context,
-                                ).showSnackBar(SnackBar(content: Text('Error: ${e.toString()}'), backgroundColor: Colors.red));
+                                ).showSnackBar(SnackBar(content: Text('Error: $e'), backgroundColor: Colors.red));
                               }
                             }
                           },
@@ -215,7 +214,7 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
                         delegate: StickyTabBarDelegate(
                           child: ProfileTabs(
                             selectedIndex: tabsRouter.activeIndex,
-                            onTabSelected: (index) => tabsRouter.setActiveIndex(index),
+                            onTabSelected: tabsRouter.setActiveIndex,
                             isAuthenticated: isCurrentUser,
                           ),
                         ),
@@ -239,7 +238,7 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
         context: context,
         message: error.toString(),
         stackTrace: stackTrace,
-        onRetry: () => notifier.refreshProfile(),
+        onRetry: notifier.refreshProfile,
         theme: theme,
       ),
     );
@@ -248,12 +247,12 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
 
 class ErrorScreen extends StatelessWidget {
   const ErrorScreen({
-    super.key,
     required this.context,
     required this.message,
     required this.stackTrace,
     required this.onRetry,
     required this.theme,
+    super.key,
   });
 
   final BuildContext context;
diff --git a/lib/src/features/profile/ui/pages/profile_photos_page.dart b/lib/src/features/profile/ui/pages/profile_photos_page.dart
index 7fe97fac..4bbc3722 100644
--- a/lib/src/features/profile/ui/pages/profile_photos_page.dart
+++ b/lib/src/features/profile/ui/pages/profile_photos_page.dart
@@ -6,9 +6,8 @@ import 'package:sparksocial/src/features/profile/ui/widgets/profile_grid_widget.
 
 @RoutePage()
 class ProfilePhotosPage extends ConsumerWidget {
-  final String did;
-
   const ProfilePhotosPage({@PathParam('did') required this.did, super.key});
+  final String did;
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -17,4 +16,4 @@ class ProfilePhotosPage extends ConsumerWidget {
       videosOnly: false,
     );
   }
-} 
\ No newline at end of file
+}
diff --git a/lib/src/features/profile/ui/pages/profile_videos_page.dart b/lib/src/features/profile/ui/pages/profile_videos_page.dart
index 3d5aab2d..83896714 100644
--- a/lib/src/features/profile/ui/pages/profile_videos_page.dart
+++ b/lib/src/features/profile/ui/pages/profile_videos_page.dart
@@ -6,9 +6,8 @@ import 'package:sparksocial/src/features/profile/ui/widgets/profile_grid_widget.
 
 @RoutePage()
 class ProfileVideosPage extends ConsumerWidget {
-  final String did;
-
   const ProfileVideosPage({@PathParam('did') required this.did, super.key});
+  final String did;
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -17,4 +16,4 @@ class ProfileVideosPage extends ConsumerWidget {
       videosOnly: true,
     );
   }
-} 
\ No newline at end of file
+}
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 77736c72..7fdcb985 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
@@ -1,5 +1,5 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:atproto_core/atproto_core.dart';
+import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:sparksocial/src/core/theme/data/models/colors.dart';
@@ -9,16 +9,15 @@ import 'package:sparksocial/src/features/profile/ui/widgets/profile_feed_post_wi
 
 @RoutePage()
 class StandaloneProfileFeedPage extends ConsumerStatefulWidget {
-  final String profileUri;
-  final bool videosOnly;
-  final int initialPostIndex;
-
   const StandaloneProfileFeedPage({
-    super.key,
     required this.profileUri,
     required this.videosOnly,
     required this.initialPostIndex,
+    super.key,
   });
+  final String profileUri;
+  final bool videosOnly;
+  final int initialPostIndex;
 
   @override
   ConsumerState<StandaloneProfileFeedPage> createState() => _StandaloneProfileFeedPageState();
@@ -47,7 +46,7 @@ class _StandaloneProfileFeedPageState extends ConsumerState<StandaloneProfileFee
 
     return Scaffold(
       backgroundColor: AppColors.black,
-      appBar: AppBar(backgroundColor: AppColors.black, leading: AutoLeadingButton()),
+      appBar: AppBar(backgroundColor: AppColors.black, leading: const AutoLeadingButton()),
       body: feedState.when(
         data: (state) {
           if (state.loadedPosts.isEmpty) {
@@ -71,7 +70,6 @@ class _StandaloneProfileFeedPageState extends ConsumerState<StandaloneProfileFee
           return CacheablePageView.builder(
             controller: pageController,
             scrollDirection: Axis.vertical,
-            pageSnapping: true,
             itemCount: state.loadedPosts.length,
             onPageChanged: (index) {
               // Load more posts when approaching the end
diff --git a/lib/src/features/profile/ui/widgets/auth_required_content.dart b/lib/src/features/profile/ui/widgets/auth_required_content.dart
index 43f0df2d..0b9e6217 100644
--- a/lib/src/features/profile/ui/widgets/auth_required_content.dart
+++ b/lib/src/features/profile/ui/widgets/auth_required_content.dart
@@ -2,28 +2,27 @@ import 'package:flutter/material.dart';
 import 'package:sparksocial/src/core/theme/data/models/colors.dart';
 
 class AuthRequiredContent extends StatelessWidget {
-  final String title;
-  final String description;
-  final IconData icon;
-  final VoidCallback onLoginPressed;
-
   const AuthRequiredContent({
-    super.key,
     required this.title,
     required this.description,
     required this.icon,
     required this.onLoginPressed,
+    super.key,
   });
+  final String title;
+  final String description;
+  final IconData icon;
+  final VoidCallback onLoginPressed;
 
   @override
   Widget build(BuildContext context) {
-    final ThemeData theme = Theme.of(context);
+    final theme = Theme.of(context);
 
     return SliverFillRemaining(
       hasScrollBody: false,
       child: Center(
         child: Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 24.0),
+          padding: const EdgeInsets.symmetric(horizontal: 24),
           child: Column(
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
@@ -52,7 +51,10 @@ class AuthRequiredContent extends StatelessWidget {
                   shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
                 ),
                 onPressed: onLoginPressed,
-                child: const Text('Login', style: TextStyle(fontWeight: FontWeight.bold, color: AppColors.white)),
+                child: const Text(
+                  'Login',
+                  style: TextStyle(fontWeight: FontWeight.bold, color: AppColors.white),
+                ),
               ),
             ],
           ),
diff --git a/lib/src/features/profile/ui/widgets/early_supporter_sheet.dart b/lib/src/features/profile/ui/widgets/early_supporter_sheet.dart
index 50839131..01fee5c9 100644
--- a/lib/src/features/profile/ui/widgets/early_supporter_sheet.dart
+++ b/lib/src/features/profile/ui/widgets/early_supporter_sheet.dart
@@ -7,8 +7,8 @@ class EarlySupporterSheet extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final ThemeData theme = Theme.of(context);
-    final bool isDarkMode = theme.brightness == Brightness.dark;
+    final theme = Theme.of(context);
+    final isDarkMode = theme.brightness == Brightness.dark;
 
     return Container(
       padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 20),
@@ -32,7 +32,10 @@ class EarlySupporterSheet extends StatelessWidget {
             colorFilter: const ColorFilter.mode(AppColors.primary, BlendMode.srcIn),
           ),
           const SizedBox(height: 16),
-          const Text('Early supporter', style: TextStyle(fontSize: 24, fontWeight: FontWeight.bold, color: AppColors.primary)),
+          const Text(
+            'Early supporter',
+            style: TextStyle(fontSize: 24, fontWeight: FontWeight.bold, color: AppColors.primary),
+          ),
           const SizedBox(height: 24),
           Text.rich(
             TextSpan(
@@ -54,7 +57,10 @@ class EarlySupporterSheet extends StatelessWidget {
               style: TextStyle(fontSize: 16, color: isDarkMode ? Colors.grey.shade400 : Colors.grey.shade600),
               children: const [
                 TextSpan(text: 'Thanks to them, '),
-                TextSpan(text: 'Spark is a reality', style: TextStyle(color: AppColors.primary, fontWeight: FontWeight.bold)),
+                TextSpan(
+                  text: 'Spark is a reality',
+                  style: TextStyle(color: AppColors.primary, fontWeight: FontWeight.bold),
+                ),
                 TextSpan(text: '.'),
               ],
             ),
diff --git a/lib/src/features/profile/ui/widgets/profile_avatar_editor.dart b/lib/src/features/profile/ui/widgets/profile_avatar_editor.dart
index e6b22bef..38d9f410 100644
--- a/lib/src/features/profile/ui/widgets/profile_avatar_editor.dart
+++ b/lib/src/features/profile/ui/widgets/profile_avatar_editor.dart
@@ -3,20 +3,20 @@ import 'dart:typed_data';
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:sparksocial/src/core/theme/data/models/colors.dart';
-import 'package:sparksocial/src/features/profile/providers/edit_profile_state.dart';
 import 'package:sparksocial/src/features/profile/providers/edit_profile_provider.dart';
+import 'package:sparksocial/src/features/profile/providers/edit_profile_state.dart';
 
 /// Widget for editing the profile avatar
 class ProfileAvatarEditor extends StatefulWidget {
+  /// Creates a profile avatar editor
+  const ProfileAvatarEditor({required this.state, required this.notifier, super.key});
+
   /// Current state of the profile being edited
   final EditProfileState state;
 
   /// The notifier to trigger actions on the profile
   final EditProfile notifier;
 
-  /// Creates a profile avatar editor
-  const ProfileAvatarEditor({super.key, required this.state, required this.notifier});
-
   @override
   State<ProfileAvatarEditor> createState() => _ProfileAvatarEditorState();
 }
diff --git a/lib/src/features/profile/ui/widgets/profile_content_thumbnail.dart b/lib/src/features/profile/ui/widgets/profile_content_thumbnail.dart
index 5148d070..0562e32f 100644
--- a/lib/src/features/profile/ui/widgets/profile_content_thumbnail.dart
+++ b/lib/src/features/profile/ui/widgets/profile_content_thumbnail.dart
@@ -1,35 +1,33 @@
-import 'package:flutter/material.dart';
 import 'package:fluentui_system_icons/fluentui_system_icons.dart';
+import 'package:flutter/material.dart';
+import 'package:get_it/get_it.dart';
 import 'package:sparksocial/src/core/theme/data/models/colors.dart';
-import 'package:sparksocial/src/core/utils/logging/logger.dart';
 import 'package:sparksocial/src/core/utils/logging/log_service.dart';
-import 'package:get_it/get_it.dart';
 
 class ProfileContentThumbnail extends StatelessWidget {
-  final int index;
-  final Color backgroundColor;
-  final IconData icon;
-  final String viewCount;
-  final String? duration;
-
   const ProfileContentThumbnail({
-    super.key,
     required this.index,
     required this.backgroundColor,
     required this.icon,
     required this.viewCount,
+    super.key,
     this.duration,
   });
+  final int index;
+  final Color backgroundColor;
+  final IconData icon;
+  final String viewCount;
+  final String? duration;
 
   @override
   Widget build(BuildContext context) {
-    final SparkLogger logger = GetIt.instance<LogService>().getLogger('ProfileContentThumbnail');
+    final logger = GetIt.instance<LogService>().getLogger('ProfileContentThumbnail');
 
     return GestureDetector(
       onTap: () {
         logger.d('Content clicked at index $index');
       },
-      child: Container(
+      child: ColoredBox(
         color: backgroundColor,
         child: Stack(
           children: [
diff --git a/lib/src/features/profile/ui/widgets/profile_description.dart b/lib/src/features/profile/ui/widgets/profile_description.dart
index f8228f98..7517b11f 100644
--- a/lib/src/features/profile/ui/widgets/profile_description.dart
+++ b/lib/src/features/profile/ui/widgets/profile_description.dart
@@ -3,20 +3,19 @@ import 'package:flutter/material.dart';
 import 'package:sparksocial/src/core/theme/data/models/colors.dart';
 
 class ProfileDescription extends StatefulWidget {
-  final String text;
-  final TextStyle? style;
-  final int maxLines;
-  final Function(bool isExpanded)? onExpandToggle;
-  final Function(String username)? onMentionTap;
-
   const ProfileDescription({
-    super.key,
     required this.text,
+    super.key,
     this.style,
     this.maxLines = 2,
     this.onExpandToggle,
     this.onMentionTap,
   });
+  final String text;
+  final TextStyle? style;
+  final int maxLines;
+  final Function(bool isExpanded)? onExpandToggle;
+  final Function(String username)? onMentionTap;
 
   @override
   State<ProfileDescription> createState() => _ProfileDescriptionState();
@@ -33,8 +32,8 @@ class _ProfileDescriptionState extends State<ProfileDescription> with SingleTick
     _animationController = AnimationController(vsync: this, duration: const Duration(milliseconds: 300));
 
     _scaleAnimation = TweenSequence<double>([
-      TweenSequenceItem(tween: Tween<double>(begin: 1.0, end: 1.03), weight: 30),
-      TweenSequenceItem(tween: Tween<double>(begin: 1.03, end: 1.0), weight: 70),
+      TweenSequenceItem(tween: Tween<double>(begin: 1, end: 1.03), weight: 30),
+      TweenSequenceItem(tween: Tween<double>(begin: 1.03, end: 1), weight: 70),
     ]).animate(CurvedAnimation(parent: _animationController, curve: Curves.easeInOut));
   }
 
@@ -60,13 +59,13 @@ class _ProfileDescriptionState extends State<ProfileDescription> with SingleTick
   }
 
   List<Match> _findUsernameMatches(String text) {
-    final RegExp usernameRegex = RegExp(r'\B@([a-zA-Z0-9_.-]+\.[a-zA-Z]{2,}|[a-zA-Z0-9_]+)', caseSensitive: false);
+    final usernameRegex = RegExp(r'\B@([a-zA-Z0-9_.-]+\.[a-zA-Z]{2,}|[a-zA-Z0-9_]+)', caseSensitive: false);
     return usernameRegex.allMatches(text).toList();
   }
 
   List<InlineSpan> _buildTextSpans(String text, List<Match> usernameMatches, TextStyle defaultStyle) {
-    final List<InlineSpan> spans = [];
-    int lastEnd = 0;
+    final spans = <InlineSpan>[];
+    var lastEnd = 0;
 
     usernameMatches.sort((a, b) => a.start.compareTo(b.start));
 
@@ -75,18 +74,17 @@ class _ProfileDescriptionState extends State<ProfileDescription> with SingleTick
         spans.add(TextSpan(text: text.substring(lastEnd, match.start))); // Default style is applied by RichText
       }
 
-      final String username = match.group(0)!;
+      final username = match.group(0)!;
       spans.add(
         TextSpan(
           text: username,
           style: const TextStyle(color: AppColors.primary, fontWeight: FontWeight.bold),
-          recognizer:
-              TapGestureRecognizer()
-                ..onTap = () {
-                  if (widget.onMentionTap != null) {
-                    widget.onMentionTap!(username);
-                  }
-                },
+          recognizer: TapGestureRecognizer()
+            ..onTap = () {
+              if (widget.onMentionTap != null) {
+                widget.onMentionTap!(username);
+              }
+            },
         ),
       );
       lastEnd = match.end;
@@ -100,12 +98,12 @@ class _ProfileDescriptionState extends State<ProfileDescription> with SingleTick
 
   @override
   Widget build(BuildContext context) {
-    final ThemeData theme = Theme.of(context);
+    final theme = Theme.of(context);
     final usernameMatches = _findUsernameMatches(widget.text);
-    final TextStyle defaultStyle =
+    final defaultStyle =
         widget.style ?? TextStyle(color: theme.textTheme.bodyMedium?.color ?? theme.colorScheme.onSurface, fontSize: 14);
 
-    final TextSpan textSpan = TextSpan(
+    final textSpan = TextSpan(
       children: _buildTextSpans(widget.text, usernameMatches, defaultStyle),
       style: defaultStyle, // Apply default style to the parent TextSpan
     );
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 544d8b5e..e1c35411 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
@@ -1,5 +1,5 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:atproto_core/atproto_core.dart';
+import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:get_it/get_it.dart';
@@ -8,23 +8,22 @@ import 'package:sparksocial/src/core/network/atproto/data/repositories/sprk_repo
 import 'package:sparksocial/src/core/routing/app_router.dart';
 import 'package:sparksocial/src/core/storage/cache/sql_cache_interface.dart';
 import 'package:sparksocial/src/core/theme/data/models/colors.dart';
+import 'package:sparksocial/src/core/utils/label_utils.dart';
+import 'package:sparksocial/src/core/widgets/content_warning_overlay.dart';
+import 'package:sparksocial/src/core/widgets/heart_animation.dart';
 import 'package:sparksocial/src/features/feed/providers/like_post.dart';
 import 'package:sparksocial/src/features/feed/ui/widgets/action_buttons/side_action_bar.dart';
 import 'package:sparksocial/src/features/feed/ui/widgets/images/image_carousel.dart';
 import 'package:sparksocial/src/features/feed/ui/widgets/post/info_bar.dart';
 import 'package:sparksocial/src/features/feed/ui/widgets/videos/video_player.dart';
-import 'package:sparksocial/src/core/widgets/heart_animation.dart';
-import 'package:sparksocial/src/core/utils/label_utils.dart';
-import 'package:sparksocial/src/core/widgets/content_warning_overlay.dart';
 
 class ProfileFeedPostWidget extends ConsumerStatefulWidget {
+  const ProfileFeedPostWidget({required this.postUri, required this.profileUri, required this.videosOnly, super.key, this.post});
   final AtUri postUri;
   final AtUri profileUri;
   final bool videosOnly;
   final PostView? post;
 
-  const ProfileFeedPostWidget({super.key, required this.postUri, required this.profileUri, required this.videosOnly, this.post});
-
   @override
   ConsumerState<ProfileFeedPostWidget> createState() => _ProfileFeedPostWidgetState();
 }
@@ -149,16 +148,16 @@ class _ProfileFeedPostWidgetState extends ConsumerState<ProfileFeedPostWidget> {
         future: _loadPostWithFallback(),
         builder: (context, snapshot) {
           if (snapshot.connectionState == ConnectionState.waiting) {
-            return Container(
+            return const ColoredBox(
               color: AppColors.black,
-              child: const Center(child: CircularProgressIndicator(color: AppColors.white)),
+              child: Center(child: CircularProgressIndicator(color: AppColors.white)),
             );
           }
 
           if (snapshot.hasError || !snapshot.hasData) {
-            return Container(
+            return const ColoredBox(
               color: AppColors.black,
-              child: const Center(
+              child: Center(
                 child: Column(
                   mainAxisAlignment: MainAxisAlignment.center,
                   children: [
diff --git a/lib/src/features/profile/ui/widgets/profile_grid_widget.dart b/lib/src/features/profile/ui/widgets/profile_grid_widget.dart
index 553c667c..b92e4c4f 100644
--- a/lib/src/features/profile/ui/widgets/profile_grid_widget.dart
+++ b/lib/src/features/profile/ui/widgets/profile_grid_widget.dart
@@ -14,11 +14,10 @@ import 'package:sparksocial/src/core/utils/label_utils.dart';
 import 'package:sparksocial/src/features/profile/providers/profile_feed_provider.dart';
 
 class ProfileGridWidget extends ConsumerStatefulWidget {
+  const ProfileGridWidget({required this.profileUri, required this.videosOnly, super.key});
   final AtUri profileUri;
   final bool videosOnly;
 
-  const ProfileGridWidget({super.key, required this.profileUri, required this.videosOnly});
-
   @override
   ConsumerState<ProfileGridWidget> createState() => _ProfileGridWidgetState();
 }
@@ -84,7 +83,7 @@ class _ProfileGridWidgetState extends ConsumerState<ProfileGridWidget> {
           itemCount: state.loadedPosts.length + (state.isEndOfNetwork ? 0 : 1),
           itemBuilder: (context, index) {
             if (index >= state.loadedPosts.length) {
-              return Container(
+              return ColoredBox(
                 color: Theme.of(context).colorScheme.surfaceContainerHighest,
                 child: const Center(child: SizedBox(width: 20, height: 20, child: CircularProgressIndicator(strokeWidth: 2))),
               );
@@ -145,12 +144,11 @@ class _ProfileGridWidgetState extends ConsumerState<ProfileGridWidget> {
 }
 
 class ProfileGridTile extends StatefulWidget {
+  const ProfileGridTile({required this.postView, required this.onTap, super.key, this.postSource});
   final PostView postView;
   final String? postSource;
   final VoidCallback onTap;
 
-  const ProfileGridTile({super.key, required this.postView, this.postSource, required this.onTap});
-
   @override
   State<ProfileGridTile> createState() => _ProfileGridTileState();
 }
@@ -189,19 +187,19 @@ class _ProfileGridTileState extends State<ProfileGridTile> {
             imageUrl: thumbnailUrl,
             fit: BoxFit.cover,
             placeholder: (context, url) => const SizedBox.shrink(),
-            errorWidget: (context, url, error) => Container(
+            errorWidget: (context, url, error) => ColoredBox(
               color: Theme.of(context).colorScheme.surfaceContainerHighest,
               child: const Center(child: Icon(FluentIcons.error_circle_24_regular, size: 20)),
             ),
           )
-        : Container(
+        : ColoredBox(
             color: Theme.of(context).colorScheme.surfaceContainerHighest,
             child: const Center(child: Icon(FluentIcons.image_off_24_regular, size: 20)),
           );
 
     return GestureDetector(
       onTap: widget.onTap,
-      child: Container(
+      child: ColoredBox(
         color: AppColors.black,
         child: thumbnailUrl.isNotEmpty
             ? Stack(
@@ -209,7 +207,7 @@ class _ProfileGridTileState extends State<ProfileGridTile> {
                 children: [
                   if (_shouldBlur)
                     ImageFiltered(
-                      imageFilter: ImageFilter.blur(sigmaX: 20.0, sigmaY: 20.0),
+                      imageFilter: ImageFilter.blur(sigmaX: 20, sigmaY: 20),
                       child: image,
                     )
                   else
@@ -230,7 +228,7 @@ class _ProfileGridTileState extends State<ProfileGridTile> {
                     ),
                 ],
               )
-            : Container(
+            : ColoredBox(
                 color: Theme.of(context).colorScheme.surfaceContainerHighest,
                 child: const Center(child: Icon(FluentIcons.image_off_24_regular, size: 20)),
               ),
diff --git a/lib/src/features/profile/ui/widgets/profile_header.dart b/lib/src/features/profile/ui/widgets/profile_header.dart
index 071d1814..6fc98779 100644
--- a/lib/src/features/profile/ui/widgets/profile_header.dart
+++ b/lib/src/features/profile/ui/widgets/profile_header.dart
@@ -4,41 +4,38 @@ import 'package:fluentui_system_icons/fluentui_system_icons.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:get_it/get_it.dart';
-
+import 'package:sparksocial/src/core/auth/data/repositories/identity_repository.dart';
 import 'package:sparksocial/src/core/network/atproto/data/models/actor_models.dart' as actor_models;
+import 'package:sparksocial/src/core/network/atproto/data/repositories/sprk_repository.dart';
 import 'package:sparksocial/src/core/routing/app_router.dart';
 import 'package:sparksocial/src/core/theme/data/models/colors.dart';
+import 'package:sparksocial/src/core/utils/logging/log_service.dart';
+import 'package:sparksocial/src/core/utils/logging/logger.dart';
 import 'package:sparksocial/src/core/utils/text_formatter.dart';
 import 'package:sparksocial/src/core/widgets/user_avatar.dart';
-import 'package:sparksocial/src/core/auth/data/repositories/identity_repository.dart';
-import 'package:sparksocial/src/core/utils/logging/logger.dart';
-import 'package:sparksocial/src/core/utils/logging/log_service.dart';
-import 'package:sparksocial/src/core/network/atproto/data/repositories/sprk_repository.dart';
-
 // Local imports for other profile widgets that will be migrated
-import 'profile_description.dart';
-import 'profile_links.dart'; // Placeholder will be created
-import 'profile_stat_item.dart'; // Placeholder will be created
+import 'package:sparksocial/src/features/profile/ui/widgets/profile_description.dart';
+import 'package:sparksocial/src/features/profile/ui/widgets/profile_links.dart'; // Placeholder will be created
+import 'package:sparksocial/src/features/profile/ui/widgets/profile_stat_item.dart'; // Placeholder will be created
 
 class ProfileHeader extends StatefulWidget {
-  final actor_models.ProfileViewDetailed profile;
-  final bool isCurrentUser;
-  final bool isEarlySupporter;
-  final VoidCallback onEarlySupporterTap;
-  final VoidCallback onEditTap;
-  final VoidCallback onShareTap;
-  final VoidCallback onFollowTap;
-
   const ProfileHeader({
-    super.key,
     required this.profile,
     required this.isCurrentUser,
-    this.isEarlySupporter = false,
     required this.onEarlySupporterTap,
     required this.onEditTap,
     required this.onShareTap,
     required this.onFollowTap,
+    super.key,
+    this.isEarlySupporter = false,
   });
+  final actor_models.ProfileViewDetailed profile;
+  final bool isCurrentUser;
+  final bool isEarlySupporter;
+  final VoidCallback onEarlySupporterTap;
+  final VoidCallback onEditTap;
+  final VoidCallback onShareTap;
+  final VoidCallback onFollowTap;
 
   @override
   State<ProfileHeader> createState() => _ProfileHeaderState();
@@ -59,10 +56,10 @@ class _ProfileHeaderState extends State<ProfileHeader> {
 
   Future<void> _handleUsernameTap(String username) async {
     try {
-      final String cleanUsername = username.startsWith('@') ? username.substring(1) : username;
+      final cleanUsername = username.startsWith('@') ? username.substring(1) : username;
       _logger.d('Username clicked: $cleanUsername');
 
-      final String? didRes = await _identityRepository.resolveHandleToDid(cleanUsername);
+      final didRes = await _identityRepository.resolveHandleToDid(cleanUsername);
       if (didRes == null) {
         _logger.w('Could not resolve handle to DID for $cleanUsername');
         return;
@@ -79,9 +76,7 @@ class _ProfileHeaderState extends State<ProfileHeader> {
     if (!(widget.profile.stories?.isNotEmpty ?? false)) return;
 
     try {
-      final storyUris = widget.profile.stories!
-          .map((strongRef) => strongRef.uri)
-          .toList();
+      final storyUris = widget.profile.stories!.map((strongRef) => strongRef.uri).toList();
 
       if (storyUris.isEmpty) return;
       final stories = await _sprkRepository.feed.getStoryViews(storyUris);
@@ -103,7 +98,7 @@ class _ProfileHeaderState extends State<ProfileHeader> {
 
       if (mounted) {
         context.router.push(
-          AllStoriesRoute(storiesByAuthor: {authorBasic: stories}, initialAuthorIndex: 0),
+          AllStoriesRoute(storiesByAuthor: {authorBasic: stories}),
         );
       }
     } catch (e, s) {
@@ -113,11 +108,11 @@ class _ProfileHeaderState extends State<ProfileHeader> {
 
   @override
   Widget build(BuildContext context) {
-    final ThemeData theme = Theme.of(context);
-    final bool isDarkMode = theme.brightness == Brightness.dark;
+    final theme = Theme.of(context);
+    final isDarkMode = theme.brightness == Brightness.dark;
 
     // Determine if the profile has any stories associated with it.
-    final bool hasStories = (widget.profile.stories?.isNotEmpty ?? false);
+    final hasStories = widget.profile.stories?.isNotEmpty ?? false;
 
     final String displayNameForAvatar;
     if (widget.profile.displayName case final String dn when dn.isNotEmpty) {
@@ -129,7 +124,7 @@ class _ProfileHeaderState extends State<ProfileHeader> {
     final Widget avatarWidget;
     if (widget.profile.avatar case final AtUri av when av.toString().isNotEmpty) {
       avatarWidget = ClipOval(
-        child: UserAvatar(imageUrl: av.toString(), username: displayNameForAvatar, size: 90, borderWidth: 0),
+        child: UserAvatar(imageUrl: av.toString(), username: displayNameForAvatar, size: 90),
       );
     } else {
       avatarWidget = Icon(
@@ -146,23 +141,22 @@ class _ProfileHeaderState extends State<ProfileHeader> {
       headerDisplayName = widget.profile.handle;
     }
 
-    final String handle = widget.profile.handle;
-    final String description = widget.profile.description ?? '';
+    final handle = widget.profile.handle;
+    final description = widget.profile.description ?? '';
 
-    final String postsCount = TextFormatter.formatCount(widget.profile.postsCount);
-    final String followersCount = TextFormatter.formatCount(widget.profile.followersCount);
-    final String followsCount = TextFormatter.formatCount(widget.profile.followsCount);
+    final postsCount = TextFormatter.formatCount(widget.profile.postsCount);
+    final followersCount = TextFormatter.formatCount(widget.profile.followersCount);
+    final followsCount = TextFormatter.formatCount(widget.profile.followsCount);
 
-    final List<String> links = TextFormatter.extractUrls(description);
-    final List<String> uniqueLinks = links.toSet().toList();
+    final links = TextFormatter.extractUrls(description);
+    final uniqueLinks = links.toSet().toList();
 
     return Padding(
-      padding: const EdgeInsets.all(16.0),
+      padding: const EdgeInsets.all(16),
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           Row(
-            crossAxisAlignment: CrossAxisAlignment.center,
             children: [
               Stack(
                 children: [
@@ -183,8 +177,7 @@ class _ProfileHeaderState extends State<ProfileHeader> {
                           : BoxDecoration(
                               color: isDarkMode ? AppColors.darkPurple : AppColors.lightLavender,
                               shape: BoxShape.circle,
-                              border: Border.all(
-                                  color: isDarkMode ? AppColors.darkPurple : AppColors.lightLavender, width: 2),
+                              border: Border.all(color: isDarkMode ? AppColors.darkPurple : AppColors.lightLavender, width: 2),
                             ),
                       child: hasStories
                           ? Container(
@@ -209,8 +202,7 @@ class _ProfileHeaderState extends State<ProfileHeader> {
                             color: AppColors.primary,
                             border: Border.all(color: isDarkMode ? AppColors.deepPurple : AppColors.white, width: 2),
                           ),
-                          child:
-                              const Center(child: Icon(FluentIcons.add_24_filled, size: 18, color: AppColors.white)),
+                          child: const Center(child: Icon(FluentIcons.add_24_filled, size: 18, color: AppColors.white)),
                         ),
                       ),
                     ),
@@ -272,7 +264,7 @@ class _ProfileHeaderState extends State<ProfileHeader> {
               ),
             if (uniqueLinks.isNotEmpty)
               Padding(
-                padding: const EdgeInsets.only(top: 4.0),
+                padding: const EdgeInsets.only(top: 4),
                 child: ProfileLinks(links: uniqueLinks),
               ),
           ],
@@ -281,7 +273,6 @@ class _ProfileHeaderState extends State<ProfileHeader> {
             children: [
               if (widget.isCurrentUser) ...[
                 Expanded(
-                  flex: 1,
                   child: Container(
                     constraints: const BoxConstraints(minHeight: 36),
                     child: ElevatedButton(
@@ -300,7 +291,6 @@ class _ProfileHeaderState extends State<ProfileHeader> {
                 const SizedBox(width: 8),
               ] else ...[
                 Expanded(
-                  flex: 1,
                   child: Container(
                     constraints: const BoxConstraints(minHeight: 36),
                     child: ElevatedButton(
diff --git a/lib/src/features/profile/ui/widgets/profile_links.dart b/lib/src/features/profile/ui/widgets/profile_links.dart
index 4e99b958..bf7d5d73 100644
--- a/lib/src/features/profile/ui/widgets/profile_links.dart
+++ b/lib/src/features/profile/ui/widgets/profile_links.dart
@@ -1,19 +1,17 @@
+import 'package:fluentui_system_icons/fluentui_system_icons.dart';
 import 'package:flutter/material.dart';
+import 'package:get_it/get_it.dart';
 import 'package:sparksocial/src/core/theme/data/models/colors.dart';
-import 'package:fluentui_system_icons/fluentui_system_icons.dart';
-import 'package:sparksocial/src/core/utils/logging/logger.dart';
 import 'package:sparksocial/src/core/utils/logging/log_service.dart';
-import 'package:get_it/get_it.dart';
 
 // Placeholder for ProfileLinks widget
 class ProfileLinks extends StatelessWidget {
-  final List<String> links;
-
   const ProfileLinks({required this.links, super.key});
+  final List<String> links;
 
   @override
   Widget build(BuildContext context) {
-    final SparkLogger logger = GetIt.instance<LogService>().getLogger('ProfileLinks');
+    final logger = GetIt.instance<LogService>().getLogger('ProfileLinks');
 
     logger.d('Building ProfileLinks with ${links.length} links: $links');
 
@@ -22,7 +20,7 @@ class ProfileLinks extends StatelessWidget {
     }
 
     return Container(
-      margin: const EdgeInsets.only(top: 6.0),
+      margin: const EdgeInsets.only(top: 6),
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: links.map((url) => _ProfileLinkItem(url: url)).toList(),
@@ -32,26 +30,24 @@ class ProfileLinks extends StatelessWidget {
 }
 
 class _ProfileLinkItem extends StatelessWidget {
-  final String url;
-
   const _ProfileLinkItem({required this.url});
+  final String url;
 
   @override
   Widget build(BuildContext context) {
     // Use theme colors if possible, or keep AppColors.blue if it's a specific brand blue
-    final Color linkColor = AppColors.blue; // Or: Theme.of(context).colorScheme.primary;
+    const linkColor = AppColors.blue; // Or: Theme.of(context).colorScheme.primary;
 
     return Padding(
-      padding: const EdgeInsets.only(top: 4.0, bottom: 2.0),
+      padding: const EdgeInsets.only(top: 4, bottom: 2),
       child: Row(
-        crossAxisAlignment: CrossAxisAlignment.center,
         children: [
-          Icon(FluentIcons.link_24_regular, size: 16, color: linkColor),
+          const Icon(FluentIcons.link_24_regular, size: 16, color: linkColor),
           const SizedBox(width: 6),
           Expanded(
             child: Text(
               url,
-              style: TextStyle(color: linkColor, fontWeight: FontWeight.bold, fontSize: 14),
+              style: const TextStyle(color: linkColor, fontWeight: FontWeight.bold, fontSize: 14),
               overflow: TextOverflow.ellipsis,
             ),
           ),
diff --git a/lib/src/features/profile/ui/widgets/profile_save_button.dart b/lib/src/features/profile/ui/widgets/profile_save_button.dart
index 363c2025..4aee1fc0 100644
--- a/lib/src/features/profile/ui/widgets/profile_save_button.dart
+++ b/lib/src/features/profile/ui/widgets/profile_save_button.dart
@@ -2,11 +2,14 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:sparksocial/src/core/theme/data/models/colors.dart';
 import 'package:sparksocial/src/core/utils/logging/logger.dart';
-import 'package:sparksocial/src/features/profile/providers/edit_profile_state.dart';
 import 'package:sparksocial/src/features/profile/providers/edit_profile_provider.dart';
+import 'package:sparksocial/src/features/profile/providers/edit_profile_state.dart';
 
 /// Button widget for saving profile changes
 class ProfileSaveButton extends StatelessWidget {
+  /// Creates a profile save button
+  const ProfileSaveButton({required this.state, required this.notifier, required this.formKey, required this.logger, super.key});
+
   /// Current state of the profile being edited
   final EditProfileState state;
 
@@ -19,48 +22,43 @@ class ProfileSaveButton extends StatelessWidget {
   /// Logger for error reporting
   final SparkLogger logger;
 
-  /// Creates a profile save button
-  const ProfileSaveButton({super.key, required this.state, required this.notifier, required this.formKey, required this.logger});
-
   @override
   Widget build(BuildContext context) {
     return SizedBox(
       width: double.infinity,
       child: ElevatedButton(
-        onPressed:
-            state.isSaving
-                ? null
-                : () async {
-                  if (!formKey.currentState!.validate()) return;
+        onPressed: state.isSaving
+            ? null
+            : () async {
+                if (!formKey.currentState!.validate()) return;
 
-                  try {
-                    final result = await notifier.saveProfile();
-                    if (result && context.mounted) {
-                      context.router.maybePop(true);
-                    } else if (context.mounted) {
-                      ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('Failed to update profile')));
-                    }
-                  } catch (e) {
-                    logger.e('Error saving profile', error: e);
-                    if (context.mounted) {
-                      ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Error updating profile: $e')));
-                    }
+                try {
+                  final result = await notifier.saveProfile();
+                  if (result && context.mounted) {
+                    context.router.maybePop(true);
+                  } else if (context.mounted) {
+                    ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('Failed to update profile')));
+                  }
+                } catch (e) {
+                  logger.e('Error saving profile', error: e);
+                  if (context.mounted) {
+                    ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Error updating profile: $e')));
                   }
-                },
+                }
+              },
         style: ElevatedButton.styleFrom(
           backgroundColor: AppColors.primary,
           foregroundColor: Colors.white,
           padding: const EdgeInsets.symmetric(vertical: 12),
           shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
         ),
-        child:
-            state.isSaving
-                ? const SizedBox(
-                  width: 24,
-                  height: 24,
-                  child: CircularProgressIndicator(valueColor: AlwaysStoppedAnimation<Color>(Colors.white), strokeWidth: 2),
-                )
-                : const Text('Save', style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600)),
+        child: state.isSaving
+            ? const SizedBox(
+                width: 24,
+                height: 24,
+                child: CircularProgressIndicator(valueColor: AlwaysStoppedAnimation<Color>(Colors.white), strokeWidth: 2),
+              )
+            : const Text('Save', style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600)),
       ),
     );
   }
diff --git a/lib/src/features/profile/ui/widgets/profile_stat_item.dart b/lib/src/features/profile/ui/widgets/profile_stat_item.dart
index 4be187bc..00007c15 100644
--- a/lib/src/features/profile/ui/widgets/profile_stat_item.dart
+++ b/lib/src/features/profile/ui/widgets/profile_stat_item.dart
@@ -2,13 +2,13 @@ import 'package:flutter/material.dart';
 
 // Placeholder for ProfileStatItem widget
 class ProfileStatItem extends StatelessWidget {
+  const ProfileStatItem({required this.count, required this.label, super.key});
   final String count;
   final String label;
-  const ProfileStatItem({super.key, required this.count, required this.label});
 
   @override
   Widget build(BuildContext context) {
-    final ThemeData theme = Theme.of(context);
+    final theme = Theme.of(context);
     return Column(
       mainAxisSize: MainAxisSize.min,
       mainAxisAlignment: MainAxisAlignment.center,
diff --git a/lib/src/features/profile/ui/widgets/profile_tabs.dart b/lib/src/features/profile/ui/widgets/profile_tabs.dart
index 88242260..4ccce29b 100644
--- a/lib/src/features/profile/ui/widgets/profile_tabs.dart
+++ b/lib/src/features/profile/ui/widgets/profile_tabs.dart
@@ -2,15 +2,16 @@ import 'package:fluentui_system_icons/fluentui_system_icons.dart';
 import 'package:flutter/material.dart';
 
 class ProfileTabs extends StatelessWidget {
+  // This might be handled by a provider later if tabs change based on auth state
+
+  const ProfileTabs({required this.selectedIndex, required this.onTabSelected, required this.isAuthenticated, super.key});
   final int selectedIndex;
   final Function(int) onTabSelected;
-  final bool isAuthenticated; // This might be handled by a provider later if tabs change based on auth state
-
-  const ProfileTabs({super.key, required this.selectedIndex, required this.onTabSelected, required this.isAuthenticated});
+  final bool isAuthenticated;
 
   @override
   Widget build(BuildContext context) {
-    final ThemeData theme = Theme.of(context);
+    final theme = Theme.of(context);
     return Container(
       decoration: BoxDecoration(
         color: theme.colorScheme.surface, // Updated color
@@ -49,17 +50,16 @@ class ProfileTabs extends StatelessWidget {
 }
 
 class _ProfileTabItemWidget extends StatelessWidget {
+  const _ProfileTabItemWidget({required this.icon, required this.filledIcon, required this.isSelected, required this.onTap});
   final IconData icon;
   final IconData filledIcon;
   final bool isSelected;
   final VoidCallback onTap;
 
-  const _ProfileTabItemWidget({required this.icon, required this.filledIcon, required this.isSelected, required this.onTap});
-
   @override
   Widget build(BuildContext context) {
-    final ThemeData theme = Theme.of(context);
-    final Color iconColor = isSelected ? theme.colorScheme.primary : theme.colorScheme.onSurfaceVariant;
+    final theme = Theme.of(context);
+    final iconColor = isSelected ? theme.colorScheme.primary : theme.colorScheme.onSurfaceVariant;
 
     return Expanded(
       // Ensures tabs take equal space
@@ -84,11 +84,10 @@ class _ProfileTabItemWidget extends StatelessWidget {
 }
 
 class StickyTabBarDelegate extends SliverPersistentHeaderDelegate {
+  StickyTabBarDelegate({required this.child, this.height = 50.0});
   final Widget child;
   final double height;
 
-  StickyTabBarDelegate({required this.child, this.height = 50.0});
-
   @override
   Widget build(BuildContext context, double shrinkOffset, bool overlapsContent) {
     return Material(
@@ -105,7 +104,7 @@ class StickyTabBarDelegate extends SliverPersistentHeaderDelegate {
 
   @override
   bool shouldRebuild(covariant SliverPersistentHeaderDelegate oldDelegate) {
-    if (oldDelegate case StickyTabBarDelegate delegate) {
+    if (oldDelegate case final StickyTabBarDelegate delegate) {
       return delegate.height != height || delegate.child != child;
     }
     return true;
diff --git a/lib/src/features/profile/ui/widgets/profile_text_field.dart b/lib/src/features/profile/ui/widgets/profile_text_field.dart
index 3f433f71..c7877849 100644
--- a/lib/src/features/profile/ui/widgets/profile_text_field.dart
+++ b/lib/src/features/profile/ui/widgets/profile_text_field.dart
@@ -3,6 +3,16 @@ import 'package:sparksocial/src/core/theme/data/models/colors.dart';
 
 /// A customized text field widget for profile editing
 class ProfileTextField extends StatefulWidget {
+  /// Creates a profile text field
+  const ProfileTextField({
+    required this.initialValue,
+    required this.hintText,
+    required this.onChanged,
+    required this.bgColor,
+    super.key,
+    this.maxLines = 1,
+  });
+
   /// Initial value of the text field
   final String initialValue;
 
@@ -18,16 +28,6 @@ class ProfileTextField extends StatefulWidget {
   /// Number of lines for the text field
   final int maxLines;
 
-  /// Creates a profile text field
-  const ProfileTextField({
-    super.key,
-    required this.initialValue,
-    required this.hintText,
-    required this.onChanged,
-    required this.bgColor,
-    this.maxLines = 1,
-  });
-
   @override
   State<ProfileTextField> createState() => _ProfileTextFieldState();
 }
@@ -65,14 +65,17 @@ class _ProfileTextFieldState extends State<ProfileTextField> {
         hintText: widget.hintText,
         filled: true,
         fillColor: widget.bgColor,
-        border: OutlineInputBorder(borderRadius: BorderRadius.circular(8), borderSide: BorderSide(color: AppColors.border)),
+        border: OutlineInputBorder(
+          borderRadius: BorderRadius.circular(8),
+          borderSide: const BorderSide(color: AppColors.border),
+        ),
         enabledBorder: OutlineInputBorder(
           borderRadius: BorderRadius.circular(8),
-          borderSide: BorderSide(color: AppColors.border),
+          borderSide: const BorderSide(color: AppColors.border),
         ),
         focusedBorder: OutlineInputBorder(
           borderRadius: BorderRadius.circular(8),
-          borderSide: BorderSide(color: AppColors.primary),
+          borderSide: const BorderSide(color: AppColors.primary),
         ),
       ),
     );
diff --git a/lib/src/features/profile/ui/widgets/profile_video_tile.dart b/lib/src/features/profile/ui/widgets/profile_video_tile.dart
index 585615d8..41734564 100644
--- a/lib/src/features/profile/ui/widgets/profile_video_tile.dart
+++ b/lib/src/features/profile/ui/widgets/profile_video_tile.dart
@@ -1,34 +1,33 @@
-import 'package:flutter/material.dart';
+import 'package:cached_network_image/cached_network_image.dart';
 import 'package:fluentui_system_icons/fluentui_system_icons.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
-import 'package:cached_network_image/cached_network_image.dart';
 import 'package:sparksocial/src/core/theme/data/models/colors.dart';
 
 class ProfileVideoTile extends StatelessWidget {
-  final String? videoUrl;
-  final String? thumbnailUrl;
-  final String username;
-  final String description;
-  final List<String> hashtags;
-  final int index;
-  final int likeCount;
-  final VoidCallback onTap;
-  final bool isSprk;
-  final bool isImage;
-
   const ProfileVideoTile({
-    super.key,
     required this.videoUrl,
-    this.thumbnailUrl,
     required this.username,
     required this.description,
     required this.hashtags,
     required this.index,
-    this.likeCount = 0,
     required this.onTap,
+    super.key,
+    this.thumbnailUrl,
+    this.likeCount = 0,
     this.isSprk = false,
     this.isImage = false,
   });
+  final String? videoUrl;
+  final String? thumbnailUrl;
+  final String username;
+  final String description;
+  final List<String> hashtags;
+  final int index;
+  final int likeCount;
+  final VoidCallback onTap;
+  final bool isSprk;
+  final bool isImage;
 
   @override
   Widget build(BuildContext context) {
@@ -37,18 +36,15 @@ class ProfileVideoTile extends StatelessWidget {
       thumbnailWidget = CachedNetworkImage(
         imageUrl: url,
         fit: BoxFit.cover,
-        alignment: Alignment.center,
         fadeInDuration: const Duration(milliseconds: 200),
-        placeholder:
-            (context, url) => Container(
-              color: Colors.black,
-              child: const Center(child: CircularProgressIndicator(strokeWidth: 2, color: Colors.white)),
-            ),
-        errorWidget:
-            (context, url, error) => Container(
-              color: Colors.black,
-              child: const Center(child: Icon(FluentIcons.video_24_regular, color: Colors.white, size: 24)),
-            ),
+        placeholder: (context, url) => const ColoredBox(
+          color: Colors.black,
+          child: Center(child: CircularProgressIndicator(strokeWidth: 2, color: Colors.white)),
+        ),
+        errorWidget: (context, url, error) => const ColoredBox(
+          color: Colors.black,
+          child: Center(child: Icon(FluentIcons.video_24_regular, color: Colors.white, size: 24)),
+        ),
       );
     } else {
       thumbnailWidget = Center(child: Icon(FluentIcons.video_24_regular, color: AppColors.white.withAlpha(204), size: 24));
@@ -56,7 +52,7 @@ class ProfileVideoTile extends StatelessWidget {
 
     return GestureDetector(
       onTap: onTap,
-      child: Container(
+      child: ColoredBox(
         color: AppColors.richPurple.withAlpha(120),
         child: Stack(
           fit: StackFit.expand,
@@ -81,7 +77,7 @@ class ProfileVideoTile extends StatelessWidget {
                 decoration: BoxDecoration(
                   borderRadius: BorderRadius.circular(42),
                   boxShadow: [
-                    BoxShadow(color: AppColors.black.withAlpha(30), blurRadius: 4, spreadRadius: 1, offset: const Offset(0, 0)),
+                    BoxShadow(color: AppColors.black.withAlpha(30), blurRadius: 4, spreadRadius: 1),
                   ],
                 ),
                 child: Icon(
@@ -99,13 +95,12 @@ class ProfileVideoTile extends StatelessWidget {
                 decoration: BoxDecoration(
                   borderRadius: BorderRadius.circular(42),
                   boxShadow: [
-                    BoxShadow(color: AppColors.black.withAlpha(30), blurRadius: 4, spreadRadius: 1, offset: const Offset(0, 0)),
+                    BoxShadow(color: AppColors.black.withAlpha(30), blurRadius: 4, spreadRadius: 1),
                   ],
                 ),
-                child:
-                    isSprk
-                        ? SvgPicture.asset('assets/images/sprk.svg', width: 14, height: 14)
-                        : SvgPicture.asset('assets/images/bsky.svg', width: 14, height: 14),
+                child: isSprk
+                    ? SvgPicture.asset('assets/images/sprk.svg', width: 14, height: 14)
+                    : SvgPicture.asset('assets/images/bsky.svg', width: 14, height: 14),
               ),
             ),
           ],
diff --git a/lib/src/features/search/providers/search_provider.dart b/lib/src/features/search/providers/search_provider.dart
index 351f1e58..2a60f62b 100644
--- a/lib/src/features/search/providers/search_provider.dart
+++ b/lib/src/features/search/providers/search_provider.dart
@@ -3,11 +3,12 @@ import 'dart:async';
 import 'package:atproto_core/atproto_core.dart';
 import 'package:get_it/get_it.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:sparksocial/src/core/auth/data/repositories/auth_repository.dart';
 import 'package:sparksocial/src/core/network/atproto/data/models/actor_models.dart';
 import 'package:sparksocial/src/core/network/atproto/data/repositories/actor_repository.dart';
 import 'package:sparksocial/src/core/network/atproto/data/repositories/graph_repository.dart';
 import 'package:sparksocial/src/core/utils/logging/log_service.dart';
-import 'package:sparksocial/src/core/auth/data/repositories/auth_repository.dart';
+import 'package:sparksocial/src/core/utils/logging/logger.dart';
 import 'package:sparksocial/src/features/search/providers/search_state.dart';
 
 part 'search_provider.g.dart';
@@ -16,10 +17,10 @@ part 'search_provider.g.dart';
 @riverpod
 class Search extends _$Search {
   Timer? _debounce;
-  final _logger = GetIt.instance<LogService>().getLogger('SearchProvider');
-  final _actorRepository = GetIt.instance<ActorRepository>();
-  final _authRepository = GetIt.instance<AuthRepository>();
-  final _graphRepository = GetIt.instance<GraphRepository>();
+  final SparkLogger _logger = GetIt.instance<LogService>().getLogger('SearchProvider');
+  final ActorRepository _actorRepository = GetIt.instance<ActorRepository>();
+  final AuthRepository _authRepository = GetIt.instance<AuthRepository>();
+  final GraphRepository _graphRepository = GetIt.instance<GraphRepository>();
 
   @override
   SearchState build() {
@@ -146,7 +147,7 @@ class Search extends _$Search {
       if (userIndex != -1) {
         final user = updatedResults[userIndex];
 
-        final updatedUser = user.copyWith(viewer: ActorViewer(following: null));
+        final updatedUser = user.copyWith(viewer: const ActorViewer());
 
         updatedResults[userIndex] = updatedUser;
         state = state.copyWith(searchResults: updatedResults);
diff --git a/lib/src/features/search/ui/pages/search_page.dart b/lib/src/features/search/ui/pages/search_page.dart
index d63054b9..7ff649ec 100644
--- a/lib/src/features/search/ui/pages/search_page.dart
+++ b/lib/src/features/search/ui/pages/search_page.dart
@@ -6,8 +6,8 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:sparksocial/src/core/routing/app_router.dart';
 import 'package:sparksocial/src/features/search/providers/search_provider.dart';
 import 'package:sparksocial/src/features/search/ui/widgets/suggested_account_card.dart';
-import 'package:sparksocial/src/features/stories/ui/widgets/stories_list.dart';
 import 'package:sparksocial/src/features/stories/providers/stories_by_author.dart';
+import 'package:sparksocial/src/features/stories/ui/widgets/stories_list.dart';
 
 /// Search page to find users
 @RoutePage()
@@ -53,7 +53,7 @@ class _SearchPageState extends ConsumerState<SearchPage> {
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
               Padding(
-                padding: const EdgeInsets.all(16.0),
+                padding: const EdgeInsets.all(16),
                 child: TextField(
                   controller: _searchController,
                   decoration: InputDecoration(
@@ -80,7 +80,7 @@ class _SearchPageState extends ConsumerState<SearchPage> {
                       borderRadius: BorderRadius.circular(8),
                       borderSide: BorderSide(color: colorScheme.outline),
                     ),
-                    contentPadding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 12.0),
+                    contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
                   ),
                 ),
               ),
@@ -90,11 +90,11 @@ class _SearchPageState extends ConsumerState<SearchPage> {
                   child: RefreshIndicator(
                     onRefresh: () async {
                       // Refresh the stories timeline
-                      ref.invalidate(storiesByAuthorProvider(limit: 30, cursor: null));
+                      ref.invalidate(storiesByAuthorProvider());
                     },
                     child: CustomScrollView(
                       slivers: [
-                        SliverToBoxAdapter(child: StoriesList()),
+                        const SliverToBoxAdapter(child: StoriesList()),
                         SliverFillRemaining(
                           hasScrollBody: false,
                           child: Center(
@@ -131,7 +131,7 @@ class _SearchPageState extends ConsumerState<SearchPage> {
                     unselectedLabelColor: theme.textTheme.bodyMedium?.color,
                   ),
                 ),
-                Expanded(child: TabBarView(children: [const UserResults()])),
+                const Expanded(child: TabBarView(children: [UserResults()])),
               ],
             ],
           ),
@@ -197,7 +197,7 @@ class _UserResultsState extends ConsumerState<UserResults> {
         if (index >= state.searchResults.length) {
           // Loading indicator at bottom
           return const Padding(
-            padding: EdgeInsets.all(16.0),
+            padding: EdgeInsets.all(16),
             child: Center(child: CircularProgressIndicator()),
           );
         }
diff --git a/lib/src/features/search/ui/widgets/category_chip.dart b/lib/src/features/search/ui/widgets/category_chip.dart
index 7d958220..3d04e31a 100644
--- a/lib/src/features/search/ui/widgets/category_chip.dart
+++ b/lib/src/features/search/ui/widgets/category_chip.dart
@@ -1,12 +1,11 @@
 import 'package:flutter/material.dart';
 
 class CategoryChip extends StatelessWidget {
+  const CategoryChip({required this.label, super.key, this.onTap, this.isSelected = false});
   final String label;
   final VoidCallback? onTap;
   final bool isSelected;
 
-  const CategoryChip({super.key, required this.label, this.onTap, this.isSelected = false});
-
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
diff --git a/lib/src/features/search/ui/widgets/section_header.dart b/lib/src/features/search/ui/widgets/section_header.dart
index 85ed2e33..6814ac04 100644
--- a/lib/src/features/search/ui/widgets/section_header.dart
+++ b/lib/src/features/search/ui/widgets/section_header.dart
@@ -1,12 +1,11 @@
 import 'package:flutter/material.dart';
 
 class SectionHeader extends StatelessWidget {
+  const SectionHeader({required this.title, super.key, this.onViewAllTap, this.icon});
   final String title;
   final VoidCallback? onViewAllTap;
   final IconData? icon;
 
-  const SectionHeader({super.key, required this.title, this.onViewAllTap, this.icon});
-
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
diff --git a/lib/src/features/search/ui/widgets/sound_card.dart b/lib/src/features/search/ui/widgets/sound_card.dart
index 7692d257..5f412df4 100644
--- a/lib/src/features/search/ui/widgets/sound_card.dart
+++ b/lib/src/features/search/ui/widgets/sound_card.dart
@@ -1,14 +1,13 @@
-import 'package:flutter/material.dart';
 import 'package:fluentui_system_icons/fluentui_system_icons.dart';
+import 'package:flutter/material.dart';
 
 class SoundCard extends StatelessWidget {
+  const SoundCard({required this.title, required this.artist, required this.imageUrl, super.key, this.onTap});
   final String title;
   final String artist;
   final String imageUrl;
   final VoidCallback? onTap;
 
-  const SoundCard({super.key, required this.title, required this.artist, required this.imageUrl, this.onTap});
-
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
diff --git a/lib/src/features/search/ui/widgets/story_circle.dart b/lib/src/features/search/ui/widgets/story_circle.dart
index 30842e12..4def64fa 100644
--- a/lib/src/features/search/ui/widgets/story_circle.dart
+++ b/lib/src/features/search/ui/widgets/story_circle.dart
@@ -1,22 +1,21 @@
-import 'package:flutter/material.dart';
 import 'package:fluentui_system_icons/fluentui_system_icons.dart';
+import 'package:flutter/material.dart';
 import 'package:sparksocial/src/core/theme/data/models/colors.dart';
 
 class StoryCircle extends StatelessWidget {
-  final String username;
-  final String imageUrl;
-  final bool isLive;
-  final bool isYourStory;
-  final VoidCallback? onTap;
-
   const StoryCircle({
-    super.key,
     required this.username,
     required this.imageUrl,
+    super.key,
     this.isLive = false,
     this.isYourStory = false,
     this.onTap,
   });
+  final String username;
+  final String imageUrl;
+  final bool isLive;
+  final bool isYourStory;
+  final VoidCallback? onTap;
 
   @override
   Widget build(BuildContext context) {
@@ -63,7 +62,7 @@ class StoryCircle extends StatelessWidget {
                     decoration: BoxDecoration(
                       color: colorScheme.primary,
                       shape: BoxShape.circle,
-                      border: Border.all(color: AppColors.black, width: 1.5),
+                      border: Border.all(width: 1.5),
                     ),
                     child: const Icon(FluentIcons.add_24_regular, size: 16, color: Colors.white),
                   ),
diff --git a/lib/src/features/search/ui/widgets/suggested_account_card.dart b/lib/src/features/search/ui/widgets/suggested_account_card.dart
index 9ef375b3..3b3e5788 100644
--- a/lib/src/features/search/ui/widgets/suggested_account_card.dart
+++ b/lib/src/features/search/ui/widgets/suggested_account_card.dart
@@ -3,21 +3,11 @@ import 'package:flutter/material.dart';
 import 'package:sparksocial/src/core/widgets/user_avatar.dart';
 
 class SuggestedAccountCard extends StatelessWidget {
-  final String username;
-  final String handle;
-  final String avatarUrl;
-  final String? description;
-  final VoidCallback? onTap;
-  final VoidCallback? onFollowTap;
-  final VoidCallback? onUnfollowTap;
-  final bool showFollowButton;
-  final bool isFollowing;
-
   const SuggestedAccountCard({
-    super.key,
     required this.username,
     required this.handle,
     required this.avatarUrl,
+    super.key,
     this.description,
     this.onTap,
     this.onFollowTap,
@@ -25,6 +15,15 @@ class SuggestedAccountCard extends StatelessWidget {
     this.showFollowButton = true,
     this.isFollowing = false,
   });
+  final String username;
+  final String handle;
+  final String avatarUrl;
+  final String? description;
+  final VoidCallback? onTap;
+  final VoidCallback? onFollowTap;
+  final VoidCallback? onUnfollowTap;
+  final bool showFollowButton;
+  final bool isFollowing;
 
   @override
   Widget build(BuildContext context) {
@@ -67,7 +66,7 @@ class SuggestedAccountCard extends StatelessWidget {
                   ),
                   if (description != null && description!.isNotEmpty)
                     Padding(
-                      padding: const EdgeInsets.only(top: 2.0),
+                      padding: const EdgeInsets.only(top: 2),
                       child: Text(
                         description!,
                         style: TextStyle(fontSize: 13, color: secondaryTextColor),
diff --git a/lib/src/features/search/ui/widgets/trending_video_card.dart b/lib/src/features/search/ui/widgets/trending_video_card.dart
index 32bc66a1..05a7ba77 100644
--- a/lib/src/features/search/ui/widgets/trending_video_card.dart
+++ b/lib/src/features/search/ui/widgets/trending_video_card.dart
@@ -4,12 +4,11 @@ import 'package:sparksocial/src/core/theme/data/models/colors.dart';
 import 'package:sparksocial/src/core/utils/text_formatter.dart';
 
 class TrendingVideoCard extends StatelessWidget {
+  const TrendingVideoCard({required this.thumbnailUrl, required this.viewCount, super.key, this.onTap});
   final String thumbnailUrl;
   final int viewCount;
   final VoidCallback? onTap;
 
-  const TrendingVideoCard({super.key, required this.thumbnailUrl, required this.viewCount, this.onTap});
-
   @override
   Widget build(BuildContext context) {
     final formattedViews = TextFormatter.formatCount(viewCount);
diff --git a/lib/src/features/settings/providers/settings_provider.dart b/lib/src/features/settings/providers/settings_provider.dart
index 0f0379c3..bbb06f1d 100644
--- a/lib/src/features/settings/providers/settings_provider.dart
+++ b/lib/src/features/settings/providers/settings_provider.dart
@@ -1,12 +1,12 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:get_it/get_it.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:sparksocial/src/core/network/atproto/data/models/feed_models.dart';
+import 'package:sparksocial/src/core/storage/preferences/settings_repository.dart';
 import 'package:sparksocial/src/core/utils/logging/log_service.dart';
 import 'package:sparksocial/src/core/utils/logging/logger.dart';
+import 'package:sparksocial/src/features/settings/providers/settings_state.dart';
 import 'package:sparksocial/src/features/settings/ui/pages/profile_settings_page.dart';
-import 'settings_state.dart';
-import '../../../core/storage/preferences/settings_repository.dart';
-import 'package:sparksocial/src/core/network/atproto/data/models/feed_models.dart';
 
 part 'settings_provider.g.dart';
 
@@ -29,20 +29,11 @@ class Settings extends _$Settings {
 
     // Load settings asynchronously but return a temporary state immediately
     // This prevents blocking the UI while loading
-    Future.microtask(() => loadSettings());
+    Future.microtask(loadSettings);
 
     // Return temporary default state that will be replaced by loadSettings()
-    return SettingsState(
+    return const SettingsState(
       activeFeed: Feed.hardCoded(hardCodedFeed: HardCodedFeedEnum.latestSprk),
-      feedBlurEnabled: false,
-      hideAdultContent: true,
-      followMode: FollowMode.sprk,
-      feeds: [
-        Feed.hardCoded(hardCodedFeed: HardCodedFeedEnum.following),
-        Feed.hardCoded(hardCodedFeed: HardCodedFeedEnum.forYou),
-        Feed.hardCoded(hardCodedFeed: HardCodedFeedEnum.latestSprk),
-      ],
-      postToBskyEnabled: false,
     );
   }
 
@@ -137,12 +128,13 @@ class Settings extends _$Settings {
 
   /// Reorders a feed in feeds list
   Future<void> reorderFeed(int oldIndex, int newIndex) async {
+    var actualNewIndex = newIndex;
     if (newIndex == state.feeds.length) {
-      newIndex = state.feeds.length - 1;
+      actualNewIndex = state.feeds.length - 1;
     }
     final updatedList = [...state.feeds];
     final feed = updatedList.removeAt(oldIndex);
-    updatedList.insert(newIndex, feed);
+    updatedList.insert(actualNewIndex, feed);
     await _repository.setFeeds(updatedList);
     state = state.copyWith(feeds: updatedList);
   }
diff --git a/lib/src/features/settings/providers/settings_state.dart b/lib/src/features/settings/providers/settings_state.dart
index 80b66caa..f33319e8 100644
--- a/lib/src/features/settings/providers/settings_state.dart
+++ b/lib/src/features/settings/providers/settings_state.dart
@@ -8,6 +8,7 @@ part 'settings_state.freezed.dart';
 @freezed
 class SettingsState with _$SettingsState {
   const factory SettingsState({
+    required Feed activeFeed,
     @Default(false) bool feedBlurEnabled,
     @Default(true) bool hideAdultContent,
     @Default(FollowMode.sprk) FollowMode followMode,
@@ -17,7 +18,6 @@ class SettingsState with _$SettingsState {
       Feed.hardCoded(hardCodedFeed: HardCodedFeedEnum.latestSprk),
     ])
     List<Feed> feeds,
-    required Feed activeFeed,
     @Default(false) bool postToBskyEnabled,
   }) = _SettingsState;
 }
diff --git a/lib/src/features/settings/ui/pages/feed_list_page.dart b/lib/src/features/settings/ui/pages/feed_list_page.dart
index b5109929..0ddc20c3 100644
--- a/lib/src/features/settings/ui/pages/feed_list_page.dart
+++ b/lib/src/features/settings/ui/pages/feed_list_page.dart
@@ -1,10 +1,11 @@
+import 'dart:ui' show lerpDouble;
+
 import 'package:auto_route/auto_route.dart';
+import 'package:fluentui_system_icons/fluentui_system_icons.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:sparksocial/src/core/network/atproto/data/models/feed_models.dart';
 import 'package:sparksocial/src/features/settings/providers/settings_provider.dart';
-import 'package:fluentui_system_icons/fluentui_system_icons.dart';
-import 'dart:ui' show lerpDouble;
 
 @RoutePage()
 class FeedListPage extends ConsumerStatefulWidget {
@@ -132,15 +133,15 @@ class _FeedListPageState extends ConsumerState<FeedListPage> {
                     },
                     onReorder: (oldIndex, newIndex) async {
                       if (_isReordering) return;
-                      
+
                       setState(() => _isReordering = true);
-                      
+
                       try {
                         // Adjust newIndex if moving down the list
                         if (newIndex > oldIndex) newIndex -= 1;
-                        
+
                         await ref.read(settingsProvider.notifier).reorderFeed(oldIndex, newIndex);
-                        
+
                         // Small delay to allow state to settle
                         await Future.delayed(const Duration(milliseconds: 50));
                       } catch (e) {
@@ -162,7 +163,7 @@ class _FeedListPageState extends ConsumerState<FeedListPage> {
                           final animValue = Curves.easeInOutCubic.transform(animation.value);
                           final elevation = lerpDouble(2, 8, animValue)!;
                           final scale = lerpDouble(1, 1.05, animValue)!;
-                          
+
                           return Transform.scale(
                             scale: scale,
                             child: Material(
@@ -216,16 +217,16 @@ class _FeedListPageState extends ConsumerState<FeedListPage> {
                                 ),
                               const SizedBox(width: 8),
                               Icon(
-                                FluentIcons.re_order_dots_vertical_24_regular, 
-                                color: _isReordering 
-                                  ? colorScheme.primary.withAlpha(128)
-                                  : colorScheme.onSurface.withAlpha(178),
+                                FluentIcons.re_order_dots_vertical_24_regular,
+                                color: _isReordering ? colorScheme.primary.withAlpha(128) : colorScheme.onSurface.withAlpha(178),
                               ),
                             ],
                           ),
-                          onTap: _isReordering ? null : () {
-                            ref.read(settingsProvider.notifier).setActiveFeed(feed);
-                          },
+                          onTap: _isReordering
+                              ? null
+                              : () {
+                                  ref.read(settingsProvider.notifier).setActiveFeed(feed);
+                                },
                         ),
                       );
                     },
diff --git a/lib/src/features/settings/ui/pages/feed_settings_page.dart b/lib/src/features/settings/ui/pages/feed_settings_page.dart
index 24d49790..3e6ddceb 100644
--- a/lib/src/features/settings/ui/pages/feed_settings_page.dart
+++ b/lib/src/features/settings/ui/pages/feed_settings_page.dart
@@ -12,8 +12,7 @@ class FeedSettingsPage extends ConsumerStatefulWidget {
   ConsumerState<FeedSettingsPage> createState() => _FeedSettingsPageState();
 }
 
-class _FeedSettingsPageState extends ConsumerState<FeedSettingsPage>
-    with SingleTickerProviderStateMixin {
+class _FeedSettingsPageState extends ConsumerState<FeedSettingsPage> with SingleTickerProviderStateMixin {
   late TabController _tabController;
 
   @override
@@ -45,10 +44,9 @@ class _FeedSettingsPageState extends ConsumerState<FeedSettingsPage>
           controller: _tabController,
           labelColor: textColor,
           unselectedLabelColor: textColor.withAlpha(127),
-          isScrollable: false,
           tabs: const [
-            Tab(text: "Your Feeds"),
-            Tab(text: "Content Labels"),
+            Tab(text: 'Your Feeds'),
+            Tab(text: 'Content Labels'),
           ],
         ),
       ),
diff --git a/lib/src/features/settings/ui/pages/label_settings_page.dart b/lib/src/features/settings/ui/pages/label_settings_page.dart
index 2d333690..fe725a16 100644
--- a/lib/src/features/settings/ui/pages/label_settings_page.dart
+++ b/lib/src/features/settings/ui/pages/label_settings_page.dart
@@ -35,7 +35,7 @@ class _LabelSettingsPageState extends ConsumerState<LabelSettingsPage> {
       setState(() => _isLoading = true);
 
       final followedLabelers = await _settingsRepository.getFollowedLabelers();
-      final Map<String, LabelPreference> preferences = {};
+      final preferences = <String, LabelPreference>{};
 
       _logger.d('Loading preferences for ${defaultLabels.length} default labels');
 
@@ -346,16 +346,15 @@ class _LabelSettingsPageState extends ConsumerState<LabelSettingsPage> {
 }
 
 class LabelSettingTile extends StatelessWidget {
-  final String label;
-  final LabelPreference preference;
-  final Function(String label, {Setting? setting, Blurs? blurs, Severity? severity}) onPreferenceUpdate;
-
   const LabelSettingTile({
-    super.key,
     required this.label,
     required this.preference,
     required this.onPreferenceUpdate,
+    super.key,
   });
+  final String label;
+  final LabelPreference preference;
+  final Function(String label, {Setting? setting, Blurs? blurs, Severity? severity}) onPreferenceUpdate;
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/src/features/settings/ui/pages/profile_settings_page.dart b/lib/src/features/settings/ui/pages/profile_settings_page.dart
index f799180e..7fdd05bf 100644
--- a/lib/src/features/settings/ui/pages/profile_settings_page.dart
+++ b/lib/src/features/settings/ui/pages/profile_settings_page.dart
@@ -2,9 +2,9 @@ import 'package:auto_route/auto_route.dart';
 import 'package:fluentui_system_icons/fluentui_system_icons.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:sparksocial/src/features/settings/providers/settings_provider.dart';
-import 'package:sparksocial/src/features/profile/providers/profile_provider.dart';
 import 'package:sparksocial/src/core/routing/app_router.dart';
+import 'package:sparksocial/src/features/profile/providers/profile_provider.dart';
+import 'package:sparksocial/src/features/settings/providers/settings_provider.dart';
 
 enum FollowMode { sprk, bsky }
 
@@ -47,7 +47,7 @@ class _ProfileSettingsPageState extends ConsumerState<ProfileSettingsPage> {
         // Show error message
         ScaffoldMessenger.of(context).showSnackBar(
           SnackBar(
-            content: Text('Logout failed: ${e.toString()}'),
+            content: Text('Logout failed: $e'),
             backgroundColor: Colors.red,
           ),
         );
@@ -65,7 +65,7 @@ class _ProfileSettingsPageState extends ConsumerState<ProfileSettingsPage> {
     final brightness = Theme.of(context).brightness;
     final isDark = brightness == Brightness.dark;
     final itemColor = isDark ? Colors.grey.shade800 : Colors.grey.shade200;
-    final pinkColor = const Color(0xFFE91E63);
+    const pinkColor = Color(0xFFE91E63);
 
     final displayValues = _followModeMap.keys.toList();
     final modeValues = _followModeMap.values.toList();
@@ -89,7 +89,7 @@ class _ProfileSettingsPageState extends ConsumerState<ProfileSettingsPage> {
         padding: const EdgeInsets.symmetric(horizontal: 16),
         children: [
           Padding(
-            padding: const EdgeInsets.symmetric(vertical: 8.0),
+            padding: const EdgeInsets.symmetric(vertical: 8),
             child: Container(
               decoration: BoxDecoration(color: itemColor, borderRadius: BorderRadius.circular(16)),
               padding: const EdgeInsets.all(16),
@@ -112,7 +112,7 @@ class _ProfileSettingsPageState extends ConsumerState<ProfileSettingsPage> {
                       // Spark exclusive button
                       Expanded(
                         child: Padding(
-                          padding: const EdgeInsets.symmetric(horizontal: 4.0),
+                          padding: const EdgeInsets.symmetric(horizontal: 4),
                           child: ElevatedButton(
                             onPressed: () => _handleFollowModeChange(modeValues[0]),
                             style: ElevatedButton.styleFrom(
@@ -139,7 +139,7 @@ class _ProfileSettingsPageState extends ConsumerState<ProfileSettingsPage> {
                       ),
                       Expanded(
                         child: Padding(
-                          padding: const EdgeInsets.symmetric(horizontal: 4.0),
+                          padding: const EdgeInsets.symmetric(horizontal: 4),
                           child: ElevatedButton(
                             onPressed: () => _handleFollowModeChange(modeValues[1]),
                             style: ElevatedButton.styleFrom(
diff --git a/lib/src/features/splash/providers/splash_state.dart b/lib/src/features/splash/providers/splash_state.dart
index b779adaa..05eaed68 100644
--- a/lib/src/features/splash/providers/splash_state.dart
+++ b/lib/src/features/splash/providers/splash_state.dart
@@ -10,4 +10,4 @@ class SplashState with _$SplashState {
     /// Whether the image is loaded
     @Default(false) bool isImageLoaded,
   }) = _SplashState;
-} 
\ No newline at end of file
+}
diff --git a/lib/src/features/splash/ui/pages/splash_page.dart b/lib/src/features/splash/ui/pages/splash_page.dart
index 71b5179c..b7b05e33 100644
--- a/lib/src/features/splash/ui/pages/splash_page.dart
+++ b/lib/src/features/splash/ui/pages/splash_page.dart
@@ -3,18 +3,18 @@ import 'dart:async';
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:flutter_native_splash/flutter_native_splash.dart';
 import 'package:get_it/get_it.dart';
-import 'package:sparksocial/src/core/routing/app_router.dart';
-import 'package:sparksocial/src/core/theme/data/models/colors.dart';
 import 'package:sparksocial/src/core/auth/data/repositories/auth_repository.dart';
 import 'package:sparksocial/src/core/auth/data/repositories/auth_repository_impl.dart';
 import 'package:sparksocial/src/core/auth/data/repositories/onboarding_repository.dart';
+import 'package:sparksocial/src/core/routing/app_router.dart';
+import 'package:sparksocial/src/core/theme/data/models/colors.dart';
+import 'package:sparksocial/src/core/utils/logging/log_service.dart';
+import 'package:sparksocial/src/core/utils/logging/logger.dart';
 import 'package:sparksocial/src/features/auth/providers/auth_providers.dart';
-import 'package:sparksocial/src/features/splash/providers/splash_providers.dart';
 import 'package:sparksocial/src/features/feed/providers/feed_provider.dart';
 import 'package:sparksocial/src/features/settings/providers/settings_provider.dart';
-import 'package:sparksocial/src/core/utils/logging/log_service.dart';
+import 'package:sparksocial/src/features/splash/providers/splash_providers.dart';
 
 @RoutePage()
 class SplashPage extends ConsumerStatefulWidget {
@@ -25,7 +25,7 @@ class SplashPage extends ConsumerStatefulWidget {
 }
 
 class _SplashPageState extends ConsumerState<SplashPage> {
-  final _logger = GetIt.instance<LogService>().getLogger('SplashPage');
+  final SparkLogger _logger = GetIt.instance<LogService>().getLogger('SplashPage');
   bool _isNavigating = false;
   bool _hasStartedFeedLoading = false;
 
@@ -38,7 +38,6 @@ class _SplashPageState extends ConsumerState<SplashPage> {
   @override
   void dispose() {
     // Always remove splash screen when disposing splash page
-    FlutterNativeSplash.remove();
     super.dispose();
   }
 
@@ -71,7 +70,7 @@ class _SplashPageState extends ConsumerState<SplashPage> {
         return;
       }
 
-      final bool isSessionValid = await authRepository.validateSession();
+      final isSessionValid = await authRepository.validateSession();
 
       if (!mounted) return;
 
@@ -173,30 +172,34 @@ class _SplashPageState extends ConsumerState<SplashPage> {
   void _navigateToLogin() {
     if (_isNavigating || !mounted) return;
     _isNavigating = true;
-    FlutterNativeSplash.remove();
     context.router.replaceAll([const LoginRoute()]);
   }
 
   void _navigateToRegister() {
     if (_isNavigating || !mounted) return;
     _isNavigating = true;
-    FlutterNativeSplash.remove();
     context.router.replaceAll([const RegisterRoute()]);
   }
 
   void _navigateToMain() {
     if (_isNavigating || !mounted) return;
     _isNavigating = true;
-    FlutterNativeSplash.remove();
     context.router.replaceAll([const MainRoute()]);
   }
 
   @override
   Widget build(BuildContext context) {
-    // Show a minimal loading screen while keeping native splash active
-    return const Scaffold(
+    return Scaffold(
       backgroundColor: AppColors.black,
-      body: Center(child: CircularProgressIndicator(color: AppColors.white)),
+      body: Stack(
+        fit: StackFit.expand,
+        children: [
+          Image.asset(
+            'assets/branding/intro.webp',
+            fit: BoxFit.cover,
+          ),
+        ],
+      ),
     );
   }
 }
diff --git a/lib/src/features/stories/providers/stories_by_author.dart b/lib/src/features/stories/providers/stories_by_author.dart
index a8e17189..4bbdea38 100644
--- a/lib/src/features/stories/providers/stories_by_author.dart
+++ b/lib/src/features/stories/providers/stories_by_author.dart
@@ -1,8 +1,8 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:get_it/get_it.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
-import 'package:sparksocial/src/core/network/atproto/data/models/feed_models.dart';
 import 'package:sparksocial/src/core/network/atproto/data/models/actor_models.dart';
+import 'package:sparksocial/src/core/network/atproto/data/models/feed_models.dart';
 import 'package:sparksocial/src/core/network/atproto/data/repositories/sprk_repository.dart';
 
 part 'stories_by_author.g.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 477d3cf3..e59de142 100644
--- a/lib/src/features/stories/ui/pages/all_stories_page.dart
+++ b/lib/src/features/stories/ui/pages/all_stories_page.dart
@@ -2,13 +2,13 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:sparksocial/src/core/network/atproto/data/models/actor_models.dart';
 import 'package:sparksocial/src/core/network/atproto/data/models/feed_models.dart';
-import 'author_stories_page.dart';
+import 'package:sparksocial/src/features/stories/ui/pages/author_stories_page.dart';
 
 @RoutePage()
 class AllStoriesPage extends StatefulWidget {
   const AllStoriesPage({
-    super.key,
     required this.storiesByAuthor,
+    super.key,
     this.initialAuthorIndex = 0,
   });
 
@@ -53,15 +53,15 @@ class _AllStoriesPageState extends State<AllStoriesPage> {
               stories: entry.value,
               onPreviousAuthor: index > 0
                   ? () => _pageController.previousPage(
-                        duration: const Duration(milliseconds: 250),
-                        curve: Curves.easeInOut,
-                      )
+                      duration: const Duration(milliseconds: 250),
+                      curve: Curves.easeInOut,
+                    )
                   : null,
               onNextAuthor: index < _authorsList.length - 1
                   ? () => _pageController.nextPage(
-                        duration: const Duration(milliseconds: 250),
-                        curve: Curves.easeInOut,
-                      )
+                      duration: const Duration(milliseconds: 250),
+                      curve: Curves.easeInOut,
+                    )
                   : null,
             );
           },
@@ -69,4 +69,4 @@ class _AllStoriesPageState extends State<AllStoriesPage> {
       ),
     );
   }
-}
\ No newline at end of file
+}
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 1d9e7089..08da5565 100644
--- a/lib/src/features/stories/ui/pages/author_stories_page.dart
+++ b/lib/src/features/stories/ui/pages/author_stories_page.dart
@@ -1,20 +1,20 @@
+import 'dart:async';
+
 import 'package:auto_route/auto_route.dart';
+import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:sparksocial/src/core/network/atproto/data/models/actor_models.dart';
 import 'package:sparksocial/src/core/network/atproto/data/models/feed_models.dart';
-import 'package:cached_network_image/cached_network_image.dart';
 import 'package:sparksocial/src/core/routing/app_router.dart';
-import 'dart:async';
-
 import 'package:sparksocial/src/features/stories/ui/pages/story_page.dart';
 
 @RoutePage()
 class AuthorStoriesPage extends ConsumerStatefulWidget {
   const AuthorStoriesPage({
-    super.key,
     required this.author,
     required this.stories,
+    super.key,
     this.initialStoryIndex = 0,
     this.onPreviousAuthor,
     this.onNextAuthor,
@@ -40,8 +40,8 @@ class _AuthorStoriesPageState extends ConsumerState<AuthorStoriesPage> with Tick
   late final PageController _pageController;
   late final List<AnimationController> _progressControllers;
   int _currentStoryIndex = 0;
-  double _dragOffset = 0.0;
-  double _dragScale = 1.0;
+  double _dragOffset = 0;
+  double _dragScale = 1;
   bool _isDragging = false;
   bool _isCurrentStoryLoading = true;
 
@@ -94,7 +94,7 @@ class _AuthorStoriesPageState extends ConsumerState<AuthorStoriesPage> with Tick
       setState(() {
         _isCurrentStoryLoading = isLoading;
       });
-      
+
       if (isLoading) {
         _pause();
       } else {
@@ -181,7 +181,7 @@ class _AuthorStoriesPageState extends ConsumerState<AuthorStoriesPage> with Tick
     final startScale = _dragScale;
     const steps = 30;
     const duration = Duration(milliseconds: 10);
-    int step = 0;
+    var step = 0;
     Timer.periodic(duration, (timer) {
       step++;
       final t = step / steps;
diff --git a/lib/src/features/stories/ui/pages/story_page.dart b/lib/src/features/stories/ui/pages/story_page.dart
index 29c180fa..b42f2232 100644
--- a/lib/src/features/stories/ui/pages/story_page.dart
+++ b/lib/src/features/stories/ui/pages/story_page.dart
@@ -1,15 +1,15 @@
 import 'package:auto_route/auto_route.dart';
+import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:video_player/video_player.dart';
-import 'package:cached_network_image/cached_network_image.dart';
 import 'package:sparksocial/src/core/network/atproto/data/models/feed_models.dart';
+import 'package:video_player/video_player.dart';
 
 @RoutePage()
 class StoryPage extends ConsumerStatefulWidget {
   const StoryPage({
-    super.key,
     required this.story,
+    super.key,
     this.onLoadingStateChanged,
   });
 
@@ -39,9 +39,7 @@ class _StoryPageState extends ConsumerState<StoryPage> with TickerProviderStateM
   }
 
   void _updateLoadingState() {
-    final bool isLoading = _isVideoStory(widget.story)
-        ? !_isVideoInitialized
-        : !_isImageLoaded;
+    final isLoading = _isVideoStory(widget.story) ? !_isVideoInitialized : !_isImageLoaded;
 
     if (_isLoading != isLoading) {
       _isLoading = isLoading;
@@ -140,8 +138,7 @@ class _StoryPageState extends ConsumerState<StoryPage> with TickerProviderStateM
       mediaContent = CachedNetworkImage(
         imageUrl: imageUrl,
         fit: BoxFit.cover,
-        progressIndicatorBuilder: (context, url, progress) =>
-            const Center(child: CircularProgressIndicator()),
+        progressIndicatorBuilder: (context, url, progress) => const Center(child: CircularProgressIndicator()),
         errorWidget: (context, url, error) {
           // Consider error state as "loaded" to avoid infinite loading
           WidgetsBinding.instance.addPostFrameCallback((_) {
diff --git a/lib/src/features/stories/ui/widgets/stories_list.dart b/lib/src/features/stories/ui/widgets/stories_list.dart
index 34b46ee4..fd82da87 100644
--- a/lib/src/features/stories/ui/widgets/stories_list.dart
+++ b/lib/src/features/stories/ui/widgets/stories_list.dart
@@ -21,12 +21,12 @@ class _StoriesListState extends ConsumerState<StoriesList> {
 
   @override
   Widget build(BuildContext context) {
-    final storiesByAuthor = ref.watch(storiesByAuthorProvider(limit: 30, cursor: _cursor));
+    final storiesByAuthor = ref.watch(storiesByAuthorProvider(cursor: _cursor));
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
+          padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
           child: Row(
             children: [
               Text(
@@ -47,7 +47,7 @@ class _StoriesListState extends ConsumerState<StoriesList> {
               final authorsList = data.storiesByAuthor.entries.toList();
               return ListView.builder(
                 scrollDirection: Axis.horizontal,
-                padding: const EdgeInsets.symmetric(horizontal: 16.0),
+                padding: const EdgeInsets.symmetric(horizontal: 16),
                 itemCount: authorsList.length + 1, // +1 for add story button
                 itemBuilder: (context, index) {
                   if (index == 0) {
@@ -89,7 +89,7 @@ class _StoriesListState extends ConsumerState<StoriesList> {
                                     decoration: BoxDecoration(
                                       shape: BoxShape.circle,
                                       color: Theme.of(context).colorScheme.primary,
-                                      border: Border.all(color: Colors.black, width: 2),
+                                      border: Border.all(width: 2),
                                     ),
                                     child: const Icon(FluentIcons.add_12_regular, color: Colors.white, size: 12),
                                   ),
@@ -128,7 +128,7 @@ class _StoriesListState extends ConsumerState<StoriesList> {
                                 storiesByAuthor: data.storiesByAuthor,
                                 initialAuthorIndex: realIndex,
                               ),
-                            )
+                            ),
                           },
                           child: Stack(
                             children: [
diff --git a/lib/src/sprk_app.dart b/lib/src/sprk_app.dart
index f914156e..54693fa5 100644
--- a/lib/src/sprk_app.dart
+++ b/lib/src/sprk_app.dart
@@ -1,14 +1,10 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:sparksocial/src/core/di/service_locator.dart';
 import 'package:sparksocial/src/core/routing/app_router.dart';
-import 'package:flutter/services.dart';
-
-import 'core/theme/data/models/app_theme.dart';
-import 'core/theme/domain/theme_provider.dart';
+import 'package:sparksocial/src/core/theme/data/models/app_theme.dart';
+import 'package:sparksocial/src/core/theme/domain/theme_provider.dart';
 
-/// SprkApp is the root widget of the new architecture.
-/// As features are migrated, they will be integrated here.
 class SprkApp extends ConsumerStatefulWidget {
   const SprkApp({super.key});
 
@@ -31,7 +27,6 @@ class _SprkAppState extends ConsumerState<SprkApp> {
     // Force dark status bar and navigation bar
     SystemChrome.setSystemUIOverlayStyle(AppTheme.darkSystemUiStyle);
 
-    // Watch theme mode from the provider
     final themeMode = ref.watch(themeModeProvider);
 
     return MaterialApp.router(
@@ -44,10 +39,3 @@ class _SprkAppState extends ConsumerState<SprkApp> {
     );
   }
 }
-
-/// This method configures all dependencies required for the new architecture.
-/// It should be called before the app starts.
-Future<void> configureDependencies() async {
-  // Initialize GetIt
-  await initServiceLocator();
-}
diff --git a/pubspec.lock b/pubspec.lock
index 69d04ce3..eb45b205 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -157,10 +157,10 @@ packages:
     dependency: transitive
     description:
       name: build
-      sha256: cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0
+      sha256: "51dc711996cbf609b90cbe5b335bbce83143875a9d58e4b5c6d3c4f684d3dda7"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.2"
+    version: "2.5.4"
   build_config:
     dependency: transitive
     description:
@@ -181,26 +181,26 @@ packages:
     dependency: transitive
     description:
       name: build_resolvers
-      sha256: b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0
+      sha256: ee4257b3f20c0c90e72ed2b57ad637f694ccba48839a821e87db762548c22a62
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.4"
+    version: "2.5.4"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99"
+      sha256: "382a4d649addbfb7ba71a3631df0ec6a45d5ab9b098638144faf27f02778eb53"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.15"
+    version: "2.5.4"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
-      sha256: "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021"
+      sha256: "85fbbb1036d576d966332a3f5ce83f2ce66a40bea1a94ad2d5fc29a19a0d3792"
       url: "https://pub.dev"
     source: hosted
-    version: "8.0.0"
+    version: "9.1.2"
   built_collection:
     dependency: transitive
     description:
@@ -393,14 +393,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.2"
-  cupertino_icons:
-    dependency: "direct main"
-    description:
-      name: cupertino_icons
-      sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.8"
   custom_lint_core:
     dependency: transitive
     description:
@@ -433,22 +425,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.1.0"
-  dio:
-    dependency: "direct main"
-    description:
-      name: dio
-      sha256: "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.8.0+1"
-  dio_web_adapter:
-    dependency: transitive
-    description:
-      name: dio_web_adapter
-      sha256: "7586e476d70caecaf1686d21eee7247ea43ef5c345eab9e0cc3583ff13378d78"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.1"
   fake_async:
     dependency: transitive
     description:
@@ -551,7 +527,7 @@ packages:
     source: hosted
     version: "0.18.6"
   flutter_launcher_icons:
-    dependency: "direct main"
+    dependency: "direct dev"
     description:
       name: flutter_launcher_icons
       sha256: bfa04787c85d80ecb3f8777bde5fc10c3de809240c48fa061a2c2bf15ea5211c
@@ -566,14 +542,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.0.0"
-  flutter_native_splash:
-    dependency: "direct main"
-    description:
-      name: flutter_native_splash
-      sha256: "8321a6d11a8d13977fa780c89de8d257cce3d841eecfb7a4cadffcc4f12d82dc"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.6"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
@@ -642,10 +610,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_svg
-      sha256: c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b
+      sha256: cd57f7969b4679317c17af6fd16ee233c1e60a82ed209d8a475c54fd6fd6f845
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.17"
+    version: "2.2.0"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -856,14 +824,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.5"
-  ionicons:
-    dependency: "direct main"
-    description:
-      name: ionicons
-      sha256: "5496bc65a16115ecf05b15b78f494ee4a8869504357668f0a11d689e970523cf"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.2"
   js:
     dependency: transitive
     description:
@@ -928,14 +888,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.0.0"
-  logger:
-    dependency: "direct main"
-    description:
-      name: logger
-      sha256: be4b23575aac7ebf01f225a241eb7f6b5641eeaf43c6a8613510fc2f8cf187d1
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.5.0"
   logging:
     dependency: transitive
     description:
@@ -944,14 +896,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.0"
-  lucide_icons_flutter:
-    dependency: "direct main"
-    description:
-      name: lucide_icons_flutter
-      sha256: "2cc30b669d2e9329072bdd4e3f50d4a31d4dd6ee9e9748d639dab95cd2edd0ce"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.5"
   matcher:
     dependency: transitive
     description:
@@ -977,7 +921,7 @@ packages:
     source: hosted
     version: "1.16.0"
   mime:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: mime
       sha256: "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a"
@@ -1144,14 +1088,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.0.1"
-  preload_page_view:
-    dependency: "direct main"
-    description:
-      name: preload_page_view
-      sha256: "488a10c158c5c2e9ba9d77e5dbc09b1e49e37a20df2301e5ba02992eac802b7a"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.0"
   pub_semver:
     dependency: transitive
     description:
@@ -1309,22 +1245,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.0.4"
-  socket_io_client:
-    dependency: "direct main"
-    description:
-      name: socket_io_client
-      sha256: c8471c2c6843cf308a5532ff653f2bcdb7fa9ae79d84d1179920578a06624f0d
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.2"
-  socket_io_common:
-    dependency: transitive
-    description:
-      name: socket_io_common
-      sha256: "162fbaecbf4bf9a9372a62a341b3550b51dcef2f02f3e5830a297fd48203d45b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.1"
   source_gen:
     dependency: transitive
     description:
@@ -1629,6 +1549,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
+  very_good_analysis:
+    dependency: "direct dev"
+    description:
+      name: very_good_analysis
+      sha256: e479fbc0941009262343db308133e121bf8660c2c81d48dd8e952df7b7e1e382
+      url: "https://pub.dev"
+    source: hosted
+    version: "9.0.0"
   video_player:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index a122ee3b..276eb55b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: sparksocial
-description: "A new Flutter project."
-publish_to: 'none'
+description: "Spark mobile app"
+publish_to: "none"
 # The number after + should stay fixed, the android workflow will change it on every build
 version: 0.2.0+1
 
@@ -11,32 +11,23 @@ dependencies:
   flutter:
     sdk: flutter
   flutter_dotenv: ^5.1.0
-  ionicons: ^0.2.2
-  cupertino_icons: ^1.0.6
   video_player: ^2.10.0
   cached_network_image: ^3.3.1
   camera: ^0.11.1
   path_provider: ^2.1.2
-  flutter_launcher_icons: ^0.14.3
-  flutter_svg: ^2.0.7
+  flutter_svg: ^2.2.0
   atproto: ^0.13.3
   bluesky: ^0.18.10
   http: ^1.2.0
   url_launcher: ^6.2.5
-  dio: ^5.4.0
   shared_preferences: ^2.5.3
   fvp: ^0.32.1
-  lucide_icons_flutter: ^3.0.5
   fluentui_system_icons: ^1.1.273
   image_picker: ^1.0.7
   path: ^1.9.1
-  preload_page_view: ^0.2.0
-  mime: ^1.0.6
   image: ^4.5.4
   flutter_cache_manager: ^3.3.1
-  # New architecture dependencies
   synchronized: ^3.1.0
-  logger: ^2.0.2
   flutter_riverpod: ^2.4.9
   riverpod_annotation: ^2.3.3
   freezed: ^2.4.6
@@ -49,11 +40,9 @@ dependencies:
   sqflite: ^2.4.2
   pool: ^1.5.0
   collection: ^1.19.1
-  flutter_native_splash: ^2.4.1
   carousel_slider: ^5.0.0
   smooth_video_progress: ^0.0.4
   imgly_editor: ^1.51.0
-  socket_io_client: ^3.1.2
   web_socket_channel: ^3.0.3
   any_link_preview: ^3.0.3
 
@@ -61,11 +50,12 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   flutter_lints: ^6.0.0
-  # New architecture dev dependencies
-  build_runner: ^2.4.8
+  build_runner: ^2.5.4
   riverpod_generator: ^2.3.9
   json_serializable: ^6.7.1
   auto_route_generator: ^10.2.3
+  flutter_launcher_icons: ^0.14.3
+  very_good_analysis: ^9.0.0
 
 flutter_launcher_icons:
   android: true
@@ -89,4 +79,4 @@ flutter:
   assets:
     - assets/images/
     - assets/branding/
-    - .env
\ No newline at end of file
+    - .env