diff --git a/lib/main.dart b/lib/main.dart
index f8d6d40..a87d7f5 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -102,7 +102,6 @@ class const App({super.key}) extends StatelessWidget {
       builder: (context, ref, child) => MaterialApp(
         navigatorKey: navigatorKey,
         debugShowCheckedModeBanner: false,
-        // Use indigo to work around bugs in theme generation
         theme:
             (ref
                         .watch(SettingsController.provider)
diff --git a/lib/models/account_data.dart b/lib/models/account_data.dart
index e01e261..53b4ff2 100644
--- a/lib/models/account_data.dart
+++ b/lib/models/account_data.dart
@@ -4,12 +4,12 @@ import "package:freezed_annotation/freezed_annotation.dart";
 part "account_data.freezed.dart";
 part "account_data.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const AccountData({
   @JsonKey(name: AccountData.invitePermissionConfigKey)
   final InvitePermissionConfig invitePermissionConfig =
-      const _InvitePermissionConfig(),
+      const InvitePermissionConfig(),
 
   @JsonKey(name: AccountData.directKey)
   final IMap<String, IList<String>> directMessages = const IMap.empty(),
@@ -34,31 +34,28 @@ class const AccountData({
   static const directKey = "m.direct";
   static const recentEmojiKey = "m.recent_emoji";
 
-  @override
   Map<String, Object?> toJson() => _$AccountDataToJson(this);
 
   factory AccountData.fromJson(Map<String, Object?> json) =>
       _$AccountDataFromJson(json);
 }
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const InvitePermissionConfig({
   @JsonKey(unknownEnumValue: DefaultInviteAction.allow)
   final DefaultInviteAction defaultAction = DefaultInviteAction.allow,
 }) with _$InvitePermissionConfig {
-  @override
   Map<String, Object?> toJson() => _$InvitePermissionConfigToJson(this);
 
   factory InvitePermissionConfig.fromJson(Map<String, Object?> json) =>
       _$InvitePermissionConfigFromJson(json);
 }
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const RecentEmoji({required final String emoji, required final int total})
     with _$RecentEmoji {
-  @override
   Map<String, Object?> toJson() => _$RecentEmojiToJson(this);
 
   factory RecentEmoji.fromJson(Map<String, Object?> json) =>
diff --git a/lib/models/client_state.dart b/lib/models/client_state.dart
index 5be7b1e..ff433ab 100644
--- a/lib/models/client_state.dart
+++ b/lib/models/client_state.dart
@@ -3,7 +3,7 @@ import "package:freezed_annotation/freezed_annotation.dart";
 part "client_state.freezed.dart";
 part "client_state.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const ClientState({
   required final bool isInitialized,
@@ -12,7 +12,6 @@ class const ClientState({
   required final String? userId,
   required final String? homeserverUrl,
 }) with _$ClientState {
-  @override
   Map<String, Object?> toJson() => _$ClientStateToJson(this);
 
   factory ClientState.fromJson(Map<String, Object?> json) =>
diff --git a/lib/models/configs/members_by_status.dart b/lib/models/configs/members_by_status.dart
index c15d48e..6b4aec4 100644
--- a/lib/models/configs/members_by_status.dart
+++ b/lib/models/configs/members_by_status.dart
@@ -4,13 +4,12 @@ import "package:nexus/models/membership_status.dart";
 part "members_by_status.freezed.dart";
 part "members_by_status.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const MembersByStatusConfig({
   required final String roomId,
   required final MembershipStatus status,
 }) with _$MembersByStatusConfig {
-  @override
   Map<String, Object?> toJson() => _$MembersByStatusConfigToJson(this);
 
   factory MembersByStatusConfig.fromJson(Map<String, Object?> json) =>
diff --git a/lib/models/configs/reactions.dart b/lib/models/configs/reactions.dart
index b06cff4..b9de793 100644
--- a/lib/models/configs/reactions.dart
+++ b/lib/models/configs/reactions.dart
@@ -3,13 +3,12 @@ import "package:freezed_annotation/freezed_annotation.dart";
 part "reactions.freezed.dart";
 part "reactions.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const ReactionsConfig({
   required final String roomId,
   required final int eventRowId,
 }) with _$ReactionsConfig {
-  @override
   Map<String, Object?> toJson() => _$ReactionsConfigToJson(this);
 
   factory ReactionsConfig.fromJson(Map<String, Object?> json) =>
diff --git a/lib/models/configs/user.dart b/lib/models/configs/user.dart
index e332a3d..bbbc83d 100644
--- a/lib/models/configs/user.dart
+++ b/lib/models/configs/user.dart
@@ -3,11 +3,10 @@ import "package:freezed_annotation/freezed_annotation.dart";
 part "user.freezed.dart";
 part "user.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const UserConfig({final String? roomId, required final String userId})
     with _$UserConfig {
-  @override
   Map<String, Object?> toJson() => _$UserConfigToJson(this);
 
   factory UserConfig.fromJson(Map<String, Object?> json) =>
diff --git a/lib/models/content/create.dart b/lib/models/content/create.dart
index b4a60cf..b937a94 100644
--- a/lib/models/content/create.dart
+++ b/lib/models/content/create.dart
@@ -30,10 +30,9 @@ enum RoomType {
   space,
 }
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const PreviousRoom({required final String roomId}) with _$PreviousRoom {
-  @override
   Map<String, Object?> toJson() => _$PreviousRoomToJson(this);
 
   factory PreviousRoom.fromJson(Map<String, Object?> json) =>
diff --git a/lib/models/content/join_rules.dart b/lib/models/content/join_rules.dart
index 104820a..3f1c17b 100644
--- a/lib/models/content/join_rules.dart
+++ b/lib/models/content/join_rules.dart
@@ -17,13 +17,12 @@ sealed class JoinRulesContent extends Content with _$JoinRulesContent {
       _$JoinRulesContentFromJson(json);
 }
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const AllowCondition({
   final String? roomId,
   required final AllowConditionType type,
 }) with _$AllowCondition {
-  @override
   Map<String, Object?> toJson() => _$AllowConditionToJson(this);
 
   factory AllowCondition.fromJson(Map<String, Object?> json) =>
diff --git a/lib/models/content/power_levels.dart b/lib/models/content/power_levels.dart
index 33e796f..5ae6561 100644
--- a/lib/models/content/power_levels.dart
+++ b/lib/models/content/power_levels.dart
@@ -24,13 +24,12 @@ sealed class PowerLevelsContent extends Content with _$PowerLevelsContent {
       _$PowerLevelsContentFromJson(json);
 }
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const Notifications({
   final int room = 50,
   final IMap<String, int> other = const IMap.empty(),
 }) with _$Notifications {
-  @override
   Map<String, Object?> toJson() => _$NotificationsToJson(this);
 
   factory Notifications.fromJson(Map<String, Object?> json) =>
diff --git a/lib/models/content/topic.dart b/lib/models/content/topic.dart
index 785240e..c8256e3 100644
--- a/lib/models/content/topic.dart
+++ b/lib/models/content/topic.dart
@@ -17,25 +17,23 @@ sealed class TopicContent extends Content with _$TopicContent {
       _$TopicContentFromJson(json);
 }
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const TopicContentBlock({
   final IList<TextualRepresentation> representations = const IList.empty(),
 }) with _$TopicContentBlock {
-  @override
   Map<String, Object?> toJson() => _$TopicContentBlockToJson(this);
 
   factory TopicContentBlock.fromJson(Map<String, Object?> json) =>
       _$TopicContentBlockFromJson(json);
 }
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const TextualRepresentation({
   required final String body,
   final String mimetype = "text/plain",
 }) with _$TextualRepresentation {
-  @override
   Map<String, Object?> toJson() => _$TextualRepresentationToJson(this);
 
   factory TextualRepresentation.fromJson(Map<String, Object?> json) =>
diff --git a/lib/models/emoji.dart b/lib/models/emoji.dart
new file mode 100644
index 0000000..149ae18
--- /dev/null
+++ b/lib/models/emoji.dart
@@ -0,0 +1,18 @@
+import "package:fast_immutable_collections/fast_immutable_collections.dart";
+import "package:freezed_annotation/freezed_annotation.dart";
+part "emoji.freezed.dart";
+part "emoji.g.dart";
+
+@Freezed(toJson: false, fromJson: false)
+@JsonSerializable()
+class Emoji({
+  required final String emoji,
+  required final String category,
+  required final IList<String> aliases,
+  required final String description,
+  required final IList<String> tags,
+}) with _$Emoji {
+  Map<String, Object?> toJson() => _$EmojiToJson(this);
+
+  factory Emoji.fromJson(Map<String, Object?> json) => _$EmojiFromJson(json);
+}
diff --git a/lib/models/event.dart b/lib/models/event.dart
index 56fea96..d06b41a 100644
--- a/lib/models/event.dart
+++ b/lib/models/event.dart
@@ -7,7 +7,7 @@ import "package:nexus/models/profile_response.dart";
 part "event.freezed.dart";
 part "event.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const Event({
   @JsonKey(name: "rowid") required final int rowId,
@@ -34,7 +34,6 @@ class const Event({
   required final Content content,
   required final Content? previousContent,
 }) with _$Event {
-  @override
   Map<String, Object?> toJson() => _$EventToJson(this);
 
   static String typeJsonFromJson(Map<dynamic, dynamic> json, _) =>
@@ -75,7 +74,7 @@ class const Event({
       );
 }
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const LocalContent({
   final String? sanitizedHtml,
@@ -85,7 +84,6 @@ class const LocalContent({
   final bool? hasMath,
   final bool? replyFallbackRemoved,
 }) with _$LocalContent {
-  @override
   Map<String, Object?> toJson() => _$LocalContentToJson(this);
 
   @override
diff --git a/lib/models/info/audio.dart b/lib/models/info/audio.dart
index be116a7..ac90282 100644
--- a/lib/models/info/audio.dart
+++ b/lib/models/info/audio.dart
@@ -4,14 +4,13 @@ import "package:nexus/models/ms_duration.dart";
 part "audio.freezed.dart";
 part "audio.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const AudioInfo({
   @MSDuration() final Duration? duration,
   @JsonKey(name: "mimetype") final String? mimeType,
   final int? size,
 }) with _$AudioInfo {
-  @override
   Map<String, Object?> toJson() => _$AudioInfoToJson(this);
 
   factory AudioInfo.fromJson(Map<String, Object?> json) =>
diff --git a/lib/models/info/file.dart b/lib/models/info/file.dart
index 6b26859..ce0aa84 100644
--- a/lib/models/info/file.dart
+++ b/lib/models/info/file.dart
@@ -3,13 +3,12 @@ import "package:freezed_annotation/freezed_annotation.dart";
 part "file.freezed.dart";
 part "file.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const FileInfo({
   @JsonKey(name: "mimetype") final String? mimeType,
   final int? size,
 }) with _$FileInfo {
-  @override
   Map<String, Object?> toJson() => _$FileInfoToJson(this);
 
   factory FileInfo.fromJson(Map<String, Object?> json) =>
diff --git a/lib/models/info/image.dart b/lib/models/info/image.dart
index 8b448eb..266fb01 100644
--- a/lib/models/info/image.dart
+++ b/lib/models/info/image.dart
@@ -3,7 +3,7 @@ import "package:freezed_annotation/freezed_annotation.dart";
 part "image.freezed.dart";
 part "image.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const ImageInfo({
   @JsonKey(name: "h") final double? height,
@@ -12,7 +12,6 @@ class const ImageInfo({
   @JsonKey(name: "xyz.amorgan.blurhash") final String? blurHash,
   final int? size,
 }) with _$ImageInfo {
-  @override
   Map<String, Object?> toJson() => _$ImageInfoToJson(this);
 
   factory ImageInfo.fromJson(Map<String, Object?> json) =>
diff --git a/lib/models/info/video.dart b/lib/models/info/video.dart
index 7c0473f..31b1fb6 100644
--- a/lib/models/info/video.dart
+++ b/lib/models/info/video.dart
@@ -4,7 +4,7 @@ import "package:nexus/models/ms_duration.dart";
 part "video.freezed.dart";
 part "video.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const VideoInfo({
   @JsonKey(name: "h") final int? height,
@@ -13,7 +13,6 @@ class const VideoInfo({
   @MSDuration() final Duration? duration,
   final int? size,
 }) with _$VideoInfo {
-  @override
   Map<String, Object?> toJson() => _$VideoInfoToJson(this);
 
   factory VideoInfo.fromJson(Map<String, Object?> json) =>
diff --git a/lib/models/lazy_load_summary.dart b/lib/models/lazy_load_summary.dart
index 4196d69..f9a814e 100644
--- a/lib/models/lazy_load_summary.dart
+++ b/lib/models/lazy_load_summary.dart
@@ -4,14 +4,13 @@ import "package:freezed_annotation/freezed_annotation.dart";
 part "lazy_load_summary.freezed.dart";
 part "lazy_load_summary.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const LazyLoadSummary({
   required final IList<String>? heroes,
   required final int? joinedMemberCount,
   required final int? invitedMemberCount,
 }) with _$LazyLoadSummary {
-  @override
   Map<String, Object?> toJson() => _$LazyLoadSummaryToJson(this);
 
   factory LazyLoadSummary.fromJson(Map<String, Object?> json) =>
diff --git a/lib/models/oauth_auth_code_response.dart b/lib/models/oauth_auth_code_response.dart
index 06d918f..3074335 100644
--- a/lib/models/oauth_auth_code_response.dart
+++ b/lib/models/oauth_auth_code_response.dart
@@ -3,14 +3,13 @@ import "package:freezed_annotation/freezed_annotation.dart";
 part "oauth_auth_code_response.freezed.dart";
 part "oauth_auth_code_response.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const OAuthAuthCodeResponse({
   required final String state,
   required final String codeVerifier,
   required final Uri url,
 }) with _$OAuthAuthCodeResponse {
-  @override
   Map<String, Object?> toJson() => _$OAuthAuthCodeResponseToJson(this);
 
   factory OAuthAuthCodeResponse.fromJson(Map<String, Object?> json) =>
diff --git a/lib/models/open_graph_data.dart b/lib/models/open_graph_data.dart
index 3fd4228..a183ef7 100644
--- a/lib/models/open_graph_data.dart
+++ b/lib/models/open_graph_data.dart
@@ -3,7 +3,7 @@ import "package:freezed_annotation/freezed_annotation.dart";
 part "open_graph_data.freezed.dart";
 part "open_graph_data.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const OpenGraphData({
   @JsonKey(name: "og:title") required final String? title,
@@ -12,7 +12,6 @@ class const OpenGraphData({
   @JsonKey(name: "og:image:width") required final double? width,
   @JsonKey(name: "og:image:height") required final double? height,
 }) with _$OpenGraphData {
-  @override
   Map<String, Object?> toJson() => _$OpenGraphDataToJson(this);
 
   factory OpenGraphData.fromJson(Map<String, dynamic> json) =>
diff --git a/lib/models/paginate.dart b/lib/models/paginate.dart
index 2f7902f..dc6eede 100644
--- a/lib/models/paginate.dart
+++ b/lib/models/paginate.dart
@@ -5,14 +5,13 @@ import "package:nexus/models/event.dart";
 part "paginate.freezed.dart";
 part "paginate.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const Paginate({
   required final IList<Event> events,
   required final IList<Event> relatedEvents,
   required final bool hasMore,
 }) with _$Paginate {
-  @override
   Map<String, Object?> toJson() => _$PaginateToJson(this);
 
   factory Paginate.fromJson(Map<String, Object?> json) =>
diff --git a/lib/models/profile_response.dart b/lib/models/profile_response.dart
index 03ad88f..8984bcf 100644
--- a/lib/models/profile_response.dart
+++ b/lib/models/profile_response.dart
@@ -5,30 +5,28 @@ import "package:nexus/models/content/membership.dart";
 part "profile_response.freezed.dart";
 part "profile_response.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const ProfileResponse({
   @JsonKey(fromJson: Profile.fromJson) required final Profile profile,
   required final Bio? bio,
 }) with _$ProfileResponse {
-  @override
   Map<String, Object?> toJson() => _$ProfileResponseToJson(this);
 
   factory ProfileResponse.fromJson(Map<String, Object?> json) =>
       _$ProfileResponseFromJson(json);
 }
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const Bio({required final String html, final String? editSource})
     with _$Bio {
-  @override
   Map<String, Object?> toJson() => _$BioToJson(this);
 
   factory Bio.fromJson(Map<String, Object?> json) => _$BioFromJson(json);
 }
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const Profile({
   final String? id,
@@ -44,7 +42,6 @@ class const Profile({
   @JsonKey(readValue: Profile.readPronouns, name: "m.pronouns")
   final IList<Pronoun> pronouns = const IList.empty(),
 }) with _$Profile {
-  @override
   Map<String, Object?> toJson() => _$ProfileToJson(this);
 
   static Object? readPronouns(Map<dynamic, dynamic> map, String key) =>
@@ -65,13 +62,12 @@ class const Profile({
   }
 }
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const Pronoun({
   required final String language,
   required final String summary,
 }) with _$Pronoun {
-  @override
   Map<String, Object?> toJson() => _$PronounToJson(this);
 
   factory Pronoun.fromJson(Map<String, Object?> json) =>
diff --git a/lib/models/read_receipt.dart b/lib/models/read_receipt.dart
index b0d3513..ab4edd8 100644
--- a/lib/models/read_receipt.dart
+++ b/lib/models/read_receipt.dart
@@ -4,7 +4,7 @@ import "package:nexus/models/epoch_date_time_converter.dart";
 part "read_receipt.freezed.dart";
 part "read_receipt.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const ReadReceipt({
   final String? roomId,
@@ -13,7 +13,6 @@ class const ReadReceipt({
   required final String eventId,
   @EpochDateTimeConverter() required final DateTime timestamp,
 }) with _$ReadReceipt {
-  @override
   Map<String, Object?> toJson() => _$ReadReceiptToJson(this);
 
   factory ReadReceipt.fromJson(Map<String, Object?> json) =>
diff --git a/lib/models/requests/download_media.dart b/lib/models/requests/download_media.dart
index d77f286..c9751f8 100644
--- a/lib/models/requests/download_media.dart
+++ b/lib/models/requests/download_media.dart
@@ -3,7 +3,7 @@ import "package:freezed_annotation/freezed_annotation.dart";
 part "download_media.freezed.dart";
 part "download_media.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const DownloadMediaRequest({
   required final Uri mxc,
@@ -11,7 +11,6 @@ class const DownloadMediaRequest({
   final bool isAvatar = false,
   final bool thumbnailAvatar = false,
 }) with _$DownloadMediaRequest {
-  @override
   Map<String, Object?> toJson() => _$DownloadMediaRequestToJson(this);
 
   factory DownloadMediaRequest.fromJson(Map<String, Object?> json) =>
diff --git a/lib/models/requests/get_event.dart b/lib/models/requests/get_event.dart
index 84f14ef..b4692ee 100644
--- a/lib/models/requests/get_event.dart
+++ b/lib/models/requests/get_event.dart
@@ -3,14 +3,13 @@ import "package:freezed_annotation/freezed_annotation.dart";
 part "get_event.freezed.dart";
 part "get_event.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const GetEventRequest({
   required final String roomId,
   required final String eventId,
   final bool unredact = false,
 }) with _$GetEventRequest {
-  @override
   Map<String, Object?> toJson() => _$GetEventRequestToJson(this);
 
   factory GetEventRequest.fromJson(Map<String, Object?> json) =>
diff --git a/lib/models/requests/get_related_events.dart b/lib/models/requests/get_related_events.dart
index 79ea74b..08be426 100644
--- a/lib/models/requests/get_related_events.dart
+++ b/lib/models/requests/get_related_events.dart
@@ -3,14 +3,13 @@ import "package:freezed_annotation/freezed_annotation.dart";
 part "get_related_events.freezed.dart";
 part "get_related_events.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const GetRelatedEventsRequest({
   required final String roomId,
   required final String eventId,
   required final String relationType,
 }) with _$GetRelatedEventsRequest {
-  @override
   Map<String, Object?> toJson() => _$GetRelatedEventsRequestToJson(this);
 
   factory GetRelatedEventsRequest.fromJson(Map<String, Object?> json) =>
diff --git a/lib/models/requests/get_room_state.dart b/lib/models/requests/get_room_state.dart
index 63f0f8e..66504da 100644
--- a/lib/models/requests/get_room_state.dart
+++ b/lib/models/requests/get_room_state.dart
@@ -3,7 +3,7 @@ import "package:freezed_annotation/freezed_annotation.dart";
 part "get_room_state.freezed.dart";
 part "get_room_state.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const GetRoomStateRequest({
   required final String roomId,
@@ -11,7 +11,6 @@ class const GetRoomStateRequest({
   final bool fetchMembers = false,
   final bool includeMembers = false,
 }) with _$GetRoomStateRequest {
-  @override
   Map<String, Object?> toJson() => _$GetRoomStateRequestToJson(this);
 
   factory GetRoomStateRequest.fromJson(Map<String, Object?> json) =>
diff --git a/lib/models/requests/join_room.dart b/lib/models/requests/join_room.dart
index c238a53..350b762 100644
--- a/lib/models/requests/join_room.dart
+++ b/lib/models/requests/join_room.dart
@@ -4,13 +4,12 @@ import "package:freezed_annotation/freezed_annotation.dart";
 part "join_room.freezed.dart";
 part "join_room.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const JoinRoomRequest({
   required final String roomIdOrAlias,
   final IList<String> via = const IList.empty(),
 }) with _$JoinRoomRequest {
-  @override
   Map<String, Object?> toJson() => _$JoinRoomRequestToJson(this);
 
   factory JoinRoomRequest.fromJson(Map<String, Object?> json) =>
diff --git a/lib/models/requests/oauth/exchange_token.dart b/lib/models/requests/oauth/exchange_token.dart
index cd7da28..fb47358 100644
--- a/lib/models/requests/oauth/exchange_token.dart
+++ b/lib/models/requests/oauth/exchange_token.dart
@@ -3,7 +3,7 @@ import "package:freezed_annotation/freezed_annotation.dart";
 part "exchange_token.freezed.dart";
 part "exchange_token.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const OAuthExchangeTokenRequest({
   required final Uri homeserverUrl,
@@ -12,7 +12,6 @@ class const OAuthExchangeTokenRequest({
   required final String code,
   required final String clientId,
 }) with _$OAuthExchangeTokenRequest {
-  @override
   Map<String, Object?> toJson() => _$OAuthExchangeTokenRequestToJson(this);
 
   factory OAuthExchangeTokenRequest.fromJson(Map<String, Object?> json) =>
diff --git a/lib/models/requests/oauth/get_auth_url.dart b/lib/models/requests/oauth/get_auth_url.dart
index b1940de..1ff166a 100644
--- a/lib/models/requests/oauth/get_auth_url.dart
+++ b/lib/models/requests/oauth/get_auth_url.dart
@@ -6,7 +6,7 @@ import "package:freezed_annotation/freezed_annotation.dart";
 part "get_auth_url.freezed.dart";
 part "get_auth_url.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const OAuthGetAuthUrl({
   required final ResponseMode responseMode,
@@ -16,7 +16,6 @@ class const OAuthGetAuthUrl({
   required final String clientId,
   final String? userIdHint,
 }) with _$OAuthGetAuthUrl {
-  @override
   Map<String, Object?> toJson() => _$OAuthGetAuthUrlToJson(this);
 
   factory OAuthGetAuthUrl.fromJson(Map<String, Object?> json) =>
diff --git a/lib/models/requests/oauth/register_client.dart b/lib/models/requests/oauth/register_client.dart
index be04edf..e5c1a70 100644
--- a/lib/models/requests/oauth/register_client.dart
+++ b/lib/models/requests/oauth/register_client.dart
@@ -4,7 +4,7 @@ import "package:freezed_annotation/freezed_annotation.dart";
 part "register_client.freezed.dart";
 part "register_client.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const OAuthRegisterClientRequest({
   required final Uri homeserverUrl,
@@ -21,7 +21,6 @@ class const OAuthRegisterClientRequest({
   @JsonKey(name: "token_endpoint_auth_method")
   final AuthMethod? authMethod = AuthMethod.none,
 }) with _$OAuthRegisterClientRequest {
-  @override
   Map<String, Object?> toJson() => _$OAuthRegisterClientRequestToJson(this);
 
   factory OAuthRegisterClientRequest.fromJson(Map<String, Object?> json) =>
diff --git a/lib/models/requests/paginate.dart b/lib/models/requests/paginate.dart
index 444b7b6..b3903c6 100644
--- a/lib/models/requests/paginate.dart
+++ b/lib/models/requests/paginate.dart
@@ -3,14 +3,13 @@ import "package:freezed_annotation/freezed_annotation.dart";
 part "paginate.freezed.dart";
 part "paginate.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const PaginateRequest({
   required final String roomId,
   required final int? maxTimelineId,
   final int limit = 20,
 }) with _$PaginateRequest {
-  @override
   Map<String, Object?> toJson() => _$PaginateRequestToJson(this);
 
   factory PaginateRequest.fromJson(Map<String, Object?> json) =>
diff --git a/lib/models/requests/report.dart b/lib/models/requests/report.dart
index d107294..ed05715 100644
--- a/lib/models/requests/report.dart
+++ b/lib/models/requests/report.dart
@@ -3,14 +3,13 @@ import "package:freezed_annotation/freezed_annotation.dart";
 part "report.freezed.dart";
 part "report.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const ReportRequest({
   required final String roomId,
   required final String eventId,
   final String? reason,
 }) with _$ReportRequest {
-  @override
   Map<String, Object?> toJson() => _$ReportRequestToJson(this);
 
   factory ReportRequest.fromJson(Map<String, Object?> json) =>
diff --git a/lib/models/requests/send_event.dart b/lib/models/requests/send_event.dart
index 2246601..acad57f 100644
--- a/lib/models/requests/send_event.dart
+++ b/lib/models/requests/send_event.dart
@@ -4,7 +4,7 @@ import "package:nexus/models/content/content.dart";
 part "send_event.freezed.dart";
 part "send_event.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const SendEventRequest({
   required final String roomId,
@@ -15,7 +15,6 @@ class const SendEventRequest({
   final bool synchronous = false,
   final bool disableEncryption = false,
 }) with _$SendEventRequest {
-  @override
   Map<String, Object?> toJson() => _$SendEventRequestToJson(this);
 
   factory SendEventRequest.fromJson(Map<String, Object?> json) =>
diff --git a/lib/models/requests/send_message.dart b/lib/models/requests/send_message.dart
index 47215a7..e9bbbb2 100644
--- a/lib/models/requests/send_message.dart
+++ b/lib/models/requests/send_message.dart
@@ -6,29 +6,27 @@ import "package:nexus/models/relation_type.dart";
 part "send_message.freezed.dart";
 part "send_message.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const SendMessageRequest({
   required final String roomId,
   required final String text,
   final Content? baseContent,
-  @JsonKey(name: "mentions") final Mentions mentions = const _Mentions(),
+  @JsonKey(name: "mentions") final Mentions mentions = const Mentions(),
   @JsonKey(name: "relates_to") final Relation? relation,
 }) with _$SendMessageRequest {
-  @override
   Map<String, Object?> toJson() => _$SendMessageRequestToJson(this);
 
   factory SendMessageRequest.fromJson(Map<String, Object?> json) =>
       _$SendMessageRequestFromJson(json);
 }
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const Mentions({
   final bool room = false,
   final IList<String> userIds = const IList.empty(),
 }) with _$Mentions {
-  @override
   Map<String, Object?> toJson() => _$MentionsToJson(this);
 
   factory Mentions.fromJson(Map<String, Object?> json) =>
diff --git a/lib/models/requests/set_account_data.dart b/lib/models/requests/set_account_data.dart
index ba7365a..95ef75c 100644
--- a/lib/models/requests/set_account_data.dart
+++ b/lib/models/requests/set_account_data.dart
@@ -3,14 +3,13 @@ import "package:freezed_annotation/freezed_annotation.dart";
 part "set_account_data.freezed.dart";
 part "set_account_data.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const SetAccountDataRequest({
   required final String type,
   required final dynamic content,
   final String? roomId,
 }) with _$SetAccountDataRequest {
-  @override
   Map<String, Object?> toJson() => _$SetAccountDataRequestToJson(this);
 
   factory SetAccountDataRequest.fromJson(Map<String, Object?> json) =>
diff --git a/lib/models/requests/set_membership.dart b/lib/models/requests/set_membership.dart
index 8f540fd..9d88da2 100644
--- a/lib/models/requests/set_membership.dart
+++ b/lib/models/requests/set_membership.dart
@@ -4,7 +4,7 @@ import "package:nexus/models/membership_action.dart";
 part "set_membership.freezed.dart";
 part "set_membership.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const SetMembershipRequest({
   required final String userId,
@@ -13,7 +13,6 @@ class const SetMembershipRequest({
   @JsonKey(name: "action") required final MembershipAction action,
   @JsonKey(name: "msc4293_redact_events") final bool redact = false,
 }) with _$SetMembershipRequest {
-  @override
   Map<String, Object?> toJson() => _$SetMembershipRequestToJson(this);
 
   factory SetMembershipRequest.fromJson(Map<String, Object?> json) =>
diff --git a/lib/models/requests/set_state.dart b/lib/models/requests/set_state.dart
index 045644a..d0e3e95 100644
--- a/lib/models/requests/set_state.dart
+++ b/lib/models/requests/set_state.dart
@@ -5,7 +5,7 @@ import "package:nexus/models/ms_duration.dart";
 part "set_state.freezed.dart";
 part "set_state.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const SetStateRequest({
   required final String roomId,
@@ -17,7 +17,6 @@ class const SetStateRequest({
   @MSDuration()
   final Duration? delay,
 }) with _$SetStateRequest {
-  @override
   Map<String, Object?> toJson() => _$SetStateRequestToJson(this);
 
   factory SetStateRequest.fromJson(Map<String, Object?> json) =>
diff --git a/lib/models/requests/upload_media.dart b/lib/models/requests/upload_media.dart
index 78d36db..d6e69ac 100644
--- a/lib/models/requests/upload_media.dart
+++ b/lib/models/requests/upload_media.dart
@@ -3,7 +3,7 @@ import "package:freezed_annotation/freezed_annotation.dart";
 part "upload_media.freezed.dart";
 part "upload_media.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const UploadMediaRequest({
   required final String path,
@@ -20,7 +20,6 @@ class const UploadMediaRequest({
   final int? resizePercent,
   final int quality = 80,
 }) with _$UploadMediaRequest {
-  @override
   Map<String, Object?> toJson() => _$UploadMediaRequestToJson(this);
 
   factory UploadMediaRequest.fromJson(Map<String, Object?> json) =>
diff --git a/lib/models/room.dart b/lib/models/room.dart
index 483c11a..d030043 100644
--- a/lib/models/room.dart
+++ b/lib/models/room.dart
@@ -7,7 +7,7 @@ import "package:nexus/models/room_metadata.dart";
 part "room.freezed.dart";
 part "room.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const Room({
   @JsonKey(name: "meta") final RoomMetadata? metadata,
@@ -53,7 +53,6 @@ class const Room({
         }),
       );
 
-  @override
   Map<String, Object?> toJson() => _$RoomToJson(this);
 
   factory Room.fromJson(Map<String, Object?> json) => _$RoomFromJson(json);
diff --git a/lib/models/room_metadata.dart b/lib/models/room_metadata.dart
index a152f2d..3aafd0e 100644
--- a/lib/models/room_metadata.dart
+++ b/lib/models/room_metadata.dart
@@ -5,7 +5,7 @@ import "package:nexus/models/lazy_load_summary.dart";
 part "room_metadata.freezed.dart";
 part "room_metadata.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const RoomMetadata({
   @JsonKey(name: "room_id") required final String id,
@@ -25,7 +25,6 @@ class const RoomMetadata({
   required final int unreadNotifications,
   required final int unreadMessages,
 }) with _$RoomMetadata {
-  @override
   Map<String, Object?> toJson() => _$RoomMetadataToJson(this);
 
   factory RoomMetadata.fromJson(Map<String, Object?> json) =>
diff --git a/lib/models/room_summary.dart b/lib/models/room_summary.dart
index b603314..7c2d6d2 100644
--- a/lib/models/room_summary.dart
+++ b/lib/models/room_summary.dart
@@ -5,7 +5,7 @@ import "package:nexus/models/join_rule.dart";
 part "room_summary.freezed.dart";
 part "room_summary.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const RoomSummary({
   required final String roomId,
@@ -18,7 +18,6 @@ class const RoomSummary({
   final String? roomVersion,
   @JsonKey(unknownEnumValue: RoomType.room) final RoomType? roomType,
 }) with _$RoomSummary {
-  @override
   Map<String, Object?> toJson() => _$RoomSummaryToJson(this);
 
   factory RoomSummary.fromJson(Map<String, Object?> json) =>
diff --git a/lib/models/settings.dart b/lib/models/settings.dart
index 31aca21..7f73375 100644
--- a/lib/models/settings.dart
+++ b/lib/models/settings.dart
@@ -4,14 +4,13 @@ import "package:freezed_annotation/freezed_annotation.dart";
 part "settings.freezed.dart";
 part "settings.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const Settings({
   final ThemeMode theme = ThemeMode.system,
   final bool useDynamicTheming = true,
   final bool linuxMobileMode = false,
 }) with _$Settings {
-  @override
   Map<String, Object?> toJson() => _$SettingsToJson(this);
 
   factory Settings.fromJson(Map<String, Object?> json) =>
diff --git a/lib/models/space_edge.dart b/lib/models/space_edge.dart
index a45be48..ea74130 100644
--- a/lib/models/space_edge.dart
+++ b/lib/models/space_edge.dart
@@ -3,13 +3,12 @@ import "package:freezed_annotation/freezed_annotation.dart";
 part "space_edge.freezed.dart";
 part "space_edge.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const SpaceEdge({
   required final String childId,
   final bool suggested = false,
 }) with _$SpaceEdge {
-  @override
   Map<String, Object?> toJson() => _$SpaceEdgeToJson(this);
 
   factory SpaceEdge.fromJson(Map<String, Object?> json) =>
diff --git a/lib/models/spec_versions_response.dart b/lib/models/spec_versions_response.dart
index ca847ed..1f414d2 100644
--- a/lib/models/spec_versions_response.dart
+++ b/lib/models/spec_versions_response.dart
@@ -4,20 +4,19 @@ import "package:freezed_annotation/freezed_annotation.dart";
 part "spec_versions_response.freezed.dart";
 part "spec_versions_response.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const SpecVersionsResponse({
   required final IList<String> versions,
   required final UnstableFeatures unstableFeatures,
 }) with _$SpecVersionsResponse {
-  @override
   Map<String, Object?> toJson() => _$SpecVersionsResponseToJson(this);
 
   factory SpecVersionsResponse.fromJson(Map<String, Object?> json) =>
       _$SpecVersionsResponseFromJson(json);
 }
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const UnstableFeatures({
   @JsonKey(name: "uk.timedout.msc4494") final bool msc4494 = false,
diff --git a/lib/models/sync_data.dart b/lib/models/sync_data.dart
index 9e32673..a9c10bf 100644
--- a/lib/models/sync_data.dart
+++ b/lib/models/sync_data.dart
@@ -6,7 +6,7 @@ import "package:nexus/models/space_edge.dart";
 part "sync_data.freezed.dart";
 part "sync_data.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const SyncData({
   final bool clearState = false,
diff --git a/lib/models/sync_status.dart b/lib/models/sync_status.dart
index 94a69cf..57bd882 100644
--- a/lib/models/sync_status.dart
+++ b/lib/models/sync_status.dart
@@ -3,7 +3,7 @@ import "package:freezed_annotation/freezed_annotation.dart";
 part "sync_status.freezed.dart";
 part "sync_status.g.dart";
 
-@freezed
+@Freezed(toJson: false, fromJson: false)
 @JsonSerializable()
 class const SyncStatus({
   required final SyncStatusType type,
diff --git a/pubspec.lock b/pubspec.lock
index f0dd0a0..901a1ca 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -301,10 +301,10 @@ packages:
     dependency: "direct main"
     description:
       name: dynamic_color
-      sha256: "4aeb76de323e8eb660bab5557d826ad7ebbf1434a598f0c6aa8a11a9696a6757"
+      sha256: "869b3bce0100eb519768ecd71c0111f0b5ea679f5f62e1f59c49d80067e730c5"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.0"
+    version: "2.1.0"
   dynamic_polls:
     dependency: "direct main"
     description:
@@ -1004,7 +1004,7 @@ packages:
     description:
       path: "packages/navigation_rail_m3e"
       ref: HEAD
-      resolved-ref: "667b0bc8526fd53296778903b6ef3f22424f3aa4"
+      resolved-ref: c9edb0be7251e1a31e2336444f00557eb93ca09d
       url: "https://github.com/Henry-Hiles/material_3_expressive"
     source: git
     version: "0.3.5"
diff --git a/pubspec.yaml b/pubspec.yaml
index c9c2860..42e0426 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -18,6 +18,7 @@ environment:
     sdk: 3.13.0
 
 dependency_overrides:
+    dynamic_color: 2.1.0
     path_provider_android: 2.2.23 # Pinned to avoid JNI
     linkify:
         git:
@@ -38,7 +39,7 @@ dependencies:
     freezed_annotation: 3.1.0
     image_picker: 1.2.3
     path: 1.9.1
-    dynamic_color: 1.9.0
+    dynamic_color: 2.1.0
     collection: 1.19.1
     window_manager: 0.5.2
     color_hash: 1.0.1