diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 1e198ad9..4e50bad4 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -29,10 +29,6 @@
         android:enableOnBackInvokedCallback="true"
         android:networkSecurityConfig="@xml/network_security_config">
 
-        <meta-data
-            android:name="wger.check_min_app_version"
-            android:value="true" />
-
         <activity
             android:name=".MainActivity"
             android:exported="true"
diff --git a/lib/helpers/consts.dart b/lib/helpers/consts.dart
index bdce093d..ac39612a 100644
--- a/lib/helpers/consts.dart
+++ b/lib/helpers/consts.dart
@@ -31,9 +31,6 @@ const DEFAULT_SERVER_TEST = 'https://wger-master.rge.uber.space/';
 const TESTSERVER_USER_NAME = 'user';
 const TESTSERVER_PASSWORD = 'flutteruser';
 
-/// Keys used in the android manifest
-const MANIFEST_KEY_CHECK_UPDATE = 'wger.check_min_app_version';
-
 /// Default impression for a workout session (neutral)
 const DEFAULT_IMPRESSION = 2;
 
diff --git a/lib/main.dart b/lib/main.dart
index 479fe39e..71e7b25c 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -54,6 +54,7 @@ import 'package:wger/screens/routine_list_screen.dart';
 import 'package:wger/screens/routine_logs_screen.dart';
 import 'package:wger/screens/routine_screen.dart';
 import 'package:wger/screens/splash_screen.dart';
+import 'package:wger/screens/update_app_screen.dart';
 import 'package:wger/screens/weight_screen.dart';
 import 'package:wger/theme/theme.dart';
 import 'package:wger/widgets/core/about.dart';
@@ -82,11 +83,27 @@ void main() async {
   await PreferenceHelper.instance.migrationSupportFunctionForSharedPreferences();
 
   // Application
-  runApp(const riverpod.ProviderScope(child: MyApp()));
+  runApp(const riverpod.ProviderScope(child: MainApp()));
 }
 
-class MyApp extends StatelessWidget {
-  const MyApp();
+class MainApp extends StatelessWidget {
+  const MainApp();
+
+  Widget _getHomeScreen(AuthProvider auth) {
+    if (auth.state == AuthState.loggedIn) {
+      return HomeTabsScreen();
+    } else if (auth.state == AuthState.updateRequired) {
+      return const UpdateAppScreen();
+    } else {
+      return FutureBuilder(
+        future: auth.tryAutoLogin(),
+        builder: (ctx, authResultSnapshot) =>
+            authResultSnapshot.connectionState == ConnectionState.waiting
+                ? const SplashScreen()
+                : const AuthScreen(),
+      );
+    }
+  }
 
   @override
   Widget build(BuildContext context) {
@@ -161,15 +178,7 @@ class MyApp extends StatelessWidget {
             highContrastTheme: wgerLightThemeHc,
             highContrastDarkTheme: wgerDarkThemeHc,
             themeMode: user.themeMode,
-            home: auth.isAuth
-                ? HomeTabsScreen()
-                : FutureBuilder(
-                    future: auth.tryAutoLogin(),
-                    builder: (ctx, authResultSnapshot) =>
-                        authResultSnapshot.connectionState == ConnectionState.waiting
-                            ? const SplashScreen()
-                            : const AuthScreen(),
-                  ),
+            home: _getHomeScreen(auth),
             routes: {
               DashboardScreen.routeName: (ctx) => const DashboardScreen(),
               FormScreen.routeName: (ctx) => const FormScreen(),
diff --git a/lib/models/exercises/exercise_api.dart b/lib/models/exercises/exercise_api.dart
index 7cf6c687..b89eafc1 100644
--- a/lib/models/exercises/exercise_api.dart
+++ b/lib/models/exercises/exercise_api.dart
@@ -16,7 +16,7 @@ part 'exercise_api.g.dart';
 /// Basically this is just used as a convenience to create "real" exercise
 /// objects and nothing more
 @freezed
-class ExerciseApiData with _$ExerciseApiData {
+sealed class ExerciseApiData with _$ExerciseApiData {
   factory ExerciseApiData({
     required int id,
     required String uuid,
@@ -52,7 +52,7 @@ class ExerciseApiData with _$ExerciseApiData {
 /// Model for the search results returned from the /api/v2/exercise/search endpoint
 ///
 @freezed
-class ExerciseSearchDetails with _$ExerciseSearchDetails {
+sealed class ExerciseSearchDetails with _$ExerciseSearchDetails {
   factory ExerciseSearchDetails({
     // ignore: invalid_annotation_target
     @JsonKey(name: 'id') required int translationId,
@@ -70,7 +70,7 @@ class ExerciseSearchDetails with _$ExerciseSearchDetails {
 }
 
 @freezed
-class ExerciseSearchEntry with _$ExerciseSearchEntry {
+sealed class ExerciseSearchEntry with _$ExerciseSearchEntry {
   factory ExerciseSearchEntry({
     required String value,
     required ExerciseSearchDetails data,
@@ -81,7 +81,7 @@ class ExerciseSearchEntry with _$ExerciseSearchEntry {
 }
 
 @freezed
-class ExerciseApiSearch with _$ExerciseApiSearch {
+sealed class ExerciseApiSearch with _$ExerciseApiSearch {
   factory ExerciseApiSearch({
     required List<ExerciseSearchEntry> suggestions,
   }) = _ExerciseApiSearch;
diff --git a/lib/models/exercises/exercise_api.freezed.dart b/lib/models/exercises/exercise_api.freezed.dart
index 650a6df8..711987ac 100644
--- a/lib/models/exercises/exercise_api.freezed.dart
+++ b/lib/models/exercises/exercise_api.freezed.dart
@@ -1,3 +1,4 @@
+// dart format width=80
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
 // ignore_for_file: type=lint
@@ -9,180 +10,101 @@ part of 'exercise_api.dart';
 // FreezedGenerator
 // **************************************************************************
 
+// dart format off
 T _$identity<T>(T value) => value;
-
-final _privateConstructorUsedError = UnsupportedError(
-    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
-
 ExerciseApiData _$ExerciseApiDataFromJson(Map<String, dynamic> json) {
   return _ExerciseBaseData.fromJson(json);
 }
 
 /// @nodoc
 mixin _$ExerciseApiData {
-  int get id => throw _privateConstructorUsedError;
-  String get uuid => throw _privateConstructorUsedError; // ignore: invalid_annotation_target
+  int get id;
+  String get uuid; // ignore: invalid_annotation_target
   @JsonKey(name: 'variations')
-  int? get variationId => throw _privateConstructorUsedError; // ignore: invalid_annotation_target
+  int? get variationId; // ignore: invalid_annotation_target
   @JsonKey(name: 'created')
-  DateTime get created => throw _privateConstructorUsedError; // ignore: invalid_annotation_target
+  DateTime get created; // ignore: invalid_annotation_target
   @JsonKey(name: 'last_update')
-  DateTime get lastUpdate =>
-      throw _privateConstructorUsedError; // ignore: invalid_annotation_target
+  DateTime get lastUpdate; // ignore: invalid_annotation_target
   @JsonKey(name: 'last_update_global')
-  DateTime get lastUpdateGlobal => throw _privateConstructorUsedError;
-  ExerciseCategory get category => throw _privateConstructorUsedError;
-  List<Muscle> get muscles =>
-      throw _privateConstructorUsedError; // ignore: invalid_annotation_target
+  DateTime get lastUpdateGlobal;
+  ExerciseCategory get category;
+  List<Muscle> get muscles; // ignore: invalid_annotation_target
   @JsonKey(name: 'muscles_secondary')
-  List<Muscle> get musclesSecondary =>
-      throw _privateConstructorUsedError; // ignore: invalid_annotation_target
-  List<Equipment> get equipment =>
-      throw _privateConstructorUsedError; // ignore: invalid_annotation_target
+  List<Muscle> get musclesSecondary; // ignore: invalid_annotation_target
+  List<Equipment> get equipment; // ignore: invalid_annotation_target
   @JsonKey(name: 'translations', defaultValue: [])
-  List<Translation> get translations => throw _privateConstructorUsedError;
-  List<ExerciseImage> get images => throw _privateConstructorUsedError;
-  List<Video> get videos => throw _privateConstructorUsedError; // ignore: invalid_annotation_target
+  List<Translation> get translations;
+  List<ExerciseImage> get images;
+  List<Video> get videos; // ignore: invalid_annotation_target
   @JsonKey(name: 'author_history')
-  List<String> get authors =>
-      throw _privateConstructorUsedError; // ignore: invalid_annotation_target
+  List<String> get authors; // ignore: invalid_annotation_target
   @JsonKey(name: 'total_authors_history')
-  List<String> get authorsGlobal => throw _privateConstructorUsedError;
-
-  /// Serializes this ExerciseApiData to a JSON map.
-  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
+  List<String> get authorsGlobal;
 
   /// Create a copy of ExerciseApiData
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
-  $ExerciseApiDataCopyWith<ExerciseApiData> get copyWith => throw _privateConstructorUsedError;
-}
-
-/// @nodoc
-abstract class $ExerciseApiDataCopyWith<$Res> {
-  factory $ExerciseApiDataCopyWith(ExerciseApiData value, $Res Function(ExerciseApiData) then) =
-      _$ExerciseApiDataCopyWithImpl<$Res, ExerciseApiData>;
-  @useResult
-  $Res call(
-      {int id,
-      String uuid,
-      @JsonKey(name: 'variations') int? variationId,
-      @JsonKey(name: 'created') DateTime created,
-      @JsonKey(name: 'last_update') DateTime lastUpdate,
-      @JsonKey(name: 'last_update_global') DateTime lastUpdateGlobal,
-      ExerciseCategory category,
-      List<Muscle> muscles,
-      @JsonKey(name: 'muscles_secondary') List<Muscle> musclesSecondary,
-      List<Equipment> equipment,
-      @JsonKey(name: 'translations', defaultValue: []) List<Translation> translations,
-      List<ExerciseImage> images,
-      List<Video> videos,
-      @JsonKey(name: 'author_history') List<String> authors,
-      @JsonKey(name: 'total_authors_history') List<String> authorsGlobal});
-}
-
-/// @nodoc
-class _$ExerciseApiDataCopyWithImpl<$Res, $Val extends ExerciseApiData>
-    implements $ExerciseApiDataCopyWith<$Res> {
-  _$ExerciseApiDataCopyWithImpl(this._value, this._then);
-
-  // ignore: unused_field
-  final $Val _value;
-  // ignore: unused_field
-  final $Res Function($Val) _then;
-
-  /// Create a copy of ExerciseApiData
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
+  $ExerciseApiDataCopyWith<ExerciseApiData> get copyWith =>
+      _$ExerciseApiDataCopyWithImpl<ExerciseApiData>(this as ExerciseApiData, _$identity);
+
+  /// Serializes this ExerciseApiData to a JSON map.
+  Map<String, dynamic> toJson();
+
   @override
-  $Res call({
-    Object? id = null,
-    Object? uuid = null,
-    Object? variationId = freezed,
-    Object? created = null,
-    Object? lastUpdate = null,
-    Object? lastUpdateGlobal = null,
-    Object? category = null,
-    Object? muscles = null,
-    Object? musclesSecondary = null,
-    Object? equipment = null,
-    Object? translations = null,
-    Object? images = null,
-    Object? videos = null,
-    Object? authors = null,
-    Object? authorsGlobal = null,
-  }) {
-    return _then(_value.copyWith(
-      id: null == id
-          ? _value.id
-          : id // ignore: cast_nullable_to_non_nullable
-              as int,
-      uuid: null == uuid
-          ? _value.uuid
-          : uuid // ignore: cast_nullable_to_non_nullable
-              as String,
-      variationId: freezed == variationId
-          ? _value.variationId
-          : variationId // ignore: cast_nullable_to_non_nullable
-              as int?,
-      created: null == created
-          ? _value.created
-          : created // ignore: cast_nullable_to_non_nullable
-              as DateTime,
-      lastUpdate: null == lastUpdate
-          ? _value.lastUpdate
-          : lastUpdate // ignore: cast_nullable_to_non_nullable
-              as DateTime,
-      lastUpdateGlobal: null == lastUpdateGlobal
-          ? _value.lastUpdateGlobal
-          : lastUpdateGlobal // ignore: cast_nullable_to_non_nullable
-              as DateTime,
-      category: null == category
-          ? _value.category
-          : category // ignore: cast_nullable_to_non_nullable
-              as ExerciseCategory,
-      muscles: null == muscles
-          ? _value.muscles
-          : muscles // ignore: cast_nullable_to_non_nullable
-              as List<Muscle>,
-      musclesSecondary: null == musclesSecondary
-          ? _value.musclesSecondary
-          : musclesSecondary // ignore: cast_nullable_to_non_nullable
-              as List<Muscle>,
-      equipment: null == equipment
-          ? _value.equipment
-          : equipment // ignore: cast_nullable_to_non_nullable
-              as List<Equipment>,
-      translations: null == translations
-          ? _value.translations
-          : translations // ignore: cast_nullable_to_non_nullable
-              as List<Translation>,
-      images: null == images
-          ? _value.images
-          : images // ignore: cast_nullable_to_non_nullable
-              as List<ExerciseImage>,
-      videos: null == videos
-          ? _value.videos
-          : videos // ignore: cast_nullable_to_non_nullable
-              as List<Video>,
-      authors: null == authors
-          ? _value.authors
-          : authors // ignore: cast_nullable_to_non_nullable
-              as List<String>,
-      authorsGlobal: null == authorsGlobal
-          ? _value.authorsGlobal
-          : authorsGlobal // ignore: cast_nullable_to_non_nullable
-              as List<String>,
-    ) as $Val);
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is ExerciseApiData &&
+            (identical(other.id, id) || other.id == id) &&
+            (identical(other.uuid, uuid) || other.uuid == uuid) &&
+            (identical(other.variationId, variationId) || other.variationId == variationId) &&
+            (identical(other.created, created) || other.created == created) &&
+            (identical(other.lastUpdate, lastUpdate) || other.lastUpdate == lastUpdate) &&
+            (identical(other.lastUpdateGlobal, lastUpdateGlobal) ||
+                other.lastUpdateGlobal == lastUpdateGlobal) &&
+            (identical(other.category, category) || other.category == category) &&
+            const DeepCollectionEquality().equals(other.muscles, muscles) &&
+            const DeepCollectionEquality().equals(other.musclesSecondary, musclesSecondary) &&
+            const DeepCollectionEquality().equals(other.equipment, equipment) &&
+            const DeepCollectionEquality().equals(other.translations, translations) &&
+            const DeepCollectionEquality().equals(other.images, images) &&
+            const DeepCollectionEquality().equals(other.videos, videos) &&
+            const DeepCollectionEquality().equals(other.authors, authors) &&
+            const DeepCollectionEquality().equals(other.authorsGlobal, authorsGlobal));
+  }
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  int get hashCode => Object.hash(
+      runtimeType,
+      id,
+      uuid,
+      variationId,
+      created,
+      lastUpdate,
+      lastUpdateGlobal,
+      category,
+      const DeepCollectionEquality().hash(muscles),
+      const DeepCollectionEquality().hash(musclesSecondary),
+      const DeepCollectionEquality().hash(equipment),
+      const DeepCollectionEquality().hash(translations),
+      const DeepCollectionEquality().hash(images),
+      const DeepCollectionEquality().hash(videos),
+      const DeepCollectionEquality().hash(authors),
+      const DeepCollectionEquality().hash(authorsGlobal));
+
+  @override
+  String toString() {
+    return 'ExerciseApiData(id: $id, uuid: $uuid, variationId: $variationId, created: $created, lastUpdate: $lastUpdate, lastUpdateGlobal: $lastUpdateGlobal, category: $category, muscles: $muscles, musclesSecondary: $musclesSecondary, equipment: $equipment, translations: $translations, images: $images, videos: $videos, authors: $authors, authorsGlobal: $authorsGlobal)';
   }
 }
 
 /// @nodoc
-abstract class _$$ExerciseBaseDataImplCopyWith<$Res> implements $ExerciseApiDataCopyWith<$Res> {
-  factory _$$ExerciseBaseDataImplCopyWith(
-          _$ExerciseBaseDataImpl value, $Res Function(_$ExerciseBaseDataImpl) then) =
-      __$$ExerciseBaseDataImplCopyWithImpl<$Res>;
-  @override
+abstract mixin class $ExerciseApiDataCopyWith<$Res> {
+  factory $ExerciseApiDataCopyWith(ExerciseApiData value, $Res Function(ExerciseApiData) _then) =
+      _$ExerciseApiDataCopyWithImpl;
   @useResult
   $Res call(
       {int id,
@@ -203,12 +125,11 @@ abstract class _$$ExerciseBaseDataImplCopyWith<$Res> implements $ExerciseApiData
 }
 
 /// @nodoc
-class __$$ExerciseBaseDataImplCopyWithImpl<$Res>
-    extends _$ExerciseApiDataCopyWithImpl<$Res, _$ExerciseBaseDataImpl>
-    implements _$$ExerciseBaseDataImplCopyWith<$Res> {
-  __$$ExerciseBaseDataImplCopyWithImpl(
-      _$ExerciseBaseDataImpl _value, $Res Function(_$ExerciseBaseDataImpl) _then)
-      : super(_value, _then);
+class _$ExerciseApiDataCopyWithImpl<$Res> implements $ExerciseApiDataCopyWith<$Res> {
+  _$ExerciseApiDataCopyWithImpl(this._self, this._then);
+
+  final ExerciseApiData _self;
+  final $Res Function(ExerciseApiData) _then;
 
   /// Create a copy of ExerciseApiData
   /// with the given fields replaced by the non-null parameter values.
@@ -231,65 +152,65 @@ class __$$ExerciseBaseDataImplCopyWithImpl<$Res>
     Object? authors = null,
     Object? authorsGlobal = null,
   }) {
-    return _then(_$ExerciseBaseDataImpl(
+    return _then(_self.copyWith(
       id: null == id
-          ? _value.id
+          ? _self.id
           : id // ignore: cast_nullable_to_non_nullable
               as int,
       uuid: null == uuid
-          ? _value.uuid
+          ? _self.uuid
           : uuid // ignore: cast_nullable_to_non_nullable
               as String,
       variationId: freezed == variationId
-          ? _value.variationId
+          ? _self.variationId
           : variationId // ignore: cast_nullable_to_non_nullable
               as int?,
       created: null == created
-          ? _value.created
+          ? _self.created
           : created // ignore: cast_nullable_to_non_nullable
               as DateTime,
       lastUpdate: null == lastUpdate
-          ? _value.lastUpdate
+          ? _self.lastUpdate
           : lastUpdate // ignore: cast_nullable_to_non_nullable
               as DateTime,
       lastUpdateGlobal: null == lastUpdateGlobal
-          ? _value.lastUpdateGlobal
+          ? _self.lastUpdateGlobal
           : lastUpdateGlobal // ignore: cast_nullable_to_non_nullable
               as DateTime,
       category: null == category
-          ? _value.category
+          ? _self.category
           : category // ignore: cast_nullable_to_non_nullable
               as ExerciseCategory,
       muscles: null == muscles
-          ? _value._muscles
+          ? _self.muscles
           : muscles // ignore: cast_nullable_to_non_nullable
               as List<Muscle>,
       musclesSecondary: null == musclesSecondary
-          ? _value._musclesSecondary
+          ? _self.musclesSecondary
           : musclesSecondary // ignore: cast_nullable_to_non_nullable
               as List<Muscle>,
       equipment: null == equipment
-          ? _value._equipment
+          ? _self.equipment
           : equipment // ignore: cast_nullable_to_non_nullable
               as List<Equipment>,
       translations: null == translations
-          ? _value._translations
+          ? _self.translations
           : translations // ignore: cast_nullable_to_non_nullable
               as List<Translation>,
       images: null == images
-          ? _value._images
+          ? _self.images
           : images // ignore: cast_nullable_to_non_nullable
               as List<ExerciseImage>,
       videos: null == videos
-          ? _value._videos
+          ? _self.videos
           : videos // ignore: cast_nullable_to_non_nullable
               as List<Video>,
       authors: null == authors
-          ? _value._authors
+          ? _self.authors
           : authors // ignore: cast_nullable_to_non_nullable
               as List<String>,
       authorsGlobal: null == authorsGlobal
-          ? _value._authorsGlobal
+          ? _self.authorsGlobal
           : authorsGlobal // ignore: cast_nullable_to_non_nullable
               as List<String>,
     ));
@@ -298,8 +219,8 @@ class __$$ExerciseBaseDataImplCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$ExerciseBaseDataImpl implements _ExerciseBaseData {
-  _$ExerciseBaseDataImpl(
+class _ExerciseBaseData implements ExerciseApiData {
+  _ExerciseBaseData(
       {required this.id,
       required this.uuid,
       @JsonKey(name: 'variations') this.variationId = null,
@@ -324,9 +245,7 @@ class _$ExerciseBaseDataImpl implements _ExerciseBaseData {
         _videos = videos,
         _authors = authors,
         _authorsGlobal = authorsGlobal;
-
-  factory _$ExerciseBaseDataImpl.fromJson(Map<String, dynamic> json) =>
-      _$$ExerciseBaseDataImplFromJson(json);
+  factory _ExerciseBaseData.fromJson(Map<String, dynamic> json) => _$ExerciseBaseDataFromJson(json);
 
   @override
   final int id;
@@ -428,16 +347,26 @@ class _$ExerciseBaseDataImpl implements _ExerciseBaseData {
     return EqualUnmodifiableListView(_authorsGlobal);
   }
 
+  /// Create a copy of ExerciseApiData
+  /// with the given fields replaced by the non-null parameter values.
   @override
-  String toString() {
-    return 'ExerciseApiData(id: $id, uuid: $uuid, variationId: $variationId, created: $created, lastUpdate: $lastUpdate, lastUpdateGlobal: $lastUpdateGlobal, category: $category, muscles: $muscles, musclesSecondary: $musclesSecondary, equipment: $equipment, translations: $translations, images: $images, videos: $videos, authors: $authors, authorsGlobal: $authorsGlobal)';
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @pragma('vm:prefer-inline')
+  _$ExerciseBaseDataCopyWith<_ExerciseBaseData> get copyWith =>
+      __$ExerciseBaseDataCopyWithImpl<_ExerciseBaseData>(this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$ExerciseBaseDataToJson(
+      this,
+    );
   }
 
   @override
   bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$ExerciseBaseDataImpl &&
+            other is _ExerciseBaseData &&
             (identical(other.id, id) || other.id == id) &&
             (identical(other.uuid, uuid) || other.uuid == uuid) &&
             (identical(other.variationId, variationId) || other.variationId == variationId) &&
@@ -476,191 +405,185 @@ class _$ExerciseBaseDataImpl implements _ExerciseBaseData {
       const DeepCollectionEquality().hash(_authors),
       const DeepCollectionEquality().hash(_authorsGlobal));
 
-  /// Create a copy of ExerciseApiData
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
   @override
-  @pragma('vm:prefer-inline')
-  _$$ExerciseBaseDataImplCopyWith<_$ExerciseBaseDataImpl> get copyWith =>
-      __$$ExerciseBaseDataImplCopyWithImpl<_$ExerciseBaseDataImpl>(this, _$identity);
-
-  @override
-  Map<String, dynamic> toJson() {
-    return _$$ExerciseBaseDataImplToJson(
-      this,
-    );
+  String toString() {
+    return 'ExerciseApiData(id: $id, uuid: $uuid, variationId: $variationId, created: $created, lastUpdate: $lastUpdate, lastUpdateGlobal: $lastUpdateGlobal, category: $category, muscles: $muscles, musclesSecondary: $musclesSecondary, equipment: $equipment, translations: $translations, images: $images, videos: $videos, authors: $authors, authorsGlobal: $authorsGlobal)';
   }
 }
 
-abstract class _ExerciseBaseData implements ExerciseApiData {
-  factory _ExerciseBaseData(
-          {required final int id,
-          required final String uuid,
-          @JsonKey(name: 'variations') final int? variationId,
-          @JsonKey(name: 'created') required final DateTime created,
-          @JsonKey(name: 'last_update') required final DateTime lastUpdate,
-          @JsonKey(name: 'last_update_global') required final DateTime lastUpdateGlobal,
-          required final ExerciseCategory category,
-          required final List<Muscle> muscles,
-          @JsonKey(name: 'muscles_secondary') required final List<Muscle> musclesSecondary,
-          required final List<Equipment> equipment,
-          @JsonKey(name: 'translations', defaultValue: [])
-          required final List<Translation> translations,
-          required final List<ExerciseImage> images,
-          required final List<Video> videos,
-          @JsonKey(name: 'author_history') required final List<String> authors,
-          @JsonKey(name: 'total_authors_history') required final List<String> authorsGlobal}) =
-      _$ExerciseBaseDataImpl;
+/// @nodoc
+abstract mixin class _$ExerciseBaseDataCopyWith<$Res> implements $ExerciseApiDataCopyWith<$Res> {
+  factory _$ExerciseBaseDataCopyWith(
+          _ExerciseBaseData value, $Res Function(_ExerciseBaseData) _then) =
+      __$ExerciseBaseDataCopyWithImpl;
+  @override
+  @useResult
+  $Res call(
+      {int id,
+      String uuid,
+      @JsonKey(name: 'variations') int? variationId,
+      @JsonKey(name: 'created') DateTime created,
+      @JsonKey(name: 'last_update') DateTime lastUpdate,
+      @JsonKey(name: 'last_update_global') DateTime lastUpdateGlobal,
+      ExerciseCategory category,
+      List<Muscle> muscles,
+      @JsonKey(name: 'muscles_secondary') List<Muscle> musclesSecondary,
+      List<Equipment> equipment,
+      @JsonKey(name: 'translations', defaultValue: []) List<Translation> translations,
+      List<ExerciseImage> images,
+      List<Video> videos,
+      @JsonKey(name: 'author_history') List<String> authors,
+      @JsonKey(name: 'total_authors_history') List<String> authorsGlobal});
+}
 
-  factory _ExerciseBaseData.fromJson(Map<String, dynamic> json) = _$ExerciseBaseDataImpl.fromJson;
+/// @nodoc
+class __$ExerciseBaseDataCopyWithImpl<$Res> implements _$ExerciseBaseDataCopyWith<$Res> {
+  __$ExerciseBaseDataCopyWithImpl(this._self, this._then);
 
-  @override
-  int get id;
-  @override
-  String get uuid; // ignore: invalid_annotation_target
-  @override
-  @JsonKey(name: 'variations')
-  int? get variationId; // ignore: invalid_annotation_target
-  @override
-  @JsonKey(name: 'created')
-  DateTime get created; // ignore: invalid_annotation_target
-  @override
-  @JsonKey(name: 'last_update')
-  DateTime get lastUpdate; // ignore: invalid_annotation_target
-  @override
-  @JsonKey(name: 'last_update_global')
-  DateTime get lastUpdateGlobal;
-  @override
-  ExerciseCategory get category;
-  @override
-  List<Muscle> get muscles; // ignore: invalid_annotation_target
-  @override
-  @JsonKey(name: 'muscles_secondary')
-  List<Muscle> get musclesSecondary; // ignore: invalid_annotation_target
-  @override
-  List<Equipment> get equipment; // ignore: invalid_annotation_target
-  @override
-  @JsonKey(name: 'translations', defaultValue: [])
-  List<Translation> get translations;
-  @override
-  List<ExerciseImage> get images;
-  @override
-  List<Video> get videos; // ignore: invalid_annotation_target
-  @override
-  @JsonKey(name: 'author_history')
-  List<String> get authors; // ignore: invalid_annotation_target
-  @override
-  @JsonKey(name: 'total_authors_history')
-  List<String> get authorsGlobal;
+  final _ExerciseBaseData _self;
+  final $Res Function(_ExerciseBaseData) _then;
 
   /// Create a copy of ExerciseApiData
   /// with the given fields replaced by the non-null parameter values.
   @override
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  _$$ExerciseBaseDataImplCopyWith<_$ExerciseBaseDataImpl> get copyWith =>
-      throw _privateConstructorUsedError;
-}
-
-ExerciseSearchDetails _$ExerciseSearchDetailsFromJson(Map<String, dynamic> json) {
-  return _ExerciseSearchDetails.fromJson(json);
+  @pragma('vm:prefer-inline')
+  $Res call({
+    Object? id = null,
+    Object? uuid = null,
+    Object? variationId = freezed,
+    Object? created = null,
+    Object? lastUpdate = null,
+    Object? lastUpdateGlobal = null,
+    Object? category = null,
+    Object? muscles = null,
+    Object? musclesSecondary = null,
+    Object? equipment = null,
+    Object? translations = null,
+    Object? images = null,
+    Object? videos = null,
+    Object? authors = null,
+    Object? authorsGlobal = null,
+  }) {
+    return _then(_ExerciseBaseData(
+      id: null == id
+          ? _self.id
+          : id // ignore: cast_nullable_to_non_nullable
+              as int,
+      uuid: null == uuid
+          ? _self.uuid
+          : uuid // ignore: cast_nullable_to_non_nullable
+              as String,
+      variationId: freezed == variationId
+          ? _self.variationId
+          : variationId // ignore: cast_nullable_to_non_nullable
+              as int?,
+      created: null == created
+          ? _self.created
+          : created // ignore: cast_nullable_to_non_nullable
+              as DateTime,
+      lastUpdate: null == lastUpdate
+          ? _self.lastUpdate
+          : lastUpdate // ignore: cast_nullable_to_non_nullable
+              as DateTime,
+      lastUpdateGlobal: null == lastUpdateGlobal
+          ? _self.lastUpdateGlobal
+          : lastUpdateGlobal // ignore: cast_nullable_to_non_nullable
+              as DateTime,
+      category: null == category
+          ? _self.category
+          : category // ignore: cast_nullable_to_non_nullable
+              as ExerciseCategory,
+      muscles: null == muscles
+          ? _self._muscles
+          : muscles // ignore: cast_nullable_to_non_nullable
+              as List<Muscle>,
+      musclesSecondary: null == musclesSecondary
+          ? _self._musclesSecondary
+          : musclesSecondary // ignore: cast_nullable_to_non_nullable
+              as List<Muscle>,
+      equipment: null == equipment
+          ? _self._equipment
+          : equipment // ignore: cast_nullable_to_non_nullable
+              as List<Equipment>,
+      translations: null == translations
+          ? _self._translations
+          : translations // ignore: cast_nullable_to_non_nullable
+              as List<Translation>,
+      images: null == images
+          ? _self._images
+          : images // ignore: cast_nullable_to_non_nullable
+              as List<ExerciseImage>,
+      videos: null == videos
+          ? _self._videos
+          : videos // ignore: cast_nullable_to_non_nullable
+              as List<Video>,
+      authors: null == authors
+          ? _self._authors
+          : authors // ignore: cast_nullable_to_non_nullable
+              as List<String>,
+      authorsGlobal: null == authorsGlobal
+          ? _self._authorsGlobal
+          : authorsGlobal // ignore: cast_nullable_to_non_nullable
+              as List<String>,
+    ));
+  }
 }
 
 /// @nodoc
 mixin _$ExerciseSearchDetails {
 // ignore: invalid_annotation_target
   @JsonKey(name: 'id')
-  int get translationId => throw _privateConstructorUsedError; // ignore: invalid_annotation_target
+  int get translationId; // ignore: invalid_annotation_target
   @JsonKey(name: 'base_id')
-  int get exerciseId => throw _privateConstructorUsedError;
-  String get name => throw _privateConstructorUsedError;
-  String get category => throw _privateConstructorUsedError;
-  String? get image => throw _privateConstructorUsedError; // ignore: invalid_annotation_target
+  int get exerciseId;
+  String get name;
+  String get category;
+  String? get image; // ignore: invalid_annotation_target
   @JsonKey(name: 'image_thumbnail')
-  String? get imageThumbnail => throw _privateConstructorUsedError;
-
-  /// Serializes this ExerciseSearchDetails to a JSON map.
-  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
+  String? get imageThumbnail;
 
   /// Create a copy of ExerciseSearchDetails
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
-  $ExerciseSearchDetailsCopyWith<ExerciseSearchDetails> get copyWith =>
-      throw _privateConstructorUsedError;
-}
-
-/// @nodoc
-abstract class $ExerciseSearchDetailsCopyWith<$Res> {
-  factory $ExerciseSearchDetailsCopyWith(
-          ExerciseSearchDetails value, $Res Function(ExerciseSearchDetails) then) =
-      _$ExerciseSearchDetailsCopyWithImpl<$Res, ExerciseSearchDetails>;
-  @useResult
-  $Res call(
-      {@JsonKey(name: 'id') int translationId,
-      @JsonKey(name: 'base_id') int exerciseId,
-      String name,
-      String category,
-      String? image,
-      @JsonKey(name: 'image_thumbnail') String? imageThumbnail});
-}
-
-/// @nodoc
-class _$ExerciseSearchDetailsCopyWithImpl<$Res, $Val extends ExerciseSearchDetails>
-    implements $ExerciseSearchDetailsCopyWith<$Res> {
-  _$ExerciseSearchDetailsCopyWithImpl(this._value, this._then);
-
-  // ignore: unused_field
-  final $Val _value;
-  // ignore: unused_field
-  final $Res Function($Val) _then;
-
-  /// Create a copy of ExerciseSearchDetails
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
+  $ExerciseSearchDetailsCopyWith<ExerciseSearchDetails> get copyWith =>
+      _$ExerciseSearchDetailsCopyWithImpl<ExerciseSearchDetails>(
+          this as ExerciseSearchDetails, _$identity);
+
+  /// Serializes this ExerciseSearchDetails to a JSON map.
+  Map<String, dynamic> toJson();
+
   @override
-  $Res call({
-    Object? translationId = null,
-    Object? exerciseId = null,
-    Object? name = null,
-    Object? category = null,
-    Object? image = freezed,
-    Object? imageThumbnail = freezed,
-  }) {
-    return _then(_value.copyWith(
-      translationId: null == translationId
-          ? _value.translationId
-          : translationId // ignore: cast_nullable_to_non_nullable
-              as int,
-      exerciseId: null == exerciseId
-          ? _value.exerciseId
-          : exerciseId // ignore: cast_nullable_to_non_nullable
-              as int,
-      name: null == name
-          ? _value.name
-          : name // ignore: cast_nullable_to_non_nullable
-              as String,
-      category: null == category
-          ? _value.category
-          : category // ignore: cast_nullable_to_non_nullable
-              as String,
-      image: freezed == image
-          ? _value.image
-          : image // ignore: cast_nullable_to_non_nullable
-              as String?,
-      imageThumbnail: freezed == imageThumbnail
-          ? _value.imageThumbnail
-          : imageThumbnail // ignore: cast_nullable_to_non_nullable
-              as String?,
-    ) as $Val);
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is ExerciseSearchDetails &&
+            (identical(other.translationId, translationId) ||
+                other.translationId == translationId) &&
+            (identical(other.exerciseId, exerciseId) || other.exerciseId == exerciseId) &&
+            (identical(other.name, name) || other.name == name) &&
+            (identical(other.category, category) || other.category == category) &&
+            (identical(other.image, image) || other.image == image) &&
+            (identical(other.imageThumbnail, imageThumbnail) ||
+                other.imageThumbnail == imageThumbnail));
+  }
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  int get hashCode =>
+      Object.hash(runtimeType, translationId, exerciseId, name, category, image, imageThumbnail);
+
+  @override
+  String toString() {
+    return 'ExerciseSearchDetails(translationId: $translationId, exerciseId: $exerciseId, name: $name, category: $category, image: $image, imageThumbnail: $imageThumbnail)';
   }
 }
 
 /// @nodoc
-abstract class _$$ExerciseSearchDetailsImplCopyWith<$Res>
-    implements $ExerciseSearchDetailsCopyWith<$Res> {
-  factory _$$ExerciseSearchDetailsImplCopyWith(
-          _$ExerciseSearchDetailsImpl value, $Res Function(_$ExerciseSearchDetailsImpl) then) =
-      __$$ExerciseSearchDetailsImplCopyWithImpl<$Res>;
-  @override
+abstract mixin class $ExerciseSearchDetailsCopyWith<$Res> {
+  factory $ExerciseSearchDetailsCopyWith(
+          ExerciseSearchDetails value, $Res Function(ExerciseSearchDetails) _then) =
+      _$ExerciseSearchDetailsCopyWithImpl;
   @useResult
   $Res call(
       {@JsonKey(name: 'id') int translationId,
@@ -672,12 +595,11 @@ abstract class _$$ExerciseSearchDetailsImplCopyWith<$Res>
 }
 
 /// @nodoc
-class __$$ExerciseSearchDetailsImplCopyWithImpl<$Res>
-    extends _$ExerciseSearchDetailsCopyWithImpl<$Res, _$ExerciseSearchDetailsImpl>
-    implements _$$ExerciseSearchDetailsImplCopyWith<$Res> {
-  __$$ExerciseSearchDetailsImplCopyWithImpl(
-      _$ExerciseSearchDetailsImpl _value, $Res Function(_$ExerciseSearchDetailsImpl) _then)
-      : super(_value, _then);
+class _$ExerciseSearchDetailsCopyWithImpl<$Res> implements $ExerciseSearchDetailsCopyWith<$Res> {
+  _$ExerciseSearchDetailsCopyWithImpl(this._self, this._then);
+
+  final ExerciseSearchDetails _self;
+  final $Res Function(ExerciseSearchDetails) _then;
 
   /// Create a copy of ExerciseSearchDetails
   /// with the given fields replaced by the non-null parameter values.
@@ -691,29 +613,29 @@ class __$$ExerciseSearchDetailsImplCopyWithImpl<$Res>
     Object? image = freezed,
     Object? imageThumbnail = freezed,
   }) {
-    return _then(_$ExerciseSearchDetailsImpl(
+    return _then(_self.copyWith(
       translationId: null == translationId
-          ? _value.translationId
+          ? _self.translationId
           : translationId // ignore: cast_nullable_to_non_nullable
               as int,
       exerciseId: null == exerciseId
-          ? _value.exerciseId
+          ? _self.exerciseId
           : exerciseId // ignore: cast_nullable_to_non_nullable
               as int,
       name: null == name
-          ? _value.name
+          ? _self.name
           : name // ignore: cast_nullable_to_non_nullable
               as String,
       category: null == category
-          ? _value.category
+          ? _self.category
           : category // ignore: cast_nullable_to_non_nullable
               as String,
       image: freezed == image
-          ? _value.image
+          ? _self.image
           : image // ignore: cast_nullable_to_non_nullable
               as String?,
       imageThumbnail: freezed == imageThumbnail
-          ? _value.imageThumbnail
+          ? _self.imageThumbnail
           : imageThumbnail // ignore: cast_nullable_to_non_nullable
               as String?,
     ));
@@ -722,17 +644,16 @@ class __$$ExerciseSearchDetailsImplCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$ExerciseSearchDetailsImpl implements _ExerciseSearchDetails {
-  _$ExerciseSearchDetailsImpl(
+class _ExerciseSearchDetails implements ExerciseSearchDetails {
+  _ExerciseSearchDetails(
       {@JsonKey(name: 'id') required this.translationId,
       @JsonKey(name: 'base_id') required this.exerciseId,
       required this.name,
       required this.category,
       required this.image,
       @JsonKey(name: 'image_thumbnail') required this.imageThumbnail});
-
-  factory _$ExerciseSearchDetailsImpl.fromJson(Map<String, dynamic> json) =>
-      _$$ExerciseSearchDetailsImplFromJson(json);
+  factory _ExerciseSearchDetails.fromJson(Map<String, dynamic> json) =>
+      _$ExerciseSearchDetailsFromJson(json);
 
 // ignore: invalid_annotation_target
   @override
@@ -753,16 +674,26 @@ class _$ExerciseSearchDetailsImpl implements _ExerciseSearchDetails {
   @JsonKey(name: 'image_thumbnail')
   final String? imageThumbnail;
 
+  /// Create a copy of ExerciseSearchDetails
+  /// with the given fields replaced by the non-null parameter values.
   @override
-  String toString() {
-    return 'ExerciseSearchDetails(translationId: $translationId, exerciseId: $exerciseId, name: $name, category: $category, image: $image, imageThumbnail: $imageThumbnail)';
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @pragma('vm:prefer-inline')
+  _$ExerciseSearchDetailsCopyWith<_ExerciseSearchDetails> get copyWith =>
+      __$ExerciseSearchDetailsCopyWithImpl<_ExerciseSearchDetails>(this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$ExerciseSearchDetailsToJson(
+      this,
+    );
   }
 
   @override
   bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$ExerciseSearchDetailsImpl &&
+            other is _ExerciseSearchDetails &&
             (identical(other.translationId, translationId) ||
                 other.translationId == translationId) &&
             (identical(other.exerciseId, exerciseId) || other.exerciseId == exerciseId) &&
@@ -778,197 +709,98 @@ class _$ExerciseSearchDetailsImpl implements _ExerciseSearchDetails {
   int get hashCode =>
       Object.hash(runtimeType, translationId, exerciseId, name, category, image, imageThumbnail);
 
-  /// Create a copy of ExerciseSearchDetails
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
   @override
-  @pragma('vm:prefer-inline')
-  _$$ExerciseSearchDetailsImplCopyWith<_$ExerciseSearchDetailsImpl> get copyWith =>
-      __$$ExerciseSearchDetailsImplCopyWithImpl<_$ExerciseSearchDetailsImpl>(this, _$identity);
-
-  @override
-  Map<String, dynamic> toJson() {
-    return _$$ExerciseSearchDetailsImplToJson(
-      this,
-    );
+  String toString() {
+    return 'ExerciseSearchDetails(translationId: $translationId, exerciseId: $exerciseId, name: $name, category: $category, image: $image, imageThumbnail: $imageThumbnail)';
   }
 }
 
-abstract class _ExerciseSearchDetails implements ExerciseSearchDetails {
-  factory _ExerciseSearchDetails(
-          {@JsonKey(name: 'id') required final int translationId,
-          @JsonKey(name: 'base_id') required final int exerciseId,
-          required final String name,
-          required final String category,
-          required final String? image,
-          @JsonKey(name: 'image_thumbnail') required final String? imageThumbnail}) =
-      _$ExerciseSearchDetailsImpl;
+/// @nodoc
+abstract mixin class _$ExerciseSearchDetailsCopyWith<$Res>
+    implements $ExerciseSearchDetailsCopyWith<$Res> {
+  factory _$ExerciseSearchDetailsCopyWith(
+          _ExerciseSearchDetails value, $Res Function(_ExerciseSearchDetails) _then) =
+      __$ExerciseSearchDetailsCopyWithImpl;
+  @override
+  @useResult
+  $Res call(
+      {@JsonKey(name: 'id') int translationId,
+      @JsonKey(name: 'base_id') int exerciseId,
+      String name,
+      String category,
+      String? image,
+      @JsonKey(name: 'image_thumbnail') String? imageThumbnail});
+}
 
-  factory _ExerciseSearchDetails.fromJson(Map<String, dynamic> json) =
-      _$ExerciseSearchDetailsImpl.fromJson;
+/// @nodoc
+class __$ExerciseSearchDetailsCopyWithImpl<$Res> implements _$ExerciseSearchDetailsCopyWith<$Res> {
+  __$ExerciseSearchDetailsCopyWithImpl(this._self, this._then);
 
-// ignore: invalid_annotation_target
-  @override
-  @JsonKey(name: 'id')
-  int get translationId; // ignore: invalid_annotation_target
-  @override
-  @JsonKey(name: 'base_id')
-  int get exerciseId;
-  @override
-  String get name;
-  @override
-  String get category;
-  @override
-  String? get image; // ignore: invalid_annotation_target
-  @override
-  @JsonKey(name: 'image_thumbnail')
-  String? get imageThumbnail;
+  final _ExerciseSearchDetails _self;
+  final $Res Function(_ExerciseSearchDetails) _then;
 
   /// Create a copy of ExerciseSearchDetails
   /// with the given fields replaced by the non-null parameter values.
   @override
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  _$$ExerciseSearchDetailsImplCopyWith<_$ExerciseSearchDetailsImpl> get copyWith =>
-      throw _privateConstructorUsedError;
-}
-
-ExerciseSearchEntry _$ExerciseSearchEntryFromJson(Map<String, dynamic> json) {
-  return _ExerciseSearchEntry.fromJson(json);
-}
-
-/// @nodoc
-mixin _$ExerciseSearchEntry {
-  String get value => throw _privateConstructorUsedError;
-  ExerciseSearchDetails get data => throw _privateConstructorUsedError;
-
-  /// Serializes this ExerciseSearchEntry to a JSON map.
-  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-
-  /// Create a copy of ExerciseSearchEntry
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  $ExerciseSearchEntryCopyWith<ExerciseSearchEntry> get copyWith =>
-      throw _privateConstructorUsedError;
-}
-
-/// @nodoc
-abstract class $ExerciseSearchEntryCopyWith<$Res> {
-  factory $ExerciseSearchEntryCopyWith(
-          ExerciseSearchEntry value, $Res Function(ExerciseSearchEntry) then) =
-      _$ExerciseSearchEntryCopyWithImpl<$Res, ExerciseSearchEntry>;
-  @useResult
-  $Res call({String value, ExerciseSearchDetails data});
-
-  $ExerciseSearchDetailsCopyWith<$Res> get data;
-}
-
-/// @nodoc
-class _$ExerciseSearchEntryCopyWithImpl<$Res, $Val extends ExerciseSearchEntry>
-    implements $ExerciseSearchEntryCopyWith<$Res> {
-  _$ExerciseSearchEntryCopyWithImpl(this._value, this._then);
-
-  // ignore: unused_field
-  final $Val _value;
-  // ignore: unused_field
-  final $Res Function($Val) _then;
-
-  /// Create a copy of ExerciseSearchEntry
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
-  @override
   $Res call({
-    Object? value = null,
-    Object? data = null,
+    Object? translationId = null,
+    Object? exerciseId = null,
+    Object? name = null,
+    Object? category = null,
+    Object? image = freezed,
+    Object? imageThumbnail = freezed,
   }) {
-    return _then(_value.copyWith(
-      value: null == value
-          ? _value.value
-          : value // ignore: cast_nullable_to_non_nullable
+    return _then(_ExerciseSearchDetails(
+      translationId: null == translationId
+          ? _self.translationId
+          : translationId // ignore: cast_nullable_to_non_nullable
+              as int,
+      exerciseId: null == exerciseId
+          ? _self.exerciseId
+          : exerciseId // ignore: cast_nullable_to_non_nullable
+              as int,
+      name: null == name
+          ? _self.name
+          : name // ignore: cast_nullable_to_non_nullable
               as String,
-      data: null == data
-          ? _value.data
-          : data // ignore: cast_nullable_to_non_nullable
-              as ExerciseSearchDetails,
-    ) as $Val);
-  }
-
-  /// Create a copy of ExerciseSearchEntry
-  /// with the given fields replaced by the non-null parameter values.
-  @override
-  @pragma('vm:prefer-inline')
-  $ExerciseSearchDetailsCopyWith<$Res> get data {
-    return $ExerciseSearchDetailsCopyWith<$Res>(_value.data, (value) {
-      return _then(_value.copyWith(data: value) as $Val);
-    });
-  }
-}
-
-/// @nodoc
-abstract class _$$ExerciseSearchEntryImplCopyWith<$Res>
-    implements $ExerciseSearchEntryCopyWith<$Res> {
-  factory _$$ExerciseSearchEntryImplCopyWith(
-          _$ExerciseSearchEntryImpl value, $Res Function(_$ExerciseSearchEntryImpl) then) =
-      __$$ExerciseSearchEntryImplCopyWithImpl<$Res>;
-  @override
-  @useResult
-  $Res call({String value, ExerciseSearchDetails data});
-
-  @override
-  $ExerciseSearchDetailsCopyWith<$Res> get data;
-}
-
-/// @nodoc
-class __$$ExerciseSearchEntryImplCopyWithImpl<$Res>
-    extends _$ExerciseSearchEntryCopyWithImpl<$Res, _$ExerciseSearchEntryImpl>
-    implements _$$ExerciseSearchEntryImplCopyWith<$Res> {
-  __$$ExerciseSearchEntryImplCopyWithImpl(
-      _$ExerciseSearchEntryImpl _value, $Res Function(_$ExerciseSearchEntryImpl) _then)
-      : super(_value, _then);
-
-  /// Create a copy of ExerciseSearchEntry
-  /// with the given fields replaced by the non-null parameter values.
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? value = null,
-    Object? data = null,
-  }) {
-    return _then(_$ExerciseSearchEntryImpl(
-      value: null == value
-          ? _value.value
-          : value // ignore: cast_nullable_to_non_nullable
+      category: null == category
+          ? _self.category
+          : category // ignore: cast_nullable_to_non_nullable
               as String,
-      data: null == data
-          ? _value.data
-          : data // ignore: cast_nullable_to_non_nullable
-              as ExerciseSearchDetails,
+      image: freezed == image
+          ? _self.image
+          : image // ignore: cast_nullable_to_non_nullable
+              as String?,
+      imageThumbnail: freezed == imageThumbnail
+          ? _self.imageThumbnail
+          : imageThumbnail // ignore: cast_nullable_to_non_nullable
+              as String?,
     ));
   }
 }
 
 /// @nodoc
-@JsonSerializable()
-class _$ExerciseSearchEntryImpl implements _ExerciseSearchEntry {
-  _$ExerciseSearchEntryImpl({required this.value, required this.data});
+mixin _$ExerciseSearchEntry {
+  String get value;
+  ExerciseSearchDetails get data;
 
-  factory _$ExerciseSearchEntryImpl.fromJson(Map<String, dynamic> json) =>
-      _$$ExerciseSearchEntryImplFromJson(json);
+  /// Create a copy of ExerciseSearchEntry
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @pragma('vm:prefer-inline')
+  $ExerciseSearchEntryCopyWith<ExerciseSearchEntry> get copyWith =>
+      _$ExerciseSearchEntryCopyWithImpl<ExerciseSearchEntry>(
+          this as ExerciseSearchEntry, _$identity);
 
-  @override
-  final String value;
-  @override
-  final ExerciseSearchDetails data;
-
-  @override
-  String toString() {
-    return 'ExerciseSearchEntry(value: $value, data: $data)';
-  }
+  /// Serializes this ExerciseSearchEntry to a JSON map.
+  Map<String, dynamic> toJson();
 
   @override
   bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$ExerciseSearchEntryImpl &&
+            other is ExerciseSearchEntry &&
             (identical(other.value, value) || other.value == value) &&
             (identical(other.data, data) || other.data == data));
   }
@@ -977,112 +809,206 @@ class _$ExerciseSearchEntryImpl implements _ExerciseSearchEntry {
   @override
   int get hashCode => Object.hash(runtimeType, value, data);
 
-  /// Create a copy of ExerciseSearchEntry
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
   @override
-  @pragma('vm:prefer-inline')
-  _$$ExerciseSearchEntryImplCopyWith<_$ExerciseSearchEntryImpl> get copyWith =>
-      __$$ExerciseSearchEntryImplCopyWithImpl<_$ExerciseSearchEntryImpl>(this, _$identity);
-
-  @override
-  Map<String, dynamic> toJson() {
-    return _$$ExerciseSearchEntryImplToJson(
-      this,
-    );
+  String toString() {
+    return 'ExerciseSearchEntry(value: $value, data: $data)';
   }
 }
 
-abstract class _ExerciseSearchEntry implements ExerciseSearchEntry {
-  factory _ExerciseSearchEntry(
-      {required final String value,
-      required final ExerciseSearchDetails data}) = _$ExerciseSearchEntryImpl;
+/// @nodoc
+abstract mixin class $ExerciseSearchEntryCopyWith<$Res> {
+  factory $ExerciseSearchEntryCopyWith(
+          ExerciseSearchEntry value, $Res Function(ExerciseSearchEntry) _then) =
+      _$ExerciseSearchEntryCopyWithImpl;
+  @useResult
+  $Res call({String value, ExerciseSearchDetails data});
 
-  factory _ExerciseSearchEntry.fromJson(Map<String, dynamic> json) =
-      _$ExerciseSearchEntryImpl.fromJson;
+  $ExerciseSearchDetailsCopyWith<$Res> get data;
+}
+
+/// @nodoc
+class _$ExerciseSearchEntryCopyWithImpl<$Res> implements $ExerciseSearchEntryCopyWith<$Res> {
+  _$ExerciseSearchEntryCopyWithImpl(this._self, this._then);
+
+  final ExerciseSearchEntry _self;
+  final $Res Function(ExerciseSearchEntry) _then;
+
+  /// Create a copy of ExerciseSearchEntry
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? value = null,
+    Object? data = null,
+  }) {
+    return _then(_self.copyWith(
+      value: null == value
+          ? _self.value
+          : value // ignore: cast_nullable_to_non_nullable
+              as String,
+      data: null == data
+          ? _self.data
+          : data // ignore: cast_nullable_to_non_nullable
+              as ExerciseSearchDetails,
+    ));
+  }
+
+  /// Create a copy of ExerciseSearchEntry
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @pragma('vm:prefer-inline')
+  $ExerciseSearchDetailsCopyWith<$Res> get data {
+    return $ExerciseSearchDetailsCopyWith<$Res>(_self.data, (value) {
+      return _then(_self.copyWith(data: value));
+    });
+  }
+}
+
+/// @nodoc
+@JsonSerializable()
+class _ExerciseSearchEntry implements ExerciseSearchEntry {
+  _ExerciseSearchEntry({required this.value, required this.data});
+  factory _ExerciseSearchEntry.fromJson(Map<String, dynamic> json) =>
+      _$ExerciseSearchEntryFromJson(json);
 
   @override
-  String get value;
+  final String value;
   @override
-  ExerciseSearchDetails get data;
+  final ExerciseSearchDetails data;
 
   /// Create a copy of ExerciseSearchEntry
   /// with the given fields replaced by the non-null parameter values.
   @override
   @JsonKey(includeFromJson: false, includeToJson: false)
-  _$$ExerciseSearchEntryImplCopyWith<_$ExerciseSearchEntryImpl> get copyWith =>
-      throw _privateConstructorUsedError;
+  @pragma('vm:prefer-inline')
+  _$ExerciseSearchEntryCopyWith<_ExerciseSearchEntry> get copyWith =>
+      __$ExerciseSearchEntryCopyWithImpl<_ExerciseSearchEntry>(this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$ExerciseSearchEntryToJson(
+      this,
+    );
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _ExerciseSearchEntry &&
+            (identical(other.value, value) || other.value == value) &&
+            (identical(other.data, data) || other.data == data));
+  }
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  int get hashCode => Object.hash(runtimeType, value, data);
+
+  @override
+  String toString() {
+    return 'ExerciseSearchEntry(value: $value, data: $data)';
+  }
 }
 
-ExerciseApiSearch _$ExerciseApiSearchFromJson(Map<String, dynamic> json) {
-  return _ExerciseApiSearch.fromJson(json);
+/// @nodoc
+abstract mixin class _$ExerciseSearchEntryCopyWith<$Res>
+    implements $ExerciseSearchEntryCopyWith<$Res> {
+  factory _$ExerciseSearchEntryCopyWith(
+          _ExerciseSearchEntry value, $Res Function(_ExerciseSearchEntry) _then) =
+      __$ExerciseSearchEntryCopyWithImpl;
+  @override
+  @useResult
+  $Res call({String value, ExerciseSearchDetails data});
+
+  @override
+  $ExerciseSearchDetailsCopyWith<$Res> get data;
+}
+
+/// @nodoc
+class __$ExerciseSearchEntryCopyWithImpl<$Res> implements _$ExerciseSearchEntryCopyWith<$Res> {
+  __$ExerciseSearchEntryCopyWithImpl(this._self, this._then);
+
+  final _ExerciseSearchEntry _self;
+  final $Res Function(_ExerciseSearchEntry) _then;
+
+  /// Create a copy of ExerciseSearchEntry
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @pragma('vm:prefer-inline')
+  $Res call({
+    Object? value = null,
+    Object? data = null,
+  }) {
+    return _then(_ExerciseSearchEntry(
+      value: null == value
+          ? _self.value
+          : value // ignore: cast_nullable_to_non_nullable
+              as String,
+      data: null == data
+          ? _self.data
+          : data // ignore: cast_nullable_to_non_nullable
+              as ExerciseSearchDetails,
+    ));
+  }
+
+  /// Create a copy of ExerciseSearchEntry
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @pragma('vm:prefer-inline')
+  $ExerciseSearchDetailsCopyWith<$Res> get data {
+    return $ExerciseSearchDetailsCopyWith<$Res>(_self.data, (value) {
+      return _then(_self.copyWith(data: value));
+    });
+  }
 }
 
 /// @nodoc
 mixin _$ExerciseApiSearch {
-  List<ExerciseSearchEntry> get suggestions => throw _privateConstructorUsedError;
-
-  /// Serializes this ExerciseApiSearch to a JSON map.
-  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
+  List<ExerciseSearchEntry> get suggestions;
 
   /// Create a copy of ExerciseApiSearch
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
-  $ExerciseApiSearchCopyWith<ExerciseApiSearch> get copyWith => throw _privateConstructorUsedError;
-}
-
-/// @nodoc
-abstract class $ExerciseApiSearchCopyWith<$Res> {
-  factory $ExerciseApiSearchCopyWith(
-          ExerciseApiSearch value, $Res Function(ExerciseApiSearch) then) =
-      _$ExerciseApiSearchCopyWithImpl<$Res, ExerciseApiSearch>;
-  @useResult
-  $Res call({List<ExerciseSearchEntry> suggestions});
-}
-
-/// @nodoc
-class _$ExerciseApiSearchCopyWithImpl<$Res, $Val extends ExerciseApiSearch>
-    implements $ExerciseApiSearchCopyWith<$Res> {
-  _$ExerciseApiSearchCopyWithImpl(this._value, this._then);
-
-  // ignore: unused_field
-  final $Val _value;
-  // ignore: unused_field
-  final $Res Function($Val) _then;
-
-  /// Create a copy of ExerciseApiSearch
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
+  $ExerciseApiSearchCopyWith<ExerciseApiSearch> get copyWith =>
+      _$ExerciseApiSearchCopyWithImpl<ExerciseApiSearch>(this as ExerciseApiSearch, _$identity);
+
+  /// Serializes this ExerciseApiSearch to a JSON map.
+  Map<String, dynamic> toJson();
+
   @override
-  $Res call({
-    Object? suggestions = null,
-  }) {
-    return _then(_value.copyWith(
-      suggestions: null == suggestions
-          ? _value.suggestions
-          : suggestions // ignore: cast_nullable_to_non_nullable
-              as List<ExerciseSearchEntry>,
-    ) as $Val);
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is ExerciseApiSearch &&
+            const DeepCollectionEquality().equals(other.suggestions, suggestions));
+  }
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  int get hashCode => Object.hash(runtimeType, const DeepCollectionEquality().hash(suggestions));
+
+  @override
+  String toString() {
+    return 'ExerciseApiSearch(suggestions: $suggestions)';
   }
 }
 
 /// @nodoc
-abstract class _$$ExerciseApiSearchImplCopyWith<$Res> implements $ExerciseApiSearchCopyWith<$Res> {
-  factory _$$ExerciseApiSearchImplCopyWith(
-          _$ExerciseApiSearchImpl value, $Res Function(_$ExerciseApiSearchImpl) then) =
-      __$$ExerciseApiSearchImplCopyWithImpl<$Res>;
-  @override
+abstract mixin class $ExerciseApiSearchCopyWith<$Res> {
+  factory $ExerciseApiSearchCopyWith(
+          ExerciseApiSearch value, $Res Function(ExerciseApiSearch) _then) =
+      _$ExerciseApiSearchCopyWithImpl;
   @useResult
   $Res call({List<ExerciseSearchEntry> suggestions});
 }
 
 /// @nodoc
-class __$$ExerciseApiSearchImplCopyWithImpl<$Res>
-    extends _$ExerciseApiSearchCopyWithImpl<$Res, _$ExerciseApiSearchImpl>
-    implements _$$ExerciseApiSearchImplCopyWith<$Res> {
-  __$$ExerciseApiSearchImplCopyWithImpl(
-      _$ExerciseApiSearchImpl _value, $Res Function(_$ExerciseApiSearchImpl) _then)
-      : super(_value, _then);
+class _$ExerciseApiSearchCopyWithImpl<$Res> implements $ExerciseApiSearchCopyWith<$Res> {
+  _$ExerciseApiSearchCopyWithImpl(this._self, this._then);
+
+  final ExerciseApiSearch _self;
+  final $Res Function(ExerciseApiSearch) _then;
 
   /// Create a copy of ExerciseApiSearch
   /// with the given fields replaced by the non-null parameter values.
@@ -1091,9 +1017,9 @@ class __$$ExerciseApiSearchImplCopyWithImpl<$Res>
   $Res call({
     Object? suggestions = null,
   }) {
-    return _then(_$ExerciseApiSearchImpl(
+    return _then(_self.copyWith(
       suggestions: null == suggestions
-          ? _value._suggestions
+          ? _self.suggestions
           : suggestions // ignore: cast_nullable_to_non_nullable
               as List<ExerciseSearchEntry>,
     ));
@@ -1102,12 +1028,11 @@ class __$$ExerciseApiSearchImplCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$ExerciseApiSearchImpl implements _ExerciseApiSearch {
-  _$ExerciseApiSearchImpl({required final List<ExerciseSearchEntry> suggestions})
+class _ExerciseApiSearch implements ExerciseApiSearch {
+  _ExerciseApiSearch({required final List<ExerciseSearchEntry> suggestions})
       : _suggestions = suggestions;
-
-  factory _$ExerciseApiSearchImpl.fromJson(Map<String, dynamic> json) =>
-      _$$ExerciseApiSearchImplFromJson(json);
+  factory _ExerciseApiSearch.fromJson(Map<String, dynamic> json) =>
+      _$ExerciseApiSearchFromJson(json);
 
   final List<ExerciseSearchEntry> _suggestions;
   @override
@@ -1117,16 +1042,26 @@ class _$ExerciseApiSearchImpl implements _ExerciseApiSearch {
     return EqualUnmodifiableListView(_suggestions);
   }
 
+  /// Create a copy of ExerciseApiSearch
+  /// with the given fields replaced by the non-null parameter values.
   @override
-  String toString() {
-    return 'ExerciseApiSearch(suggestions: $suggestions)';
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @pragma('vm:prefer-inline')
+  _$ExerciseApiSearchCopyWith<_ExerciseApiSearch> get copyWith =>
+      __$ExerciseApiSearchCopyWithImpl<_ExerciseApiSearch>(this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$ExerciseApiSearchToJson(
+      this,
+    );
   }
 
   @override
   bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$ExerciseApiSearchImpl &&
+            other is _ExerciseApiSearch &&
             const DeepCollectionEquality().equals(other._suggestions, _suggestions));
   }
 
@@ -1134,35 +1069,43 @@ class _$ExerciseApiSearchImpl implements _ExerciseApiSearch {
   @override
   int get hashCode => Object.hash(runtimeType, const DeepCollectionEquality().hash(_suggestions));
 
-  /// Create a copy of ExerciseApiSearch
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
   @override
-  @pragma('vm:prefer-inline')
-  _$$ExerciseApiSearchImplCopyWith<_$ExerciseApiSearchImpl> get copyWith =>
-      __$$ExerciseApiSearchImplCopyWithImpl<_$ExerciseApiSearchImpl>(this, _$identity);
-
-  @override
-  Map<String, dynamic> toJson() {
-    return _$$ExerciseApiSearchImplToJson(
-      this,
-    );
+  String toString() {
+    return 'ExerciseApiSearch(suggestions: $suggestions)';
   }
 }
 
-abstract class _ExerciseApiSearch implements ExerciseApiSearch {
-  factory _ExerciseApiSearch({required final List<ExerciseSearchEntry> suggestions}) =
-      _$ExerciseApiSearchImpl;
-
-  factory _ExerciseApiSearch.fromJson(Map<String, dynamic> json) = _$ExerciseApiSearchImpl.fromJson;
-
+/// @nodoc
+abstract mixin class _$ExerciseApiSearchCopyWith<$Res> implements $ExerciseApiSearchCopyWith<$Res> {
+  factory _$ExerciseApiSearchCopyWith(
+          _ExerciseApiSearch value, $Res Function(_ExerciseApiSearch) _then) =
+      __$ExerciseApiSearchCopyWithImpl;
   @override
-  List<ExerciseSearchEntry> get suggestions;
+  @useResult
+  $Res call({List<ExerciseSearchEntry> suggestions});
+}
+
+/// @nodoc
+class __$ExerciseApiSearchCopyWithImpl<$Res> implements _$ExerciseApiSearchCopyWith<$Res> {
+  __$ExerciseApiSearchCopyWithImpl(this._self, this._then);
+
+  final _ExerciseApiSearch _self;
+  final $Res Function(_ExerciseApiSearch) _then;
 
   /// Create a copy of ExerciseApiSearch
   /// with the given fields replaced by the non-null parameter values.
   @override
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  _$$ExerciseApiSearchImplCopyWith<_$ExerciseApiSearchImpl> get copyWith =>
-      throw _privateConstructorUsedError;
+  @pragma('vm:prefer-inline')
+  $Res call({
+    Object? suggestions = null,
+  }) {
+    return _then(_ExerciseApiSearch(
+      suggestions: null == suggestions
+          ? _self._suggestions
+          : suggestions // ignore: cast_nullable_to_non_nullable
+              as List<ExerciseSearchEntry>,
+    ));
+  }
 }
+
+// dart format on
diff --git a/lib/models/exercises/exercise_api.g.dart b/lib/models/exercises/exercise_api.g.dart
index 54b42817..99a9a585 100644
--- a/lib/models/exercises/exercise_api.g.dart
+++ b/lib/models/exercises/exercise_api.g.dart
@@ -6,8 +6,7 @@ part of 'exercise_api.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-_$ExerciseBaseDataImpl _$$ExerciseBaseDataImplFromJson(Map<String, dynamic> json) =>
-    _$ExerciseBaseDataImpl(
+_ExerciseBaseData _$ExerciseBaseDataFromJson(Map<String, dynamic> json) => _ExerciseBaseData(
       id: (json['id'] as num).toInt(),
       uuid: json['uuid'] as String,
       variationId: (json['variations'] as num?)?.toInt() ?? null,
@@ -39,8 +38,7 @@ _$ExerciseBaseDataImpl _$$ExerciseBaseDataImplFromJson(Map<String, dynamic> json
           (json['total_authors_history'] as List<dynamic>).map((e) => e as String).toList(),
     );
 
-Map<String, dynamic> _$$ExerciseBaseDataImplToJson(_$ExerciseBaseDataImpl instance) =>
-    <String, dynamic>{
+Map<String, dynamic> _$ExerciseBaseDataToJson(_ExerciseBaseData instance) => <String, dynamic>{
       'id': instance.id,
       'uuid': instance.uuid,
       'variations': instance.variationId,
@@ -58,8 +56,8 @@ Map<String, dynamic> _$$ExerciseBaseDataImplToJson(_$ExerciseBaseDataImpl instan
       'total_authors_history': instance.authorsGlobal,
     };
 
-_$ExerciseSearchDetailsImpl _$$ExerciseSearchDetailsImplFromJson(Map<String, dynamic> json) =>
-    _$ExerciseSearchDetailsImpl(
+_ExerciseSearchDetails _$ExerciseSearchDetailsFromJson(Map<String, dynamic> json) =>
+    _ExerciseSearchDetails(
       translationId: (json['id'] as num).toInt(),
       exerciseId: (json['base_id'] as num).toInt(),
       name: json['name'] as String,
@@ -68,7 +66,7 @@ _$ExerciseSearchDetailsImpl _$$ExerciseSearchDetailsImplFromJson(Map<String, dyn
       imageThumbnail: json['image_thumbnail'] as String?,
     );
 
-Map<String, dynamic> _$$ExerciseSearchDetailsImplToJson(_$ExerciseSearchDetailsImpl instance) =>
+Map<String, dynamic> _$ExerciseSearchDetailsToJson(_ExerciseSearchDetails instance) =>
     <String, dynamic>{
       'id': instance.translationId,
       'base_id': instance.exerciseId,
@@ -78,26 +76,24 @@ Map<String, dynamic> _$$ExerciseSearchDetailsImplToJson(_$ExerciseSearchDetailsI
       'image_thumbnail': instance.imageThumbnail,
     };
 
-_$ExerciseSearchEntryImpl _$$ExerciseSearchEntryImplFromJson(Map<String, dynamic> json) =>
-    _$ExerciseSearchEntryImpl(
+_ExerciseSearchEntry _$ExerciseSearchEntryFromJson(Map<String, dynamic> json) =>
+    _ExerciseSearchEntry(
       value: json['value'] as String,
       data: ExerciseSearchDetails.fromJson(json['data'] as Map<String, dynamic>),
     );
 
-Map<String, dynamic> _$$ExerciseSearchEntryImplToJson(_$ExerciseSearchEntryImpl instance) =>
+Map<String, dynamic> _$ExerciseSearchEntryToJson(_ExerciseSearchEntry instance) =>
     <String, dynamic>{
       'value': instance.value,
       'data': instance.data,
     };
 
-_$ExerciseApiSearchImpl _$$ExerciseApiSearchImplFromJson(Map<String, dynamic> json) =>
-    _$ExerciseApiSearchImpl(
+_ExerciseApiSearch _$ExerciseApiSearchFromJson(Map<String, dynamic> json) => _ExerciseApiSearch(
       suggestions: (json['suggestions'] as List<dynamic>)
           .map((e) => ExerciseSearchEntry.fromJson(e as Map<String, dynamic>))
           .toList(),
     );
 
-Map<String, dynamic> _$$ExerciseApiSearchImplToJson(_$ExerciseApiSearchImpl instance) =>
-    <String, dynamic>{
+Map<String, dynamic> _$ExerciseApiSearchToJson(_ExerciseApiSearch instance) => <String, dynamic>{
       'suggestions': instance.suggestions,
     };
diff --git a/lib/models/exercises/ingredient_api.dart b/lib/models/exercises/ingredient_api.dart
index 68d7c33a..a1b011a7 100644
--- a/lib/models/exercises/ingredient_api.dart
+++ b/lib/models/exercises/ingredient_api.dart
@@ -5,7 +5,7 @@ part 'ingredient_api.g.dart';
 
 /// Model for the search results returned from the /api/v2/ingredient/search endpoint
 @freezed
-class IngredientApiSearchDetails with _$IngredientApiSearchDetails {
+sealed class IngredientApiSearchDetails with _$IngredientApiSearchDetails {
   factory IngredientApiSearchDetails({
     required int id,
     required String name,
@@ -19,7 +19,7 @@ class IngredientApiSearchDetails with _$IngredientApiSearchDetails {
 }
 
 @freezed
-class IngredientApiSearchEntry with _$IngredientApiSearchEntry {
+sealed class IngredientApiSearchEntry with _$IngredientApiSearchEntry {
   factory IngredientApiSearchEntry({
     required String value,
     required IngredientApiSearchDetails data,
@@ -30,7 +30,7 @@ class IngredientApiSearchEntry with _$IngredientApiSearchEntry {
 }
 
 @freezed
-class IngredientApiSearch with _$IngredientApiSearch {
+sealed class IngredientApiSearch with _$IngredientApiSearch {
   factory IngredientApiSearch({
     required List<IngredientApiSearchEntry> suggestions,
   }) = _IngredientApiSearch;
diff --git a/lib/models/exercises/ingredient_api.freezed.dart b/lib/models/exercises/ingredient_api.freezed.dart
index e7e680b0..f2337dcc 100644
--- a/lib/models/exercises/ingredient_api.freezed.dart
+++ b/lib/models/exercises/ingredient_api.freezed.dart
@@ -1,3 +1,4 @@
+// dart format width=80
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
 // ignore_for_file: type=lint
@@ -9,94 +10,55 @@ part of 'ingredient_api.dart';
 // FreezedGenerator
 // **************************************************************************
 
+// dart format off
 T _$identity<T>(T value) => value;
 
-final _privateConstructorUsedError = UnsupportedError(
-    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
-
-IngredientApiSearchDetails _$IngredientApiSearchDetailsFromJson(Map<String, dynamic> json) {
-  return _IngredientApiSearchDetails.fromJson(json);
-}
-
 /// @nodoc
 mixin _$IngredientApiSearchDetails {
-  int get id => throw _privateConstructorUsedError;
-  String get name => throw _privateConstructorUsedError;
-  String? get image => throw _privateConstructorUsedError; // ignore: invalid_annotation_target
+  int get id;
+  String get name;
+  String? get image; // ignore: invalid_annotation_target
   @JsonKey(name: 'image_thumbnail')
-  String? get imageThumbnail => throw _privateConstructorUsedError;
-
-  /// Serializes this IngredientApiSearchDetails to a JSON map.
-  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
+  String? get imageThumbnail;
 
   /// Create a copy of IngredientApiSearchDetails
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
-  $IngredientApiSearchDetailsCopyWith<IngredientApiSearchDetails> get copyWith =>
-      throw _privateConstructorUsedError;
-}
-
-/// @nodoc
-abstract class $IngredientApiSearchDetailsCopyWith<$Res> {
-  factory $IngredientApiSearchDetailsCopyWith(
-          IngredientApiSearchDetails value, $Res Function(IngredientApiSearchDetails) then) =
-      _$IngredientApiSearchDetailsCopyWithImpl<$Res, IngredientApiSearchDetails>;
-  @useResult
-  $Res call(
-      {int id,
-      String name,
-      String? image,
-      @JsonKey(name: 'image_thumbnail') String? imageThumbnail});
-}
-
-/// @nodoc
-class _$IngredientApiSearchDetailsCopyWithImpl<$Res, $Val extends IngredientApiSearchDetails>
-    implements $IngredientApiSearchDetailsCopyWith<$Res> {
-  _$IngredientApiSearchDetailsCopyWithImpl(this._value, this._then);
-
-  // ignore: unused_field
-  final $Val _value;
-  // ignore: unused_field
-  final $Res Function($Val) _then;
-
-  /// Create a copy of IngredientApiSearchDetails
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
+  $IngredientApiSearchDetailsCopyWith<IngredientApiSearchDetails> get copyWith =>
+      _$IngredientApiSearchDetailsCopyWithImpl<IngredientApiSearchDetails>(
+          this as IngredientApiSearchDetails, _$identity);
+
+  /// Serializes this IngredientApiSearchDetails to a JSON map.
+  Map<String, dynamic> toJson();
+
   @override
-  $Res call({
-    Object? id = null,
-    Object? name = null,
-    Object? image = freezed,
-    Object? imageThumbnail = freezed,
-  }) {
-    return _then(_value.copyWith(
-      id: null == id
-          ? _value.id
-          : id // ignore: cast_nullable_to_non_nullable
-              as int,
-      name: null == name
-          ? _value.name
-          : name // ignore: cast_nullable_to_non_nullable
-              as String,
-      image: freezed == image
-          ? _value.image
-          : image // ignore: cast_nullable_to_non_nullable
-              as String?,
-      imageThumbnail: freezed == imageThumbnail
-          ? _value.imageThumbnail
-          : imageThumbnail // ignore: cast_nullable_to_non_nullable
-              as String?,
-    ) as $Val);
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is IngredientApiSearchDetails &&
+            (identical(other.id, id) || other.id == id) &&
+            (identical(other.name, name) || other.name == name) &&
+            (identical(other.image, image) || other.image == image) &&
+            (identical(other.imageThumbnail, imageThumbnail) ||
+                other.imageThumbnail == imageThumbnail));
+  }
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  int get hashCode => Object.hash(runtimeType, id, name, image, imageThumbnail);
+
+  @override
+  String toString() {
+    return 'IngredientApiSearchDetails(id: $id, name: $name, image: $image, imageThumbnail: $imageThumbnail)';
   }
 }
 
 /// @nodoc
-abstract class _$$IngredientApiSearchDetailsImplCopyWith<$Res>
-    implements $IngredientApiSearchDetailsCopyWith<$Res> {
-  factory _$$IngredientApiSearchDetailsImplCopyWith(_$IngredientApiSearchDetailsImpl value,
-          $Res Function(_$IngredientApiSearchDetailsImpl) then) =
-      __$$IngredientApiSearchDetailsImplCopyWithImpl<$Res>;
-  @override
+abstract mixin class $IngredientApiSearchDetailsCopyWith<$Res> {
+  factory $IngredientApiSearchDetailsCopyWith(
+          IngredientApiSearchDetails value, $Res Function(IngredientApiSearchDetails) _then) =
+      _$IngredientApiSearchDetailsCopyWithImpl;
   @useResult
   $Res call(
       {int id,
@@ -106,12 +68,12 @@ abstract class _$$IngredientApiSearchDetailsImplCopyWith<$Res>
 }
 
 /// @nodoc
-class __$$IngredientApiSearchDetailsImplCopyWithImpl<$Res>
-    extends _$IngredientApiSearchDetailsCopyWithImpl<$Res, _$IngredientApiSearchDetailsImpl>
-    implements _$$IngredientApiSearchDetailsImplCopyWith<$Res> {
-  __$$IngredientApiSearchDetailsImplCopyWithImpl(_$IngredientApiSearchDetailsImpl _value,
-      $Res Function(_$IngredientApiSearchDetailsImpl) _then)
-      : super(_value, _then);
+class _$IngredientApiSearchDetailsCopyWithImpl<$Res>
+    implements $IngredientApiSearchDetailsCopyWith<$Res> {
+  _$IngredientApiSearchDetailsCopyWithImpl(this._self, this._then);
+
+  final IngredientApiSearchDetails _self;
+  final $Res Function(IngredientApiSearchDetails) _then;
 
   /// Create a copy of IngredientApiSearchDetails
   /// with the given fields replaced by the non-null parameter values.
@@ -123,21 +85,21 @@ class __$$IngredientApiSearchDetailsImplCopyWithImpl<$Res>
     Object? image = freezed,
     Object? imageThumbnail = freezed,
   }) {
-    return _then(_$IngredientApiSearchDetailsImpl(
+    return _then(_self.copyWith(
       id: null == id
-          ? _value.id
+          ? _self.id
           : id // ignore: cast_nullable_to_non_nullable
               as int,
       name: null == name
-          ? _value.name
+          ? _self.name
           : name // ignore: cast_nullable_to_non_nullable
               as String,
       image: freezed == image
-          ? _value.image
+          ? _self.image
           : image // ignore: cast_nullable_to_non_nullable
               as String?,
       imageThumbnail: freezed == imageThumbnail
-          ? _value.imageThumbnail
+          ? _self.imageThumbnail
           : imageThumbnail // ignore: cast_nullable_to_non_nullable
               as String?,
     ));
@@ -146,15 +108,14 @@ class __$$IngredientApiSearchDetailsImplCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$IngredientApiSearchDetailsImpl implements _IngredientApiSearchDetails {
-  _$IngredientApiSearchDetailsImpl(
+class _IngredientApiSearchDetails implements IngredientApiSearchDetails {
+  _IngredientApiSearchDetails(
       {required this.id,
       required this.name,
       required this.image,
       @JsonKey(name: 'image_thumbnail') required this.imageThumbnail});
-
-  factory _$IngredientApiSearchDetailsImpl.fromJson(Map<String, dynamic> json) =>
-      _$$IngredientApiSearchDetailsImplFromJson(json);
+  factory _IngredientApiSearchDetails.fromJson(Map<String, dynamic> json) =>
+      _$IngredientApiSearchDetailsFromJson(json);
 
   @override
   final int id;
@@ -167,16 +128,26 @@ class _$IngredientApiSearchDetailsImpl implements _IngredientApiSearchDetails {
   @JsonKey(name: 'image_thumbnail')
   final String? imageThumbnail;
 
+  /// Create a copy of IngredientApiSearchDetails
+  /// with the given fields replaced by the non-null parameter values.
   @override
-  String toString() {
-    return 'IngredientApiSearchDetails(id: $id, name: $name, image: $image, imageThumbnail: $imageThumbnail)';
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @pragma('vm:prefer-inline')
+  _$IngredientApiSearchDetailsCopyWith<_IngredientApiSearchDetails> get copyWith =>
+      __$IngredientApiSearchDetailsCopyWithImpl<_IngredientApiSearchDetails>(this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$IngredientApiSearchDetailsToJson(
+      this,
+    );
   }
 
   @override
   bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$IngredientApiSearchDetailsImpl &&
+            other is _IngredientApiSearchDetails &&
             (identical(other.id, id) || other.id == id) &&
             (identical(other.name, name) || other.name == name) &&
             (identical(other.image, image) || other.image == image) &&
@@ -188,189 +159,87 @@ class _$IngredientApiSearchDetailsImpl implements _IngredientApiSearchDetails {
   @override
   int get hashCode => Object.hash(runtimeType, id, name, image, imageThumbnail);
 
-  /// Create a copy of IngredientApiSearchDetails
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
   @override
-  @pragma('vm:prefer-inline')
-  _$$IngredientApiSearchDetailsImplCopyWith<_$IngredientApiSearchDetailsImpl> get copyWith =>
-      __$$IngredientApiSearchDetailsImplCopyWithImpl<_$IngredientApiSearchDetailsImpl>(
-          this, _$identity);
-
-  @override
-  Map<String, dynamic> toJson() {
-    return _$$IngredientApiSearchDetailsImplToJson(
-      this,
-    );
+  String toString() {
+    return 'IngredientApiSearchDetails(id: $id, name: $name, image: $image, imageThumbnail: $imageThumbnail)';
   }
 }
 
-abstract class _IngredientApiSearchDetails implements IngredientApiSearchDetails {
-  factory _IngredientApiSearchDetails(
-          {required final int id,
-          required final String name,
-          required final String? image,
-          @JsonKey(name: 'image_thumbnail') required final String? imageThumbnail}) =
-      _$IngredientApiSearchDetailsImpl;
+/// @nodoc
+abstract mixin class _$IngredientApiSearchDetailsCopyWith<$Res>
+    implements $IngredientApiSearchDetailsCopyWith<$Res> {
+  factory _$IngredientApiSearchDetailsCopyWith(
+          _IngredientApiSearchDetails value, $Res Function(_IngredientApiSearchDetails) _then) =
+      __$IngredientApiSearchDetailsCopyWithImpl;
+  @override
+  @useResult
+  $Res call(
+      {int id,
+      String name,
+      String? image,
+      @JsonKey(name: 'image_thumbnail') String? imageThumbnail});
+}
 
-  factory _IngredientApiSearchDetails.fromJson(Map<String, dynamic> json) =
-      _$IngredientApiSearchDetailsImpl.fromJson;
+/// @nodoc
+class __$IngredientApiSearchDetailsCopyWithImpl<$Res>
+    implements _$IngredientApiSearchDetailsCopyWith<$Res> {
+  __$IngredientApiSearchDetailsCopyWithImpl(this._self, this._then);
 
-  @override
-  int get id;
-  @override
-  String get name;
-  @override
-  String? get image; // ignore: invalid_annotation_target
-  @override
-  @JsonKey(name: 'image_thumbnail')
-  String? get imageThumbnail;
+  final _IngredientApiSearchDetails _self;
+  final $Res Function(_IngredientApiSearchDetails) _then;
 
   /// Create a copy of IngredientApiSearchDetails
   /// with the given fields replaced by the non-null parameter values.
   @override
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  _$$IngredientApiSearchDetailsImplCopyWith<_$IngredientApiSearchDetailsImpl> get copyWith =>
-      throw _privateConstructorUsedError;
-}
-
-IngredientApiSearchEntry _$IngredientApiSearchEntryFromJson(Map<String, dynamic> json) {
-  return _IngredientApiSearchEntry.fromJson(json);
-}
-
-/// @nodoc
-mixin _$IngredientApiSearchEntry {
-  String get value => throw _privateConstructorUsedError;
-  IngredientApiSearchDetails get data => throw _privateConstructorUsedError;
-
-  /// Serializes this IngredientApiSearchEntry to a JSON map.
-  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-
-  /// Create a copy of IngredientApiSearchEntry
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  $IngredientApiSearchEntryCopyWith<IngredientApiSearchEntry> get copyWith =>
-      throw _privateConstructorUsedError;
-}
-
-/// @nodoc
-abstract class $IngredientApiSearchEntryCopyWith<$Res> {
-  factory $IngredientApiSearchEntryCopyWith(
-          IngredientApiSearchEntry value, $Res Function(IngredientApiSearchEntry) then) =
-      _$IngredientApiSearchEntryCopyWithImpl<$Res, IngredientApiSearchEntry>;
-  @useResult
-  $Res call({String value, IngredientApiSearchDetails data});
-
-  $IngredientApiSearchDetailsCopyWith<$Res> get data;
-}
-
-/// @nodoc
-class _$IngredientApiSearchEntryCopyWithImpl<$Res, $Val extends IngredientApiSearchEntry>
-    implements $IngredientApiSearchEntryCopyWith<$Res> {
-  _$IngredientApiSearchEntryCopyWithImpl(this._value, this._then);
-
-  // ignore: unused_field
-  final $Val _value;
-  // ignore: unused_field
-  final $Res Function($Val) _then;
-
-  /// Create a copy of IngredientApiSearchEntry
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
-  @override
   $Res call({
-    Object? value = null,
-    Object? data = null,
+    Object? id = null,
+    Object? name = null,
+    Object? image = freezed,
+    Object? imageThumbnail = freezed,
   }) {
-    return _then(_value.copyWith(
-      value: null == value
-          ? _value.value
-          : value // ignore: cast_nullable_to_non_nullable
+    return _then(_IngredientApiSearchDetails(
+      id: null == id
+          ? _self.id
+          : id // ignore: cast_nullable_to_non_nullable
+              as int,
+      name: null == name
+          ? _self.name
+          : name // ignore: cast_nullable_to_non_nullable
               as String,
-      data: null == data
-          ? _value.data
-          : data // ignore: cast_nullable_to_non_nullable
-              as IngredientApiSearchDetails,
-    ) as $Val);
-  }
-
-  /// Create a copy of IngredientApiSearchEntry
-  /// with the given fields replaced by the non-null parameter values.
-  @override
-  @pragma('vm:prefer-inline')
-  $IngredientApiSearchDetailsCopyWith<$Res> get data {
-    return $IngredientApiSearchDetailsCopyWith<$Res>(_value.data, (value) {
-      return _then(_value.copyWith(data: value) as $Val);
-    });
-  }
-}
-
-/// @nodoc
-abstract class _$$IngredientApiSearchEntryImplCopyWith<$Res>
-    implements $IngredientApiSearchEntryCopyWith<$Res> {
-  factory _$$IngredientApiSearchEntryImplCopyWith(_$IngredientApiSearchEntryImpl value,
-          $Res Function(_$IngredientApiSearchEntryImpl) then) =
-      __$$IngredientApiSearchEntryImplCopyWithImpl<$Res>;
-  @override
-  @useResult
-  $Res call({String value, IngredientApiSearchDetails data});
-
-  @override
-  $IngredientApiSearchDetailsCopyWith<$Res> get data;
-}
-
-/// @nodoc
-class __$$IngredientApiSearchEntryImplCopyWithImpl<$Res>
-    extends _$IngredientApiSearchEntryCopyWithImpl<$Res, _$IngredientApiSearchEntryImpl>
-    implements _$$IngredientApiSearchEntryImplCopyWith<$Res> {
-  __$$IngredientApiSearchEntryImplCopyWithImpl(
-      _$IngredientApiSearchEntryImpl _value, $Res Function(_$IngredientApiSearchEntryImpl) _then)
-      : super(_value, _then);
-
-  /// Create a copy of IngredientApiSearchEntry
-  /// with the given fields replaced by the non-null parameter values.
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? value = null,
-    Object? data = null,
-  }) {
-    return _then(_$IngredientApiSearchEntryImpl(
-      value: null == value
-          ? _value.value
-          : value // ignore: cast_nullable_to_non_nullable
-              as String,
-      data: null == data
-          ? _value.data
-          : data // ignore: cast_nullable_to_non_nullable
-              as IngredientApiSearchDetails,
+      image: freezed == image
+          ? _self.image
+          : image // ignore: cast_nullable_to_non_nullable
+              as String?,
+      imageThumbnail: freezed == imageThumbnail
+          ? _self.imageThumbnail
+          : imageThumbnail // ignore: cast_nullable_to_non_nullable
+              as String?,
     ));
   }
 }
 
 /// @nodoc
-@JsonSerializable()
-class _$IngredientApiSearchEntryImpl implements _IngredientApiSearchEntry {
-  _$IngredientApiSearchEntryImpl({required this.value, required this.data});
+mixin _$IngredientApiSearchEntry {
+  String get value;
+  IngredientApiSearchDetails get data;
 
-  factory _$IngredientApiSearchEntryImpl.fromJson(Map<String, dynamic> json) =>
-      _$$IngredientApiSearchEntryImplFromJson(json);
+  /// Create a copy of IngredientApiSearchEntry
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @pragma('vm:prefer-inline')
+  $IngredientApiSearchEntryCopyWith<IngredientApiSearchEntry> get copyWith =>
+      _$IngredientApiSearchEntryCopyWithImpl<IngredientApiSearchEntry>(
+          this as IngredientApiSearchEntry, _$identity);
 
-  @override
-  final String value;
-  @override
-  final IngredientApiSearchDetails data;
-
-  @override
-  String toString() {
-    return 'IngredientApiSearchEntry(value: $value, data: $data)';
-  }
+  /// Serializes this IngredientApiSearchEntry to a JSON map.
+  Map<String, dynamic> toJson();
 
   @override
   bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$IngredientApiSearchEntryImpl &&
+            other is IngredientApiSearchEntry &&
             (identical(other.value, value) || other.value == value) &&
             (identical(other.data, data) || other.data == data));
   }
@@ -379,115 +248,209 @@ class _$IngredientApiSearchEntryImpl implements _IngredientApiSearchEntry {
   @override
   int get hashCode => Object.hash(runtimeType, value, data);
 
-  /// Create a copy of IngredientApiSearchEntry
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
   @override
-  @pragma('vm:prefer-inline')
-  _$$IngredientApiSearchEntryImplCopyWith<_$IngredientApiSearchEntryImpl> get copyWith =>
-      __$$IngredientApiSearchEntryImplCopyWithImpl<_$IngredientApiSearchEntryImpl>(
-          this, _$identity);
-
-  @override
-  Map<String, dynamic> toJson() {
-    return _$$IngredientApiSearchEntryImplToJson(
-      this,
-    );
+  String toString() {
+    return 'IngredientApiSearchEntry(value: $value, data: $data)';
   }
 }
 
-abstract class _IngredientApiSearchEntry implements IngredientApiSearchEntry {
-  factory _IngredientApiSearchEntry(
-      {required final String value,
-      required final IngredientApiSearchDetails data}) = _$IngredientApiSearchEntryImpl;
+/// @nodoc
+abstract mixin class $IngredientApiSearchEntryCopyWith<$Res> {
+  factory $IngredientApiSearchEntryCopyWith(
+          IngredientApiSearchEntry value, $Res Function(IngredientApiSearchEntry) _then) =
+      _$IngredientApiSearchEntryCopyWithImpl;
+  @useResult
+  $Res call({String value, IngredientApiSearchDetails data});
 
-  factory _IngredientApiSearchEntry.fromJson(Map<String, dynamic> json) =
-      _$IngredientApiSearchEntryImpl.fromJson;
+  $IngredientApiSearchDetailsCopyWith<$Res> get data;
+}
+
+/// @nodoc
+class _$IngredientApiSearchEntryCopyWithImpl<$Res>
+    implements $IngredientApiSearchEntryCopyWith<$Res> {
+  _$IngredientApiSearchEntryCopyWithImpl(this._self, this._then);
+
+  final IngredientApiSearchEntry _self;
+  final $Res Function(IngredientApiSearchEntry) _then;
+
+  /// Create a copy of IngredientApiSearchEntry
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? value = null,
+    Object? data = null,
+  }) {
+    return _then(_self.copyWith(
+      value: null == value
+          ? _self.value
+          : value // ignore: cast_nullable_to_non_nullable
+              as String,
+      data: null == data
+          ? _self.data
+          : data // ignore: cast_nullable_to_non_nullable
+              as IngredientApiSearchDetails,
+    ));
+  }
+
+  /// Create a copy of IngredientApiSearchEntry
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @pragma('vm:prefer-inline')
+  $IngredientApiSearchDetailsCopyWith<$Res> get data {
+    return $IngredientApiSearchDetailsCopyWith<$Res>(_self.data, (value) {
+      return _then(_self.copyWith(data: value));
+    });
+  }
+}
+
+/// @nodoc
+@JsonSerializable()
+class _IngredientApiSearchEntry implements IngredientApiSearchEntry {
+  _IngredientApiSearchEntry({required this.value, required this.data});
+  factory _IngredientApiSearchEntry.fromJson(Map<String, dynamic> json) =>
+      _$IngredientApiSearchEntryFromJson(json);
 
   @override
-  String get value;
+  final String value;
   @override
-  IngredientApiSearchDetails get data;
+  final IngredientApiSearchDetails data;
 
   /// Create a copy of IngredientApiSearchEntry
   /// with the given fields replaced by the non-null parameter values.
   @override
   @JsonKey(includeFromJson: false, includeToJson: false)
-  _$$IngredientApiSearchEntryImplCopyWith<_$IngredientApiSearchEntryImpl> get copyWith =>
-      throw _privateConstructorUsedError;
+  @pragma('vm:prefer-inline')
+  _$IngredientApiSearchEntryCopyWith<_IngredientApiSearchEntry> get copyWith =>
+      __$IngredientApiSearchEntryCopyWithImpl<_IngredientApiSearchEntry>(this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$IngredientApiSearchEntryToJson(
+      this,
+    );
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _IngredientApiSearchEntry &&
+            (identical(other.value, value) || other.value == value) &&
+            (identical(other.data, data) || other.data == data));
+  }
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  int get hashCode => Object.hash(runtimeType, value, data);
+
+  @override
+  String toString() {
+    return 'IngredientApiSearchEntry(value: $value, data: $data)';
+  }
 }
 
-IngredientApiSearch _$IngredientApiSearchFromJson(Map<String, dynamic> json) {
-  return _IngredientApiSearch.fromJson(json);
+/// @nodoc
+abstract mixin class _$IngredientApiSearchEntryCopyWith<$Res>
+    implements $IngredientApiSearchEntryCopyWith<$Res> {
+  factory _$IngredientApiSearchEntryCopyWith(
+          _IngredientApiSearchEntry value, $Res Function(_IngredientApiSearchEntry) _then) =
+      __$IngredientApiSearchEntryCopyWithImpl;
+  @override
+  @useResult
+  $Res call({String value, IngredientApiSearchDetails data});
+
+  @override
+  $IngredientApiSearchDetailsCopyWith<$Res> get data;
+}
+
+/// @nodoc
+class __$IngredientApiSearchEntryCopyWithImpl<$Res>
+    implements _$IngredientApiSearchEntryCopyWith<$Res> {
+  __$IngredientApiSearchEntryCopyWithImpl(this._self, this._then);
+
+  final _IngredientApiSearchEntry _self;
+  final $Res Function(_IngredientApiSearchEntry) _then;
+
+  /// Create a copy of IngredientApiSearchEntry
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @pragma('vm:prefer-inline')
+  $Res call({
+    Object? value = null,
+    Object? data = null,
+  }) {
+    return _then(_IngredientApiSearchEntry(
+      value: null == value
+          ? _self.value
+          : value // ignore: cast_nullable_to_non_nullable
+              as String,
+      data: null == data
+          ? _self.data
+          : data // ignore: cast_nullable_to_non_nullable
+              as IngredientApiSearchDetails,
+    ));
+  }
+
+  /// Create a copy of IngredientApiSearchEntry
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @pragma('vm:prefer-inline')
+  $IngredientApiSearchDetailsCopyWith<$Res> get data {
+    return $IngredientApiSearchDetailsCopyWith<$Res>(_self.data, (value) {
+      return _then(_self.copyWith(data: value));
+    });
+  }
 }
 
 /// @nodoc
 mixin _$IngredientApiSearch {
-  List<IngredientApiSearchEntry> get suggestions => throw _privateConstructorUsedError;
-
-  /// Serializes this IngredientApiSearch to a JSON map.
-  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
+  List<IngredientApiSearchEntry> get suggestions;
 
   /// Create a copy of IngredientApiSearch
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
-  $IngredientApiSearchCopyWith<IngredientApiSearch> get copyWith =>
-      throw _privateConstructorUsedError;
-}
-
-/// @nodoc
-abstract class $IngredientApiSearchCopyWith<$Res> {
-  factory $IngredientApiSearchCopyWith(
-          IngredientApiSearch value, $Res Function(IngredientApiSearch) then) =
-      _$IngredientApiSearchCopyWithImpl<$Res, IngredientApiSearch>;
-  @useResult
-  $Res call({List<IngredientApiSearchEntry> suggestions});
-}
-
-/// @nodoc
-class _$IngredientApiSearchCopyWithImpl<$Res, $Val extends IngredientApiSearch>
-    implements $IngredientApiSearchCopyWith<$Res> {
-  _$IngredientApiSearchCopyWithImpl(this._value, this._then);
-
-  // ignore: unused_field
-  final $Val _value;
-  // ignore: unused_field
-  final $Res Function($Val) _then;
-
-  /// Create a copy of IngredientApiSearch
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
+  $IngredientApiSearchCopyWith<IngredientApiSearch> get copyWith =>
+      _$IngredientApiSearchCopyWithImpl<IngredientApiSearch>(
+          this as IngredientApiSearch, _$identity);
+
+  /// Serializes this IngredientApiSearch to a JSON map.
+  Map<String, dynamic> toJson();
+
   @override
-  $Res call({
-    Object? suggestions = null,
-  }) {
-    return _then(_value.copyWith(
-      suggestions: null == suggestions
-          ? _value.suggestions
-          : suggestions // ignore: cast_nullable_to_non_nullable
-              as List<IngredientApiSearchEntry>,
-    ) as $Val);
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is IngredientApiSearch &&
+            const DeepCollectionEquality().equals(other.suggestions, suggestions));
+  }
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  int get hashCode => Object.hash(runtimeType, const DeepCollectionEquality().hash(suggestions));
+
+  @override
+  String toString() {
+    return 'IngredientApiSearch(suggestions: $suggestions)';
   }
 }
 
 /// @nodoc
-abstract class _$$IngredientApiSearchImplCopyWith<$Res>
-    implements $IngredientApiSearchCopyWith<$Res> {
-  factory _$$IngredientApiSearchImplCopyWith(
-          _$IngredientApiSearchImpl value, $Res Function(_$IngredientApiSearchImpl) then) =
-      __$$IngredientApiSearchImplCopyWithImpl<$Res>;
-  @override
+abstract mixin class $IngredientApiSearchCopyWith<$Res> {
+  factory $IngredientApiSearchCopyWith(
+          IngredientApiSearch value, $Res Function(IngredientApiSearch) _then) =
+      _$IngredientApiSearchCopyWithImpl;
   @useResult
   $Res call({List<IngredientApiSearchEntry> suggestions});
 }
 
 /// @nodoc
-class __$$IngredientApiSearchImplCopyWithImpl<$Res>
-    extends _$IngredientApiSearchCopyWithImpl<$Res, _$IngredientApiSearchImpl>
-    implements _$$IngredientApiSearchImplCopyWith<$Res> {
-  __$$IngredientApiSearchImplCopyWithImpl(
-      _$IngredientApiSearchImpl _value, $Res Function(_$IngredientApiSearchImpl) _then)
-      : super(_value, _then);
+class _$IngredientApiSearchCopyWithImpl<$Res> implements $IngredientApiSearchCopyWith<$Res> {
+  _$IngredientApiSearchCopyWithImpl(this._self, this._then);
+
+  final IngredientApiSearch _self;
+  final $Res Function(IngredientApiSearch) _then;
 
   /// Create a copy of IngredientApiSearch
   /// with the given fields replaced by the non-null parameter values.
@@ -496,9 +459,9 @@ class __$$IngredientApiSearchImplCopyWithImpl<$Res>
   $Res call({
     Object? suggestions = null,
   }) {
-    return _then(_$IngredientApiSearchImpl(
+    return _then(_self.copyWith(
       suggestions: null == suggestions
-          ? _value._suggestions
+          ? _self.suggestions
           : suggestions // ignore: cast_nullable_to_non_nullable
               as List<IngredientApiSearchEntry>,
     ));
@@ -507,12 +470,11 @@ class __$$IngredientApiSearchImplCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$IngredientApiSearchImpl implements _IngredientApiSearch {
-  _$IngredientApiSearchImpl({required final List<IngredientApiSearchEntry> suggestions})
+class _IngredientApiSearch implements IngredientApiSearch {
+  _IngredientApiSearch({required final List<IngredientApiSearchEntry> suggestions})
       : _suggestions = suggestions;
-
-  factory _$IngredientApiSearchImpl.fromJson(Map<String, dynamic> json) =>
-      _$$IngredientApiSearchImplFromJson(json);
+  factory _IngredientApiSearch.fromJson(Map<String, dynamic> json) =>
+      _$IngredientApiSearchFromJson(json);
 
   final List<IngredientApiSearchEntry> _suggestions;
   @override
@@ -522,16 +484,26 @@ class _$IngredientApiSearchImpl implements _IngredientApiSearch {
     return EqualUnmodifiableListView(_suggestions);
   }
 
+  /// Create a copy of IngredientApiSearch
+  /// with the given fields replaced by the non-null parameter values.
   @override
-  String toString() {
-    return 'IngredientApiSearch(suggestions: $suggestions)';
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @pragma('vm:prefer-inline')
+  _$IngredientApiSearchCopyWith<_IngredientApiSearch> get copyWith =>
+      __$IngredientApiSearchCopyWithImpl<_IngredientApiSearch>(this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$IngredientApiSearchToJson(
+      this,
+    );
   }
 
   @override
   bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$IngredientApiSearchImpl &&
+            other is _IngredientApiSearch &&
             const DeepCollectionEquality().equals(other._suggestions, _suggestions));
   }
 
@@ -539,36 +511,44 @@ class _$IngredientApiSearchImpl implements _IngredientApiSearch {
   @override
   int get hashCode => Object.hash(runtimeType, const DeepCollectionEquality().hash(_suggestions));
 
-  /// Create a copy of IngredientApiSearch
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
   @override
-  @pragma('vm:prefer-inline')
-  _$$IngredientApiSearchImplCopyWith<_$IngredientApiSearchImpl> get copyWith =>
-      __$$IngredientApiSearchImplCopyWithImpl<_$IngredientApiSearchImpl>(this, _$identity);
-
-  @override
-  Map<String, dynamic> toJson() {
-    return _$$IngredientApiSearchImplToJson(
-      this,
-    );
+  String toString() {
+    return 'IngredientApiSearch(suggestions: $suggestions)';
   }
 }
 
-abstract class _IngredientApiSearch implements IngredientApiSearch {
-  factory _IngredientApiSearch({required final List<IngredientApiSearchEntry> suggestions}) =
-      _$IngredientApiSearchImpl;
-
-  factory _IngredientApiSearch.fromJson(Map<String, dynamic> json) =
-      _$IngredientApiSearchImpl.fromJson;
-
+/// @nodoc
+abstract mixin class _$IngredientApiSearchCopyWith<$Res>
+    implements $IngredientApiSearchCopyWith<$Res> {
+  factory _$IngredientApiSearchCopyWith(
+          _IngredientApiSearch value, $Res Function(_IngredientApiSearch) _then) =
+      __$IngredientApiSearchCopyWithImpl;
   @override
-  List<IngredientApiSearchEntry> get suggestions;
+  @useResult
+  $Res call({List<IngredientApiSearchEntry> suggestions});
+}
+
+/// @nodoc
+class __$IngredientApiSearchCopyWithImpl<$Res> implements _$IngredientApiSearchCopyWith<$Res> {
+  __$IngredientApiSearchCopyWithImpl(this._self, this._then);
+
+  final _IngredientApiSearch _self;
+  final $Res Function(_IngredientApiSearch) _then;
 
   /// Create a copy of IngredientApiSearch
   /// with the given fields replaced by the non-null parameter values.
   @override
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  _$$IngredientApiSearchImplCopyWith<_$IngredientApiSearchImpl> get copyWith =>
-      throw _privateConstructorUsedError;
+  @pragma('vm:prefer-inline')
+  $Res call({
+    Object? suggestions = null,
+  }) {
+    return _then(_IngredientApiSearch(
+      suggestions: null == suggestions
+          ? _self._suggestions
+          : suggestions // ignore: cast_nullable_to_non_nullable
+              as List<IngredientApiSearchEntry>,
+    ));
+  }
 }
+
+// dart format on
diff --git a/lib/models/exercises/ingredient_api.g.dart b/lib/models/exercises/ingredient_api.g.dart
index 6c7f76c2..e9f033ed 100644
--- a/lib/models/exercises/ingredient_api.g.dart
+++ b/lib/models/exercises/ingredient_api.g.dart
@@ -6,17 +6,15 @@ part of 'ingredient_api.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-_$IngredientApiSearchDetailsImpl _$$IngredientApiSearchDetailsImplFromJson(
-        Map<String, dynamic> json) =>
-    _$IngredientApiSearchDetailsImpl(
+_IngredientApiSearchDetails _$IngredientApiSearchDetailsFromJson(Map<String, dynamic> json) =>
+    _IngredientApiSearchDetails(
       id: (json['id'] as num).toInt(),
       name: json['name'] as String,
       image: json['image'] as String?,
       imageThumbnail: json['image_thumbnail'] as String?,
     );
 
-Map<String, dynamic> _$$IngredientApiSearchDetailsImplToJson(
-        _$IngredientApiSearchDetailsImpl instance) =>
+Map<String, dynamic> _$IngredientApiSearchDetailsToJson(_IngredientApiSearchDetails instance) =>
     <String, dynamic>{
       'id': instance.id,
       'name': instance.name,
@@ -24,27 +22,26 @@ Map<String, dynamic> _$$IngredientApiSearchDetailsImplToJson(
       'image_thumbnail': instance.imageThumbnail,
     };
 
-_$IngredientApiSearchEntryImpl _$$IngredientApiSearchEntryImplFromJson(Map<String, dynamic> json) =>
-    _$IngredientApiSearchEntryImpl(
+_IngredientApiSearchEntry _$IngredientApiSearchEntryFromJson(Map<String, dynamic> json) =>
+    _IngredientApiSearchEntry(
       value: json['value'] as String,
       data: IngredientApiSearchDetails.fromJson(json['data'] as Map<String, dynamic>),
     );
 
-Map<String, dynamic> _$$IngredientApiSearchEntryImplToJson(
-        _$IngredientApiSearchEntryImpl instance) =>
+Map<String, dynamic> _$IngredientApiSearchEntryToJson(_IngredientApiSearchEntry instance) =>
     <String, dynamic>{
       'value': instance.value,
       'data': instance.data,
     };
 
-_$IngredientApiSearchImpl _$$IngredientApiSearchImplFromJson(Map<String, dynamic> json) =>
-    _$IngredientApiSearchImpl(
+_IngredientApiSearch _$IngredientApiSearchFromJson(Map<String, dynamic> json) =>
+    _IngredientApiSearch(
       suggestions: (json['suggestions'] as List<dynamic>)
           .map((e) => IngredientApiSearchEntry.fromJson(e as Map<String, dynamic>))
           .toList(),
     );
 
-Map<String, dynamic> _$$IngredientApiSearchImplToJson(_$IngredientApiSearchImpl instance) =>
+Map<String, dynamic> _$IngredientApiSearchToJson(_IngredientApiSearch instance) =>
     <String, dynamic>{
       'suggestions': instance.suggestions,
     };
diff --git a/lib/providers/auth.dart b/lib/providers/auth.dart
index 467489a0..d9fdd0a3 100644
--- a/lib/providers/auth.dart
+++ b/lib/providers/auth.dart
@@ -38,6 +38,12 @@ enum LoginActions {
   proceed,
 }
 
+enum AuthState {
+  updateRequired,
+  loggedIn,
+  loggedOut,
+}
+
 class AuthProvider with ChangeNotifier {
   final _logger = Logger('AuthProvider');
 
@@ -46,6 +52,7 @@ class AuthProvider with ChangeNotifier {
   String? serverVersion;
   PackageInfo? applicationVersion;
   Map<String, String> metadata = {};
+  AuthState state = AuthState.loggedOut;
 
   static const MIN_APP_VERSION_URL = 'min-app-version';
   static const SERVER_VERSION_URL = 'version';
@@ -54,7 +61,7 @@ class AuthProvider with ChangeNotifier {
 
   late http.Client client;
 
-  AuthProvider([http.Client? client, bool? checkMetadata]) {
+  AuthProvider([http.Client? client]) {
     this.client = client ?? http.Client();
   }
 
@@ -83,27 +90,22 @@ class AuthProvider with ChangeNotifier {
   }
 
   /// Checking if there is a new version of the application.
-  Future<bool> applicationUpdateRequired([
-    String? version,
-    Map<String, String>? metadata,
-  ]) async {
-    metadata ??= this.metadata;
-
-    if (!metadata.containsKey(MANIFEST_KEY_CHECK_UPDATE) ||
-        metadata[MANIFEST_KEY_CHECK_UPDATE] == 'false') {
-      return false;
-    }
-
+  Future<bool> applicationUpdateRequired([String? version]) async {
     final applicationCurrentVersion = version ?? applicationVersion!.version;
     final response = await client.get(makeUri(serverUrl!, MIN_APP_VERSION_URL));
     final currentVersion = Version.parse(applicationCurrentVersion);
     final requiredAppVersion = Version.parse(jsonDecode(response.body));
 
-    return requiredAppVersion > currentVersion;
+    final needUpdate = requiredAppVersion > currentVersion;
+    if (needUpdate) {
+      _logger.fine('Application update required: $requiredAppVersion > $currentVersion');
+    }
+
+    return needUpdate;
   }
 
   /// Registers a new user
-  Future<Map<String, LoginActions>> register({
+  Future<LoginActions> register({
     required String username,
     required String password,
     required String email,
@@ -136,7 +138,7 @@ class AuthProvider with ChangeNotifier {
   }
 
   /// Authenticates a user
-  Future<Map<String, LoginActions>> login(
+  Future<LoginActions> login(
     String username,
     String password,
     String serverUrl,
@@ -160,15 +162,14 @@ class AuthProvider with ChangeNotifier {
     await initVersions(serverUrl);
 
     // If update is required don't log in user
-    if (await applicationUpdateRequired(
-      applicationVersion!.version,
-      {MANIFEST_KEY_CHECK_UPDATE: 'true'},
-    )) {
-      return {'action': LoginActions.update};
+    if (await applicationUpdateRequired()) {
+      state = AuthState.updateRequired;
+      return LoginActions.update;
     }
 
     // Log user in
     token = responseData['token'];
+    state = AuthState.loggedIn;
     notifyListeners();
 
     // store login data in shared preferences
@@ -181,7 +182,7 @@ class AuthProvider with ChangeNotifier {
 
     prefs.setString(PREFS_USER, userData);
     prefs.setString(PREFS_LAST_SERVER, serverData);
-    return {'action': LoginActions.proceed};
+    return LoginActions.proceed;
   }
 
   /// Loads the last server URL from which the user successfully logged in
@@ -195,23 +196,58 @@ class AuthProvider with ChangeNotifier {
     return userData['serverUrl'] as String;
   }
 
-  Future<bool> tryAutoLogin() async {
+  /// Tries to auto-login the user with the stored token
+  Future<void> tryAutoLogin() async {
     final prefs = PreferenceHelper.asyncPref;
     if (!(await prefs.containsKey(PREFS_USER))) {
-      _logger.info('autologin failed');
-      return false;
+      _logger.info('autologin failed, no saved user data');
+      state = AuthState.loggedOut;
+      return;
     }
-    final extractedUserData = json.decode((await prefs.getString(PREFS_USER))!);
 
-    token = extractedUserData['token'];
-    serverUrl = extractedUserData['serverUrl'];
+    final userData = json.decode((await prefs.getString(PREFS_USER))!);
+
+    if (!userData.containsKey('token') || !userData.containsKey('serverUrl')) {
+      _logger.info('autologin failed, no token or serverUrl');
+      state = AuthState.loggedOut;
+      return;
+    }
+
+    token = userData['token'];
+    serverUrl = userData['serverUrl'];
+
+    if (token == null || serverUrl == null) {
+      _logger.info('autologin failed, token or serverUrl is null');
+      state = AuthState.loggedOut;
+      return;
+    }
+
+    // // Try to talk to a URL using the token, if this doesn't work, log out
+    final response = await client.head(
+      makeUri(serverUrl!, 'routine'),
+      headers: {
+        HttpHeaders.contentTypeHeader: 'application/json; charset=UTF-8',
+        HttpHeaders.userAgentHeader: getAppNameHeader(),
+        HttpHeaders.authorizationHeader: 'Token $token'
+      },
+    );
+    if (response.statusCode != 200) {
+      _logger.info('autologin failed, statusCode: ${response.statusCode}');
+      await logout();
+      return;
+    }
+
+    await initVersions(serverUrl!);
+
+    // If update is required don't log in user
+    if (await applicationUpdateRequired()) {
+      state = AuthState.updateRequired;
+    } else {
+      state = AuthState.loggedIn;
+      _logger.info('autologin successful');
+    }
 
-    _logger.info('autologin successful');
-    setApplicationVersion();
-    setServerVersion();
     notifyListeners();
-    //_autoLogout();
-    return true;
   }
 
   Future<void> logout({bool shouldNotify = true}) async {
@@ -219,6 +255,7 @@ class AuthProvider with ChangeNotifier {
     token = null;
     serverUrl = null;
     dataInit = false;
+    state = AuthState.loggedOut;
 
     if (shouldNotify) {
       notifyListeners();
@@ -236,7 +273,8 @@ class AuthProvider with ChangeNotifier {
     if (applicationVersion != null) {
       out = '/${applicationVersion!.version} '
           '(${applicationVersion!.packageName}; '
-          'build: ${applicationVersion!.buildNumber})';
+          'build: ${applicationVersion!.buildNumber})'
+          ' - https://github.com/wger-project';
     }
     return 'wger App$out';
   }
diff --git a/lib/screens/auth_screen.dart b/lib/screens/auth_screen.dart
index c4c73eca..c94ce93f 100644
--- a/lib/screens/auth_screen.dart
+++ b/lib/screens/auth_screen.dart
@@ -89,12 +89,6 @@ class AuthScreen extends StatelessWidget {
               ),
             ),
           ),
-          // Positioned(
-          //   top: 0.4 * deviceSize.height,
-          //   left: 15,
-          //   right: 15,
-          //   child: const ,
-          // ),
         ],
       ),
     );
@@ -166,7 +160,6 @@ class _AuthCardState extends State<AuthCard> {
 
   void _submit(BuildContext context) async {
     if (!_formKey.currentState!.validate()) {
-      // Invalid!
       return;
     }
     _formKey.currentState!.save();
@@ -176,7 +169,7 @@ class _AuthCardState extends State<AuthCard> {
 
     try {
       // Login existing user
-      late Map<String, LoginActions> res;
+      late LoginActions res;
       if (_authMode == AuthMode.Login) {
         res = await Provider.of<AuthProvider>(context, listen: false).login(
           _authData['username']!,
@@ -196,13 +189,11 @@ class _AuthCardState extends State<AuthCard> {
       }
 
       // Check if update is required else continue normally
-      if (res.containsKey('action')) {
-        if (res['action'] == LoginActions.update && mounted) {
-          Navigator.of(context).push(
-            MaterialPageRoute(builder: (context) => const UpdateAppScreen()),
-          );
-          return;
-        }
+      if (res == LoginActions.update && mounted) {
+        Navigator.of(context).push(
+          MaterialPageRoute(builder: (context) => const UpdateAppScreen()),
+        );
+        return;
       }
 
       setState(() {
diff --git a/lib/screens/home_tabs_screen.dart b/lib/screens/home_tabs_screen.dart
index b038a942..22ac70c5 100644
--- a/lib/screens/home_tabs_screen.dart
+++ b/lib/screens/home_tabs_screen.dart
@@ -146,27 +146,8 @@ class _HomeTabsScreenState extends State<HomeTabsScreen> with SingleTickerProvid
       future: _initialData,
       builder: (context, snapshot) {
         if (snapshot.connectionState != ConnectionState.done) {
-          return Scaffold(
-            body: Center(
-              child: Column(
-                mainAxisAlignment: MainAxisAlignment.center,
-                children: [
-                  const Center(
-                    child: SizedBox(
-                      height: 70,
-                      child: RiveAnimation.asset(
-                        'assets/animations/wger_logo.riv',
-                        animations: ['idle_loop2'],
-                      ),
-                    ),
-                  ),
-                  Text(
-                    AppLocalizations.of(context).loadingText,
-                    style: Theme.of(context).textTheme.headlineSmall,
-                  ),
-                ],
-              ),
-            ),
+          return const Scaffold(
+            body: LoadingWidget(),
           );
         } else {
           return Scaffold(
@@ -204,3 +185,33 @@ class _HomeTabsScreenState extends State<HomeTabsScreen> with SingleTickerProvid
     );
   }
 }
+
+class LoadingWidget extends StatelessWidget {
+  const LoadingWidget({
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: [
+          const Center(
+            child: SizedBox(
+              height: 70,
+              child: RiveAnimation.asset(
+                'assets/animations/wger_logo.riv',
+                animations: ['idle_loop2'],
+              ),
+            ),
+          ),
+          Text(
+            AppLocalizations.of(context).loadingText,
+            style: Theme.of(context).textTheme.headlineSmall,
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/screens/update_app_screen.dart b/lib/screens/update_app_screen.dart
index 8b1996c7..2b01eeec 100644
--- a/lib/screens/update_app_screen.dart
+++ b/lib/screens/update_app_screen.dart
@@ -30,10 +30,7 @@ class UpdateAppScreen extends StatelessWidget {
           AppLocalizations.of(context).appUpdateTitle,
           style: Theme.of(context).textTheme.headlineSmall,
         ),
-        content: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [Text(AppLocalizations.of(context).appUpdateContent)],
-        ),
+        content: Text(AppLocalizations.of(context).appUpdateContent),
         actions: null,
       ),
     );
diff --git a/test/auth/auth_provider_test.dart b/test/auth/auth_provider_test.dart
index 8c7d9db4..cea67ef8 100644
--- a/test/auth/auth_provider_test.dart
+++ b/test/auth/auth_provider_test.dart
@@ -15,11 +15,9 @@ void main() {
     path: 'api/v2/min-app-version/',
   );
 
-  final testMetadata = {'wger.check_min_app_version': 'true'};
-
   setUp(() {
     mockClient = MockClient();
-    authProvider = AuthProvider(mockClient, false);
+    authProvider = AuthProvider(mockClient);
     authProvider.serverUrl = 'http://localhost';
   });
 
@@ -27,7 +25,7 @@ void main() {
     test('app version higher than min version', () async {
       // arrange
       when(mockClient.get(tVersionUri)).thenAnswer((_) => Future(() => Response('"1.2.0"', 200)));
-      final updateNeeded = await authProvider.applicationUpdateRequired('1.3.0', testMetadata);
+      final updateNeeded = await authProvider.applicationUpdateRequired('1.3.0');
 
       // assert
       expect(updateNeeded, false);
@@ -36,7 +34,7 @@ void main() {
     test('app version higher than min version - 1', () async {
       // arrange
       when(mockClient.get(tVersionUri)).thenAnswer((_) => Future(() => Response('"1.3"', 200)));
-      final updateNeeded = await authProvider.applicationUpdateRequired('1.1', testMetadata);
+      final updateNeeded = await authProvider.applicationUpdateRequired('1.1');
 
       // assert
       expect(updateNeeded, true);
@@ -45,7 +43,7 @@ void main() {
     test('app version higher than min version - 2', () async {
       // arrange
       when(mockClient.get(tVersionUri)).thenAnswer((_) => Future(() => Response('"1.3.0"', 200)));
-      final updateNeeded = await authProvider.applicationUpdateRequired('1.1', testMetadata);
+      final updateNeeded = await authProvider.applicationUpdateRequired('1.1');
 
       // assert
       expect(updateNeeded, true);
@@ -54,7 +52,7 @@ void main() {
     test('app version equal as min version', () async {
       // arrange
       when(mockClient.get(tVersionUri)).thenAnswer((_) => Future(() => Response('"1.3.0"', 200)));
-      final updateNeeded = await authProvider.applicationUpdateRequired('1.3.0', testMetadata);
+      final updateNeeded = await authProvider.applicationUpdateRequired('1.3.0');
 
       // assert
       expect(updateNeeded, false);
diff --git a/test/auth/auth_screen_test.dart b/test/auth/auth_screen_test.dart
index cfbdfd2d..b030e7cc 100644
--- a/test/auth/auth_screen_test.dart
+++ b/test/auth/auth_screen_test.dart
@@ -78,7 +78,7 @@ void main() {
 
   setUp(() {
     mockClient = MockClient();
-    authProvider = AuthProvider(mockClient, false);
+    authProvider = AuthProvider(mockClient);
     authProvider.serverUrl = 'https://wger.de';
 
     SharedPreferences.setMockInitialValues({});
diff --git a/test/nutrition/nutritional_plan_screen_test.mocks.dart b/test/nutrition/nutritional_plan_screen_test.mocks.dart
index 09ca8fcb..ef2f03d1 100644
--- a/test/nutrition/nutritional_plan_screen_test.mocks.dart
+++ b/test/nutrition/nutritional_plan_screen_test.mocks.dart
@@ -202,6 +202,18 @@ class MockAuthProvider extends _i1.Mock implements _i2.AuthProvider {
         returnValueForMissingStub: null,
       );
 
+  @override
+  _i2.AuthState get state => (super.noSuchMethod(
+        Invocation.getter(#state),
+        returnValue: _i2.AuthState.updateRequired,
+      ) as _i2.AuthState);
+
+  @override
+  set state(_i2.AuthState? _state) => super.noSuchMethod(
+        Invocation.setter(#state, _state),
+        returnValueForMissingStub: null,
+      );
+
   @override
   _i3.Client get client => (super.noSuchMethod(
         Invocation.getter(#client),
@@ -253,17 +265,13 @@ class MockAuthProvider extends _i1.Mock implements _i2.AuthProvider {
       ) as _i5.Future<void>);
 
   @override
-  _i5.Future<bool> applicationUpdateRequired([
-    String? version,
-    Map<String, String>? metadata,
-  ]) =>
-      (super.noSuchMethod(
-        Invocation.method(#applicationUpdateRequired, [version, metadata]),
+  _i5.Future<bool> applicationUpdateRequired([String? version]) => (super.noSuchMethod(
+        Invocation.method(#applicationUpdateRequired, [version]),
         returnValue: _i5.Future<bool>.value(false),
       ) as _i5.Future<bool>);
 
   @override
-  _i5.Future<Map<String, _i2.LoginActions>> register({
+  _i5.Future<_i2.LoginActions> register({
     required String? username,
     required String? password,
     required String? email,
@@ -278,23 +286,23 @@ class MockAuthProvider extends _i1.Mock implements _i2.AuthProvider {
           #serverUrl: serverUrl,
           #locale: locale,
         }),
-        returnValue: _i5.Future<Map<String, _i2.LoginActions>>.value(
-          <String, _i2.LoginActions>{},
+        returnValue: _i5.Future<_i2.LoginActions>.value(
+          _i2.LoginActions.update,
         ),
-      ) as _i5.Future<Map<String, _i2.LoginActions>>);
+      ) as _i5.Future<_i2.LoginActions>);
 
   @override
-  _i5.Future<Map<String, _i2.LoginActions>> login(
+  _i5.Future<_i2.LoginActions> login(
     String? username,
     String? password,
     String? serverUrl,
   ) =>
       (super.noSuchMethod(
         Invocation.method(#login, [username, password, serverUrl]),
-        returnValue: _i5.Future<Map<String, _i2.LoginActions>>.value(
-          <String, _i2.LoginActions>{},
+        returnValue: _i5.Future<_i2.LoginActions>.value(
+          _i2.LoginActions.update,
         ),
-      ) as _i5.Future<Map<String, _i2.LoginActions>>);
+      ) as _i5.Future<_i2.LoginActions>);
 
   @override
   _i5.Future<String> getServerUrlFromPrefs() => (super.noSuchMethod(
@@ -308,10 +316,11 @@ class MockAuthProvider extends _i1.Mock implements _i2.AuthProvider {
       ) as _i5.Future<String>);
 
   @override
-  _i5.Future<bool> tryAutoLogin() => (super.noSuchMethod(
+  _i5.Future<void> tryAutoLogin() => (super.noSuchMethod(
         Invocation.method(#tryAutoLogin, []),
-        returnValue: _i5.Future<bool>.value(false),
-      ) as _i5.Future<bool>);
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
 
   @override
   _i5.Future<void> logout({bool? shouldNotify = true}) => (super.noSuchMethod(
diff --git a/test/nutrition/nutritional_plans_screen_test.mocks.dart b/test/nutrition/nutritional_plans_screen_test.mocks.dart
index dff174c1..f37db6da 100644
--- a/test/nutrition/nutritional_plans_screen_test.mocks.dart
+++ b/test/nutrition/nutritional_plans_screen_test.mocks.dart
@@ -94,6 +94,18 @@ class MockAuthProvider extends _i1.Mock implements _i3.AuthProvider {
         returnValueForMissingStub: null,
       );
 
+  @override
+  _i3.AuthState get state => (super.noSuchMethod(
+        Invocation.getter(#state),
+        returnValue: _i3.AuthState.updateRequired,
+      ) as _i3.AuthState);
+
+  @override
+  set state(_i3.AuthState? _state) => super.noSuchMethod(
+        Invocation.setter(#state, _state),
+        returnValueForMissingStub: null,
+      );
+
   @override
   _i2.Client get client => (super.noSuchMethod(
         Invocation.getter(#client),
@@ -145,17 +157,13 @@ class MockAuthProvider extends _i1.Mock implements _i3.AuthProvider {
       ) as _i5.Future<void>);
 
   @override
-  _i5.Future<bool> applicationUpdateRequired([
-    String? version,
-    Map<String, String>? metadata,
-  ]) =>
-      (super.noSuchMethod(
-        Invocation.method(#applicationUpdateRequired, [version, metadata]),
+  _i5.Future<bool> applicationUpdateRequired([String? version]) => (super.noSuchMethod(
+        Invocation.method(#applicationUpdateRequired, [version]),
         returnValue: _i5.Future<bool>.value(false),
       ) as _i5.Future<bool>);
 
   @override
-  _i5.Future<Map<String, _i3.LoginActions>> register({
+  _i5.Future<_i3.LoginActions> register({
     required String? username,
     required String? password,
     required String? email,
@@ -170,23 +178,23 @@ class MockAuthProvider extends _i1.Mock implements _i3.AuthProvider {
           #serverUrl: serverUrl,
           #locale: locale,
         }),
-        returnValue: _i5.Future<Map<String, _i3.LoginActions>>.value(
-          <String, _i3.LoginActions>{},
+        returnValue: _i5.Future<_i3.LoginActions>.value(
+          _i3.LoginActions.update,
         ),
-      ) as _i5.Future<Map<String, _i3.LoginActions>>);
+      ) as _i5.Future<_i3.LoginActions>);
 
   @override
-  _i5.Future<Map<String, _i3.LoginActions>> login(
+  _i5.Future<_i3.LoginActions> login(
     String? username,
     String? password,
     String? serverUrl,
   ) =>
       (super.noSuchMethod(
         Invocation.method(#login, [username, password, serverUrl]),
-        returnValue: _i5.Future<Map<String, _i3.LoginActions>>.value(
-          <String, _i3.LoginActions>{},
+        returnValue: _i5.Future<_i3.LoginActions>.value(
+          _i3.LoginActions.update,
         ),
-      ) as _i5.Future<Map<String, _i3.LoginActions>>);
+      ) as _i5.Future<_i3.LoginActions>);
 
   @override
   _i5.Future<String> getServerUrlFromPrefs() => (super.noSuchMethod(
@@ -200,10 +208,11 @@ class MockAuthProvider extends _i1.Mock implements _i3.AuthProvider {
       ) as _i5.Future<String>);
 
   @override
-  _i5.Future<bool> tryAutoLogin() => (super.noSuchMethod(
+  _i5.Future<void> tryAutoLogin() => (super.noSuchMethod(
         Invocation.method(#tryAutoLogin, []),
-        returnValue: _i5.Future<bool>.value(false),
-      ) as _i5.Future<bool>);
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
 
   @override
   _i5.Future<void> logout({bool? shouldNotify = true}) => (super.noSuchMethod(
diff --git a/test/utils.dart b/test/utils.dart
index 9244b4da..db590b38 100644
--- a/test/utils.dart
+++ b/test/utils.dart
@@ -23,7 +23,7 @@ import 'measurements/measurement_provider_test.mocks.dart';
 import 'other/base_provider_test.mocks.dart';
 
 // Test Auth provider
-final AuthProvider testAuthProvider = AuthProvider(MockClient(), false)
+final AuthProvider testAuthProvider = AuthProvider(MockClient())
   ..token = 'FooBar'
   ..serverUrl = 'https://localhost';