diff --git a/.github/ISSUE_TEMPLATE/1_bug.md b/.github/ISSUE_TEMPLATE/1_bug.md
deleted file mode 100644
index e12f7506..00000000
--- a/.github/ISSUE_TEMPLATE/1_bug.md
+++ /dev/null
@@ -1,34 +0,0 @@
----
-name: I found a problem with wger
-about: While using wger the application crashes or throws an exception, a
-  widget is buggy, or something looks wrong.
-title: ''
-labels: ''
-assignees: ''
-
----
-
-## Steps to Reproduce
-
-<!-- Please include as many steps to reproduce so that we can replicate the problem. -->
-
-1. ... <!-- describe how to reproduce the problem -->
-2. ...
-3. ... 
-
-**Expected results:** <!-- what did you expect to see? -->
-
-**Actual results:** <!-- what did you see? -->
-
-<details>
-  <summary>Logs</summary>
-
-<!--
-      Any logs you think would be useful (if you have a local instance)
--->
-
-```
-```
-
-
-</details>
diff --git a/.github/ISSUE_TEMPLATE/1_bug.yml b/.github/ISSUE_TEMPLATE/1_bug.yml
new file mode 100644
index 00000000..385e5cc8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/1_bug.yml
@@ -0,0 +1,53 @@
+# https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-issue-forms
+# https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-githubs-form-schema
+
+name: Bug report
+description: Report an error or unexpected behavior
+type: bug
+body:
+  - type: dropdown
+    id: priority
+    attributes:
+      label: Priority/Impact
+      description: How severe is the issue?
+      options:
+        - Low (minor inconvenience)
+        - Medium (affects some functionality)
+        - High (critical issue, blocks workflow)
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: |
+        A clear and concise description of the bug.
+      placeholder: |
+        Please include any information you think is relevant to the issue you are experiencing.
+        This could include any steps to reproduce it (if it happens consistently), expected vs.
+        actual behavior, logs, screenshots, links to related issues, etc.
+    validations:
+      required: true
+
+  - type: input
+    id: server-version
+    attributes:
+      label: Server version
+      description: |
+        What version of wger are you using and how did you install it (you use our server,
+        docker compose, manual installation, etc)?
+      placeholder: |
+        Check https://<server>/software/about-us or the git sha1 of the last commit you pulled
+    validations:
+      required: false
+
+  - type: input
+    id: app-version
+    attributes:
+      label: Mobile app version
+      description: |
+        What version of the mobile app are you using and how did you install it
+        (Play Store, App Store, Flathub, self compiled, etc.)?
+      placeholder: |
+        Check the "about wger" dialog
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/2_feature_request.md b/.github/ISSUE_TEMPLATE/2_feature_request.md
deleted file mode 100644
index 924b1e42..00000000
--- a/.github/ISSUE_TEMPLATE/2_feature_request.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-name: Feature request
-about: Suggest a new idea for wger.
-title: ''
-labels: ''
-assignees: ''
-
----
-
-## Use case
-
-<!--
-     Please tell us the problem you are running into that led to you wanting
-     a new feature.
-
-     Is your feature request related to a problem? Please give a clear and
-     concise description of what the problem is.
--->
-
-## Proposal
-
-<!--
-     Briefly but precisely describe what you would like wger to be able to do.
-
-     Consider attaching images showing what you are imagining.
--->
diff --git a/.github/ISSUE_TEMPLATE/2_feature_request.yml b/.github/ISSUE_TEMPLATE/2_feature_request.yml
new file mode 100644
index 00000000..5ea0dff8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/2_feature_request.yml
@@ -0,0 +1,33 @@
+name: Feature request
+description: Suggest a new idea for wger
+type: enhancement
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Use case
+      description: |
+        A description of what new feature or behavior you would like to see.
+    validations:
+      required: true
+
+  - type: textarea
+    id: proposal
+    attributes:
+      label: Proposal
+      description: |
+        Why is this feature needed? What problems does it solve?
+    validations:
+      required: false
+
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional Context
+      description: |
+        Any extra details, related issues, or mockups
+      placeholder: |
+        Screenshots or mockups, links to similar features in other applications, or other relevant
+        information.
+    validations:
+      required: false
diff --git a/.github/actions/flutter-common/action.yml b/.github/actions/flutter-common/action.yml
new file mode 100644
index 00000000..cfeeac9b
--- /dev/null
+++ b/.github/actions/flutter-common/action.yml
@@ -0,0 +1,23 @@
+name: 'Flutter common setup'
+description: 'Common steps needed to setup the application'
+
+runs:
+  using: "composite"
+  steps:
+
+    - name: Setup Flutter
+      uses: subosito/flutter-action@v2
+      with:
+        channel: stable
+        flutter-version: 3.35.5
+        cache: true
+
+    - name: Install Flutter dependencies
+      run: flutter pub get
+      shell: bash
+
+    - name: Install Flutter dependencies
+      run: |
+        dart --version
+        flutter --version
+      shell: bash
\ No newline at end of file
diff --git a/.github/contributing.md b/.github/contributing.md
new file mode 100644
index 00000000..a1f8dfc8
--- /dev/null
+++ b/.github/contributing.md
@@ -0,0 +1,27 @@
+# Contributing to wger
+
+🎉 Thanks for showing interest in contributing! 🎉
+
+We have centralized the documentation for contributing to wger in the online
+docs, especially for non-code contributions such as documentation, translations,
+etc.:
+
+<https://wger.readthedocs.io/en/latest/contributing.html>
+
+## Questions
+
+Are you just using the software and have a question or improvement? Let us know!
+
+* Discord: <https://discord.gg/rPWFv6W>
+* Mastodon: <https://fosstodon.org/@wger>
+
+## Issues
+
+If you run into a bug describe the problem as well as you can.
+
+- Steps and any useful information to reproduce the issue
+- If you use our server, the time when this happened, we might be able to get some
+  information from the logs
+- Environment details (app type: web / mobile, installation method, OS, etc.)
+- Screenshots or logs if applicable
+- Git SHA1 if installed from source  
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index deaa72b2..e541de6d 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -11,6 +11,11 @@ updates:
     schedule:
       interval: "weekly"
 
+  - package-ecosystem: "pub"
+    directory: "/flatpak/scripts"
+    schedule:
+      interval: "weekly"
+
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 4cf8375a..5d11748c 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,25 +1,17 @@
-## Description (Proposed Changes)
-(Please try to mention in bullet points.)
+# Proposed Changes
 
 -
 -
 
-## Link to the issue : 
+## Related Issue(s)
 
-(Add link of the issue you have proposed changes to)
+If applicable, please link to any related issues (`Closes #123`,
+`Closes wger-project/other-repo#123`, `See also #123`, etc.)
 
-- Link :
+## Please check that the PR fulfills these requirements
 
-## Tests
-
-Please make sure to add tests when implementing new features.
-
-## Checklist
-
-Please check that the PR fulfills all requirements listed below by checking the relevant checkboxes (`[x]`). This will ensure a smooth and quick review process.
-
-- [ ] Set a 100 character limit in your editor/IDE to avoid white space diffs in the PR
 - [ ] Tests for the changes have been added (for bug fixes / features)
-- [ ] Added yourself to AUTHORS.md
+- [ ] Set a 100 character limit in your editor/IDE to avoid white space diffs in the PR
+  (run `dart format .`)
 - [ ] Updated/added relevant documentation (doc comments with `///`).
 - [ ] Added relevant reviewers.
diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
new file mode 100644
index 00000000..f07a7066
--- /dev/null
+++ b/.github/workflows/build-android.yml
@@ -0,0 +1,73 @@
+name: Build Android
+on:
+  workflow_call:
+    inputs:
+      ref:
+        required: true
+        type: string
+    secrets:
+      DECRYPTKEY_PLAYSTORE_SIGNING_KEY:
+        required: true
+      DECRYPTKEY_PROPERTIES:
+        required: true
+jobs:
+  build_android_apk:
+    name: APK file
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout application
+        uses: actions/checkout@v5
+        with:
+          ref: ${{ inputs.ref }}
+
+      - name: Common flutter setup
+        uses: ./.github/actions/flutter-common
+
+      - name: Decrypt config files
+        run: |
+          cd ./fastlane/metadata/envfiles
+          chmod +x ./decrypt_secrets.sh
+          ./decrypt_secrets.sh
+        shell: bash
+        env:
+          DECRYPTKEY_PLAYSTORE_SIGNING_KEY: ${{ secrets.DECRYPTKEY_PLAYSTORE_SIGNING_KEY }}
+          DECRYPTKEY_PROPERTIES: ${{ secrets.DECRYPTKEY_PROPERTIES }}
+
+      - name: Build APK
+        run: flutter build apk --release
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: builds-apk
+          path: build/app/outputs/flutter-apk/app-release.apk
+
+  build_android_aab:
+    name: AAB file
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout application
+        uses: actions/checkout@v5
+        with:
+          ref: ${{ inputs.ref }}
+
+      - name: Common setup
+        uses: ./.github/actions/flutter-common
+
+      - name: Decrypt config files
+        run: |
+          cd ./fastlane/metadata/envfiles
+          chmod +x ./decrypt_secrets.sh
+          ./decrypt_secrets.sh
+        shell: bash
+        env:
+          DECRYPTKEY_PLAYSTORE: ${{ secrets.DECRYPTKEY_PLAYSTORE }}
+          DECRYPTKEY_PLAYSTORE_SIGNING_KEY: ${{ secrets.DECRYPTKEY_PLAYSTORE_SIGNING_KEY }}
+          DECRYPTKEY_PROPERTIES: ${{ secrets.DECRYPTKEY_PROPERTIES }}
+
+      - name: Build AAB
+        run: flutter build appbundle --release
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: builds-aab
+          path: build/app/outputs/bundle/release/app-release.aab
\ No newline at end of file
diff --git a/.github/workflows/build-apple.yml b/.github/workflows/build-apple.yml
new file mode 100644
index 00000000..4faa7313
--- /dev/null
+++ b/.github/workflows/build-apple.yml
@@ -0,0 +1,90 @@
+name: Build Apple
+on:
+  workflow_call:
+    inputs:
+      ref:
+        required: true
+        type: string
+jobs:
+  build_ios:
+    name: iOS
+    runs-on: macos-latest
+    steps:
+      - name: Checkout application
+        uses: actions/checkout@v5
+        with:
+          ref: ${{ inputs.ref }}
+
+      # This seems to be related to https://github.com/actions/runner-images/issues/12758
+      # Select appropriate Xcode version from
+      # https://github.com/actions/runner-images/blob/main/images/macos/macos-15-arm64-Readme.md#xcode
+      - name: Xcode setup
+        run: |
+          sudo xcode-select --switch /Applications/Xcode_16.4.app
+
+      - name: Common flutter setup
+        uses: ./.github/actions/flutter-common
+
+      - name: Build .app
+        run: |
+          flutter build ios --release --no-codesign
+          cd build/ios/iphoneos
+          zip -r Runner.app.zip Runner.app
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: builds-ios
+          path: build/ios/iphoneos/Runner.app.zip
+
+  build_ipa:
+    name: IPA
+    runs-on: macos-latest
+    steps:
+      - name: Checkout application
+        uses: actions/checkout@v5
+        with:
+          ref: ${{ inputs.ref }}
+
+      - name: Common flutter setup
+        uses: ./.github/actions/flutter-common
+
+      # This seems to be related to https://github.com/actions/runner-images/issues/12758
+      # Select appropriate Xcode version from
+      # https://github.com/actions/runner-images/blob/main/images/macos/macos-15-arm64-Readme.md#xcode
+      - name: Xcode setup
+        run: |
+          sudo xcode-select --switch /Applications/Xcode_16.4.app
+
+      - name: Build .xcarchive
+        run: |
+          flutter build ipa --release --no-codesign
+          cd build/ios/archive
+          zip -r Runner.xcarchive.zip Runner.xcarchive
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: builds-ipa
+          path: build/ios/archive/Runner.xcarchive.zip
+
+  build_macos:
+    name: macOS
+    runs-on: macos-latest
+    steps:
+      - name: Checkout application
+        uses: actions/checkout@v5
+        with:
+          ref: ${{ inputs.ref }}
+
+      - name: Common flutter setup
+        uses: ./.github/actions/flutter-common
+
+      - name: Build .app
+        run: |
+          flutter build macos --release
+          cd build/macos/Build/Products/Release
+          zip -r wger.app.zip wger.app
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: builds-macos
+          path: build/macos/Build/Products/Release/wger.app.zip
\ No newline at end of file
diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
new file mode 100644
index 00000000..a3d3e461
--- /dev/null
+++ b/.github/workflows/build-linux.yml
@@ -0,0 +1,80 @@
+name: Build Linux
+on:
+  workflow_call:
+    inputs:
+      ref:
+        required: true
+        type: string
+    secrets:
+      SSH_DEPLOY_KEY:
+        required: true
+jobs:
+
+  # TODO: note that we currently only build for x64, as arm64 is not supported by
+  #       subosito/flutter-action@v2 yet and we don't want to install flutter manually
+  #       just for this workflow: https://github.com/subosito/flutter-action/issues/345
+  build_linux:
+    name: Build application - ${{ matrix.platform }}
+    runs-on: ${{ matrix.runner }}
+    strategy:
+      matrix:
+        include:
+          - platform: x64
+            runner: ubuntu-latest
+        # - platform: arm64
+        #   runner: ubuntu-24.04-arm
+    steps:
+      - name: Checkout application
+        uses: actions/checkout@v5
+        with:
+          ref: ${{ inputs.ref }}
+
+      - name: Common setup
+        uses: ./.github/actions/flutter-common
+
+      # https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md
+      - name: Build application for linux
+        run: |
+          sudo apt update
+          sudo apt install -y pkg-config libgtk-3-dev liblzma-dev libstdc++-12-dev --no-install-recommends
+          flutter build linux --release
+          tar -zcvf linux-${{ matrix.platform }}.tar.gz build/linux/${{ matrix.platform }}/release/bundle
+      - uses: actions/upload-artifact@v4
+        with:
+          name: builds-linux
+          path: |
+            linux-${{ matrix.platform }}.tar.gz
+
+  generate_flathub_manifest:
+    runs-on: ubuntu-latest
+    name: Update flathub manifest
+
+    # If the job fails just continue, this can be done manually later
+    continue-on-error: true
+    needs:
+      - build_linux
+    steps:
+
+      - name: Checkout flatpak-flathub repo
+        uses: actions/checkout@v5
+        with:
+          repository: wger-project/de.wger.flutter
+
+      - name: Bump version and update manifest
+        run: |
+          pip install pyyaml toml packaging
+          git clone https://github.com/TheAppgineer/flatpak-flutter.git --branch 0.7.3 ../flatpak-flutter
+          python bump-wger-version.py ${{ inputs.ref }}
+          ../flatpak-flutter/flatpak-flutter.py --app-module wger flatpak-flutter.json
+
+      - name: Push updated config to flathub repository
+        uses: cpina/github-action-push-to-another-repository@main
+        env:
+          SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
+        with:
+          destination-github-username: wger-project
+          destination-repository-name: de.wger.flutter
+          user-email: github-actions@github.com
+          target-branch: release-${{ inputs.ref }}
+          create-target-branch-if-needed: true
+          commit-message: Update to ${{ inputs.ref }}
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
deleted file mode 100644
index c9a06a0a..00000000
--- a/.github/workflows/build-release.yml
+++ /dev/null
@@ -1,131 +0,0 @@
-name: Build release artefacts
-on:
-  push:
-    tags:
-      - 'v[0-9]+.[0-9]+.[0-9]+'
-
-jobs:
-  deploy_android:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout application code
-        uses: actions/checkout@v4
-
-      - name: Setup Java
-        uses: actions/setup-java@v4
-        with:
-          java-version: '17'
-          distribution: 'oracle'
-
-      - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: '3.2'
-
-      - name: Setup Flutter
-        uses: subosito/flutter-action@v2
-        with:
-          channel: stable
-          flutter-version: 3.24.x
-
-      - name: Flutter info
-        run: |
-          dart --version
-          flutter --version
-
-      - name: Install Flutter dependencies
-        run: flutter pub get
-
-      - name: Decrypt config files
-        run: |
-          cd ./fastlane/metadata/envfiles
-          chmod +x ./decrypt_secrets.sh
-          ./decrypt_secrets.sh
-        env:
-          DECRYPTKEY_PLAYSTORE: ${{ secrets.DECRYPTKEY_PLAYSTORE }}
-          DECRYPTKEY_PLAYSTORE_SIGNING_KEY: ${{ secrets.DECRYPTKEY_PLAYSTORE_SIGNING_KEY }}
-          DECRYPTKEY_PROPERTIES: ${{ secrets.DECRYPTKEY_PROPERTIES }}
-
-      - name: Extract version information
-        run: |
-          echo "VERSION_V=$(echo $GITHUB_REF | cut -d / -f 3)" >> $GITHUB_ENV
-          echo "VERSION=$(echo $GITHUB_REF | cut -d / -f 3 | cut -c 2-)" >> $GITHUB_ENV
-          echo "BUILD=$(flutter pub run cider version | cut -d '+' -f 2)" >> $GITHUB_ENV
-
-      - name: Bump pubspec version
-        run: |
-          flutter pub run cider version ${{ env.VERSION }}+${{ env.BUILD }}
-          flutter pub run cider bump build
-
-      - name: Build application for linux
-        run: |
-          sudo apt update
-          sudo apt install -y clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev libstdc++-12-dev
-          flutter build linux --release
-          cd flatpak/scripts
-          dart pub get
-          dart flatpak_packager.dart --meta ../flatpak_meta.json --github --addTodaysVersion ${{ env.VERSION }}
-
-      - name: Build AAB
-        run: flutter build appbundle --release
-        env:
-          WGER_API_KEY: ${{ secrets.WGER_API_KEY }}
-
-      - name: Build APK
-        run: flutter build apk --release
-        env:
-          WGER_API_KEY: ${{ secrets.WGER_API_KEY }}
-
-      - name: Upload build to Play Store
-        run: |
-          bundle install
-          bundle exec fastlane android production
-
-      - name: Make Github release
-        uses: softprops/action-gh-release@v2
-        with:
-          tag_name: ${{ env.VERSION }}
-          files: |
-            build/app/outputs/bundle/release/app-release.aab
-            build/app/outputs/flutter-apk/app-release.apk
-            flatpak/scripts/flatpak_generator_exports/wger-linux-x86_64.tar.gz
-            flatpak/scripts/flatpak_generator_exports/wger-linux-x86_64.sha256
-
-      - name: Generate flathub manifest
-        run: |
-          cd flatpak/scripts
-          dart pub get
-          dart manifest_generator.dart --meta ../flatpak_meta.json --github
-          mkdir ../../flathub
-          cp flatpak_generator_exports/de.wger.flutter.json ../../flathub
-          cp flatpak_generator_exports/flathub.json ../../flathub
-
-      - name: Push updated config to flathub repository
-        uses: cpina/github-action-push-to-another-repository@main
-        env:
-          SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
-        with:
-          source-directory: flathub
-          destination-github-username: wger-project
-          destination-repository-name: de.wger.flutter
-          user-email: github-actions@github.com
-          target-branch: release-${{ env.VERSION }}
-          create-target-branch-if-needed: true
-          commit-message: Update to ${{ env.VERSION }}
-
-      # Note: the original tag that triggered the workflow is in the form vX.Y.Z
-      #       but the pubspec.yaml is committed in the commit after that one.
-      #       Since we need the tag to point to the correct commit for other workflows
-      #       such as f-droid we need a way to correct it. Only moving the tag
-      #       would not work, as it would trigger this workflow again. So as
-      #       a workaround, we use the v-tag to trigger this workflow, add a new
-      #       one without the v and push it.
-      - name: Commit pubspec version and delete tag
-        run: |
-          git config user.name Github-Actions
-          git config user.email github-actions@github.com
-          git checkout -b release-${{ env.VERSION }}
-          git add pubspec.yaml
-          git commit -m "Bump version to $( flutter pub run cider version )"
-          git push origin --delete ${{ env.VERSION_V }}
-          git push --set-upstream origin release-${{ env.VERSION }}
\ No newline at end of file
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
new file mode 100644
index 00000000..adc64f80
--- /dev/null
+++ b/.github/workflows/build-windows.yml
@@ -0,0 +1,31 @@
+name: Build Windows
+on:
+  workflow_call:
+    inputs:
+      ref:
+        required: true
+        type: string
+jobs:
+  # TODO: note that we currently only upload the .exe file, which is not
+  #       sufficient for a proper Windows release. See the documentation
+  #       for what would be necessary (low priority, but nice to have):
+  #       https://docs.flutter.dev/platform-integration/windows/building
+  build_windows:
+    name: Windows
+    runs-on: windows-latest
+    steps:
+      - name: Checkout application
+        uses: actions/checkout@v5
+        with:
+          ref: ${{ inputs.ref }}
+
+      - name: Common flutter setup
+        uses: ./.github/actions/flutter-common
+
+      - name: Build .exe
+        run: flutter build windows --release
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: builds-windows
+          path: build\windows\x64\runner\Release\wger.exe
\ No newline at end of file
diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml
new file mode 100644
index 00000000..55efba77
--- /dev/null
+++ b/.github/workflows/bump-version.yml
@@ -0,0 +1,57 @@
+name: Bump version
+on:
+  workflow_call:
+    inputs:
+      app_version:
+        required: true
+        type: string
+
+jobs:
+  determine_version:
+    name: Create tag
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Checkout application
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 0 # needed to push changes
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Common flutter setup
+        uses: ./.github/actions/flutter-common
+
+      - name: Setup uv
+        uses: astral-sh/setup-uv@v7
+
+      - name: Validate version
+        run: |
+          RELEASE_VERSION="${{ inputs.app_version }}"
+          if [[ ! "${{ inputs.app_version }}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+            echo "Error: Input version '${{ inputs.app_version }}' is not in X.Y.Z format."
+            exit 1
+          fi
+
+        # In order to make sure the build number is the same across all platforms,
+        # increase to the next multiple of 10. This is needed because the iOS process
+        # is a bit more brittle and might need to be repeated if the App needs
+        # to be re-submitted.
+      - name: Bump pubspec version
+        run: |
+          CURRENT_BUILD=$(flutter pub run cider version | cut -d '+' -f 2)
+          NEXT_BUILD=$(( (CURRENT_BUILD / 10 + 1) * 10 ))
+          flutter pub run cider version ${{ inputs.app_version }}+${NEXT_BUILD}
+
+      - name: Bump flatpak version
+        run: |
+          cd flatpak
+          uv run bump-flatpak-version.py ${{ inputs.app_version }}
+
+      - name: Tag release and commit pubspec
+        run: |
+          git config user.name Github-Actions
+          git config user.email github-actions@github.com
+          git add pubspec.yaml flatpak/de.wger.flutter.metainfo.xml
+          git commit -m "Bump version to ${{ inputs.app_version }}"
+          git tag ${{ inputs.app_version }}
+          git push origin HEAD:master --tags
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b8cac3b0..1fe851a3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,29 +9,32 @@ on:
     paths:
       - '**.dart'
       - 'pubspec.yaml'
+  workflow_call:
+  workflow_dispatch:
+
 jobs:
   test:
+    name: Run tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
-      - name: Install Flutter
-        uses: subosito/flutter-action@v2
-        with:
-          cache: true
-          channel: 'stable'
-          flutter-version: '3.24.x'
+      - name: Common flutter setup
+        uses: ./.github/actions/flutter-common
 
-      - run: dart --version
-      - run: flutter --version
-
-      - name: Install app dependencies
-        run: flutter pub get
+      - name: Install dependencies
+        run: |
+          sudo apt install libsqlite3-dev lcov --no-install-recommends
+          flutter pub get
 
+      # Removing some folders from the coverage since these files are not really
+      # part of the app code and just get in the way of the report
       - name: Test app
-        run: flutter test --coverage
+        run: |
+          flutter test --coverage
+          lcov --remove coverage/lcov.info 'lib/l10n/generated/*' 'lib/theme/*' -o coverage/lcov.info
 
       - name: Coveralls
-        uses: coverallsapp/github-action@master
+        uses: coverallsapp/github-action@v2
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/linter.yml.bak b/.github/workflows/linter.yml.bak
index 6339805d..e3665a58 100644
--- a/.github/workflows/linter.yml.bak
+++ b/.github/workflows/linter.yml.bak
@@ -26,7 +26,7 @@ jobs:
         run: flutter pub get
 
       - name: Check for formatting issues (run "dart format . ")
-        run: dart format --line-length=100 .
+        run: dart format .
 
       - name: Push a commit with the changed files
         continue-on-error: true
diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml
new file mode 100644
index 00000000..1b5b5f9a
--- /dev/null
+++ b/.github/workflows/make-release.yml
@@ -0,0 +1,152 @@
+name: Build release artefacts
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: Version to tag and release (X.Y.Z)
+        required: true
+        type: string
+
+jobs:
+
+  ci:
+    name: CI
+    uses: ./.github/workflows/ci.yml
+
+  determine_version:
+    needs: ci
+    name: Prepare
+    uses: ./.github/workflows/bump-version.yml
+    with:
+      app_version: ${{ github.event.inputs.version }}
+
+  build_linux:
+    name: Linux
+    needs: determine_version
+    uses: ./.github/workflows/build-linux.yml
+    with:
+      ref: ${{ github.event.inputs.version }}
+    secrets:
+      SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
+
+  build_android:
+    name: Android
+    needs: determine_version
+    uses: ./.github/workflows/build-android.yml
+    with:
+      ref: ${{ github.event.inputs.version }}
+    secrets:
+      DECRYPTKEY_PLAYSTORE_SIGNING_KEY: ${{ secrets.DECRYPTKEY_PLAYSTORE_SIGNING_KEY }}
+      DECRYPTKEY_PROPERTIES: ${{ secrets.DECRYPTKEY_PROPERTIES }}
+
+  build_apple:
+    name: Apple
+    needs: determine_version
+    uses: ./.github/workflows/build-apple.yml
+    with:
+      ref: ${{ github.event.inputs.version }}
+
+  build_windows:
+    name: Microsoft
+    needs: determine_version
+    uses: ./.github/workflows/build-windows.yml
+    with:
+      ref: ${{ github.event.inputs.version }}
+
+  upload_play_store:
+    name: Upload to Play Store
+    runs-on: ubuntu-latest
+    needs:
+      - build_android
+      - build_linux
+    steps:
+      - name: Checkout application
+        uses: actions/checkout@v5
+        with:
+          ref: ${{ github.event.inputs.version }}
+
+      - name: Download builds
+        uses: actions/download-artifact@v5
+        with:
+          path: /tmp/
+
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.4
+
+      - name: Decrypt config files
+        run: |
+          cd ./fastlane/metadata/envfiles
+          chmod +x ./decrypt_secrets.sh
+          ./decrypt_secrets.sh
+        shell: bash
+        env:
+          DECRYPTKEY_PLAYSTORE: ${{ secrets.DECRYPTKEY_PLAYSTORE }}
+
+      - name: Upload build to Play Store
+        run: |
+          mkdir -p ./build/app/outputs/bundle/release/
+          cp /tmp/builds-aab/app-release.aab ./build/app/outputs/bundle/release/app-release.aab
+          bundle install
+          bundle exec fastlane android production
+
+  #
+  # This is currently commented out since the iOS upload are currently being handled
+  # by the fastlane script in the ios folder. We use the account of pthaler for this
+  # and he runs the script manually.
+  #
+
+  #  upload_app_store:
+  #    name: Upload to App Store (placeholder)
+  #    runs-on: ubuntu-latest
+  #    needs:
+  #      - build_android
+  #      - build_apple
+  #    steps:
+  #      - name: Checkout application
+  #        uses: actions/checkout@v5
+  #        with:
+  #          ref: feature/build-process
+  #        #          ref: ${{ github.event.inputs.version }}
+  #
+  #      - name: Common flutter setup
+  #        uses: ./.github/actions/flutter-common
+  #
+  #      - name: Download builds
+  #        uses: actions/download-artifact@v5
+  #        with:
+  #          path: /tmp/
+  #
+  #      - name: Upload build to App Store
+  #        run: |
+  #          # bundle exec fastlane todo
+
+  make_gh_release:
+    name: Make Github Release
+    runs-on: ubuntu-latest
+    needs:
+      - upload_play_store
+      - build_linux
+      - build_windows
+      - build_apple
+
+    steps:
+      - name: Download builds
+        uses: actions/download-artifact@v5
+
+      - name: Make Github release
+        uses: softprops/action-gh-release@v2
+        with:
+          generate_release_notes: true
+          tag_name: ${{ inputs.version }}
+          files: |
+            builds-aab/app-release.aab
+            builds-apk/app-release.apk
+            builds-linux/linux-x64.tar.gz
+            builds-ios/Runner.app.zip
+            builds-ipa/Runner.xcarchive.zip
+            builds-macos/wger.app.zip
+            builds-windows/wger.exe
+
+
diff --git a/.gitignore b/.gitignore
index 0df000b8..b3dc0686 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,12 +30,11 @@
 .pub-cache/
 .pub/
 /build/
+/**/build/
+/android/app/.cxx
 **/failures/*.png
 
 
-# Web related
-lib/generated_plugin_registrant.dart
-
 # Symbolication related
 app.*.symbols
 
@@ -53,3 +52,16 @@ app.*.map.json
 # Others
 /vendor/bundle/ruby/
 /coverage/
+/lib/l10n/generated/
+
+# ios build and fastlane
+ios/fastlane/.env
+ios/fastlane/*.p8
+ios/fastlane/test_output
+ios/fastlane/screenshots
+ios/fastlane/report.xml
+ios/fastlane/Preview.html
+ios/fastlane/output
+ios/Runner.ipa
+ios/Runner.app.dSYM.zip
+
diff --git a/.metadata b/.metadata
index bcef94eb..0edb585d 100644
--- a/.metadata
+++ b/.metadata
@@ -4,7 +4,42 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: bbfbf1770cca2da7c82e887e4e4af910034800b6
-  channel: stable
+  revision: "8495dee1fd4aacbe9de707e7581203232f591b2f"
+  channel: "stable"
 
 project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
+      base_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
+    - platform: android
+      create_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
+      base_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
+    - platform: ios
+      create_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
+      base_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
+    - platform: linux
+      create_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
+      base_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
+    - platform: macos
+      create_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
+      base_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
+    - platform: web
+      create_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
+      base_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
+    - platform: windows
+      create_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
+      base_revision: 8495dee1fd4aacbe9de707e7581203232f591b2f
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 9619dd65..a318ce4a 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,4 +1,4 @@
 {
   "dart.lineLength": 100,
-  "diffEditor.ignoreTrimWhitespace": true,
+  "diffEditor.ignoreTrimWhitespace": true
 }
diff --git a/AUTHORS.md b/AUTHORS.md
index ee664bf4..43571c48 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -1,81 +1,349 @@
-# Authors
+# Contributors and translators to this repository
 
-## Developers
+Thank you all for contributing to the project, you are true heroes! 🫶
 
-- Jigar Prajapati - <https://github.com/Jiggy9>
-- Roland Geider – <https://github.com/rolandgeider>
-- Dylan Aird - <https://github.com/Dolaned>
-- Jannik Norden - <https://github.com/Jannik-dev>
-- Arun Muralidharan - <https://github.com/arun-muralidharan>
-- Khushbu Bora - <https://github.com/KhushbuBora>
-- Patrick Witter - <https://github.com/patrickwitter>
-- Tomer Ben-Rachel - <https://github.com/tomerpacific>
-- Thilina Herath - <https://github.com/ThilinaTCH>
-- Marko Milosevic - <https://github.com/TaarnStar>
-- Karthik Reddy (Axel) - <https://github.com/AxelBlaz3>
-- Ogundoyin Toluwani - <https://github.com/Tolu007>
-- Nenza Nurfirmansyah - <https://github.com/nenzan>
-- Florian Schmitz - <https://github.com/floodoo>
-- Adam Bujdoš - <https://github.com/bujdy>
-- Aman Negi - <https://github.com/AmanNegi>
-- Sandi Milohanic - <https://github.com/sandimilohanic>
-- Miroslav Mazel - <https://gitlab.com/12people>
-- artchiee - <https://github.com/artchiee>
-- Tejas Bir Singh - <https://github.com/tejasbirsingh>
-- Abhishek Saini - <https://github.com/Abhisheksainii>
-- Hanaa Allohibi - <https://github.com/hn-n>
-- Shey Alnasrawi - <https://github.com/Milksheyke>
-- Costas Korai - <https://github.com/watcher6280>
-- Bassam Mutairi - <https://github.com/mutairibassam>
-- Dieter Plaetinck - <https://github.com/Dieterbe>
-- Dennis van Peer - <https://github.com/Denpeer>
-- sizzlesloth - <https://github.com/sizzlesloth>
+## Contributors
+
+- thisisyoussef - [https://github.com/thisisyoussef](https://github.com/thisisyoussef)
+- Roland Geider - [https://github.com/rolandgeider](https://github.com/rolandgeider)
+- Yashas H Majmudar - [https://github.com/yashas-hm](https://github.com/yashas-hm)
+- Github-actions - [https://github.com/invalid-email-address](https://github.com/invalid-email-address)
+- Christijan - [https://github.com/ChrispyM](https://github.com/ChrispyM)
+- Jackpkn - [https://github.com/Jackpkn](https://github.com/Jackpkn)
+- sangharshdeveloper - [https://github.com/Sangharshdeveloper](https://github.com/Sangharshdeveloper)
+- ImgBotApp - [https://github.com/ImgBotApp](https://github.com/ImgBotApp)
+- தமிழ்நேரம் - [https://github.com/TamilNeram](https://github.com/TamilNeram)
+- Xianglin Zeng - [https://github.com/FutureYL3](https://github.com/FutureYL3)
+- Arya Pratap Singh - [https://github.com/ARYPROGRAMMER](https://github.com/ARYPROGRAMMER)
+- ARYPROGRAMMER - [https://github.com/ARYPROGRAMMER](https://github.com/ARYPROGRAMMER)
+- Dieter Plaetinck - [https://github.com/Dieterbe](https://github.com/Dieterbe)
+- szalas - [https://github.com/szalas](https://github.com/szalas)
+- dan - [https://github.com/sizzlesloth](https://github.com/sizzlesloth)
+- DVPeer - [https://github.com/Denpeer](https://github.com/Denpeer)
+- Marco Rimoldi - [https://github.com/marcor](https://github.com/marcor)
+- Licaon_Kter - [https://github.com/licaon-kter](https://github.com/licaon-kter)
+- Bassam A - [https://github.com/mutairibassam](https://github.com/mutairibassam)
+- Costas Korai
+- null - [https://github.com/hn-n](https://github.com/hn-n)
+- Miroslav Mazel
+- Milksheyke - [https://github.com/sheyaln](https://github.com/sheyaln)
+- Abhishek Saini - [https://github.com/Abhisheksainii](https://github.com/Abhisheksainii)
+- dimii27 - [https://github.com/dimii27](https://github.com/dimii27)
+- Antonis-geo - [https://github.com/Antonis-geo](https://github.com/Antonis-geo)
+- artchiee - [https://github.com/artchiee](https://github.com/artchiee)
+- artchiee - [https://github.com/artchiee](https://github.com/artchiee)
+- Jigar Prajapati - [https://github.com/Jiggy9](https://github.com/Jiggy9)
+- Dalton Scavassa
+- Jigar - [https://github.com/Jiggy9](https://github.com/Jiggy9)
+- Deepanshu - [https://github.com/Deepanshu-Sharma-18](https://github.com/Deepanshu-Sharma-18)
+- tejasbirsingh - [https://github.com/tejasbirsingh](https://github.com/tejasbirsingh)
+- Freddy Cunningham - [https://github.com/freddy-c](https://github.com/freddy-c)
+- Freddy Cunningham - [https://github.com/freddy-c](https://github.com/freddy-c)
+- Malay Pandit - [https://github.com/DeveloperMalay](https://github.com/DeveloperMalay)
+- Mirek Mazel - [https://github.com/12people](https://github.com/12people)
+- Miroslav Mazel
+- Roman Kalivoda - [https://github.com/RKCZ](https://github.com/RKCZ)
+- Tiisetso Dinoko - [https://github.com/Dinokojt7](https://github.com/Dinokojt7)
+- Harshit - [https://github.com/Harshit933](https://github.com/Harshit933)
+- Harshit - [https://github.com/Harshit933](https://github.com/Harshit933)
+- Raman Tank - [https://github.com/raman04-byte](https://github.com/raman04-byte)
+- Mohammad Rafigh - [https://github.com/mohammadrafigh](https://github.com/mohammadrafigh)
+- Edmundo Meyer - [https://github.com/e-meyer](https://github.com/e-meyer)
+- Bujdy - [https://github.com/bujdy](https://github.com/bujdy)
+- amannegi - [https://github.com/AmanNegi](https://github.com/AmanNegi)
+- Aman Negi - [https://github.com/AmanNegi](https://github.com/AmanNegi)
+- Aaliya Ali - [https://github.com/Aaliya-Ali](https://github.com/Aaliya-Ali)
+- Aaliya Ali - [https://github.com/Aaliya-Ali](https://github.com/Aaliya-Ali)
+- Sandi Milohanic
+- Hissabat Manager - [https://github.com/Chinguetti-Quizz](https://github.com/Chinguetti-Quizz)
+- Nenza Nurfirmansyah - [https://github.com/nenzan](https://github.com/nenzan)
+- Vinod - [https://github.com/skdotv](https://github.com/skdotv)
+- Aditya - [https://github.com/adeeteya](https://github.com/adeeteya)
+- JustinBenito - [https://github.com/JustinBenito](https://github.com/JustinBenito)
+- Florian Schmitz - [https://github.com/floodoo](https://github.com/floodoo)
+- avinash - [https://github.com/HeyAvi](https://github.com/HeyAvi)
+- Tolu ogundoyin - [https://github.com/Tolu007](https://github.com/Tolu007)
+- Daniil Kovalev - [https://github.com/kovdan01](https://github.com/kovdan01)
+- Saint Gabriel - [https://github.com/saintgabriel0](https://github.com/saintgabriel0)
+- Artem - [https://github.com/defaultpage](https://github.com/defaultpage)
+- WMs784 - [https://github.com/WMs784](https://github.com/WMs784)
+- KenXRan - [https://github.com/kenxran](https://github.com/kenxran)
+- João Goulart - [https://github.com/usehalter](https://github.com/usehalter)
+- yaseenagwan - [https://github.com/agwanyaseen](https://github.com/agwanyaseen)
+- G. Buendía - [https://github.com/gbuendia](https://github.com/gbuendia)
+- Sylvia van Os - [https://github.com/TheLastProject](https://github.com/TheLastProject)
+- Debayan Sutradhar - [https://github.com/rnayabed](https://github.com/rnayabed)
+- Poussinou - [https://github.com/Poussinou](https://github.com/Poussinou)
+- Nikita Epifanov
+- Ady - [https://github.com/adyhnat](https://github.com/adyhnat)
+- Adrian Halko
+- Tomáš Konkoľ - [https://github.com/TomasKonkol](https://github.com/TomasKonkol)
+- Marko Milosevic - [https://github.com/TaarnStar](https://github.com/TaarnStar)
+- Sandi Milohanić - [https://github.com/sandimilohanic](https://github.com/sandimilohanic)
+- AxelBlaz3 - [https://github.com/AxelBlaz3](https://github.com/AxelBlaz3)
+- Marvin M - [https://github.com/M123-dev](https://github.com/M123-dev)
+- himikat89 - [https://github.com/himikat89](https://github.com/himikat89)
+- infiniteoverflow - [https://github.com/infiniteoverflow](https://github.com/infiniteoverflow)
+- Tomer Ben Rachel - [https://github.com/TomerPacific](https://github.com/TomerPacific)
+- Thilina TCH - [https://github.com/ThilinaTCH](https://github.com/ThilinaTCH)
+- Thilina Herath - [https://github.com/thilinatnt](https://github.com/thilinatnt)
+- ToldYouThat
+- Yair Chen - [https://github.com/chenyair](https://github.com/chenyair)
+- henok3878 - [https://github.com/henok3878](https://github.com/henok3878)
+- Patrick Witter - [https://github.com/patrickwitter](https://github.com/patrickwitter)
+- ton-An - [https://github.com/ton-An](https://github.com/ton-An)
+- Prakash Shekhar - [https://github.com/prakash-shekhar](https://github.com/prakash-shekhar)
+- Khushbu Bora - [https://github.com/KhushbuBora](https://github.com/KhushbuBora)
+- Arun Muralidharan - [https://github.com/arun-muralidharan](https://github.com/arun-muralidharan)
+- yiter
+- Henio Szewczyk - [https://github.com/hszewczyk](https://github.com/hszewczyk)
+- Jannik Norden
+- Allan Nordhøy - [https://github.com/comradekingu](https://github.com/comradekingu)
+- Stefano Rossi - [https://github.com/stefanorossiti](https://github.com/stefanorossiti)
+- Dylan Aird - [https://github.com/Dolaned](https://github.com/Dolaned)
 
 ## Translators
 
-- Saudi Arabian
-  - Hanaa Allohibi <Gmail: programmerHanaa>
+### Chinese (Traditional Han script)
 
-- German
+- Peter Dave Hello - [https://github.com/PeterDaveHello](https://github.com/PeterDaveHello)
 
-  - mondstern <mondstern@snopyta.org> (2)
-  - J. Lavoie <j.lavoie@net-c.ca> (19)
-  - Roland Geider <roland@geider.net> (142)
+### Polish
 
-- English
+- Karol Solecki - [https://github.com/karolsol](https://github.com/karolsol)
+- Piotr Strebski - [https://github.com/strebski](https://github.com/strebski)
+- Dawid Panyło
+- Anonymous - [https://github.com/weblate](https://github.com/weblate)
+- Marcin Schoenknecht
+- Patryk - [https://github.com/byakurau](https://github.com/byakurau)
+- Michał Homza - [https://github.com/HagiaHaya](https://github.com/HagiaHaya)
+- Jacob - [https://github.com/devzom](https://github.com/devzom)
 
-  - Roland Geider <roland@geider.net> (3)
-  - Allan Nordhøy <epost@anotheragency.no> (8)
+### Serbian
 
-- Italian
+- Mladen Trišić - [https://github.com/mtrisic](https://github.com/mtrisic)
 
-  - mondstern <mondstern@snopyta.org> (2)
-  - DT <semperpeppe@tracciabi.li> (4)
-  - J. Lavoie <j.lavoie@net-c.ca> (24)
-  - Stefano Rossi <stefanorossi.ti@gmail.com> (120)
+### Dutch
 
-- Spanish
+- Joey Haalboom - [https://github.com/JoeyHaalboom](https://github.com/JoeyHaalboom)
 
-  - Roland Geider <roland@geider.net> (1)
-  - martingetzel <martingetzel@gmail.com> (119)
+### Russian
 
-- French
+- Алексей Курышко - [https://github.com/alexkuryshko](https://github.com/alexkuryshko)
+- lightningcpu - [https://github.com/lightningcpu](https://github.com/lightningcpu)
+- Кирилл Александрович Злобин - [https://github.com/gungstarbeiter](https://github.com/gungstarbeiter)
+- Ivan Katkov - [https://github.com/Porphyrion](https://github.com/Porphyrion)
+- Nikita Epifanov
 
-  - J. Lavoie <j.lavoie@net-c.ca> (92)
-  - Stefano Rossi <stefanorossi.ti@gmail.com> (94)
+### Croatian
 
-- Norwegian Bokmål
+- Milo Ivir - [https://github.com/milotype](https://github.com/milotype)
+- Roland Geider - [https://github.com/rolandgeider](https://github.com/rolandgeider)
+- SMilohanic - [https://github.com/sandimilohanic](https://github.com/sandimilohanic)
 
-  - Allan Nordhøy <epost@anotheragency.no> (98)
+### Portuguese
 
-- Japanese
+- Edson Wolf - [https://github.com/edsonblwolf](https://github.com/edsonblwolf)
+- Anonymous - [https://github.com/weblate](https://github.com/weblate)
+- Wilton Rodrigues
+- Guilherme Salomão - [https://github.com/salomaoparkour](https://github.com/salomaoparkour)
+- Bruno de Moura - [https://github.com/bruunomooura](https://github.com/bruunomooura)
+- Dalton Scavassa
+- Stefan Taiguara - [https://github.com/Teitei011](https://github.com/Teitei011)
+- Eduardo Menges Mattje - [https://github.com/EduMenges](https://github.com/EduMenges)
+- Edu Cavalheiro - [https://github.com/EduCavalheiro](https://github.com/EduCavalheiro)
+- João Goulart - [https://github.com/usehalter](https://github.com/usehalter)
 
-  - Kosei TANAKA <wms784.app@gmail.com> (97)
+### Italian
 
-- Bahasa Indonesia
+- Antenore Gatta - [https://github.com/antenore](https://github.com/antenore)
+- Gab Gat
+- Anonymous - [https://github.com/weblate](https://github.com/weblate)
+- Federico Pierantoni - [https://github.com/F3FFO](https://github.com/F3FFO)
+- oarion - [https://github.com/oarion](https://github.com/oarion)
+- Alessandro Faucci - [https://github.com/Dhy19971](https://github.com/Dhy19971)
+- Sfizio Purea
+- Mirko Ferrati - [https://github.com/MirkoFerrati](https://github.com/MirkoFerrati)
+- Stefano Camillo - [https://github.com/djste](https://github.com/djste)
+- MARCO ACORTE - [https://github.com/marco-acorte](https://github.com/marco-acorte)
+- J. Lavoie
+- DT
+- mondstern
+- Stefano Rossi - [https://github.com/stefanorossiti](https://github.com/stefanorossiti)
 
-  - Nenza Nurfirmansyah <nnurfirmansyah@gmail.com> (73)
+### French
 
-- Croatian
+- William - [https://github.com/WilliamR312](https://github.com/WilliamR312)
+- florent4014 - [https://github.com/florent4014](https://github.com/florent4014)
+- Anonymous - [https://github.com/weblate](https://github.com/weblate)
+- Xav Basco
+- David Olewski - [https://github.com/Arigowin](https://github.com/Arigowin)
+- yoyomax80400 - [https://github.com/yoyomax80400](https://github.com/yoyomax80400)
+- loued - [https://github.com/Loued](https://github.com/Loued)
+- Célian
+- MrSniikyz - [https://github.com/BabyGeek](https://github.com/BabyGeek)
+- Roland Geider - [https://github.com/rolandgeider](https://github.com/rolandgeider)
+- J. Lavoie
+- Antoine Vibien - [https://github.com/r1llettes](https://github.com/r1llettes)
+- Stefano Rossi - [https://github.com/stefanorossiti](https://github.com/stefanorossiti)
 
-  - Sandi Milohaic <sandi.milohanic@gmail.com>
+### Ukrainian
+
+- Максим Горпиніч - [https://github.com/Maksim2005UA](https://github.com/Maksim2005UA)
+- Roland Geider - [https://github.com/rolandgeider](https://github.com/rolandgeider)
+- Максим Горпиніч
+- Anonymous - [https://github.com/weblate](https://github.com/weblate)
+- Dan - [https://github.com/Kefir2105](https://github.com/Kefir2105)
+- Dan
+- Tymofii Lytvynenko
+- Artem - [https://github.com/defaultpage](https://github.com/defaultpage)
+
+### Portuguese (Brazil)
+
+- Ricardo Lima - [https://github.com/rhrlima](https://github.com/rhrlima)
+- Clerton Araujo - [https://github.com/clertonraf](https://github.com/clertonraf)
+- Anonymous - [https://github.com/weblate](https://github.com/weblate)
+- Wilton Rodrigues
+- Nao interessa
+- Lucas Mezêncio - [https://github.com/lucasmezencio](https://github.com/lucasmezencio)
+- Felipe Antônio Rodrigues Cardoso
+- Luigi Henrick Feitoza Silva - [https://github.com/luigihenrick](https://github.com/luigihenrick)
+- João Hortêncio Moraes - [https://github.com/joaohortencio](https://github.com/joaohortencio)
+
+### Tamil
+
+- தமிழ்நேரம் - [https://github.com/TamilNeram](https://github.com/TamilNeram)
+
+### Chinese (Simplified Han script)
+
+- Herb Huang
+
+### Hindi
+
+- pavan arun bagwe - [https://github.com/pavanb0](https://github.com/pavanb0)
+- Anonymous - [https://github.com/weblate](https://github.com/weblate)
+- Debayan Sutradhar - [https://github.com/rnayabed](https://github.com/rnayabed)
+
+### Turkish
+
+- Oğuz Ersen - [https://github.com/oersen](https://github.com/oersen)
+- Roland Geider - [https://github.com/rolandgeider](https://github.com/rolandgeider)
+- Cem Avcı - [https://github.com/cem256](https://github.com/cem256)
+- Oğuz Ersen
+- Cenk Cidecio - [https://github.com/ccidecio](https://github.com/ccidecio)
+- ToldYouThat
+
+### German
+
+- kvnrmnn - [https://github.com/rmnn92](https://github.com/rmnn92)
+- Anonymous - [https://github.com/weblate](https://github.com/weblate)
+- Roland Geider - [https://github.com/rolandgeider](https://github.com/rolandgeider)
+- Victor Jouhoff - [https://github.com/jouhoffv](https://github.com/jouhoffv)
+- m4skedbyte
+- Axel Steinbrecher
+- Christoph Suesser - [https://github.com/TheFitzZZ](https://github.com/TheFitzZZ)
+- Luis Lüscher - [https://github.com/lslschr](https://github.com/lslschr)
+- mondstern
+- J. Lavoie
+- Marvin M - [https://github.com/M123-dev](https://github.com/M123-dev)
+- Lydia
+- Allan Nordhøy - [https://github.com/comradekingu](https://github.com/comradekingu)
+
+### Indonesian
+
+- aryakdaniswara - [https://github.com/aryakdaniswara](https://github.com/aryakdaniswara)
+- Anonymous - [https://github.com/weblate](https://github.com/weblate)
+- Debi Maulana Ahsan Halla
+- Roland Geider - [https://github.com/rolandgeider](https://github.com/rolandgeider)
+
+### Catalan
+
+- Zixu Sun - [https://github.com/ziixu](https://github.com/ziixu)
+- Anonymous - [https://github.com/weblate](https://github.com/weblate)
+- guillem - [https://github.com/gbuendia](https://github.com/gbuendia)
+
+### Chinese (Simplified)
+
+- 纪颖志 - [https://github.com/jiyingzhi](https://github.com/jiyingzhi)
+- Yi-Han Hsiung - [https://github.com/AaronHsiung](https://github.com/AaronHsiung)
+- Tsz Hong CHAN - [https://github.com/tomyan112](https://github.com/tomyan112)
+- Eddie Tang - [https://github.com/EDED2314](https://github.com/EDED2314)
+- Jing - [https://github.com/jingcheng16](https://github.com/jingcheng16)
+- sr-c - [https://github.com/sr-c](https://github.com/sr-c)
+- tony - [https://github.com/tonyxxliu](https://github.com/tonyxxliu)
+- yiter
+
+### Greek
+
+- Dimitrys Meliates
+- Antonis-geo - [https://github.com/Antonis-geo](https://github.com/Antonis-geo)
+
+### Czech
+
+- Fjuro - [https://github.com/Fjuro](https://github.com/Fjuro)
+- Fjuro
+- CaptainDolphy - [https://github.com/CaptainDolphy](https://github.com/CaptainDolphy)
+- Roman Kalivoda - [https://github.com/RKCZ](https://github.com/RKCZ)
+
+### Arabic
+
+- Anonymous - [https://github.com/weblate](https://github.com/weblate)
+- Hanaa - [https://github.com/hn-n](https://github.com/hn-n)
+- Ahmed zein - [https://github.com/Ahmed-Zein](https://github.com/Ahmed-Zein)
+
+### Hebrew
+
+- Anonymous - [https://github.com/weblate](https://github.com/weblate)
+- n,rdo
+- Tomer Ben Rachel - [https://github.com/TomerPacific](https://github.com/TomerPacific)
+
+### Japanese
+
+- Anonymous - [https://github.com/weblate](https://github.com/weblate)
+- Tsz Hong CHAN - [https://github.com/tomyan112](https://github.com/tomyan112)
+- sasukeiscool - [https://github.com/sasukeiscool](https://github.com/sasukeiscool)
+- yiter
+
+### Spanish
+
+- Anonymous - [https://github.com/weblate](https://github.com/weblate)
+- Roberto Iglesias - [https://github.com/iglesiasroberto14](https://github.com/iglesiasroberto14)
+- c06c3abb8f
+- Javier - [https://github.com/dysk0zero](https://github.com/dysk0zero)
+- facu-d - [https://github.com/facu-d](https://github.com/facu-d)
+- Biologia Libros - [https://github.com/bio201922](https://github.com/bio201922)
+- guillem - [https://github.com/gbuendia](https://github.com/gbuendia)
+- Chris Klempau - [https://github.com/yoinkers1337](https://github.com/yoinkers1337)
+- Roland Geider - [https://github.com/rolandgeider](https://github.com/rolandgeider)
+- martingetzel - [https://github.com/martingetzel](https://github.com/martingetzel)
+
+### Chinese (Traditional)
+
+- hugoalh
+- Tsz Hong CHAN - [https://github.com/tomyan112](https://github.com/tomyan112)
+- Chung-Wei Chung - [https://github.com/webb790709](https://github.com/webb790709)
+- HY Cheng
+
+### Portuguese (Portugal)
+
+- Anonymous - [https://github.com/weblate](https://github.com/weblate)
+
+### Romanian
+
+- Bogdan Bujor - [https://github.com/qSharpy](https://github.com/qSharpy)
+- dimii27 - [https://github.com/dimii27](https://github.com/dimii27)
+
+### English
+
+- guillem - [https://github.com/gbuendia](https://github.com/gbuendia)
+- Allan Nordhøy - [https://github.com/comradekingu](https://github.com/comradekingu)
+- Roland Geider - [https://github.com/rolandgeider](https://github.com/rolandgeider)
+
+### Norwegian Bokmål
+
+- Roland Geider - [https://github.com/rolandgeider](https://github.com/rolandgeider)
+- Allan Nordhøy - [https://github.com/comradekingu](https://github.com/comradekingu)
+
+### Amharic
+
+- henok3878 - [https://github.com/henok3878](https://github.com/henok3878)
diff --git a/Gemfile b/Gemfile
index 2ccf2ecb..73fd0e0c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,9 @@
 source "https://rubygems.org"
 
 gem "fastlane"
+gem 'logger'
+gem 'mutex_m'
+gem 'abbrev'
+
 plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
 eval_gemfile(plugins_path) if File.exist?(plugins_path)
diff --git a/Gemfile.lock b/Gemfile.lock
index b4b74e3c..a12426e7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,41 +5,46 @@ GEM
       base64
       nkf
       rexml
+    abbrev (0.1.2)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     artifactory (3.0.17)
     atomos (0.1.3)
-    aws-eventstream (1.3.0)
-    aws-partitions (1.960.0)
-    aws-sdk-core (3.201.3)
+    aws-eventstream (1.4.0)
+    aws-partitions (1.1163.0)
+    aws-sdk-core (3.232.0)
       aws-eventstream (~> 1, >= 1.3.0)
-      aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.8)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
+      base64
+      bigdecimal
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.88.0)
-      aws-sdk-core (~> 3, >= 3.201.0)
+      logger
+    aws-sdk-kms (1.112.0)
+      aws-sdk-core (~> 3, >= 3.231.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.156.0)
-      aws-sdk-core (~> 3, >= 3.201.0)
+    aws-sdk-s3 (1.199.0)
+      aws-sdk-core (~> 3, >= 3.231.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.9.1)
+    aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
-    base64 (0.2.0)
+    base64 (0.3.0)
+    bigdecimal (3.2.3)
     claide (1.1.0)
     colored (1.2)
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
     declarative (0.0.20)
-    digest-crc (0.6.5)
+    digest-crc (0.7.0)
       rake (>= 12.0.0, < 14.0.0)
     domain_name (0.6.20240107)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.111.0)
-    faraday (1.10.3)
+    excon (0.112.0)
+    faraday (1.10.4)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -55,20 +60,20 @@ GEM
       faraday (>= 0.8.0)
       http-cookie (~> 1.0.0)
     faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
+    faraday-em_synchrony (1.0.1)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
+    faraday-multipart (1.1.1)
+      multipart-post (~> 2.0)
     faraday-net_http (1.0.2)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    faraday_middleware (1.2.0)
+    faraday_middleware (1.2.1)
       faraday (~> 1.0)
-    fastimage (2.3.1)
-    fastlane (2.222.0)
+    fastimage (2.4.0)
+    fastlane (2.228.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -84,6 +89,7 @@ GEM
       faraday-cookie_jar (~> 0.0.6)
       faraday_middleware (~> 1.0)
       fastimage (>= 2.1.0, < 3.0.0)
+      fastlane-sirp (>= 1.0.0)
       gh_inspector (>= 1.1.2, < 2.0.0)
       google-apis-androidpublisher_v3 (~> 0.3)
       google-apis-playcustomapp_v1 (~> 0.1)
@@ -107,9 +113,11 @@ GEM
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
       xcodeproj (>= 1.13.0, < 2.0.0)
-      xcpretty (~> 0.3.0)
+      xcpretty (~> 0.4.1)
       xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
-    fastlane-plugin-versioning (0.5.2)
+    fastlane-plugin-versioning (0.7.1)
+    fastlane-sirp (1.0.0)
+      sysrandom (~> 1.0)
     gh_inspector (1.1.3)
     google-apis-androidpublisher_v3 (0.54.0)
       google-apis-core (>= 0.11.0, < 2.a)
@@ -127,12 +135,12 @@ GEM
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-storage_v1 (0.31.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-cloud-core (1.7.0)
+    google-cloud-core (1.8.0)
       google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.4.0)
+    google-cloud-errors (1.5.0)
     google-cloud-storage (1.47.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
@@ -148,45 +156,47 @@ GEM
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
-    http-cookie (1.0.6)
+    http-cookie (1.0.8)
       domain_name (~> 0.5)
-    httpclient (2.8.3)
+    httpclient (2.9.0)
+      mutex_m
     jmespath (1.6.2)
-    json (2.7.2)
-    jwt (2.8.2)
+    json (2.15.0)
+    jwt (2.10.2)
       base64
+    logger (1.7.0)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
-    multi_json (1.15.0)
+    multi_json (1.17.0)
     multipart-post (2.4.1)
-    nanaimo (0.3.0)
-    naturally (2.2.1)
+    mutex_m (0.3.0)
+    nanaimo (0.4.0)
+    naturally (2.3.0)
     nkf (0.2.0)
-    optparse (0.5.0)
+    optparse (0.6.0)
     os (1.1.4)
-    plist (3.7.1)
-    public_suffix (6.0.1)
-    rake (13.2.1)
+    plist (3.7.2)
+    public_suffix (6.0.2)
+    rake (13.3.0)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.9)
-      strscan
-    rouge (2.0.7)
+    rexml (3.4.4)
+    rouge (3.28.0)
     ruby2_keywords (0.0.5)
-    rubyzip (2.3.2)
+    rubyzip (2.4.1)
     security (0.1.5)
-    signet (0.19.0)
+    signet (0.21.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
-      jwt (>= 1.5, < 3.0)
+      jwt (>= 1.5, < 4.0)
       multi_json (~> 1.10)
     simctl (1.6.10)
       CFPropertyList
       naturally
-    strscan (3.1.0)
+    sysrandom (1.0.5)
     terminal-notifier (2.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
@@ -196,17 +206,17 @@ GEM
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
     uber (0.1.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (2.6.0)
     word_wrap (1.0.0)
-    xcodeproj (1.24.0)
+    xcodeproj (1.27.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.3.0)
-      rexml (~> 3.2.4)
-    xcpretty (0.3.0)
-      rouge (~> 2.0.7)
+      nanaimo (~> 0.4.0)
+      rexml (>= 3.3.6, < 4.0)
+    xcpretty (0.4.1)
+      rouge (~> 3.28.0)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
 
@@ -214,11 +224,15 @@ PLATFORMS
   arm64-darwin-21
   arm64-darwin-22
   arm64-darwin-23
+  arm64-darwin-24
   x86_64-linux
 
 DEPENDENCIES
+  abbrev
   fastlane
   fastlane-plugin-versioning
+  logger
+  mutex_m
 
 BUNDLED WITH
-   2.2.32
+   2.6.9
diff --git a/README.md b/README.md
index 8476a249..cf31f6d3 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Mobile app for wger Workout Manager
+# Mobile app for wger
 
 wger is a free, open-source flutter application that manages and tracks/logs
 your exercises and personal workouts, weight, and diet plans. This is the mobile
@@ -7,7 +7,7 @@ app written with Flutter, it talks via REST with the main server.
 If you want to contribute, hop on the Discord server and say hi!
 
 
-<p>
+<p align="center">
 <img src="https://raw.githubusercontent.com/wger-project/flutter/master/fastlane/metadata/android/en-US/images/phoneScreenshots/01%20-%20dashboard.png" width="200" alt="" />
 
 <img src="https://raw.githubusercontent.com/wger-project/flutter/master/fastlane/metadata/android/en-US/images/phoneScreenshots/04%20-%20measurements.png" width="200" alt="" />
@@ -17,61 +17,45 @@ If you want to contribute, hop on the Discord server and say hi!
 
 ## Installation
 
-[<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png"
+[<img src="https://raw.githubusercontent.com/wger-project/wger/refs/heads/master/wger/core/static/images/logos/play-store/badge.svg"
 alt="Get it on Google Play"
-height="80">](https://play.google.com/store/apps/details?id=de.wger.flutter)
-[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
+height="55">](https://play.google.com/store/apps/details?id=de.wger.flutter)
+[<img src="https://raw.githubusercontent.com/wger-project/wger/refs/heads/master/wger/core/static/images/logos/fdroid/get-it-on.svg"
 alt="Get it on F-Droid"
-height="80">](https://f-droid.org/packages/de.wger.flutter/)
+height="55">](https://f-droid.org/packages/de.wger.flutter/)
+[<img src="https://raw.githubusercontent.com/wger-project/wger/refs/heads/master/wger/core/static/images/logos/app-store/black.svg"
+alt="Download on the App Store"
+height="55">](https://apps.apple.com/us/app/wger-workout-manager/id6502226792)
+[<img src="https://raw.githubusercontent.com/wger-project/wger/refs/heads/master/wger/core/static/images/logos/flathub/black.svg"
+alt="Get it on Flathub"
+height="55">](https://flathub.org/apps/de.wger.flutter)
 
-## Development
+## Developing and contributing
 
-### 1
+Our goal is to build an awesome and flexible fitness and nutrition manager,
+along with a comprehensive list of exercises and ingredients, all released
+under a free license.
 
-Install the [wger server](https://github.com/wger-project/wger), the easiest way
-is to start the development docker-compose: <https://github.com/wger-project/docker>
+For this, we’d love your help! Whether it’s code, translations, exercises or
+reporting issues and ideas, check out our
+[contribution guide](https://wger.readthedocs.io/en/latest/contributing.html)
+to get started.
 
-Alternatively, you can use the test server (the db is reset every day):
+A huge thank you to everyone who has contributed so far! ❤️ See the full list
+in [AUTHORS.md](AUTHORS.md).
+
+**TLDR**
+
+```bash
+flutter run
+```
+
+This is a regular flutter application, so there's no magic. You will need a backend
+for this, so feel free to use the test server for this (the db is reset daily):
 
 * URL: `https://wger-master.rge.uber.space`
 * username: `user`
 * password: `flutteruser`
-* API key: `31e2ea0322c07b9df583a9b6d1e794f7139e78d4`
-
-### 2
-
-Install Flutter and all its dependencies, and create a new virtual device:
-<https://flutter.dev/docs/get-started/install>.
-
-The app currently uses flutter 3.22
-
-### 3
-The application will complain about an API key not being set. You can just
-ignore this during development, this is only important if you want to register
-directly over the app. If you just want to login, you can skip this section.
-
-If you want to register directly over the app, you need to set a user on the backend
-that is allowed to do this. For this, create/register a new user, generate an api key
-and run ``python3 manage.py add-user-rest theusername`` (you can later list all the
-registered users with ``python3 manage.py list-users-api``).
-
-Then create a new file ``wger.properties`` in ``fastlane/metadata/envfiles/`` and
-add the key:
-
-```properties
-WGER_API_KEY=123456
-```
-
-Alternatively, add the key as an environment variables, e.g. by running the `source`
-command on the file.
-
-### 4
-
-Start the application with ``flutter run`` or use your IDE
-(please note that depending on how you run your emulator you will need to change the IP address of
-the server)
-
-You can run the tests with the ``flutter test``
 
 ## Translation
 
diff --git a/analysis_options.yaml b/analysis_options.yaml
index 15127111..b7abc707 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -19,6 +19,10 @@ analyzer:
     # Please see https://github.com/flutter/flutter/pull/24528 for details.
     sdk_version_async_exported_from_core: ignore
 
+formatter:
+  page_width: 100
+  trailing_commas: preserve
+
 linter:
   rules:
     # These rules are documented on and in the same order as
@@ -165,8 +169,6 @@ dart_code_metrics:
     - avoid-passing-self-as-argument: false # fairly harmless. and e.g. drift calls are like this
     - avoid-passing-async-when-sync-expected: false # we really like to do this in onTap() etc, and it seems harmless
     - prefer-match-file-name: false # dieter wants to enable this. but requires a lot of renames. what does roland think?
-
   formatter:
     indent: 0
-    line-length: 100
     cascading-widget-extensions: false
diff --git a/android/app/build.gradle b/android/app/build.gradle
index a4fd4951..da8fd1dc 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -12,16 +12,6 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
-}
-
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
-}
-
 
 // Keys for the android play store
 def keystoreProperties = new Properties()
@@ -30,57 +20,29 @@ if (keystorePropertiesFile.exists()) {
     keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 }
 
-// Key for wger.de REST API
-def wgerProperties = new Properties()
-def localMapsPropertiesFile = rootProject.file('../fastlane/metadata/envfiles/wger.properties')
-if (localMapsPropertiesFile.exists()) {
-    project.logger.info('Load maps properties from local file')
-    localMapsPropertiesFile.withReader('UTF-8') { reader ->
-        wgerProperties.load(reader)
-    }
-} else {
-    project.logger.info('Load maps properties from environment')
-    try {
-        wgerProperties['WGER_API_KEY'] = System.getenv('WGER_API_KEY')
-    } catch (NullPointerException e) {
-        project.logger.warn('Failed to load WGER_API_KEY from environment.', e)
-    }
-}
-def wgerApiKey = wgerProperties.getProperty('WGER_API_KEY')
-if (wgerApiKey == null) {
-    wgerApiKey = ""
-    project.logger.error('Wger Api Key not configured. Set it in `/fastlane/metadata/android/envfiles/wger.properties` or in the environment variable `WGER_API_KEY`')
-}
 
 android {
-    compileSdkVersion 34
-    ndkVersion "25.1.8937393"
+    namespace = "de.wger.flutter"
+    compileSdkVersion 36
+    ndkVersion "28.2.13676358"
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '11'
     }
 
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
-
-    lintOptions {
-        disable 'InvalidPackage'
-    }
 
     defaultConfig {
         // Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "de.wger.flutter"
-        minSdkVersion 21
-        targetSdkVersion 34
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
-        manifestPlaceholders += [WGER_API_KEY: wgerApiKey]
+        minSdkVersion = flutter.minSdkVersion
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutter.versionCode
+        versionName = flutter.versionName
     }
 
     signingConfigs {
@@ -93,8 +55,6 @@ android {
     }
     buildTypes {
         release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
             signingConfig signingConfigs.release
         }
         debug {
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 34614bd6..4e50bad4 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -26,15 +26,9 @@
         android:name="${applicationName}"
         android:label="wger"
         android:icon="@mipmap/ic_launcher"
+        android:enableOnBackInvokedCallback="true"
         android:networkSecurityConfig="@xml/network_security_config">
 
-        <meta-data
-            android:name="wger.api_key"
-            android:value="${WGER_API_KEY}" />
-        <meta-data
-            android:name="wger.check_min_app_version"
-            android:value="true" />
-
         <activity
             android:name=".MainActivity"
             android:exported="true"
diff --git a/android/build.gradle b/android/build.gradle
index bc157bd1..ddb8ad0b 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -6,13 +6,66 @@ allprojects {
 }
 
 rootProject.buildDir = '../build'
+
+
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
 }
+
+// Workaround for APK builds - https://github.com/flutter/flutter/issues/153281
+subprojects {
+    afterEvaluate { project ->
+        if (project.extensions.findByName("android") != null) {
+            Integer pluginCompileSdk = project.android.compileSdk
+            if (pluginCompileSdk != null && pluginCompileSdk < 31) {
+                project.logger.error(
+                        "Warning: Overriding compileSdk version in Flutter plugin: "
+                                + project.name
+                                + " from "
+                                + pluginCompileSdk
+                                + " to 31 (to work around https://issuetracker.google.com/issues/199180389)."
+                                + "\nIf there is not a new version of " + project.name + ", consider filing an issue against "
+                                + project.name
+                                + " to increase their compileSdk to the latest (otherwise try updating to the latest version)."
+                )
+                project.android {
+                    compileSdk 34
+                }
+            }
+        }
+    }
+}
+
+// Workaround for " Could not create an instance of type com.android.build.api.variant.impl.LibraryVariantBuilderImpl." error
+// Note that this instance seems to be caused by flutter_barcode_scanner, which hasn't been
+// updated in three years, might be time to look for a different package
+subprojects {
+    afterEvaluate { project ->
+        if (project.hasProperty('android')) {
+            project.android {
+                if (namespace == null) {
+                    project.logger.error(
+                            "Warning: project "
+                                    + project.name
+                                    + " has no namespace set, this will prevent compilation, "
+                                    + " setting one now to "
+                                    + project.group
+                                    + "\nIf there is not a new version of " + project.name + ", consider filing an issue against "
+                                    + project.name
+                    )
+
+                    namespace project.group
+                }
+            }
+        }
+    }
+}
+
 subprojects {
     project.evaluationDependsOn(':app')
 }
 
+
 tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/android/gradle.properties b/android/gradle.properties
index 38c8d454..399dfe11 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,4 +1,4 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx2048M
 android.enableR8=true
 android.useAndroidX=true
 android.enableJetifier=true
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 6b665338..d5ce57cb 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
\ No newline at end of file
diff --git a/android/settings.gradle b/android/settings.gradle
index 1c38bbdf..ed68c2f2 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -18,8 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.1" apply false
-    id "org.jetbrains.kotlin.android" version "2.0.21" apply false
+    id "com.android.application" version "8.6.0" apply false
+    id "org.jetbrains.kotlin.android" version "2.1.20" apply false
 }
 
 include ":app"
diff --git a/assets/icons/ingredient-add.svg b/assets/icons/ingredient-add.svg
index 5a1e962c..1972f1de 100644
--- a/assets/icons/ingredient-add.svg
+++ b/assets/icons/ingredient-add.svg
@@ -1,72 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<!-- License: CC0. Made by SVG Repo: https://www.svgrepo.com/svg/150226/meal -->
-
-<svg
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   viewBox="0 0 512.002 512.002"
-   style="enable-background:new 0 0 512.002 512.002;"
-   xml:space="preserve"
-   sodipodi:docname="ingredient-add.svg"
-   inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"><defs
-   id="defs8">
-	
-</defs><sodipodi:namedview
-   id="namedview8"
-   pagecolor="#ffffff"
-   bordercolor="#000000"
-   borderopacity="0.25"
-   inkscape:showpageshadow="2"
-   inkscape:pageopacity="0.0"
-   inkscape:pagecheckerboard="0"
-   inkscape:deskcolor="#d1d1d1"
-   inkscape:zoom="1.7363213"
-   inkscape:cx="256.00101"
-   inkscape:cy="257.15287"
-   inkscape:window-width="1920"
-   inkscape:window-height="1155"
-   inkscape:window-x="0"
-   inkscape:window-y="45"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="Layer_1" />
-
-<g
-   id="g2"
-   transform="matrix(0.76051742,-0.76051742,0.76051742,0.76051742,-160.62472,302.94989)">
-	<path
-   class="st0"
-   d="m 345.114,155.163 c -13.113,-21.232 -35.755,-26.934 -50.43,-26.934 h -77.44 c -14.599,0 -37.318,5.702 -50.354,26.934 -12.022,19.752 -19.44,38.094 -23.656,54.958 -2.18,8.821 -3.507,17.252 -4.132,25.371 -3.361,40.596 10.46,71.586 15.378,93.054 1.25,5.542 3.202,12.412 5.695,20.142 2.424,7.73 5.313,16.314 8.516,25.371 12.8,36.38 29.976,79.24 37.858,97.582 15.612,36.456 35.052,40.359 49.415,40.359 14.439,0 33.879,-3.903 49.492,-40.359 11.633,-27.323 44.187,-109.292 51.993,-143.095 1.403,-6.167 3.59,-13.113 5.855,-20.843 2.264,-7.73 4.604,-16.162 6.48,-25.371 6.633,-32.553 7.181,-74.864 -24.67,-127.169 z m -57.535,127.169 c -7.021,0 -12.724,5.702 -12.724,12.724 0,6.944 5.702,12.647 12.724,12.647 h 43.18 c -1.395,4.742 -2.721,9.347 -3.735,13.814 -7.106,30.754 -38.43,110.016 -50.27,137.835 -9.179,21.422 -15.888,21.422 -20.79,21.422 -4.872,0 -11.535,0 -20.729,-21.46 -7.136,-16.62 -21.484,-52.352 -33.384,-85.255 h 18.358 c 7.029,0 12.724,-5.702 12.724,-12.647 0,-7.021 -5.695,-12.724 -12.724,-12.724 h -27.201 c -1.09,-3.294 -2.165,-6.541 -3.118,-9.582 -2.218,-6.9 -3.934,-12.922 -4.97,-17.527 -1.364,-5.954 -3.156,-12.03 -5.055,-18.456 -5.504,-18.632 -11.74,-39.75 -9.628,-65.236 0.061,-0.792 0.214,-1.6 0.29,-2.394 h 67.248 c 7.029,0 12.647,-5.702 12.647,-12.724 0,-6.945 -5.618,-12.648 -12.647,-12.648 H 175.78 c 3.957,-12.686 9.827,-25.653 17.725,-38.621 7.037,-11.466 21.011,-12.045 23.74,-12.045 h 77.44 c 3.842,0 16.917,0.877 23.763,11.946 27.94,45.887 25.76,80.055 20.736,104.702 -0.442,2.158 -0.968,4.155 -1.456,6.229 z"
-   id="path1"
-   style="fill:#000000" />
-	<polygon
-   class="st0"
-   points="259.501,20.515 260.545,71.822 248.836,71.822 248.836,0 210.062,3.423 213.965,36.478 224.371,75.245 216.565,78.668 197.049,31.927 169.718,42.189 194.7,110.588 315.451,110.588 336.263,50.163 305.036,47.876 298.534,87.786 288.127,85.506 292.031,25.082 "
-   id="polygon1"
-   style="fill:#000000" />
-</g><circle
-   id="path2"
-   style="fill:#000000;stroke:#000000;stroke-width:0.2"
-   cx="521.88666"
-   cy="45.191727"
-   r="0.0043425169" /><g
-   id="Page-1"
-   stroke="none"
-   stroke-width="1"
-   fill="none"
-   fill-rule="evenodd"
-   transform="matrix(29.995699,0,0,29.995699,241.90437,1.6845255)"><g
-     id="Dribbble-Light-Preview"
-     transform="translate(-345,-206)"
-     fill="#000000"><g
-       id="icons"
-       transform="translate(56,160)"><polygon
-         id="plus_mini-[#1523]"
-         points="298,49 298,51 294.625,51 294.625,54 292.375,54 292.375,51 289,51 289,49 292.375,49 292.375,46 294.625,46 294.625,49 " /></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 512.002 512.002" xml:space="preserve" style="enable-background:new 0 0 512.002 512.002"><g id="g2" transform="matrix(0.76051742,-0.76051742,0.76051742,0.76051742,-160.62472,302.94989)"><path id="path1" d="m 345.114,155.163 c -13.113,-21.232 -35.755,-26.934 -50.43,-26.934 h -77.44 c -14.599,0 -37.318,5.702 -50.354,26.934 -12.022,19.752 -19.44,38.094 -23.656,54.958 -2.18,8.821 -3.507,17.252 -4.132,25.371 -3.361,40.596 10.46,71.586 15.378,93.054 1.25,5.542 3.202,12.412 5.695,20.142 2.424,7.73 5.313,16.314 8.516,25.371 12.8,36.38 29.976,79.24 37.858,97.582 15.612,36.456 35.052,40.359 49.415,40.359 14.439,0 33.879,-3.903 49.492,-40.359 11.633,-27.323 44.187,-109.292 51.993,-143.095 1.403,-6.167 3.59,-13.113 5.855,-20.843 2.264,-7.73 4.604,-16.162 6.48,-25.371 6.633,-32.553 7.181,-74.864 -24.67,-127.169 z m -57.535,127.169 c -7.021,0 -12.724,5.702 -12.724,12.724 0,6.944 5.702,12.647 12.724,12.647 h 43.18 c -1.395,4.742 -2.721,9.347 -3.735,13.814 -7.106,30.754 -38.43,110.016 -50.27,137.835 -9.179,21.422 -15.888,21.422 -20.79,21.422 -4.872,0 -11.535,0 -20.729,-21.46 -7.136,-16.62 -21.484,-52.352 -33.384,-85.255 h 18.358 c 7.029,0 12.724,-5.702 12.724,-12.647 0,-7.021 -5.695,-12.724 -12.724,-12.724 h -27.201 c -1.09,-3.294 -2.165,-6.541 -3.118,-9.582 -2.218,-6.9 -3.934,-12.922 -4.97,-17.527 -1.364,-5.954 -3.156,-12.03 -5.055,-18.456 -5.504,-18.632 -11.74,-39.75 -9.628,-65.236 0.061,-0.792 0.214,-1.6 0.29,-2.394 h 67.248 c 7.029,0 12.647,-5.702 12.647,-12.724 0,-6.945 -5.618,-12.648 -12.647,-12.648 H 175.78 c 3.957,-12.686 9.827,-25.653 17.725,-38.621 7.037,-11.466 21.011,-12.045 23.74,-12.045 h 77.44 c 3.842,0 16.917,0.877 23.763,11.946 27.94,45.887 25.76,80.055 20.736,104.702 -0.442,2.158 -0.968,4.155 -1.456,6.229 z" class="st0" style="fill:#000"/><polygon id="polygon1" points="259.501 20.515 260.545 71.822 248.836 71.822 248.836 0 210.062 3.423 213.965 36.478 224.371 75.245 216.565 78.668 197.049 31.927 169.718 42.189 194.7 110.588 315.451 110.588 336.263 50.163 305.036 47.876 298.534 87.786 288.127 85.506 292.031 25.082" class="st0" style="fill:#000"/></g><circle id="path2" cx="521.887" cy="45.192" r=".004" style="fill:#000;stroke:#000;stroke-width:.2"/><g id="Page-1" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1" transform="matrix(29.995699,0,0,29.995699,241.90437,1.6845255)"><g id="Dribbble-Light-Preview" fill="#000" transform="translate(-345,-206)"><g id="icons" transform="translate(56,160)"><polygon id="plus_mini-[#1523]" points="298 49 298 51 294.625 51 294.625 54 292.375 54 292.375 51 289 51 289 49 292.375 49 292.375 46 294.625 46 294.625 49"/></g></g></g></svg>
\ No newline at end of file
diff --git a/assets/icons/ingredient-check.svg b/assets/icons/ingredient-check.svg
index e66e14f5..b8fbb224 100644
--- a/assets/icons/ingredient-check.svg
+++ b/assets/icons/ingredient-check.svg
@@ -1,65 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<!-- License: CC0. Made by SVG Repo: https://www.svgrepo.com/svg/150226/meal -->
-
-<svg
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   viewBox="0 0 512.002 512.002"
-   style="enable-background:new 0 0 512.002 512.002;"
-   xml:space="preserve"
-   sodipodi:docname="ingredient-check.svg"
-   inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"><defs
-   id="defs8">
-	
-</defs><sodipodi:namedview
-   id="namedview8"
-   pagecolor="#ffffff"
-   bordercolor="#000000"
-   borderopacity="0.25"
-   inkscape:showpageshadow="2"
-   inkscape:pageopacity="0.0"
-   inkscape:pagecheckerboard="0"
-   inkscape:deskcolor="#d1d1d1"
-   inkscape:zoom="1.7363213"
-   inkscape:cx="274.43077"
-   inkscape:cy="257.15287"
-   inkscape:window-width="1920"
-   inkscape:window-height="1155"
-   inkscape:window-x="0"
-   inkscape:window-y="45"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="Layer_1" />
-
-<g
-   id="g2"
-   transform="matrix(0.76051742,-0.76051742,0.76051742,0.76051742,-160.62472,302.94989)">
-	<path
-   class="st0"
-   d="m 345.114,155.163 c -13.113,-21.232 -35.755,-26.934 -50.43,-26.934 h -77.44 c -14.599,0 -37.318,5.702 -50.354,26.934 -12.022,19.752 -19.44,38.094 -23.656,54.958 -2.18,8.821 -3.507,17.252 -4.132,25.371 -3.361,40.596 10.46,71.586 15.378,93.054 1.25,5.542 3.202,12.412 5.695,20.142 2.424,7.73 5.313,16.314 8.516,25.371 12.8,36.38 29.976,79.24 37.858,97.582 15.612,36.456 35.052,40.359 49.415,40.359 14.439,0 33.879,-3.903 49.492,-40.359 11.633,-27.323 44.187,-109.292 51.993,-143.095 1.403,-6.167 3.59,-13.113 5.855,-20.843 2.264,-7.73 4.604,-16.162 6.48,-25.371 6.633,-32.553 7.181,-74.864 -24.67,-127.169 z m -57.535,127.169 c -7.021,0 -12.724,5.702 -12.724,12.724 0,6.944 5.702,12.647 12.724,12.647 h 43.18 c -1.395,4.742 -2.721,9.347 -3.735,13.814 -7.106,30.754 -38.43,110.016 -50.27,137.835 -9.179,21.422 -15.888,21.422 -20.79,21.422 -4.872,0 -11.535,0 -20.729,-21.46 -7.136,-16.62 -21.484,-52.352 -33.384,-85.255 h 18.358 c 7.029,0 12.724,-5.702 12.724,-12.647 0,-7.021 -5.695,-12.724 -12.724,-12.724 h -27.201 c -1.09,-3.294 -2.165,-6.541 -3.118,-9.582 -2.218,-6.9 -3.934,-12.922 -4.97,-17.527 -1.364,-5.954 -3.156,-12.03 -5.055,-18.456 -5.504,-18.632 -11.74,-39.75 -9.628,-65.236 0.061,-0.792 0.214,-1.6 0.29,-2.394 h 67.248 c 7.029,0 12.647,-5.702 12.647,-12.724 0,-6.945 -5.618,-12.648 -12.647,-12.648 H 175.78 c 3.957,-12.686 9.827,-25.653 17.725,-38.621 7.037,-11.466 21.011,-12.045 23.74,-12.045 h 77.44 c 3.842,0 16.917,0.877 23.763,11.946 27.94,45.887 25.76,80.055 20.736,104.702 -0.442,2.158 -0.968,4.155 -1.456,6.229 z"
-   id="path1"
-   style="fill:#000000" />
-	<polygon
-   class="st0"
-   points="259.501,20.515 260.545,71.822 248.836,71.822 248.836,0 210.062,3.423 213.965,36.478 224.371,75.245 216.565,78.668 197.049,31.927 169.718,42.189 194.7,110.588 315.451,110.588 336.263,50.163 305.036,47.876 298.534,87.786 288.127,85.506 292.031,25.082 "
-   id="polygon1"
-   style="fill:#000000" />
-</g><circle
-   id="path2"
-   style="fill:#000000;stroke:#000000;stroke-width:0.2"
-   cx="521.88666"
-   cy="45.191727"
-   r="0.0043425169" /><path
-   clip-rule="evenodd"
-   d="M 515.875,51.622857 349.49393,218.00373 253.80627,122.31651 303.7942,72.328499 349.49393,118.02824 465.88752,1.6348403 Z"
-   fill="#030708"
-   fill-rule="evenodd"
-   id="path1-3"
-   style="stroke-width:17.6734" /></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 512.002 512.002" xml:space="preserve" style="enable-background:new 0 0 512.002 512.002"><g id="g2" transform="matrix(0.76051742,-0.76051742,0.76051742,0.76051742,-160.62472,302.94989)"><path id="path1" d="m 345.114,155.163 c -13.113,-21.232 -35.755,-26.934 -50.43,-26.934 h -77.44 c -14.599,0 -37.318,5.702 -50.354,26.934 -12.022,19.752 -19.44,38.094 -23.656,54.958 -2.18,8.821 -3.507,17.252 -4.132,25.371 -3.361,40.596 10.46,71.586 15.378,93.054 1.25,5.542 3.202,12.412 5.695,20.142 2.424,7.73 5.313,16.314 8.516,25.371 12.8,36.38 29.976,79.24 37.858,97.582 15.612,36.456 35.052,40.359 49.415,40.359 14.439,0 33.879,-3.903 49.492,-40.359 11.633,-27.323 44.187,-109.292 51.993,-143.095 1.403,-6.167 3.59,-13.113 5.855,-20.843 2.264,-7.73 4.604,-16.162 6.48,-25.371 6.633,-32.553 7.181,-74.864 -24.67,-127.169 z m -57.535,127.169 c -7.021,0 -12.724,5.702 -12.724,12.724 0,6.944 5.702,12.647 12.724,12.647 h 43.18 c -1.395,4.742 -2.721,9.347 -3.735,13.814 -7.106,30.754 -38.43,110.016 -50.27,137.835 -9.179,21.422 -15.888,21.422 -20.79,21.422 -4.872,0 -11.535,0 -20.729,-21.46 -7.136,-16.62 -21.484,-52.352 -33.384,-85.255 h 18.358 c 7.029,0 12.724,-5.702 12.724,-12.647 0,-7.021 -5.695,-12.724 -12.724,-12.724 h -27.201 c -1.09,-3.294 -2.165,-6.541 -3.118,-9.582 -2.218,-6.9 -3.934,-12.922 -4.97,-17.527 -1.364,-5.954 -3.156,-12.03 -5.055,-18.456 -5.504,-18.632 -11.74,-39.75 -9.628,-65.236 0.061,-0.792 0.214,-1.6 0.29,-2.394 h 67.248 c 7.029,0 12.647,-5.702 12.647,-12.724 0,-6.945 -5.618,-12.648 -12.647,-12.648 H 175.78 c 3.957,-12.686 9.827,-25.653 17.725,-38.621 7.037,-11.466 21.011,-12.045 23.74,-12.045 h 77.44 c 3.842,0 16.917,0.877 23.763,11.946 27.94,45.887 25.76,80.055 20.736,104.702 -0.442,2.158 -0.968,4.155 -1.456,6.229 z" class="st0" style="fill:#000"/><polygon id="polygon1" points="259.501 20.515 260.545 71.822 248.836 71.822 248.836 0 210.062 3.423 213.965 36.478 224.371 75.245 216.565 78.668 197.049 31.927 169.718 42.189 194.7 110.588 315.451 110.588 336.263 50.163 305.036 47.876 298.534 87.786 288.127 85.506 292.031 25.082" class="st0" style="fill:#000"/></g><circle id="path2" cx="521.887" cy="45.192" r=".004" style="fill:#000;stroke:#000;stroke-width:.2"/><path id="path1-3" fill="#030708" fill-rule="evenodd" d="M 515.875,51.622857 349.49393,218.00373 253.80627,122.31651 303.7942,72.328499 349.49393,118.02824 465.88752,1.6348403 Z" clip-rule="evenodd" style="stroke-width:17.6734"/></svg>
\ No newline at end of file
diff --git a/assets/icons/ingredient-diary.svg b/assets/icons/ingredient-diary.svg
index f99aa57f..120f1e0b 100644
--- a/assets/icons/ingredient-diary.svg
+++ b/assets/icons/ingredient-diary.svg
@@ -1,86 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<!-- License: CC0. Made by SVG Repo: https://www.svgrepo.com/svg/150226/meal -->
-
-<svg
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   viewBox="0 0 512.002 512.002"
-   style="enable-background:new 0 0 512.002 512.002;"
-   xml:space="preserve"
-   sodipodi:docname="ingredient-diary.svg"
-   inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"><defs
-   id="defs8">
-	
-</defs><sodipodi:namedview
-   id="namedview8"
-   pagecolor="#ffffff"
-   bordercolor="#000000"
-   borderopacity="0.25"
-   inkscape:showpageshadow="2"
-   inkscape:pageopacity="0.0"
-   inkscape:pagecheckerboard="0"
-   inkscape:deskcolor="#d1d1d1"
-   inkscape:zoom="1.7363213"
-   inkscape:cx="256.57694"
-   inkscape:cy="257.15287"
-   inkscape:window-width="1920"
-   inkscape:window-height="1155"
-   inkscape:window-x="0"
-   inkscape:window-y="45"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="Layer_1" />
-
-<g
-   id="g2"
-   transform="matrix(0.76051742,-0.76051742,0.76051742,0.76051742,-160.62472,302.94989)">
-	<path
-   class="st0"
-   d="m 345.114,155.163 c -13.113,-21.232 -35.755,-26.934 -50.43,-26.934 h -77.44 c -14.599,0 -37.318,5.702 -50.354,26.934 -12.022,19.752 -19.44,38.094 -23.656,54.958 -2.18,8.821 -3.507,17.252 -4.132,25.371 -3.361,40.596 10.46,71.586 15.378,93.054 1.25,5.542 3.202,12.412 5.695,20.142 2.424,7.73 5.313,16.314 8.516,25.371 12.8,36.38 29.976,79.24 37.858,97.582 15.612,36.456 35.052,40.359 49.415,40.359 14.439,0 33.879,-3.903 49.492,-40.359 11.633,-27.323 44.187,-109.292 51.993,-143.095 1.403,-6.167 3.59,-13.113 5.855,-20.843 2.264,-7.73 4.604,-16.162 6.48,-25.371 6.633,-32.553 7.181,-74.864 -24.67,-127.169 z m -57.535,127.169 c -7.021,0 -12.724,5.702 -12.724,12.724 0,6.944 5.702,12.647 12.724,12.647 h 43.18 c -1.395,4.742 -2.721,9.347 -3.735,13.814 -7.106,30.754 -38.43,110.016 -50.27,137.835 -9.179,21.422 -15.888,21.422 -20.79,21.422 -4.872,0 -11.535,0 -20.729,-21.46 -7.136,-16.62 -21.484,-52.352 -33.384,-85.255 h 18.358 c 7.029,0 12.724,-5.702 12.724,-12.647 0,-7.021 -5.695,-12.724 -12.724,-12.724 h -27.201 c -1.09,-3.294 -2.165,-6.541 -3.118,-9.582 -2.218,-6.9 -3.934,-12.922 -4.97,-17.527 -1.364,-5.954 -3.156,-12.03 -5.055,-18.456 -5.504,-18.632 -11.74,-39.75 -9.628,-65.236 0.061,-0.792 0.214,-1.6 0.29,-2.394 h 67.248 c 7.029,0 12.647,-5.702 12.647,-12.724 0,-6.945 -5.618,-12.648 -12.647,-12.648 H 175.78 c 3.957,-12.686 9.827,-25.653 17.725,-38.621 7.037,-11.466 21.011,-12.045 23.74,-12.045 h 77.44 c 3.842,0 16.917,0.877 23.763,11.946 27.94,45.887 25.76,80.055 20.736,104.702 -0.442,2.158 -0.968,4.155 -1.456,6.229 z"
-   id="path1"
-   style="fill:#000000" />
-	<polygon
-   class="st0"
-   points="259.501,20.515 260.545,71.822 248.836,71.822 248.836,0 210.062,3.423 213.965,36.478 224.371,75.245 216.565,78.668 197.049,31.927 169.718,42.189 194.7,110.588 315.451,110.588 336.263,50.163 305.036,47.876 298.534,87.786 288.127,85.506 292.031,25.082 "
-   id="polygon1"
-   style="fill:#000000" />
-</g><circle
-   id="path2"
-   style="fill:#000000;stroke:#000000;stroke-width:0.2"
-   cx="521.88666"
-   cy="45.191727"
-   r="0.0043425169" /><g
-   id="g8-6"
-   transform="matrix(0.4527684,0,0,0.4527684,296.76275,1.8149751)">
-	<g
-   id="g7-7">
-		<g
-   id="g6-5">
-			<path
-   d="m 380.68,372.453 c -13.938,0 -25.284,11.342 -25.284,25.301 v 54.441 l 80.034,-79.742 z"
-   id="path1-3" />
-			<path
-   d="m 433.745,492.197 c 23.156,0 41.912,-18.76 41.912,-41.898 V 379.285 L 362.338,492.197 Z"
-   id="path2-5" />
-			<path
-   d="M 433.745,0 H 100.255 C 77.537,0 59.15,18.11 58.486,40.653 h 39.691 c 9.479,-7.013 21.051,-10.876 33.139,-10.876 30.785,0 55.84,25.055 55.84,55.84 0,30.784 -25.055,55.826 -55.84,55.826 -11.992,0 -23.527,-3.863 -33.059,-10.84 H 58.355 v 70.543 h 39.822 c 9.479,-7.008 21.051,-10.871 33.139,-10.871 30.785,0 55.84,25.055 55.84,55.84 0,30.783 -25.055,55.84 -55.84,55.84 -11.992,0 -23.547,-3.859 -33.072,-10.854 H 58.355 v 70.543 h 39.822 c 9.492,-6.995 21.064,-10.857 33.139,-10.857 30.785,0 55.84,25.042 55.84,55.825 0,30.784 -25.055,55.84 -55.84,55.84 -11.992,0 -23.527,-3.861 -33.059,-10.84 h -39.77 c 0.715,22.524 19.082,40.586 41.77,40.586 h 221.904 v -94.445 c 0,-32.281 26.258,-58.537 58.52,-58.537 H 475.66 V 41.901 C 475.659,18.761 456.903,0 433.745,0 Z"
-   id="path3-6" />
-			<path
-   d="m 36.577,105.68 h 71.213 c 5.68,6.588 14.115,10.84 23.527,10.84 17.07,0 30.916,-13.827 30.916,-30.902 0,-17.071 -13.846,-30.912 -30.916,-30.912 -9.412,0 -17.848,4.14 -23.527,10.872 H 36.577 c -11.066,0 -20.039,8.974 -20.039,20.04 -0.001,11.101 8.972,20.062 20.039,20.062 z"
-   id="path4-2" />
-			<path
-   d="m 36.577,266.172 h 71.213 c 5.68,6.606 14.115,10.858 23.527,10.858 17.07,0 30.916,-13.846 30.916,-30.915 0,-17.072 -13.846,-30.916 -30.916,-30.916 -9.412,0 -17.848,4.139 -23.527,10.875 H 36.577 c -11.066,0 -20.039,8.975 -20.039,20.059 0,11.084 8.972,20.039 20.039,20.039 z"
-   id="path5-9" />
-			<path
-   d="m 131.316,437.523 c 17.07,0 30.916,-13.839 30.916,-30.91 0,-17.074 -13.846,-30.902 -30.916,-30.902 -9.412,0 -17.848,4.141 -23.527,10.857 H 36.577 c -11.066,0 -20.039,8.975 -20.039,20.059 0,11.084 8.973,20.06 20.039,20.06 h 71.213 c 5.679,6.584 14.115,10.836 23.526,10.836 z"
-   id="path6-1" />
-		</g>
-	</g>
-</g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 512.002 512.002" xml:space="preserve" style="enable-background:new 0 0 512.002 512.002"><g id="g2" transform="matrix(0.76051742,-0.76051742,0.76051742,0.76051742,-160.62472,302.94989)"><path id="path1" d="m 345.114,155.163 c -13.113,-21.232 -35.755,-26.934 -50.43,-26.934 h -77.44 c -14.599,0 -37.318,5.702 -50.354,26.934 -12.022,19.752 -19.44,38.094 -23.656,54.958 -2.18,8.821 -3.507,17.252 -4.132,25.371 -3.361,40.596 10.46,71.586 15.378,93.054 1.25,5.542 3.202,12.412 5.695,20.142 2.424,7.73 5.313,16.314 8.516,25.371 12.8,36.38 29.976,79.24 37.858,97.582 15.612,36.456 35.052,40.359 49.415,40.359 14.439,0 33.879,-3.903 49.492,-40.359 11.633,-27.323 44.187,-109.292 51.993,-143.095 1.403,-6.167 3.59,-13.113 5.855,-20.843 2.264,-7.73 4.604,-16.162 6.48,-25.371 6.633,-32.553 7.181,-74.864 -24.67,-127.169 z m -57.535,127.169 c -7.021,0 -12.724,5.702 -12.724,12.724 0,6.944 5.702,12.647 12.724,12.647 h 43.18 c -1.395,4.742 -2.721,9.347 -3.735,13.814 -7.106,30.754 -38.43,110.016 -50.27,137.835 -9.179,21.422 -15.888,21.422 -20.79,21.422 -4.872,0 -11.535,0 -20.729,-21.46 -7.136,-16.62 -21.484,-52.352 -33.384,-85.255 h 18.358 c 7.029,0 12.724,-5.702 12.724,-12.647 0,-7.021 -5.695,-12.724 -12.724,-12.724 h -27.201 c -1.09,-3.294 -2.165,-6.541 -3.118,-9.582 -2.218,-6.9 -3.934,-12.922 -4.97,-17.527 -1.364,-5.954 -3.156,-12.03 -5.055,-18.456 -5.504,-18.632 -11.74,-39.75 -9.628,-65.236 0.061,-0.792 0.214,-1.6 0.29,-2.394 h 67.248 c 7.029,0 12.647,-5.702 12.647,-12.724 0,-6.945 -5.618,-12.648 -12.647,-12.648 H 175.78 c 3.957,-12.686 9.827,-25.653 17.725,-38.621 7.037,-11.466 21.011,-12.045 23.74,-12.045 h 77.44 c 3.842,0 16.917,0.877 23.763,11.946 27.94,45.887 25.76,80.055 20.736,104.702 -0.442,2.158 -0.968,4.155 -1.456,6.229 z" class="st0" style="fill:#000"/><polygon id="polygon1" points="259.501 20.515 260.545 71.822 248.836 71.822 248.836 0 210.062 3.423 213.965 36.478 224.371 75.245 216.565 78.668 197.049 31.927 169.718 42.189 194.7 110.588 315.451 110.588 336.263 50.163 305.036 47.876 298.534 87.786 288.127 85.506 292.031 25.082" class="st0" style="fill:#000"/></g><circle id="path2" cx="521.887" cy="45.192" r=".004" style="fill:#000;stroke:#000;stroke-width:.2"/><g id="g8-6" transform="matrix(0.4527684,0,0,0.4527684,296.76275,1.8149751)"><g id="g7-7"><g id="g6-5"><path id="path1-3" d="m 380.68,372.453 c -13.938,0 -25.284,11.342 -25.284,25.301 v 54.441 l 80.034,-79.742 z"/><path id="path2-5" d="m 433.745,492.197 c 23.156,0 41.912,-18.76 41.912,-41.898 V 379.285 L 362.338,492.197 Z"/><path id="path3-6" d="M 433.745,0 H 100.255 C 77.537,0 59.15,18.11 58.486,40.653 h 39.691 c 9.479,-7.013 21.051,-10.876 33.139,-10.876 30.785,0 55.84,25.055 55.84,55.84 0,30.784 -25.055,55.826 -55.84,55.826 -11.992,0 -23.527,-3.863 -33.059,-10.84 H 58.355 v 70.543 h 39.822 c 9.479,-7.008 21.051,-10.871 33.139,-10.871 30.785,0 55.84,25.055 55.84,55.84 0,30.783 -25.055,55.84 -55.84,55.84 -11.992,0 -23.547,-3.859 -33.072,-10.854 H 58.355 v 70.543 h 39.822 c 9.492,-6.995 21.064,-10.857 33.139,-10.857 30.785,0 55.84,25.042 55.84,55.825 0,30.784 -25.055,55.84 -55.84,55.84 -11.992,0 -23.527,-3.861 -33.059,-10.84 h -39.77 c 0.715,22.524 19.082,40.586 41.77,40.586 h 221.904 v -94.445 c 0,-32.281 26.258,-58.537 58.52,-58.537 H 475.66 V 41.901 C 475.659,18.761 456.903,0 433.745,0 Z"/><path id="path4-2" d="m 36.577,105.68 h 71.213 c 5.68,6.588 14.115,10.84 23.527,10.84 17.07,0 30.916,-13.827 30.916,-30.902 0,-17.071 -13.846,-30.912 -30.916,-30.912 -9.412,0 -17.848,4.14 -23.527,10.872 H 36.577 c -11.066,0 -20.039,8.974 -20.039,20.04 -0.001,11.101 8.972,20.062 20.039,20.062 z"/><path id="path5-9" d="m 36.577,266.172 h 71.213 c 5.68,6.606 14.115,10.858 23.527,10.858 17.07,0 30.916,-13.846 30.916,-30.915 0,-17.072 -13.846,-30.916 -30.916,-30.916 -9.412,0 -17.848,4.139 -23.527,10.875 H 36.577 c -11.066,0 -20.039,8.975 -20.039,20.059 0,11.084 8.972,20.039 20.039,20.039 z"/><path id="path6-1" d="m 131.316,437.523 c 17.07,0 30.916,-13.839 30.916,-30.91 0,-17.074 -13.846,-30.902 -30.916,-30.902 -9.412,0 -17.848,4.141 -23.527,10.857 H 36.577 c -11.066,0 -20.039,8.975 -20.039,20.059 0,11.084 8.973,20.06 20.039,20.06 h 71.213 c 5.679,6.584 14.115,10.836 23.526,10.836 z"/></g></g></g></svg>
\ No newline at end of file
diff --git a/assets/icons/ingredient-edit.svg b/assets/icons/ingredient-edit.svg
index 28634547..8d9ef593 100644
--- a/assets/icons/ingredient-edit.svg
+++ b/assets/icons/ingredient-edit.svg
@@ -1,68 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<!-- License: CC0. Made by SVG Repo: https://www.svgrepo.com/svg/150226/meal -->
-
-<svg
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   viewBox="0 0 512.002 512.002"
-   style="enable-background:new 0 0 512.002 512.002;"
-   xml:space="preserve"
-   sodipodi:docname="ingredient-write.svg"
-   inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"><defs
-   id="defs8">
-	
-</defs><sodipodi:namedview
-   id="namedview8"
-   pagecolor="#ffffff"
-   bordercolor="#000000"
-   borderopacity="0.25"
-   inkscape:showpageshadow="2"
-   inkscape:pageopacity="0.0"
-   inkscape:pagecheckerboard="0"
-   inkscape:deskcolor="#d1d1d1"
-   inkscape:zoom="1.7363213"
-   inkscape:cx="256.57694"
-   inkscape:cy="256.57694"
-   inkscape:window-width="1920"
-   inkscape:window-height="1155"
-   inkscape:window-x="0"
-   inkscape:window-y="45"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="Layer_1" />
-
-<g
-   id="g2"
-   transform="matrix(0.76051742,-0.76051742,0.76051742,0.76051742,-160.62472,302.94989)">
-	<path
-   class="st0"
-   d="m 345.114,155.163 c -13.113,-21.232 -35.755,-26.934 -50.43,-26.934 h -77.44 c -14.599,0 -37.318,5.702 -50.354,26.934 -12.022,19.752 -19.44,38.094 -23.656,54.958 -2.18,8.821 -3.507,17.252 -4.132,25.371 -3.361,40.596 10.46,71.586 15.378,93.054 1.25,5.542 3.202,12.412 5.695,20.142 2.424,7.73 5.313,16.314 8.516,25.371 12.8,36.38 29.976,79.24 37.858,97.582 15.612,36.456 35.052,40.359 49.415,40.359 14.439,0 33.879,-3.903 49.492,-40.359 11.633,-27.323 44.187,-109.292 51.993,-143.095 1.403,-6.167 3.59,-13.113 5.855,-20.843 2.264,-7.73 4.604,-16.162 6.48,-25.371 6.633,-32.553 7.181,-74.864 -24.67,-127.169 z m -57.535,127.169 c -7.021,0 -12.724,5.702 -12.724,12.724 0,6.944 5.702,12.647 12.724,12.647 h 43.18 c -1.395,4.742 -2.721,9.347 -3.735,13.814 -7.106,30.754 -38.43,110.016 -50.27,137.835 -9.179,21.422 -15.888,21.422 -20.79,21.422 -4.872,0 -11.535,0 -20.729,-21.46 -7.136,-16.62 -21.484,-52.352 -33.384,-85.255 h 18.358 c 7.029,0 12.724,-5.702 12.724,-12.647 0,-7.021 -5.695,-12.724 -12.724,-12.724 h -27.201 c -1.09,-3.294 -2.165,-6.541 -3.118,-9.582 -2.218,-6.9 -3.934,-12.922 -4.97,-17.527 -1.364,-5.954 -3.156,-12.03 -5.055,-18.456 -5.504,-18.632 -11.74,-39.75 -9.628,-65.236 0.061,-0.792 0.214,-1.6 0.29,-2.394 h 67.248 c 7.029,0 12.647,-5.702 12.647,-12.724 0,-6.945 -5.618,-12.648 -12.647,-12.648 H 175.78 c 3.957,-12.686 9.827,-25.653 17.725,-38.621 7.037,-11.466 21.011,-12.045 23.74,-12.045 h 77.44 c 3.842,0 16.917,0.877 23.763,11.946 27.94,45.887 25.76,80.055 20.736,104.702 -0.442,2.158 -0.968,4.155 -1.456,6.229 z"
-   id="path1"
-   style="fill:#000000" />
-	<polygon
-   class="st0"
-   points="259.501,20.515 260.545,71.822 248.836,71.822 248.836,0 210.062,3.423 213.965,36.478 224.371,75.245 216.565,78.668 197.049,31.927 169.718,42.189 194.7,110.588 315.451,110.588 336.263,50.163 305.036,47.876 298.534,87.786 288.127,85.506 292.031,25.082 "
-   id="polygon1"
-   style="fill:#000000" />
-</g><circle
-   id="path2"
-   style="fill:#000000;stroke:#000000;stroke-width:0.2"
-   cx="521.88666"
-   cy="45.191727"
-   r="0.0043425169" /><path
-   d="M 576,657 H -64 c -24,0 -40,-16 -40,-40 0,-24 16,-40 40,-40 h 640 c 24,0 40,16 40,40 0,24 -16,40 -40,40 z"
-   id="path1-3"
-   style="stroke-width:40" /><g
-   id="g2-7"
-   transform="matrix(0,-3.2840933,3.2840933,0,211.59523,296.53997)">
-	<path
-   d="M 88.79,29.297 70.702,11.209 c -1.052,-1.052 -2.756,-1.052 -3.808,0 l -49.505,49.504 0.109,0.109 -0.171,-0.046 -6.772,25.272 0.004,0.001 c -0.309,0.935 -0.103,2.004 0.642,2.748 0.822,0.822 2.038,0.993 3.033,0.531 l 0.002,0.009 25.027,-6.706 -0.016,-0.059 0.038,0.038 49.505,-49.505 c 1.052,-1.052 1.052,-2.756 0,-3.808 z m -69.998,51.85 4.022,-15.009 10.988,10.988 z"
-   id="path1-5" />
-</g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 512.002 512.002" xml:space="preserve" style="enable-background:new 0 0 512.002 512.002"><g id="g2" transform="matrix(0.76051742,-0.76051742,0.76051742,0.76051742,-160.62472,302.94989)"><path id="path1" d="m 345.114,155.163 c -13.113,-21.232 -35.755,-26.934 -50.43,-26.934 h -77.44 c -14.599,0 -37.318,5.702 -50.354,26.934 -12.022,19.752 -19.44,38.094 -23.656,54.958 -2.18,8.821 -3.507,17.252 -4.132,25.371 -3.361,40.596 10.46,71.586 15.378,93.054 1.25,5.542 3.202,12.412 5.695,20.142 2.424,7.73 5.313,16.314 8.516,25.371 12.8,36.38 29.976,79.24 37.858,97.582 15.612,36.456 35.052,40.359 49.415,40.359 14.439,0 33.879,-3.903 49.492,-40.359 11.633,-27.323 44.187,-109.292 51.993,-143.095 1.403,-6.167 3.59,-13.113 5.855,-20.843 2.264,-7.73 4.604,-16.162 6.48,-25.371 6.633,-32.553 7.181,-74.864 -24.67,-127.169 z m -57.535,127.169 c -7.021,0 -12.724,5.702 -12.724,12.724 0,6.944 5.702,12.647 12.724,12.647 h 43.18 c -1.395,4.742 -2.721,9.347 -3.735,13.814 -7.106,30.754 -38.43,110.016 -50.27,137.835 -9.179,21.422 -15.888,21.422 -20.79,21.422 -4.872,0 -11.535,0 -20.729,-21.46 -7.136,-16.62 -21.484,-52.352 -33.384,-85.255 h 18.358 c 7.029,0 12.724,-5.702 12.724,-12.647 0,-7.021 -5.695,-12.724 -12.724,-12.724 h -27.201 c -1.09,-3.294 -2.165,-6.541 -3.118,-9.582 -2.218,-6.9 -3.934,-12.922 -4.97,-17.527 -1.364,-5.954 -3.156,-12.03 -5.055,-18.456 -5.504,-18.632 -11.74,-39.75 -9.628,-65.236 0.061,-0.792 0.214,-1.6 0.29,-2.394 h 67.248 c 7.029,0 12.647,-5.702 12.647,-12.724 0,-6.945 -5.618,-12.648 -12.647,-12.648 H 175.78 c 3.957,-12.686 9.827,-25.653 17.725,-38.621 7.037,-11.466 21.011,-12.045 23.74,-12.045 h 77.44 c 3.842,0 16.917,0.877 23.763,11.946 27.94,45.887 25.76,80.055 20.736,104.702 -0.442,2.158 -0.968,4.155 -1.456,6.229 z" class="st0" style="fill:#000"/><polygon id="polygon1" points="259.501 20.515 260.545 71.822 248.836 71.822 248.836 0 210.062 3.423 213.965 36.478 224.371 75.245 216.565 78.668 197.049 31.927 169.718 42.189 194.7 110.588 315.451 110.588 336.263 50.163 305.036 47.876 298.534 87.786 288.127 85.506 292.031 25.082" class="st0" style="fill:#000"/></g><circle id="path2" cx="521.887" cy="45.192" r=".004" style="fill:#000;stroke:#000;stroke-width:.2"/><path id="path1-3" d="M 576,657 H -64 c -24,0 -40,-16 -40,-40 0,-24 16,-40 40,-40 h 640 c 24,0 40,16 40,40 0,24 -16,40 -40,40 z" style="stroke-width:40"/><g id="g2-7" transform="matrix(0,-3.2840933,3.2840933,0,211.59523,296.53997)"><path id="path1-5" d="M 88.79,29.297 70.702,11.209 c -1.052,-1.052 -2.756,-1.052 -3.808,0 l -49.505,49.504 0.109,0.109 -0.171,-0.046 -6.772,25.272 0.004,0.001 c -0.309,0.935 -0.103,2.004 0.642,2.748 0.822,0.822 2.038,0.993 3.033,0.531 l 0.002,0.009 25.027,-6.706 -0.016,-0.059 0.038,0.038 49.505,-49.505 c 1.052,-1.052 1.052,-2.756 0,-3.808 z m -69.998,51.85 4.022,-15.009 10.988,10.988 z"/></g></svg>
\ No newline at end of file
diff --git a/assets/icons/meal-add.svg b/assets/icons/meal-add.svg
index b4539154..13559980 100644
--- a/assets/icons/meal-add.svg
+++ b/assets/icons/meal-add.svg
@@ -1,68 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<!-- License: CC0. Made by SVG Repo: https://www.svgrepo.com/svg/150226/meal -->
-
-<svg
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   viewBox="0 0 512.002 512.002"
-   style="enable-background:new 0 0 512.002 512.002;"
-   xml:space="preserve"
-   sodipodi:docname="meal-add.svg"
-   inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"><defs
-   id="defs8">
-	
-</defs><sodipodi:namedview
-   id="namedview8"
-   pagecolor="#ffffff"
-   bordercolor="#000000"
-   borderopacity="0.25"
-   inkscape:showpageshadow="2"
-   inkscape:pageopacity="0.0"
-   inkscape:pagecheckerboard="0"
-   inkscape:deskcolor="#d1d1d1"
-   inkscape:zoom="1.7363213"
-   inkscape:cx="256.00101"
-   inkscape:cy="257.15287"
-   inkscape:window-width="1920"
-   inkscape:window-height="1155"
-   inkscape:window-x="0"
-   inkscape:window-y="45"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="Layer_1" />
-
-<circle
-   id="path2"
-   style="fill:#000000;stroke:#000000;stroke-width:0.2"
-   cx="521.88666"
-   cy="45.191727"
-   r="0.0043425169" /><g
-   id="Page-1"
-   stroke="none"
-   stroke-width="1"
-   fill="none"
-   fill-rule="evenodd"
-   transform="matrix(29.995699,0,0,29.995699,241.90437,1.6845255)"><g
-     id="Dribbble-Light-Preview"
-     transform="translate(-345,-206)"
-     fill="#000000"><g
-       id="icons"
-       transform="translate(56,160)"><polygon
-         id="plus_mini-[#1523]"
-         points="298,49 298,51 294.625,51 294.625,54 292.375,54 292.375,51 289,51 289,49 292.375,49 292.375,46 294.625,46 294.625,49 " /></g></g></g><g
-   id="g3"
-   transform="matrix(0.95088529,0,0,0.95088529,6.6189799,110.996)">
-	<g
-   id="g2">
-		<path
-   d="M 494.434,315.678 H 463.697 C 455.367,216.327 377.063,136.575 278.357,126.001 283.158,110.85 271.813,95.459 256,95.459 c -15.83,0 -27.153,15.407 -22.357,30.542 -98.707,10.574 -177.01,90.327 -185.34,189.677 H 17.566 C 7.865,315.678 0,323.543 0,333.244 c 0,9.701 7.865,17.565 17.566,17.565 h 29.99 v 13.612 c 0,28.738 23.381,52.119 52.12,52.119 h 312.648 c 28.74,0 52.12,-23.381 52.12,-52.119 v -13.612 h 29.99 c 9.701,0 17.565,-7.865 17.565,-17.565 10e-4,-9.701 -7.864,-17.566 -17.565,-17.566 z M 112.028,273.83 c 15.615,-37.716 46.155,-68.42 83.79,-84.238 8.943,-3.761 19.24,0.444 22.999,9.387 3.759,8.944 -0.444,19.241 -9.387,23 -29.17,12.261 -52.841,36.057 -64.942,65.29 -3.706,8.953 -13.973,13.224 -22.949,9.51 -8.963,-3.712 -13.221,-13.987 -9.511,-22.949 z m 317.285,90.591 c 0,9.367 -7.621,16.988 -16.989,16.988 H 99.676 c -9.368,0 -16.989,-7.621 -16.989,-16.988 v -13.612 h 346.626 z"
-   id="path1" />
-	</g>
-</g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 512.002 512.002" xml:space="preserve" style="enable-background:new 0 0 512.002 512.002"><circle id="path2" cx="521.887" cy="45.192" r=".004" style="fill:#000;stroke:#000;stroke-width:.2"/><g id="Page-1" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1" transform="matrix(29.995699,0,0,29.995699,241.90437,1.6845255)"><g id="Dribbble-Light-Preview" fill="#000" transform="translate(-345,-206)"><g id="icons" transform="translate(56,160)"><polygon id="plus_mini-[#1523]" points="298 49 298 51 294.625 51 294.625 54 292.375 54 292.375 51 289 51 289 49 292.375 49 292.375 46 294.625 46 294.625 49"/></g></g></g><g id="g3" transform="matrix(0.95088529,0,0,0.95088529,6.6189799,110.996)"><g id="g2"><path id="path1" d="M 494.434,315.678 H 463.697 C 455.367,216.327 377.063,136.575 278.357,126.001 283.158,110.85 271.813,95.459 256,95.459 c -15.83,0 -27.153,15.407 -22.357,30.542 -98.707,10.574 -177.01,90.327 -185.34,189.677 H 17.566 C 7.865,315.678 0,323.543 0,333.244 c 0,9.701 7.865,17.565 17.566,17.565 h 29.99 v 13.612 c 0,28.738 23.381,52.119 52.12,52.119 h 312.648 c 28.74,0 52.12,-23.381 52.12,-52.119 v -13.612 h 29.99 c 9.701,0 17.565,-7.865 17.565,-17.565 10e-4,-9.701 -7.864,-17.566 -17.565,-17.566 z M 112.028,273.83 c 15.615,-37.716 46.155,-68.42 83.79,-84.238 8.943,-3.761 19.24,0.444 22.999,9.387 3.759,8.944 -0.444,19.241 -9.387,23 -29.17,12.261 -52.841,36.057 -64.942,65.29 -3.706,8.953 -13.973,13.224 -22.949,9.51 -8.963,-3.712 -13.221,-13.987 -9.511,-22.949 z m 317.285,90.591 c 0,9.367 -7.621,16.988 -16.989,16.988 H 99.676 c -9.368,0 -16.989,-7.621 -16.989,-16.988 v -13.612 h 346.626 z"/></g></g></svg>
\ No newline at end of file
diff --git a/assets/icons/meal-check.svg b/assets/icons/meal-check.svg
index a0975410..ad9b5c2a 100644
--- a/assets/icons/meal-check.svg
+++ b/assets/icons/meal-check.svg
@@ -1,61 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<!-- License: CC0. Made by SVG Repo: https://www.svgrepo.com/svg/150226/meal -->
-
-<svg
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   viewBox="0 0 512.002 512.002"
-   style="enable-background:new 0 0 512.002 512.002;"
-   xml:space="preserve"
-   sodipodi:docname="meal-check.svg"
-   inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"><defs
-   id="defs8">
-	
-</defs><sodipodi:namedview
-   id="namedview8"
-   pagecolor="#ffffff"
-   bordercolor="#000000"
-   borderopacity="0.25"
-   inkscape:showpageshadow="2"
-   inkscape:pageopacity="0.0"
-   inkscape:pagecheckerboard="0"
-   inkscape:deskcolor="#d1d1d1"
-   inkscape:zoom="1.7363213"
-   inkscape:cx="274.43077"
-   inkscape:cy="257.7288"
-   inkscape:window-width="1920"
-   inkscape:window-height="1155"
-   inkscape:window-x="0"
-   inkscape:window-y="45"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="Layer_1" />
-
-<circle
-   id="path2"
-   style="fill:#000000;stroke:#000000;stroke-width:0.2"
-   cx="521.88666"
-   cy="45.191727"
-   r="0.0043425169" /><path
-   clip-rule="evenodd"
-   d="M 515.875,51.622857 349.49393,218.00373 253.80627,122.31651 303.7942,72.328499 349.49393,118.02824 465.88752,1.6348403 Z"
-   fill="#030708"
-   fill-rule="evenodd"
-   id="path1-3"
-   style="stroke-width:17.6734" /><g
-   id="g3"
-   transform="matrix(0.96951671,0,0,0.95088529,8.306314,109.89053)">
-	<g
-   id="g2">
-		<path
-   d="M 494.434,315.678 H 463.697 C 455.367,216.327 377.063,136.575 278.357,126.001 283.158,110.85 271.813,95.459 256,95.459 c -15.83,0 -27.153,15.407 -22.357,30.542 -98.707,10.574 -177.01,90.327 -185.34,189.677 H 17.566 C 7.865,315.678 0,323.543 0,333.244 c 0,9.701 7.865,17.565 17.566,17.565 h 29.99 v 13.612 c 0,28.738 23.381,52.119 52.12,52.119 h 312.648 c 28.74,0 52.12,-23.381 52.12,-52.119 v -13.612 h 29.99 c 9.701,0 17.565,-7.865 17.565,-17.565 10e-4,-9.701 -7.864,-17.566 -17.565,-17.566 z M 112.028,273.83 c 15.615,-37.716 46.155,-68.42 83.79,-84.238 8.943,-3.761 19.24,0.444 22.999,9.387 3.759,8.944 -0.444,19.241 -9.387,23 -29.17,12.261 -52.841,36.057 -64.942,65.29 -3.706,8.953 -13.973,13.224 -22.949,9.51 -8.963,-3.712 -13.221,-13.987 -9.511,-22.949 z m 317.285,90.591 c 0,9.367 -7.621,16.988 -16.989,16.988 H 99.676 c -9.368,0 -16.989,-7.621 -16.989,-16.988 v -13.612 h 346.626 z"
-   id="path1" />
-	</g>
-</g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 512.002 512.002" xml:space="preserve" style="enable-background:new 0 0 512.002 512.002"><circle id="path2" cx="521.887" cy="45.192" r=".004" style="fill:#000;stroke:#000;stroke-width:.2"/><path id="path1-3" fill="#030708" fill-rule="evenodd" d="M 515.875,51.622857 349.49393,218.00373 253.80627,122.31651 303.7942,72.328499 349.49393,118.02824 465.88752,1.6348403 Z" clip-rule="evenodd" style="stroke-width:17.6734"/><g id="g3" transform="matrix(0.96951671,0,0,0.95088529,8.306314,109.89053)"><g id="g2"><path id="path1" d="M 494.434,315.678 H 463.697 C 455.367,216.327 377.063,136.575 278.357,126.001 283.158,110.85 271.813,95.459 256,95.459 c -15.83,0 -27.153,15.407 -22.357,30.542 -98.707,10.574 -177.01,90.327 -185.34,189.677 H 17.566 C 7.865,315.678 0,323.543 0,333.244 c 0,9.701 7.865,17.565 17.566,17.565 h 29.99 v 13.612 c 0,28.738 23.381,52.119 52.12,52.119 h 312.648 c 28.74,0 52.12,-23.381 52.12,-52.119 v -13.612 h 29.99 c 9.701,0 17.565,-7.865 17.565,-17.565 10e-4,-9.701 -7.864,-17.566 -17.565,-17.566 z M 112.028,273.83 c 15.615,-37.716 46.155,-68.42 83.79,-84.238 8.943,-3.761 19.24,0.444 22.999,9.387 3.759,8.944 -0.444,19.241 -9.387,23 -29.17,12.261 -52.841,36.057 -64.942,65.29 -3.706,8.953 -13.973,13.224 -22.949,9.51 -8.963,-3.712 -13.221,-13.987 -9.511,-22.949 z m 317.285,90.591 c 0,9.367 -7.621,16.988 -16.989,16.988 H 99.676 c -9.368,0 -16.989,-7.621 -16.989,-16.988 v -13.612 h 346.626 z"/></g></g></svg>
\ No newline at end of file
diff --git a/assets/icons/meal-diary.svg b/assets/icons/meal-diary.svg
index c639e1d1..50167e22 100644
--- a/assets/icons/meal-diary.svg
+++ b/assets/icons/meal-diary.svg
@@ -1,82 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<!-- License: CC0. Made by SVG Repo: https://www.svgrepo.com/svg/150226/meal -->
-
-<svg
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   viewBox="0 0 512.002 512.002"
-   style="enable-background:new 0 0 512.002 512.002;"
-   xml:space="preserve"
-   sodipodi:docname="meal-diary.svg"
-   inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"><defs
-   id="defs8">
-	
-</defs><sodipodi:namedview
-   id="namedview8"
-   pagecolor="#ffffff"
-   bordercolor="#000000"
-   borderopacity="0.25"
-   inkscape:showpageshadow="2"
-   inkscape:pageopacity="0.0"
-   inkscape:pagecheckerboard="0"
-   inkscape:deskcolor="#d1d1d1"
-   inkscape:zoom="1.7363213"
-   inkscape:cx="257.15287"
-   inkscape:cy="257.7288"
-   inkscape:window-width="1920"
-   inkscape:window-height="1155"
-   inkscape:window-x="0"
-   inkscape:window-y="45"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="Layer_1" />
-
-<circle
-   id="path2"
-   style="fill:#000000;stroke:#000000;stroke-width:0.2"
-   cx="521.88666"
-   cy="45.191727"
-   r="0.0043425169" /><g
-   id="g8-6"
-   transform="matrix(0.4527684,0,0,0.4527684,296.76275,1.8149751)">
-	<g
-   id="g7-7">
-		<g
-   id="g6-5">
-			<path
-   d="m 380.68,372.453 c -13.938,0 -25.284,11.342 -25.284,25.301 v 54.441 l 80.034,-79.742 z"
-   id="path1-3" />
-			<path
-   d="m 433.745,492.197 c 23.156,0 41.912,-18.76 41.912,-41.898 V 379.285 L 362.338,492.197 Z"
-   id="path2-5" />
-			<path
-   d="M 433.745,0 H 100.255 C 77.537,0 59.15,18.11 58.486,40.653 h 39.691 c 9.479,-7.013 21.051,-10.876 33.139,-10.876 30.785,0 55.84,25.055 55.84,55.84 0,30.784 -25.055,55.826 -55.84,55.826 -11.992,0 -23.527,-3.863 -33.059,-10.84 H 58.355 v 70.543 h 39.822 c 9.479,-7.008 21.051,-10.871 33.139,-10.871 30.785,0 55.84,25.055 55.84,55.84 0,30.783 -25.055,55.84 -55.84,55.84 -11.992,0 -23.547,-3.859 -33.072,-10.854 H 58.355 v 70.543 h 39.822 c 9.492,-6.995 21.064,-10.857 33.139,-10.857 30.785,0 55.84,25.042 55.84,55.825 0,30.784 -25.055,55.84 -55.84,55.84 -11.992,0 -23.527,-3.861 -33.059,-10.84 h -39.77 c 0.715,22.524 19.082,40.586 41.77,40.586 h 221.904 v -94.445 c 0,-32.281 26.258,-58.537 58.52,-58.537 H 475.66 V 41.901 C 475.659,18.761 456.903,0 433.745,0 Z"
-   id="path3-6" />
-			<path
-   d="m 36.577,105.68 h 71.213 c 5.68,6.588 14.115,10.84 23.527,10.84 17.07,0 30.916,-13.827 30.916,-30.902 0,-17.071 -13.846,-30.912 -30.916,-30.912 -9.412,0 -17.848,4.14 -23.527,10.872 H 36.577 c -11.066,0 -20.039,8.974 -20.039,20.04 -0.001,11.101 8.972,20.062 20.039,20.062 z"
-   id="path4-2" />
-			<path
-   d="m 36.577,266.172 h 71.213 c 5.68,6.606 14.115,10.858 23.527,10.858 17.07,0 30.916,-13.846 30.916,-30.915 0,-17.072 -13.846,-30.916 -30.916,-30.916 -9.412,0 -17.848,4.139 -23.527,10.875 H 36.577 c -11.066,0 -20.039,8.975 -20.039,20.059 0,11.084 8.972,20.039 20.039,20.039 z"
-   id="path5-9" />
-			<path
-   d="m 131.316,437.523 c 17.07,0 30.916,-13.839 30.916,-30.91 0,-17.074 -13.846,-30.902 -30.916,-30.902 -9.412,0 -17.848,4.141 -23.527,10.857 H 36.577 c -11.066,0 -20.039,8.975 -20.039,20.059 0,11.084 8.973,20.06 20.039,20.06 h 71.213 c 5.679,6.584 14.115,10.836 23.526,10.836 z"
-   id="path6-1" />
-		</g>
-	</g>
-</g><g
-   id="g3"
-   transform="matrix(0.96722928,0,0,0.95088529,9.377261,111.69164)">
-	<g
-   id="g2">
-		<path
-   d="M 494.434,315.678 H 463.697 C 455.367,216.327 377.063,136.575 278.357,126.001 283.158,110.85 271.813,95.459 256,95.459 c -15.83,0 -27.153,15.407 -22.357,30.542 -98.707,10.574 -177.01,90.327 -185.34,189.677 H 17.566 C 7.865,315.678 0,323.543 0,333.244 c 0,9.701 7.865,17.565 17.566,17.565 h 29.99 v 13.612 c 0,28.738 23.381,52.119 52.12,52.119 h 312.648 c 28.74,0 52.12,-23.381 52.12,-52.119 v -13.612 h 29.99 c 9.701,0 17.565,-7.865 17.565,-17.565 10e-4,-9.701 -7.864,-17.566 -17.565,-17.566 z M 112.028,273.83 c 15.615,-37.716 46.155,-68.42 83.79,-84.238 8.943,-3.761 19.24,0.444 22.999,9.387 3.759,8.944 -0.444,19.241 -9.387,23 -29.17,12.261 -52.841,36.057 -64.942,65.29 -3.706,8.953 -13.973,13.224 -22.949,9.51 -8.963,-3.712 -13.221,-13.987 -9.511,-22.949 z m 317.285,90.591 c 0,9.367 -7.621,16.988 -16.989,16.988 H 99.676 c -9.368,0 -16.989,-7.621 -16.989,-16.988 v -13.612 h 346.626 z"
-   id="path1" />
-	</g>
-</g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 512.002 512.002" xml:space="preserve" style="enable-background:new 0 0 512.002 512.002"><circle id="path2" cx="521.887" cy="45.192" r=".004" style="fill:#000;stroke:#000;stroke-width:.2"/><g id="g8-6" transform="matrix(0.4527684,0,0,0.4527684,296.76275,1.8149751)"><g id="g7-7"><g id="g6-5"><path id="path1-3" d="m 380.68,372.453 c -13.938,0 -25.284,11.342 -25.284,25.301 v 54.441 l 80.034,-79.742 z"/><path id="path2-5" d="m 433.745,492.197 c 23.156,0 41.912,-18.76 41.912,-41.898 V 379.285 L 362.338,492.197 Z"/><path id="path3-6" d="M 433.745,0 H 100.255 C 77.537,0 59.15,18.11 58.486,40.653 h 39.691 c 9.479,-7.013 21.051,-10.876 33.139,-10.876 30.785,0 55.84,25.055 55.84,55.84 0,30.784 -25.055,55.826 -55.84,55.826 -11.992,0 -23.527,-3.863 -33.059,-10.84 H 58.355 v 70.543 h 39.822 c 9.479,-7.008 21.051,-10.871 33.139,-10.871 30.785,0 55.84,25.055 55.84,55.84 0,30.783 -25.055,55.84 -55.84,55.84 -11.992,0 -23.547,-3.859 -33.072,-10.854 H 58.355 v 70.543 h 39.822 c 9.492,-6.995 21.064,-10.857 33.139,-10.857 30.785,0 55.84,25.042 55.84,55.825 0,30.784 -25.055,55.84 -55.84,55.84 -11.992,0 -23.527,-3.861 -33.059,-10.84 h -39.77 c 0.715,22.524 19.082,40.586 41.77,40.586 h 221.904 v -94.445 c 0,-32.281 26.258,-58.537 58.52,-58.537 H 475.66 V 41.901 C 475.659,18.761 456.903,0 433.745,0 Z"/><path id="path4-2" d="m 36.577,105.68 h 71.213 c 5.68,6.588 14.115,10.84 23.527,10.84 17.07,0 30.916,-13.827 30.916,-30.902 0,-17.071 -13.846,-30.912 -30.916,-30.912 -9.412,0 -17.848,4.14 -23.527,10.872 H 36.577 c -11.066,0 -20.039,8.974 -20.039,20.04 -0.001,11.101 8.972,20.062 20.039,20.062 z"/><path id="path5-9" d="m 36.577,266.172 h 71.213 c 5.68,6.606 14.115,10.858 23.527,10.858 17.07,0 30.916,-13.846 30.916,-30.915 0,-17.072 -13.846,-30.916 -30.916,-30.916 -9.412,0 -17.848,4.139 -23.527,10.875 H 36.577 c -11.066,0 -20.039,8.975 -20.039,20.059 0,11.084 8.972,20.039 20.039,20.039 z"/><path id="path6-1" d="m 131.316,437.523 c 17.07,0 30.916,-13.839 30.916,-30.91 0,-17.074 -13.846,-30.902 -30.916,-30.902 -9.412,0 -17.848,4.141 -23.527,10.857 H 36.577 c -11.066,0 -20.039,8.975 -20.039,20.059 0,11.084 8.973,20.06 20.039,20.06 h 71.213 c 5.679,6.584 14.115,10.836 23.526,10.836 z"/></g></g></g><g id="g3" transform="matrix(0.96722928,0,0,0.95088529,9.377261,111.69164)"><g id="g2"><path id="path1" d="M 494.434,315.678 H 463.697 C 455.367,216.327 377.063,136.575 278.357,126.001 283.158,110.85 271.813,95.459 256,95.459 c -15.83,0 -27.153,15.407 -22.357,30.542 -98.707,10.574 -177.01,90.327 -185.34,189.677 H 17.566 C 7.865,315.678 0,323.543 0,333.244 c 0,9.701 7.865,17.565 17.566,17.565 h 29.99 v 13.612 c 0,28.738 23.381,52.119 52.12,52.119 h 312.648 c 28.74,0 52.12,-23.381 52.12,-52.119 v -13.612 h 29.99 c 9.701,0 17.565,-7.865 17.565,-17.565 10e-4,-9.701 -7.864,-17.566 -17.565,-17.566 z M 112.028,273.83 c 15.615,-37.716 46.155,-68.42 83.79,-84.238 8.943,-3.761 19.24,0.444 22.999,9.387 3.759,8.944 -0.444,19.241 -9.387,23 -29.17,12.261 -52.841,36.057 -64.942,65.29 -3.706,8.953 -13.973,13.224 -22.949,9.51 -8.963,-3.712 -13.221,-13.987 -9.511,-22.949 z m 317.285,90.591 c 0,9.367 -7.621,16.988 -16.989,16.988 H 99.676 c -9.368,0 -16.989,-7.621 -16.989,-16.988 v -13.612 h 346.626 z"/></g></g></svg>
\ No newline at end of file
diff --git a/assets/icons/meal-edit.svg b/assets/icons/meal-edit.svg
index 51899ad9..c9f68bce 100644
--- a/assets/icons/meal-edit.svg
+++ b/assets/icons/meal-edit.svg
@@ -1,64 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<!-- License: CC0. Made by SVG Repo: https://www.svgrepo.com/svg/150226/meal -->
-
-<svg
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   viewBox="0 0 512.002 512.002"
-   style="enable-background:new 0 0 512.002 512.002;"
-   xml:space="preserve"
-   sodipodi:docname="meal-edit.svg"
-   inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"><defs
-   id="defs8">
-	
-</defs><sodipodi:namedview
-   id="namedview8"
-   pagecolor="#ffffff"
-   bordercolor="#000000"
-   borderopacity="0.25"
-   inkscape:showpageshadow="2"
-   inkscape:pageopacity="0.0"
-   inkscape:pagecheckerboard="0"
-   inkscape:deskcolor="#d1d1d1"
-   inkscape:zoom="1.7363213"
-   inkscape:cx="257.15287"
-   inkscape:cy="257.15287"
-   inkscape:window-width="1920"
-   inkscape:window-height="1155"
-   inkscape:window-x="0"
-   inkscape:window-y="45"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="Layer_1" />
-
-<circle
-   id="path2"
-   style="fill:#000000;stroke:#000000;stroke-width:0.2"
-   cx="521.88666"
-   cy="45.191727"
-   r="0.0043425169" /><path
-   d="M 576,657 H -64 c -24,0 -40,-16 -40,-40 0,-24 16,-40 40,-40 h 640 c 24,0 40,16 40,40 0,24 -16,40 -40,40 z"
-   id="path1-3"
-   style="stroke-width:40" /><g
-   id="g2-7"
-   transform="matrix(0,-3.2840933,3.2840933,0,211.59523,296.53997)">
-	<path
-   d="M 88.79,29.297 70.702,11.209 c -1.052,-1.052 -2.756,-1.052 -3.808,0 l -49.505,49.504 0.109,0.109 -0.171,-0.046 -6.772,25.272 0.004,0.001 c -0.309,0.935 -0.103,2.004 0.642,2.748 0.822,0.822 2.038,0.993 3.033,0.531 l 0.002,0.009 25.027,-6.706 -0.016,-0.059 0.038,0.038 49.505,-49.505 c 1.052,-1.052 1.052,-2.756 0,-3.808 z m -69.998,51.85 4.022,-15.009 10.988,10.988 z"
-   id="path1-5" />
-</g><g
-   id="g3"
-   transform="matrix(0.96951671,0,0,0.95088529,6.988638,111.33001)">
-	<g
-   id="g2">
-		<path
-   d="M 494.434,315.678 H 463.697 C 455.367,216.327 377.063,136.575 278.357,126.001 283.158,110.85 271.813,95.459 256,95.459 c -15.83,0 -27.153,15.407 -22.357,30.542 -98.707,10.574 -177.01,90.327 -185.34,189.677 H 17.566 C 7.865,315.678 0,323.543 0,333.244 c 0,9.701 7.865,17.565 17.566,17.565 h 29.99 v 13.612 c 0,28.738 23.381,52.119 52.12,52.119 h 312.648 c 28.74,0 52.12,-23.381 52.12,-52.119 v -13.612 h 29.99 c 9.701,0 17.565,-7.865 17.565,-17.565 10e-4,-9.701 -7.864,-17.566 -17.565,-17.566 z M 112.028,273.83 c 15.615,-37.716 46.155,-68.42 83.79,-84.238 8.943,-3.761 19.24,0.444 22.999,9.387 3.759,8.944 -0.444,19.241 -9.387,23 -29.17,12.261 -52.841,36.057 -64.942,65.29 -3.706,8.953 -13.973,13.224 -22.949,9.51 -8.963,-3.712 -13.221,-13.987 -9.511,-22.949 z m 317.285,90.591 c 0,9.367 -7.621,16.988 -16.989,16.988 H 99.676 c -9.368,0 -16.989,-7.621 -16.989,-16.988 v -13.612 h 346.626 z"
-   id="path1" />
-	</g>
-</g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 512.002 512.002" xml:space="preserve" style="enable-background:new 0 0 512.002 512.002"><circle id="path2" cx="521.887" cy="45.192" r=".004" style="fill:#000;stroke:#000;stroke-width:.2"/><path id="path1-3" d="M 576,657 H -64 c -24,0 -40,-16 -40,-40 0,-24 16,-40 40,-40 h 640 c 24,0 40,16 40,40 0,24 -16,40 -40,40 z" style="stroke-width:40"/><g id="g2-7" transform="matrix(0,-3.2840933,3.2840933,0,211.59523,296.53997)"><path id="path1-5" d="M 88.79,29.297 70.702,11.209 c -1.052,-1.052 -2.756,-1.052 -3.808,0 l -49.505,49.504 0.109,0.109 -0.171,-0.046 -6.772,25.272 0.004,0.001 c -0.309,0.935 -0.103,2.004 0.642,2.748 0.822,0.822 2.038,0.993 3.033,0.531 l 0.002,0.009 25.027,-6.706 -0.016,-0.059 0.038,0.038 49.505,-49.505 c 1.052,-1.052 1.052,-2.756 0,-3.808 z m -69.998,51.85 4.022,-15.009 10.988,10.988 z"/></g><g id="g3" transform="matrix(0.96951671,0,0,0.95088529,6.988638,111.33001)"><g id="g2"><path id="path1" d="M 494.434,315.678 H 463.697 C 455.367,216.327 377.063,136.575 278.357,126.001 283.158,110.85 271.813,95.459 256,95.459 c -15.83,0 -27.153,15.407 -22.357,30.542 -98.707,10.574 -177.01,90.327 -185.34,189.677 H 17.566 C 7.865,315.678 0,323.543 0,333.244 c 0,9.701 7.865,17.565 17.566,17.565 h 29.99 v 13.612 c 0,28.738 23.381,52.119 52.12,52.119 h 312.648 c 28.74,0 52.12,-23.381 52.12,-52.119 v -13.612 h 29.99 c 9.701,0 17.565,-7.865 17.565,-17.565 10e-4,-9.701 -7.864,-17.566 -17.565,-17.566 z M 112.028,273.83 c 15.615,-37.716 46.155,-68.42 83.79,-84.238 8.943,-3.761 19.24,0.444 22.999,9.387 3.759,8.944 -0.444,19.241 -9.387,23 -29.17,12.261 -52.841,36.057 -64.942,65.29 -3.706,8.953 -13.973,13.224 -22.949,9.51 -8.963,-3.712 -13.221,-13.987 -9.511,-22.949 z m 317.285,90.591 c 0,9.367 -7.621,16.988 -16.989,16.988 H 99.676 c -9.368,0 -16.989,-7.621 -16.989,-16.988 v -13.612 h 346.626 z"/></g></g></svg>
\ No newline at end of file
diff --git a/dart_test.yaml b/dart_test.yaml
new file mode 100644
index 00000000..cfa1c9fd
--- /dev/null
+++ b/dart_test.yaml
@@ -0,0 +1,2 @@
+tags:
+  golden: { }
\ No newline at end of file
diff --git a/devtools_options.yaml b/devtools_options.yaml
new file mode 100644
index 00000000..75bd2b67
--- /dev/null
+++ b/devtools_options.yaml
@@ -0,0 +1,3 @@
+extensions:
+  - drift: true
+  - provider: true
\ No newline at end of file
diff --git a/fastlane/Appfile b/fastlane/Appfile
index 9a5da25e..88754926 100644
--- a/fastlane/Appfile
+++ b/fastlane/Appfile
@@ -1,2 +1,2 @@
 json_key_file("fastlane/metadata/android/envfiles/playstore.json")
-package_name("de.wger.flutter")
+package_name("de.wger.flutter")
\ No newline at end of file
diff --git a/fastlane/metadata/android/README.md b/fastlane/metadata/android/README.md
index e07f3c1b..9a311bc1 100644
--- a/fastlane/metadata/android/README.md
+++ b/fastlane/metadata/android/README.md
@@ -1,45 +1,3 @@
 # Release process
 
-## 1. Update flutter version
-
-If we use a new version, update the version used by
-
-* Github Actions in `android-release.yaml` in this repository
-* Fdroid build recipe
-  in [their repo](https://gitlab.com/fdroid/fdroiddata/-/blob/master/metadata/de.wger.flutter.yml).
-  Since this can potentially take some time, it should happen well in advance
-
-## 2. Dry-run release before uploading
-
-* Increase build nr in pubspec.yaml (revert after the dry-run was successful)
-* `flutter build appbundle --release`
-* `bundle install`
-* `bundle update fastlane`
-* `bundle exec fastlane android test_configuration` (needs the different keys available)
-
-It might be necessary to repeat these steps if upload_to_play_store returns any errors
-such as a missing title or similar.
-
-Also note that if a language was added over the weblate UI, it might be necessary
-to set the correct language code:
-<https://support.google.com/googleplay/android-developer/answer/9844778?hl=en#zippy=%2Cview-list-of-available-languages>
-
-## 3. Push tags to trigger release
-
-Make sure that the commit that will be tagged was already pushed or didn't change
-any dart code, otherwise the automatic linter might push a "correction" commit
-and the build step will fail.
-
-Set the vX.Y.Z tag locally, push it and delete it. It will get recreated to X.Y.Z.
-by github actions.
-
-`TAG=vX.Y.Z && git tag $TAG && git push origin $TAG && git tag -d $TAG`
-
-## 4. Edit release
-
-If necessary, edit the created release on github
-
-## 5. Merge pull requests
-
-* in the flathub repo: https://github.com/flathub/de.wger.flutter
-* in the flutter repo: https://github.com/wger-project/flutter/branches
\ No newline at end of file
+Moved to <https://wger.readthedocs.io/en/latest/development/mobile_app.html>
\ No newline at end of file
diff --git a/fastlane/metadata/android/ar/full_description.txt b/fastlane/metadata/android/ar/full_description.txt
new file mode 100644
index 00000000..ac48461b
--- /dev/null
+++ b/fastlane/metadata/android/ar/full_description.txt
@@ -0,0 +1,39 @@
+من عُشاق اللياقة إلى عُشاق اللياقة – حان الوقت لتنظيم صحتك مع WGER، رفيقك المثالي لإدارة تمارينك!
+
+هل وجدت تطبيقك الرياضي المفضل، وتستمتع بابتكار برامجك التدريبية الخاصة؟ مهما كان شغفك بالرياضة – يجمعنا قاسم مشترك: وهو شغفنا بمتابعة بياناتنا الصحية <3
+
+لا تقلق إن كنت لا تزال تدير رحلتك الرياضية بدفتر ملاحظاتك التقليدي، ولكن ندعوك للانضمام إلى مستقبل اللياقة في 2025!
+
+طورنا لك تطبيقًا رقميًا مجانيًا 100% لمتابعة صحتك ولياقتك، يركز على أهم الميزات الأساسية لتسهيل حياتك. ابدأ الآن، واصل تدريبك، واحتفل بكل إنجاز تحققه!
+
+wger مشروع مفتوح المصدر، يتمحور حول:
+
+صحة جسمك
+برامجك التدريبية
+تطورك وإنجازاتك
+بياناتك الخاصة
+صحة جسمك:
+لا داعي للبحث عن مكونات أطعمتك المفضلة، اختر وجباتك اليومية من قاعدة بيانات تضم أكثر من 78000 منتج، واطّلع على قيمها الغذائية. أضف وجباتك إلى خطتك الغذائية وتابع نظامك الغذائي بسهولة عبر التقويم.
+
+برامجك التدريبية:
+أنت أدرى بما يناسب جسمك. صمّم برامجك التدريبية الخاصة بالاختيار من بين أكثر من 200 تمرين متنوع ومتجدد. ثم، استخدم "وضع النادي الرياضي" ليرشدك خلال التمرين، وسجّل أوزانك بضغطة زر واحدة.
+
+تطورك وإنجازاتك:
+اجعل أهدافك نصب عينيك دائمًا. تابع وزنك وسجل إحصاءاتك بانتظام.
+
+بياناتك الخاصة:
+wger بمثابة سجلك الرياضي الشخصي – ولكن بياناتك ملكك وحدك. استخدم واجهة برمجة التطبيقات (REST API) للوصول إليها واستثمارها كما تشاء.
+
+ملاحظة هامة: هذا التطبيق مجاني تمامًا ولا يعتمد على أي تمويل إضافي، كما أننا لا نطلب أي تبرعات. الأهم من ذلك، أنه مشروع مجتمعي يتطور باستمرار. لذا، ترقبوا ميزات جديدة ومثيرة في أي وقت!
+
+#مفتوح_المصدر – ما المقصود بذلك؟
+
+مفتوح المصدر يعني أن الشفرة المصدرية الكاملة للتطبيق والخادم الخاص به متاحة ومجانية للجميع:
+
+هل ترغب في تشغيل wger على خادمك الخاص أو لصالح ناديك الرياضي المحلي؟ لا تتردد!
+هل هناك ميزة تفتقدها وتريد إضافتها؟ يمكنك البدء فورًا!
+هل تريد التأكد من أن بياناتك لا تُرسل إلى أي جهة خارجية؟ لك ذلك!
+انضم إلى مجتمعنا وكن واحدًا من عشاق الرياضة وخبراء التقنية من كل أنحاء العالم. نعمل باستمرار على تطوير وتحسين التطبيق ليلائم احتياجاتنا. نرحب دائمًا بمساهماتك، فلا تتردد في مشاركتنا مقترحاتك وأفكارك في أي وقت!
+
+-> تجدون الشفرة المصدرية على: https://github.com/wger-project
+-> لطرح استفساراتكم أو حتى لإلقاء التحية، انضموا إلينا على خادم ديسكورد: https://discord.gg/rPWFv6W
diff --git a/fastlane/metadata/android/ar/images/phoneScreenshots/01 - dashboard.png b/fastlane/metadata/android/ar/images/phoneScreenshots/01 - dashboard.png
new file mode 100644
index 00000000..8eb00d16
Binary files /dev/null and b/fastlane/metadata/android/ar/images/phoneScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/ar/images/phoneScreenshots/02 - workout detail.png b/fastlane/metadata/android/ar/images/phoneScreenshots/02 - workout detail.png
new file mode 100644
index 00000000..58eae411
Binary files /dev/null and b/fastlane/metadata/android/ar/images/phoneScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/ar/images/phoneScreenshots/03 - gym mode.png b/fastlane/metadata/android/ar/images/phoneScreenshots/03 - gym mode.png
new file mode 100644
index 00000000..612cd926
Binary files /dev/null and b/fastlane/metadata/android/ar/images/phoneScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/ar/images/phoneScreenshots/04 - measurements.png b/fastlane/metadata/android/ar/images/phoneScreenshots/04 - measurements.png
new file mode 100644
index 00000000..efa1a844
Binary files /dev/null and b/fastlane/metadata/android/ar/images/phoneScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/ar/images/phoneScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/ar/images/phoneScreenshots/05 - nutritional plan.png
new file mode 100644
index 00000000..1c4efb40
Binary files /dev/null and b/fastlane/metadata/android/ar/images/phoneScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/ar/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/ar/images/phoneScreenshots/06 - weight.png
new file mode 100644
index 00000000..055c9baa
Binary files /dev/null and b/fastlane/metadata/android/ar/images/phoneScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/ar/images/sevenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/ar/images/sevenInchScreenshots/01 - dashboard.png
new file mode 100644
index 00000000..0dec5182
Binary files /dev/null and b/fastlane/metadata/android/ar/images/sevenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/ar/images/sevenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/ar/images/sevenInchScreenshots/02 - workout detail.png
new file mode 100644
index 00000000..b4df3945
Binary files /dev/null and b/fastlane/metadata/android/ar/images/sevenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/ar/images/sevenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/ar/images/sevenInchScreenshots/03 - gym mode.png
new file mode 100644
index 00000000..a3ae957c
Binary files /dev/null and b/fastlane/metadata/android/ar/images/sevenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/ar/images/sevenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/ar/images/sevenInchScreenshots/04 - measurements.png
new file mode 100644
index 00000000..598ac9e1
Binary files /dev/null and b/fastlane/metadata/android/ar/images/sevenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/ar/images/sevenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/ar/images/sevenInchScreenshots/05 - nutritional plan.png
new file mode 100644
index 00000000..d839cb6d
Binary files /dev/null and b/fastlane/metadata/android/ar/images/sevenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/ar/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/ar/images/sevenInchScreenshots/06 - weight.png
new file mode 100644
index 00000000..07201906
Binary files /dev/null and b/fastlane/metadata/android/ar/images/sevenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/ar/images/tenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/ar/images/tenInchScreenshots/01 - dashboard.png
new file mode 100644
index 00000000..a6ff13b7
Binary files /dev/null and b/fastlane/metadata/android/ar/images/tenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/ar/images/tenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/ar/images/tenInchScreenshots/02 - workout detail.png
new file mode 100644
index 00000000..8cbe77bb
Binary files /dev/null and b/fastlane/metadata/android/ar/images/tenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/ar/images/tenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/ar/images/tenInchScreenshots/03 - gym mode.png
new file mode 100644
index 00000000..283e811a
Binary files /dev/null and b/fastlane/metadata/android/ar/images/tenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/ar/images/tenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/ar/images/tenInchScreenshots/04 - measurements.png
new file mode 100644
index 00000000..4cafbbdb
Binary files /dev/null and b/fastlane/metadata/android/ar/images/tenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/ar/images/tenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/ar/images/tenInchScreenshots/05 - nutritional plan.png
new file mode 100644
index 00000000..8bd892d8
Binary files /dev/null and b/fastlane/metadata/android/ar/images/tenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/ar/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/ar/images/tenInchScreenshots/06 - weight.png
new file mode 100644
index 00000000..38ec821b
Binary files /dev/null and b/fastlane/metadata/android/ar/images/tenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/ar/short_description.txt b/fastlane/metadata/android/ar/short_description.txt
new file mode 100644
index 00000000..62434f42
--- /dev/null
+++ b/fastlane/metadata/android/ar/short_description.txt
@@ -0,0 +1 @@
+متتبع التمارين الرياضية، التغذية، ومراقبة الوزن
diff --git a/fastlane/metadata/android/ar/title.txt b/fastlane/metadata/android/ar/title.txt
new file mode 100644
index 00000000..d35e4087
--- /dev/null
+++ b/fastlane/metadata/android/ar/title.txt
@@ -0,0 +1 @@
+wger Workout Manager
diff --git a/fastlane/metadata/android/ca/full_description.txt b/fastlane/metadata/android/ca/full_description.txt
index 7318552d..8e72f266 100644
--- a/fastlane/metadata/android/ca/full_description.txt
+++ b/fastlane/metadata/android/ca/full_description.txt
@@ -2,7 +2,7 @@ From fitness lovers to fitness lovers – get your health organized with WGER, y
 
 Have you already found your #1 fitness app and do you love to create your own sports routines? No matter what type of sporty beast you are – we all have something in common: We love to keep track of our health data <3
 
-So we don’t judge you for still managing your fitness journey with your handy little workout log book but welcome to 2024!
+So we don’t judge you for still managing your fitness journey with your handy little workout log book but welcome to 2025!
 
 We have developed a 100% free digital health and fitness tracker app for you, sized down to the most relevant features to make your life easier. Get started, keep training and celebrate your progress!
 
diff --git a/fastlane/metadata/android/ca/images/phoneScreenshots/01 - dashboard.png b/fastlane/metadata/android/ca/images/phoneScreenshots/01 - dashboard.png
index c7c9ed60..39025648 100644
Binary files a/fastlane/metadata/android/ca/images/phoneScreenshots/01 - dashboard.png and b/fastlane/metadata/android/ca/images/phoneScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/ca/images/phoneScreenshots/02 - workout detail.png b/fastlane/metadata/android/ca/images/phoneScreenshots/02 - workout detail.png
index 5b1221f0..f76fa96c 100644
Binary files a/fastlane/metadata/android/ca/images/phoneScreenshots/02 - workout detail.png and b/fastlane/metadata/android/ca/images/phoneScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/ca/images/phoneScreenshots/03 - gym mode.png b/fastlane/metadata/android/ca/images/phoneScreenshots/03 - gym mode.png
index e56174fc..4b863968 100644
Binary files a/fastlane/metadata/android/ca/images/phoneScreenshots/03 - gym mode.png and b/fastlane/metadata/android/ca/images/phoneScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/ca/images/phoneScreenshots/04 - measurements.png b/fastlane/metadata/android/ca/images/phoneScreenshots/04 - measurements.png
index d8be824b..cb69065f 100644
Binary files a/fastlane/metadata/android/ca/images/phoneScreenshots/04 - measurements.png and b/fastlane/metadata/android/ca/images/phoneScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/ca/images/phoneScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/ca/images/phoneScreenshots/05 - nutritional plan.png
index a5916e21..cc1193b5 100644
Binary files a/fastlane/metadata/android/ca/images/phoneScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/ca/images/phoneScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/ca/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/ca/images/phoneScreenshots/06 - weight.png
index 8d342b67..6c0edb30 100644
Binary files a/fastlane/metadata/android/ca/images/phoneScreenshots/06 - weight.png and b/fastlane/metadata/android/ca/images/phoneScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/ca/images/sevenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/ca/images/sevenInchScreenshots/01 - dashboard.png
index 3275a3bb..98aafa06 100644
Binary files a/fastlane/metadata/android/ca/images/sevenInchScreenshots/01 - dashboard.png and b/fastlane/metadata/android/ca/images/sevenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/ca/images/sevenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/ca/images/sevenInchScreenshots/02 - workout detail.png
index 612bb0a8..7faf5e2d 100644
Binary files a/fastlane/metadata/android/ca/images/sevenInchScreenshots/02 - workout detail.png and b/fastlane/metadata/android/ca/images/sevenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/ca/images/sevenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/ca/images/sevenInchScreenshots/03 - gym mode.png
index 6d5b3054..397b822c 100644
Binary files a/fastlane/metadata/android/ca/images/sevenInchScreenshots/03 - gym mode.png and b/fastlane/metadata/android/ca/images/sevenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/ca/images/sevenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/ca/images/sevenInchScreenshots/04 - measurements.png
index c0cdec15..30f8b3fa 100644
Binary files a/fastlane/metadata/android/ca/images/sevenInchScreenshots/04 - measurements.png and b/fastlane/metadata/android/ca/images/sevenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/ca/images/sevenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/ca/images/sevenInchScreenshots/05 - nutritional plan.png
index 0fa0d8f7..0fa2f6eb 100644
Binary files a/fastlane/metadata/android/ca/images/sevenInchScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/ca/images/sevenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/ca/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/ca/images/sevenInchScreenshots/06 - weight.png
index 1099a39e..08b0ef86 100644
Binary files a/fastlane/metadata/android/ca/images/sevenInchScreenshots/06 - weight.png and b/fastlane/metadata/android/ca/images/sevenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/ca/images/tenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/ca/images/tenInchScreenshots/01 - dashboard.png
index 01a42339..6414d7f1 100644
Binary files a/fastlane/metadata/android/ca/images/tenInchScreenshots/01 - dashboard.png and b/fastlane/metadata/android/ca/images/tenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/ca/images/tenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/ca/images/tenInchScreenshots/02 - workout detail.png
index 4d8cabd2..244f29b1 100644
Binary files a/fastlane/metadata/android/ca/images/tenInchScreenshots/02 - workout detail.png and b/fastlane/metadata/android/ca/images/tenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/ca/images/tenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/ca/images/tenInchScreenshots/03 - gym mode.png
index ed3d2da8..2e4a8ac0 100644
Binary files a/fastlane/metadata/android/ca/images/tenInchScreenshots/03 - gym mode.png and b/fastlane/metadata/android/ca/images/tenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/ca/images/tenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/ca/images/tenInchScreenshots/04 - measurements.png
index 42b37da3..6b4a3f5d 100644
Binary files a/fastlane/metadata/android/ca/images/tenInchScreenshots/04 - measurements.png and b/fastlane/metadata/android/ca/images/tenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/ca/images/tenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/ca/images/tenInchScreenshots/05 - nutritional plan.png
index 7b4e972d..c4f54fff 100644
Binary files a/fastlane/metadata/android/ca/images/tenInchScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/ca/images/tenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/ca/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/ca/images/tenInchScreenshots/06 - weight.png
index dfbb37ba..99fe9f20 100644
Binary files a/fastlane/metadata/android/ca/images/tenInchScreenshots/06 - weight.png and b/fastlane/metadata/android/ca/images/tenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/01 - dashboard.png b/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/01 - dashboard.png
index c5c675c0..e08a1144 100644
Binary files a/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/01 - dashboard.png and b/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/02 - workout detail.png b/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/02 - workout detail.png
index a2159e65..f76fa96c 100644
Binary files a/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/02 - workout detail.png and b/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/03 - gym mode.png b/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/03 - gym mode.png
index 83cd7fa3..eee98421 100644
Binary files a/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/03 - gym mode.png and b/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/04 - measurements.png b/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/04 - measurements.png
index 6b6eabc0..52a5ced7 100644
Binary files a/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/04 - measurements.png and b/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/05 - nutritional plan.png
index c00ab9b4..afb31f54 100644
Binary files a/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/06 - weight.png
index 2e886781..48159e4b 100644
Binary files a/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/06 - weight.png and b/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/cs-CZ/images/sevenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/cs-CZ/images/sevenInchScreenshots/01 - dashboard.png
index 8b372337..85f6530e 100644
Binary files a/fastlane/metadata/android/cs-CZ/images/sevenInchScreenshots/01 - dashboard.png and b/fastlane/metadata/android/cs-CZ/images/sevenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/cs-CZ/images/sevenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/cs-CZ/images/sevenInchScreenshots/02 - workout detail.png
index 90362984..7faf5e2d 100644
Binary files a/fastlane/metadata/android/cs-CZ/images/sevenInchScreenshots/02 - workout detail.png and b/fastlane/metadata/android/cs-CZ/images/sevenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/cs-CZ/images/sevenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/cs-CZ/images/sevenInchScreenshots/03 - gym mode.png
index 9b970a84..ee6e1013 100644
Binary files a/fastlane/metadata/android/cs-CZ/images/sevenInchScreenshots/03 - gym mode.png and b/fastlane/metadata/android/cs-CZ/images/sevenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/cs-CZ/images/sevenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/cs-CZ/images/sevenInchScreenshots/04 - measurements.png
index 12916432..53814b4b 100644
Binary files a/fastlane/metadata/android/cs-CZ/images/sevenInchScreenshots/04 - measurements.png and b/fastlane/metadata/android/cs-CZ/images/sevenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/cs-CZ/images/sevenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/cs-CZ/images/sevenInchScreenshots/05 - nutritional plan.png
index 65933301..ce95448a 100644
Binary files a/fastlane/metadata/android/cs-CZ/images/sevenInchScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/cs-CZ/images/sevenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/cs-CZ/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/cs-CZ/images/sevenInchScreenshots/06 - weight.png
index c6fb0592..3ff9b25a 100644
Binary files a/fastlane/metadata/android/cs-CZ/images/sevenInchScreenshots/06 - weight.png and b/fastlane/metadata/android/cs-CZ/images/sevenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/cs-CZ/images/tenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/cs-CZ/images/tenInchScreenshots/01 - dashboard.png
index 5562153b..444c00e9 100644
Binary files a/fastlane/metadata/android/cs-CZ/images/tenInchScreenshots/01 - dashboard.png and b/fastlane/metadata/android/cs-CZ/images/tenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/cs-CZ/images/tenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/cs-CZ/images/tenInchScreenshots/02 - workout detail.png
index 3f800e55..244f29b1 100644
Binary files a/fastlane/metadata/android/cs-CZ/images/tenInchScreenshots/02 - workout detail.png and b/fastlane/metadata/android/cs-CZ/images/tenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/cs-CZ/images/tenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/cs-CZ/images/tenInchScreenshots/03 - gym mode.png
index f10631ba..e0b1bb7f 100644
Binary files a/fastlane/metadata/android/cs-CZ/images/tenInchScreenshots/03 - gym mode.png and b/fastlane/metadata/android/cs-CZ/images/tenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/cs-CZ/images/tenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/cs-CZ/images/tenInchScreenshots/04 - measurements.png
index ffa50c8e..51ba6ad0 100644
Binary files a/fastlane/metadata/android/cs-CZ/images/tenInchScreenshots/04 - measurements.png and b/fastlane/metadata/android/cs-CZ/images/tenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/cs-CZ/images/tenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/cs-CZ/images/tenInchScreenshots/05 - nutritional plan.png
index f29f3a5c..5ad0b00f 100644
Binary files a/fastlane/metadata/android/cs-CZ/images/tenInchScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/cs-CZ/images/tenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/cs-CZ/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/cs-CZ/images/tenInchScreenshots/06 - weight.png
index 320c0c60..db0dceba 100644
Binary files a/fastlane/metadata/android/cs-CZ/images/tenInchScreenshots/06 - weight.png and b/fastlane/metadata/android/cs-CZ/images/tenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/de-DE/full_description.txt b/fastlane/metadata/android/de-DE/full_description.txt
index f2408a20..637133cc 100644
--- a/fastlane/metadata/android/de-DE/full_description.txt
+++ b/fastlane/metadata/android/de-DE/full_description.txt
@@ -2,7 +2,7 @@ Von Fitnessliebhabern für Fitnessliebhaber, organisiere deine Gesundheit mit wg
 
 Hast du schon deine Nr. 1 Fitness-Anwendung gefunden und liebst es, deine eigene Trainingspläne zu erstellen? Egal was für ein sportliches Biest du bist sind – wir haben alle etwas gemeinsam: wir lieben es, den Überblick über unsere Gesundheitsdaten zu behalten <3
 
-Wir verurteilen dich also nicht dafür, dass du deine Fitness-Reise immer noch mit deinem kleinen Tagebuch verwaltest, aber willkommen im Jahr 2024!
+Wir verurteilen dich also nicht dafür, dass du deine Fitness-Reise immer noch mit deinem kleinen Tagebuch verwaltest, aber willkommen im Jahr 2025!
 
 Wir haben eine 100 % kostenlose digitale Gesundheits- und Fitnesstracker-Anwendung für dich entwickelt, die auf die wichtigsten Funktionen reduziert ist, um dein Leben einfacher zu machen. Lege jetzt lost, trainiere weiter und feiere deine Fortschritte!
 
diff --git a/fastlane/metadata/android/de-DE/images/phoneScreenshots/01 - dashboard.png b/fastlane/metadata/android/de-DE/images/phoneScreenshots/01 - dashboard.png
index ffcd71ee..0254ffc5 100644
Binary files a/fastlane/metadata/android/de-DE/images/phoneScreenshots/01 - dashboard.png and b/fastlane/metadata/android/de-DE/images/phoneScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/de-DE/images/phoneScreenshots/02 - workout detail.png b/fastlane/metadata/android/de-DE/images/phoneScreenshots/02 - workout detail.png
index c7091243..93071ff8 100644
Binary files a/fastlane/metadata/android/de-DE/images/phoneScreenshots/02 - workout detail.png and b/fastlane/metadata/android/de-DE/images/phoneScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/de-DE/images/phoneScreenshots/03 - gym mode.png b/fastlane/metadata/android/de-DE/images/phoneScreenshots/03 - gym mode.png
index adb0dbb6..c2b4159b 100644
Binary files a/fastlane/metadata/android/de-DE/images/phoneScreenshots/03 - gym mode.png and b/fastlane/metadata/android/de-DE/images/phoneScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/de-DE/images/phoneScreenshots/04 - measurements.png b/fastlane/metadata/android/de-DE/images/phoneScreenshots/04 - measurements.png
index 61008932..f3521ca6 100644
Binary files a/fastlane/metadata/android/de-DE/images/phoneScreenshots/04 - measurements.png and b/fastlane/metadata/android/de-DE/images/phoneScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/de-DE/images/phoneScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/de-DE/images/phoneScreenshots/05 - nutritional plan.png
index 12fb3d80..d44812b0 100644
Binary files a/fastlane/metadata/android/de-DE/images/phoneScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/de-DE/images/phoneScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/de-DE/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/de-DE/images/phoneScreenshots/06 - weight.png
index 10f884d7..e7f3711a 100644
Binary files a/fastlane/metadata/android/de-DE/images/phoneScreenshots/06 - weight.png and b/fastlane/metadata/android/de-DE/images/phoneScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/de-DE/images/sevenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/de-DE/images/sevenInchScreenshots/01 - dashboard.png
index 231bac45..7f9ab10d 100644
Binary files a/fastlane/metadata/android/de-DE/images/sevenInchScreenshots/01 - dashboard.png and b/fastlane/metadata/android/de-DE/images/sevenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/de-DE/images/sevenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/de-DE/images/sevenInchScreenshots/02 - workout detail.png
index 8753afb4..2ed36353 100644
Binary files a/fastlane/metadata/android/de-DE/images/sevenInchScreenshots/02 - workout detail.png and b/fastlane/metadata/android/de-DE/images/sevenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/de-DE/images/sevenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/de-DE/images/sevenInchScreenshots/03 - gym mode.png
index 174b363a..36d05986 100644
Binary files a/fastlane/metadata/android/de-DE/images/sevenInchScreenshots/03 - gym mode.png and b/fastlane/metadata/android/de-DE/images/sevenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/de-DE/images/sevenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/de-DE/images/sevenInchScreenshots/04 - measurements.png
index a94c4b9b..b03ac571 100644
Binary files a/fastlane/metadata/android/de-DE/images/sevenInchScreenshots/04 - measurements.png and b/fastlane/metadata/android/de-DE/images/sevenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/de-DE/images/sevenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/de-DE/images/sevenInchScreenshots/05 - nutritional plan.png
index ea450f61..f85c55ea 100644
Binary files a/fastlane/metadata/android/de-DE/images/sevenInchScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/de-DE/images/sevenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/de-DE/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/de-DE/images/sevenInchScreenshots/06 - weight.png
index 1a1f8afa..92154af3 100644
Binary files a/fastlane/metadata/android/de-DE/images/sevenInchScreenshots/06 - weight.png and b/fastlane/metadata/android/de-DE/images/sevenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/de-DE/images/tenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/de-DE/images/tenInchScreenshots/01 - dashboard.png
index 8f553c61..b1a9020e 100644
Binary files a/fastlane/metadata/android/de-DE/images/tenInchScreenshots/01 - dashboard.png and b/fastlane/metadata/android/de-DE/images/tenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/de-DE/images/tenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/de-DE/images/tenInchScreenshots/02 - workout detail.png
index fa776ede..9c38dd78 100644
Binary files a/fastlane/metadata/android/de-DE/images/tenInchScreenshots/02 - workout detail.png and b/fastlane/metadata/android/de-DE/images/tenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/de-DE/images/tenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/de-DE/images/tenInchScreenshots/03 - gym mode.png
index 9e6183a7..9e251576 100644
Binary files a/fastlane/metadata/android/de-DE/images/tenInchScreenshots/03 - gym mode.png and b/fastlane/metadata/android/de-DE/images/tenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/de-DE/images/tenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/de-DE/images/tenInchScreenshots/04 - measurements.png
index df92f03c..32e2b06d 100644
Binary files a/fastlane/metadata/android/de-DE/images/tenInchScreenshots/04 - measurements.png and b/fastlane/metadata/android/de-DE/images/tenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/de-DE/images/tenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/de-DE/images/tenInchScreenshots/05 - nutritional plan.png
index 4a019310..abfaa4cf 100644
Binary files a/fastlane/metadata/android/de-DE/images/tenInchScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/de-DE/images/tenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/de-DE/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/de-DE/images/tenInchScreenshots/06 - weight.png
index c80e6bde..35f9b9b0 100644
Binary files a/fastlane/metadata/android/de-DE/images/tenInchScreenshots/06 - weight.png and b/fastlane/metadata/android/de-DE/images/tenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/el-GR/full_description.txt b/fastlane/metadata/android/el-GR/full_description.txt
index 952f2038..f45c3dab 100644
--- a/fastlane/metadata/android/el-GR/full_description.txt
+++ b/fastlane/metadata/android/el-GR/full_description.txt
@@ -2,7 +2,7 @@
 
 Έχετε ήδη βρει την #1 εφαρμογή γυμναστικής σας και σας αρέσει να δημιουργείτε τις δικές σας αθλητικές ρουτίνες; Ανεξάρτητα από το είδος του σπορ θηρίου που είστε – όλοι έχουμε κάτι κοινό: Μας αρέσει να παρακολουθούμε τα δεδομένα υγείας μας <3
 
-Επομένως, δεν σας κρίνουμε επειδή εξακολουθείτε να διαχειρίζεστε το ταξίδι σας στη φυσική κατάσταση με το εύχρηστο μικρό ημερολόγιο προπόνησης, αλλά καλώς ήρθατε στο 2024!
+Επομένως, δεν σας κρίνουμε επειδή εξακολουθείτε να διαχειρίζεστε το ταξίδι σας στη φυσική κατάσταση με το εύχρηστο μικρό ημερολόγιο προπόνησης, αλλά καλώς ήρθατε στο 2025!
 
 Έχουμε αναπτύξει μια 100% δωρεάν ψηφιακή εφαρμογή παρακολούθησης υγείας και φυσικής κατάστασης για εσάς, με μέγεθος στις πιο σχετικές λειτουργίες για να διευκολύνει τη ζωή σας. Ξεκινήστε, συνεχίστε την προπόνηση και γιορτάστε την πρόοδό σας!
 
diff --git a/fastlane/metadata/android/el-GR/images/phoneScreenshots/01 - dashboard.png b/fastlane/metadata/android/el-GR/images/phoneScreenshots/01 - dashboard.png
index 8eed818f..6f78cbed 100644
Binary files a/fastlane/metadata/android/el-GR/images/phoneScreenshots/01 - dashboard.png and b/fastlane/metadata/android/el-GR/images/phoneScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/el-GR/images/phoneScreenshots/02 - workout detail.png b/fastlane/metadata/android/el-GR/images/phoneScreenshots/02 - workout detail.png
index 5b996828..278bcebe 100644
Binary files a/fastlane/metadata/android/el-GR/images/phoneScreenshots/02 - workout detail.png and b/fastlane/metadata/android/el-GR/images/phoneScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/el-GR/images/phoneScreenshots/03 - gym mode.png b/fastlane/metadata/android/el-GR/images/phoneScreenshots/03 - gym mode.png
index e7439c9d..99102631 100644
Binary files a/fastlane/metadata/android/el-GR/images/phoneScreenshots/03 - gym mode.png and b/fastlane/metadata/android/el-GR/images/phoneScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/el-GR/images/phoneScreenshots/04 - measurements.png b/fastlane/metadata/android/el-GR/images/phoneScreenshots/04 - measurements.png
index 9367bec1..2a7eb1e9 100644
Binary files a/fastlane/metadata/android/el-GR/images/phoneScreenshots/04 - measurements.png and b/fastlane/metadata/android/el-GR/images/phoneScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/el-GR/images/phoneScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/el-GR/images/phoneScreenshots/05 - nutritional plan.png
index dd7c17c1..51130f48 100644
Binary files a/fastlane/metadata/android/el-GR/images/phoneScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/el-GR/images/phoneScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/el-GR/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/el-GR/images/phoneScreenshots/06 - weight.png
index 5b163840..fd079f02 100644
Binary files a/fastlane/metadata/android/el-GR/images/phoneScreenshots/06 - weight.png and b/fastlane/metadata/android/el-GR/images/phoneScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/el-GR/images/sevenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/el-GR/images/sevenInchScreenshots/01 - dashboard.png
index 192aa684..ff81630b 100644
Binary files a/fastlane/metadata/android/el-GR/images/sevenInchScreenshots/01 - dashboard.png and b/fastlane/metadata/android/el-GR/images/sevenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/el-GR/images/sevenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/el-GR/images/sevenInchScreenshots/02 - workout detail.png
index 0267187f..220793e7 100644
Binary files a/fastlane/metadata/android/el-GR/images/sevenInchScreenshots/02 - workout detail.png and b/fastlane/metadata/android/el-GR/images/sevenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/el-GR/images/sevenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/el-GR/images/sevenInchScreenshots/03 - gym mode.png
index 16985d01..91c92b49 100644
Binary files a/fastlane/metadata/android/el-GR/images/sevenInchScreenshots/03 - gym mode.png and b/fastlane/metadata/android/el-GR/images/sevenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/el-GR/images/sevenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/el-GR/images/sevenInchScreenshots/04 - measurements.png
index 03bebcd2..28136128 100644
Binary files a/fastlane/metadata/android/el-GR/images/sevenInchScreenshots/04 - measurements.png and b/fastlane/metadata/android/el-GR/images/sevenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/el-GR/images/sevenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/el-GR/images/sevenInchScreenshots/05 - nutritional plan.png
index ff4db838..d6910c55 100644
Binary files a/fastlane/metadata/android/el-GR/images/sevenInchScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/el-GR/images/sevenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/el-GR/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/el-GR/images/sevenInchScreenshots/06 - weight.png
index 1ef1a145..a452de1c 100644
Binary files a/fastlane/metadata/android/el-GR/images/sevenInchScreenshots/06 - weight.png and b/fastlane/metadata/android/el-GR/images/sevenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/el-GR/images/tenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/el-GR/images/tenInchScreenshots/01 - dashboard.png
index d0ff22fa..264c899b 100644
Binary files a/fastlane/metadata/android/el-GR/images/tenInchScreenshots/01 - dashboard.png and b/fastlane/metadata/android/el-GR/images/tenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/el-GR/images/tenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/el-GR/images/tenInchScreenshots/02 - workout detail.png
index ba455bef..a1404272 100644
Binary files a/fastlane/metadata/android/el-GR/images/tenInchScreenshots/02 - workout detail.png and b/fastlane/metadata/android/el-GR/images/tenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/el-GR/images/tenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/el-GR/images/tenInchScreenshots/03 - gym mode.png
index 3aad3261..0b631fe1 100644
Binary files a/fastlane/metadata/android/el-GR/images/tenInchScreenshots/03 - gym mode.png and b/fastlane/metadata/android/el-GR/images/tenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/el-GR/images/tenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/el-GR/images/tenInchScreenshots/04 - measurements.png
index 4bdab99c..54fd3dfe 100644
Binary files a/fastlane/metadata/android/el-GR/images/tenInchScreenshots/04 - measurements.png and b/fastlane/metadata/android/el-GR/images/tenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/el-GR/images/tenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/el-GR/images/tenInchScreenshots/05 - nutritional plan.png
index e927ffa9..c4702dc8 100644
Binary files a/fastlane/metadata/android/el-GR/images/tenInchScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/el-GR/images/tenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/el-GR/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/el-GR/images/tenInchScreenshots/06 - weight.png
index 96536b40..f6c034b8 100644
Binary files a/fastlane/metadata/android/el-GR/images/tenInchScreenshots/06 - weight.png and b/fastlane/metadata/android/el-GR/images/tenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
index 7318552d..8e72f266 100644
--- a/fastlane/metadata/android/en-US/full_description.txt
+++ b/fastlane/metadata/android/en-US/full_description.txt
@@ -2,7 +2,7 @@ From fitness lovers to fitness lovers – get your health organized with WGER, y
 
 Have you already found your #1 fitness app and do you love to create your own sports routines? No matter what type of sporty beast you are – we all have something in common: We love to keep track of our health data <3
 
-So we don’t judge you for still managing your fitness journey with your handy little workout log book but welcome to 2024!
+So we don’t judge you for still managing your fitness journey with your handy little workout log book but welcome to 2025!
 
 We have developed a 100% free digital health and fitness tracker app for you, sized down to the most relevant features to make your life easier. Get started, keep training and celebrate your progress!
 
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/01 - dashboard.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/01 - dashboard.png
index 92882df1..5f66b00a 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/01 - dashboard.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/02 - workout detail.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/02 - workout detail.png
index f8661037..f76fa96c 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/02 - workout detail.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/03 - gym mode.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/03 - gym mode.png
index e7439c9d..475be41d 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/03 - gym mode.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/04 - measurements.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/04 - measurements.png
index 0e54293d..6f43309a 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/04 - measurements.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/05 - nutritional plan.png
index 4b37a08b..41c0d200 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/06 - weight.png
index 73159b68..4b6ad3b8 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/06 - weight.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/01 - dashboard.png
index 40351d17..4e56a3fa 100644
Binary files a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/01 - dashboard.png and b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/02 - workout detail.png
index 8fb10ef9..7faf5e2d 100644
Binary files a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/02 - workout detail.png and b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/03 - gym mode.png
index 16985d01..191f32fe 100644
Binary files a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/03 - gym mode.png and b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/04 - measurements.png
index aa07f80b..4e7d43bd 100644
Binary files a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/04 - measurements.png and b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/05 - nutritional plan.png
index d59c4d77..7adc9b6b 100644
Binary files a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/06 - weight.png
index a5904937..de1b35bc 100644
Binary files a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/06 - weight.png and b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/01 - dashboard.png
index 61df3d8f..72a6bd5d 100644
Binary files a/fastlane/metadata/android/en-US/images/tenInchScreenshots/01 - dashboard.png and b/fastlane/metadata/android/en-US/images/tenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/02 - workout detail.png
index 7c9b1b4c..244f29b1 100644
Binary files a/fastlane/metadata/android/en-US/images/tenInchScreenshots/02 - workout detail.png and b/fastlane/metadata/android/en-US/images/tenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/03 - gym mode.png
index 3aad3261..5fb16610 100644
Binary files a/fastlane/metadata/android/en-US/images/tenInchScreenshots/03 - gym mode.png and b/fastlane/metadata/android/en-US/images/tenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/04 - measurements.png
index 09d47fd8..6d1575cd 100644
Binary files a/fastlane/metadata/android/en-US/images/tenInchScreenshots/04 - measurements.png and b/fastlane/metadata/android/en-US/images/tenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/05 - nutritional plan.png
index 765d39d0..deed1969 100644
Binary files a/fastlane/metadata/android/en-US/images/tenInchScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/en-US/images/tenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/06 - weight.png
index f6406648..aeeabd16 100644
Binary files a/fastlane/metadata/android/en-US/images/tenInchScreenshots/06 - weight.png and b/fastlane/metadata/android/en-US/images/tenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/en-US/video.txt b/fastlane/metadata/android/en-US/video.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/fastlane/metadata/android/es-ES/full_description.txt b/fastlane/metadata/android/es-ES/full_description.txt
index d6b8aceb..64846275 100644
--- a/fastlane/metadata/android/es-ES/full_description.txt
+++ b/fastlane/metadata/android/es-ES/full_description.txt
@@ -1,6 +1,6 @@
 Por amantes del fitness para amantes del fitness – ¡Organiza tu salud con WGER, tu gestor de entrenamientos!
 
-¿Has encontrado ya tu app de fitnes nº1 y te encanta crear tus propias rutinas deportivas? No importa qué clase de bestia deportista eres – todos tenemos algo en común: amamos hacer el seguimiento de los datos de nuestra salud <3
+¿Has encontrado ya tu app de fitnes nº1 y te encanta crear tus propias rutinas deportivas? No importa qué clase de bestia deportista eres – todos tenemos algo en común: nos gusta hacer el seguimiento de los datos de nuestra salud <3
 
 Así que no vamos a juzgarte si aún gestionas tu andadura en el fitness con tu pequeño y práctico diario de entrenamientos, ¡pero te damos la bienvenida a 2022!
 
diff --git a/fastlane/metadata/android/es-ES/images/phoneScreenshots/01 - dashboard.png b/fastlane/metadata/android/es-ES/images/phoneScreenshots/01 - dashboard.png
index e7e6a02d..59fa1c1b 100644
Binary files a/fastlane/metadata/android/es-ES/images/phoneScreenshots/01 - dashboard.png and b/fastlane/metadata/android/es-ES/images/phoneScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/es-ES/images/phoneScreenshots/02 - workout detail.png b/fastlane/metadata/android/es-ES/images/phoneScreenshots/02 - workout detail.png
index ca322d5f..f76fa96c 100644
Binary files a/fastlane/metadata/android/es-ES/images/phoneScreenshots/02 - workout detail.png and b/fastlane/metadata/android/es-ES/images/phoneScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/es-ES/images/phoneScreenshots/03 - gym mode.png b/fastlane/metadata/android/es-ES/images/phoneScreenshots/03 - gym mode.png
index e0c95bc7..a240130b 100644
Binary files a/fastlane/metadata/android/es-ES/images/phoneScreenshots/03 - gym mode.png and b/fastlane/metadata/android/es-ES/images/phoneScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/es-ES/images/phoneScreenshots/04 - measurements.png b/fastlane/metadata/android/es-ES/images/phoneScreenshots/04 - measurements.png
index 3de87b10..0af0d6ef 100644
Binary files a/fastlane/metadata/android/es-ES/images/phoneScreenshots/04 - measurements.png and b/fastlane/metadata/android/es-ES/images/phoneScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/es-ES/images/phoneScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/es-ES/images/phoneScreenshots/05 - nutritional plan.png
index 1172c251..dc4bea3f 100644
Binary files a/fastlane/metadata/android/es-ES/images/phoneScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/es-ES/images/phoneScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/es-ES/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/es-ES/images/phoneScreenshots/06 - weight.png
index 89f74d2e..7e2d07cc 100644
Binary files a/fastlane/metadata/android/es-ES/images/phoneScreenshots/06 - weight.png and b/fastlane/metadata/android/es-ES/images/phoneScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/es-ES/images/sevenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/es-ES/images/sevenInchScreenshots/01 - dashboard.png
index 4fc3b1bb..9513da98 100644
Binary files a/fastlane/metadata/android/es-ES/images/sevenInchScreenshots/01 - dashboard.png and b/fastlane/metadata/android/es-ES/images/sevenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/es-ES/images/sevenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/es-ES/images/sevenInchScreenshots/02 - workout detail.png
index 97e7143e..7faf5e2d 100644
Binary files a/fastlane/metadata/android/es-ES/images/sevenInchScreenshots/02 - workout detail.png and b/fastlane/metadata/android/es-ES/images/sevenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/es-ES/images/sevenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/es-ES/images/sevenInchScreenshots/03 - gym mode.png
index bf46fa3b..4080120d 100644
Binary files a/fastlane/metadata/android/es-ES/images/sevenInchScreenshots/03 - gym mode.png and b/fastlane/metadata/android/es-ES/images/sevenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/es-ES/images/sevenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/es-ES/images/sevenInchScreenshots/04 - measurements.png
index ec6880d3..42c0a3ed 100644
Binary files a/fastlane/metadata/android/es-ES/images/sevenInchScreenshots/04 - measurements.png and b/fastlane/metadata/android/es-ES/images/sevenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/es-ES/images/sevenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/es-ES/images/sevenInchScreenshots/05 - nutritional plan.png
index 236e215d..5cfc09fc 100644
Binary files a/fastlane/metadata/android/es-ES/images/sevenInchScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/es-ES/images/sevenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/es-ES/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/es-ES/images/sevenInchScreenshots/06 - weight.png
index 2372983b..8883ab31 100644
Binary files a/fastlane/metadata/android/es-ES/images/sevenInchScreenshots/06 - weight.png and b/fastlane/metadata/android/es-ES/images/sevenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/es-ES/images/tenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/es-ES/images/tenInchScreenshots/01 - dashboard.png
index 57dea675..2c2e0ab1 100644
Binary files a/fastlane/metadata/android/es-ES/images/tenInchScreenshots/01 - dashboard.png and b/fastlane/metadata/android/es-ES/images/tenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/es-ES/images/tenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/es-ES/images/tenInchScreenshots/02 - workout detail.png
index f0956061..244f29b1 100644
Binary files a/fastlane/metadata/android/es-ES/images/tenInchScreenshots/02 - workout detail.png and b/fastlane/metadata/android/es-ES/images/tenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/es-ES/images/tenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/es-ES/images/tenInchScreenshots/03 - gym mode.png
index 227ea884..4da9907b 100644
Binary files a/fastlane/metadata/android/es-ES/images/tenInchScreenshots/03 - gym mode.png and b/fastlane/metadata/android/es-ES/images/tenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/es-ES/images/tenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/es-ES/images/tenInchScreenshots/04 - measurements.png
index 689a2d20..aa86ff02 100644
Binary files a/fastlane/metadata/android/es-ES/images/tenInchScreenshots/04 - measurements.png and b/fastlane/metadata/android/es-ES/images/tenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/es-ES/images/tenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/es-ES/images/tenInchScreenshots/05 - nutritional plan.png
index 0d7b5439..109ca1ab 100644
Binary files a/fastlane/metadata/android/es-ES/images/tenInchScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/es-ES/images/tenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/es-ES/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/es-ES/images/tenInchScreenshots/06 - weight.png
index 15e683d4..9d05c13b 100644
Binary files a/fastlane/metadata/android/es-ES/images/tenInchScreenshots/06 - weight.png and b/fastlane/metadata/android/es-ES/images/tenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/fr-FR/full_description.txt b/fastlane/metadata/android/fr-FR/full_description.txt
index 25d7b846..cdacf2e0 100644
--- a/fastlane/metadata/android/fr-FR/full_description.txt
+++ b/fastlane/metadata/android/fr-FR/full_description.txt
@@ -2,7 +2,7 @@ Entre amoureux du fitness et amoureux de la forme, organisez votre santé avec W
 
 Vous avez déjà trouvé votre application de fitness nº 1 et vous aimez créer vos propres routines sportives ? Quel que soit le type de bête sportive que vous êtes - nous avons tous quelque chose en commun : nous aimons garder la trace de nos données de santé <3.
 
-Nous ne vous jugeons donc pas si vous continuez à gérer votre parcours de remise en forme avec votre petit carnet d'entraînement bien pratique, mais bienvenue en 2024 !
+Nous ne vous jugeons donc pas si vous continuez à gérer votre parcours de remise en forme avec votre petit carnet d'entraînement bien pratique, mais bienvenue en 2025 !
 
 Nous avons conçu pour vous une application numérique de suivi de la santé et de la forme physique 100 % gratuite, dimensionnée aux fonctionnalités les plus pertinentes pour vous faciliter la vie. Lancez-vous, continuez à vous entraîner et célébrez vos progrès !
 
diff --git a/fastlane/metadata/android/fr-FR/images/phoneScreenshots/01 - dashboard.png b/fastlane/metadata/android/fr-FR/images/phoneScreenshots/01 - dashboard.png
index 60e29c2b..1a3e3d6e 100644
Binary files a/fastlane/metadata/android/fr-FR/images/phoneScreenshots/01 - dashboard.png and b/fastlane/metadata/android/fr-FR/images/phoneScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/fr-FR/images/phoneScreenshots/02 - workout detail.png b/fastlane/metadata/android/fr-FR/images/phoneScreenshots/02 - workout detail.png
index 87a14337..ac7ca088 100644
Binary files a/fastlane/metadata/android/fr-FR/images/phoneScreenshots/02 - workout detail.png and b/fastlane/metadata/android/fr-FR/images/phoneScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/fr-FR/images/phoneScreenshots/03 - gym mode.png b/fastlane/metadata/android/fr-FR/images/phoneScreenshots/03 - gym mode.png
index 0ad1a476..71d958de 100644
Binary files a/fastlane/metadata/android/fr-FR/images/phoneScreenshots/03 - gym mode.png and b/fastlane/metadata/android/fr-FR/images/phoneScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/fr-FR/images/phoneScreenshots/04 - measurements.png b/fastlane/metadata/android/fr-FR/images/phoneScreenshots/04 - measurements.png
index c91f2855..5320ab0b 100644
Binary files a/fastlane/metadata/android/fr-FR/images/phoneScreenshots/04 - measurements.png and b/fastlane/metadata/android/fr-FR/images/phoneScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/fr-FR/images/phoneScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/fr-FR/images/phoneScreenshots/05 - nutritional plan.png
index 1fd68ebf..800bac47 100644
Binary files a/fastlane/metadata/android/fr-FR/images/phoneScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/fr-FR/images/phoneScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/fr-FR/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/fr-FR/images/phoneScreenshots/06 - weight.png
index 28e5d6d6..e1c81f7d 100644
Binary files a/fastlane/metadata/android/fr-FR/images/phoneScreenshots/06 - weight.png and b/fastlane/metadata/android/fr-FR/images/phoneScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/fr-FR/images/sevenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/fr-FR/images/sevenInchScreenshots/01 - dashboard.png
index 02a2d6bc..f51e2438 100644
Binary files a/fastlane/metadata/android/fr-FR/images/sevenInchScreenshots/01 - dashboard.png and b/fastlane/metadata/android/fr-FR/images/sevenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/fr-FR/images/sevenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/fr-FR/images/sevenInchScreenshots/02 - workout detail.png
index dffebf30..bd2864ad 100644
Binary files a/fastlane/metadata/android/fr-FR/images/sevenInchScreenshots/02 - workout detail.png and b/fastlane/metadata/android/fr-FR/images/sevenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/fr-FR/images/sevenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/fr-FR/images/sevenInchScreenshots/03 - gym mode.png
index 6754b592..d4d52f2a 100644
Binary files a/fastlane/metadata/android/fr-FR/images/sevenInchScreenshots/03 - gym mode.png and b/fastlane/metadata/android/fr-FR/images/sevenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/fr-FR/images/sevenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/fr-FR/images/sevenInchScreenshots/04 - measurements.png
index 02d48d72..14d5548a 100644
Binary files a/fastlane/metadata/android/fr-FR/images/sevenInchScreenshots/04 - measurements.png and b/fastlane/metadata/android/fr-FR/images/sevenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/fr-FR/images/sevenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/fr-FR/images/sevenInchScreenshots/05 - nutritional plan.png
index 509b70ab..ee514acb 100644
Binary files a/fastlane/metadata/android/fr-FR/images/sevenInchScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/fr-FR/images/sevenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/fr-FR/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/fr-FR/images/sevenInchScreenshots/06 - weight.png
index 326407f9..81be25d8 100644
Binary files a/fastlane/metadata/android/fr-FR/images/sevenInchScreenshots/06 - weight.png and b/fastlane/metadata/android/fr-FR/images/sevenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/fr-FR/images/tenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/fr-FR/images/tenInchScreenshots/01 - dashboard.png
index 80d61f66..54b55d55 100644
Binary files a/fastlane/metadata/android/fr-FR/images/tenInchScreenshots/01 - dashboard.png and b/fastlane/metadata/android/fr-FR/images/tenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/fr-FR/images/tenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/fr-FR/images/tenInchScreenshots/02 - workout detail.png
index d5ff56ae..890ac604 100644
Binary files a/fastlane/metadata/android/fr-FR/images/tenInchScreenshots/02 - workout detail.png and b/fastlane/metadata/android/fr-FR/images/tenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/fr-FR/images/tenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/fr-FR/images/tenInchScreenshots/03 - gym mode.png
index 90e030c4..17f44405 100644
Binary files a/fastlane/metadata/android/fr-FR/images/tenInchScreenshots/03 - gym mode.png and b/fastlane/metadata/android/fr-FR/images/tenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/fr-FR/images/tenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/fr-FR/images/tenInchScreenshots/04 - measurements.png
index 1b3a23fe..7cecf5e7 100644
Binary files a/fastlane/metadata/android/fr-FR/images/tenInchScreenshots/04 - measurements.png and b/fastlane/metadata/android/fr-FR/images/tenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/fr-FR/images/tenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/fr-FR/images/tenInchScreenshots/05 - nutritional plan.png
index 5b028a5f..ff199066 100644
Binary files a/fastlane/metadata/android/fr-FR/images/tenInchScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/fr-FR/images/tenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/fr-FR/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/fr-FR/images/tenInchScreenshots/06 - weight.png
index b15a87af..69c43686 100644
Binary files a/fastlane/metadata/android/fr-FR/images/tenInchScreenshots/06 - weight.png and b/fastlane/metadata/android/fr-FR/images/tenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/hi-IN/images/phoneScreenshots/01 - dashboard.png b/fastlane/metadata/android/hi-IN/images/phoneScreenshots/01 - dashboard.png
index a0a04ad9..450d52a5 100644
Binary files a/fastlane/metadata/android/hi-IN/images/phoneScreenshots/01 - dashboard.png and b/fastlane/metadata/android/hi-IN/images/phoneScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/hi-IN/images/phoneScreenshots/02 - workout detail.png b/fastlane/metadata/android/hi-IN/images/phoneScreenshots/02 - workout detail.png
index a084e00b..f76fa96c 100644
Binary files a/fastlane/metadata/android/hi-IN/images/phoneScreenshots/02 - workout detail.png and b/fastlane/metadata/android/hi-IN/images/phoneScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/hi-IN/images/phoneScreenshots/03 - gym mode.png b/fastlane/metadata/android/hi-IN/images/phoneScreenshots/03 - gym mode.png
index 270d7f43..d9d0f5a1 100644
Binary files a/fastlane/metadata/android/hi-IN/images/phoneScreenshots/03 - gym mode.png and b/fastlane/metadata/android/hi-IN/images/phoneScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/hi-IN/images/phoneScreenshots/04 - measurements.png b/fastlane/metadata/android/hi-IN/images/phoneScreenshots/04 - measurements.png
index 896d1440..2d923626 100644
Binary files a/fastlane/metadata/android/hi-IN/images/phoneScreenshots/04 - measurements.png and b/fastlane/metadata/android/hi-IN/images/phoneScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/hi-IN/images/phoneScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/hi-IN/images/phoneScreenshots/05 - nutritional plan.png
index 333bf730..c9ea957e 100644
Binary files a/fastlane/metadata/android/hi-IN/images/phoneScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/hi-IN/images/phoneScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/hi-IN/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/hi-IN/images/phoneScreenshots/06 - weight.png
index c018a091..ff34ccdb 100644
Binary files a/fastlane/metadata/android/hi-IN/images/phoneScreenshots/06 - weight.png and b/fastlane/metadata/android/hi-IN/images/phoneScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/hi-IN/images/sevenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/hi-IN/images/sevenInchScreenshots/01 - dashboard.png
index 40752d1f..e09796df 100644
Binary files a/fastlane/metadata/android/hi-IN/images/sevenInchScreenshots/01 - dashboard.png and b/fastlane/metadata/android/hi-IN/images/sevenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/hi-IN/images/sevenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/hi-IN/images/sevenInchScreenshots/02 - workout detail.png
index ba508d1d..7faf5e2d 100644
Binary files a/fastlane/metadata/android/hi-IN/images/sevenInchScreenshots/02 - workout detail.png and b/fastlane/metadata/android/hi-IN/images/sevenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/hi-IN/images/sevenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/hi-IN/images/sevenInchScreenshots/03 - gym mode.png
index d28bbedd..f1a4792d 100644
Binary files a/fastlane/metadata/android/hi-IN/images/sevenInchScreenshots/03 - gym mode.png and b/fastlane/metadata/android/hi-IN/images/sevenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/hi-IN/images/sevenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/hi-IN/images/sevenInchScreenshots/04 - measurements.png
index d498a102..7d0477db 100644
Binary files a/fastlane/metadata/android/hi-IN/images/sevenInchScreenshots/04 - measurements.png and b/fastlane/metadata/android/hi-IN/images/sevenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/hi-IN/images/sevenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/hi-IN/images/sevenInchScreenshots/05 - nutritional plan.png
index 359c8f30..6839cba6 100644
Binary files a/fastlane/metadata/android/hi-IN/images/sevenInchScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/hi-IN/images/sevenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/hi-IN/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/hi-IN/images/sevenInchScreenshots/06 - weight.png
index 2a296a4e..fb998641 100644
Binary files a/fastlane/metadata/android/hi-IN/images/sevenInchScreenshots/06 - weight.png and b/fastlane/metadata/android/hi-IN/images/sevenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/hi-IN/images/tenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/hi-IN/images/tenInchScreenshots/01 - dashboard.png
index de1be502..09b2ec58 100644
Binary files a/fastlane/metadata/android/hi-IN/images/tenInchScreenshots/01 - dashboard.png and b/fastlane/metadata/android/hi-IN/images/tenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/hi-IN/images/tenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/hi-IN/images/tenInchScreenshots/02 - workout detail.png
index 3c70f310..244f29b1 100644
Binary files a/fastlane/metadata/android/hi-IN/images/tenInchScreenshots/02 - workout detail.png and b/fastlane/metadata/android/hi-IN/images/tenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/hi-IN/images/tenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/hi-IN/images/tenInchScreenshots/03 - gym mode.png
index 8ce4156f..eff913ca 100644
Binary files a/fastlane/metadata/android/hi-IN/images/tenInchScreenshots/03 - gym mode.png and b/fastlane/metadata/android/hi-IN/images/tenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/hi-IN/images/tenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/hi-IN/images/tenInchScreenshots/04 - measurements.png
index 2800a103..3415d6d6 100644
Binary files a/fastlane/metadata/android/hi-IN/images/tenInchScreenshots/04 - measurements.png and b/fastlane/metadata/android/hi-IN/images/tenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/hi-IN/images/tenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/hi-IN/images/tenInchScreenshots/05 - nutritional plan.png
index 47f94bf7..f2eec02c 100644
Binary files a/fastlane/metadata/android/hi-IN/images/tenInchScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/hi-IN/images/tenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/hi-IN/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/hi-IN/images/tenInchScreenshots/06 - weight.png
index 74df9020..27be1f22 100644
Binary files a/fastlane/metadata/android/hi-IN/images/tenInchScreenshots/06 - weight.png and b/fastlane/metadata/android/hi-IN/images/tenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/hr/full_description.txt b/fastlane/metadata/android/hr/full_description.txt
index 0fa9a0fa..9f3ffff2 100644
--- a/fastlane/metadata/android/hr/full_description.txt
+++ b/fastlane/metadata/android/hr/full_description.txt
@@ -2,7 +2,7 @@ Od ljubitelja fitnessa za ljubitelje fitnessa – organiziraj svoje zdravlje s W
 
 Već si pronašao/la omiljeni program za fitness i voliš stvarati vlastite sportske rutine? Bez obzira na vrstu sportske zvijeri – svi imamo nešto zajedničko: Volimo pratiti naše zdravstvene podatke <3
 
-Stoga te ne osuđujemo što još uvijek upravljaš svojim fitnessom sa svojim praktičnim malim dnevnikom vježbanja, ali nalazimo se u 2024. godini!
+Stoga te ne osuđujemo što još uvijek upravljaš svojim fitnessom sa svojim praktičnim malim dnevnikom vježbanja, ali nalazimo se u 2025. godini!
 
 Razvili smo 100 % besplatan program za digitalno praćenje zdravlja i fitnessa, s najrelevantnijim funkcijama koje će ti olakšati život. Započni, nastavi trenirati i proslavi svoj napredak!
 
diff --git a/fastlane/metadata/android/hr/images/phoneScreenshots/01 - dashboard.png b/fastlane/metadata/android/hr/images/phoneScreenshots/01 - dashboard.png
index 9a382c89..3bf4a29a 100644
Binary files a/fastlane/metadata/android/hr/images/phoneScreenshots/01 - dashboard.png and b/fastlane/metadata/android/hr/images/phoneScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/hr/images/phoneScreenshots/02 - workout detail.png b/fastlane/metadata/android/hr/images/phoneScreenshots/02 - workout detail.png
index c5fe6f3b..f76fa96c 100644
Binary files a/fastlane/metadata/android/hr/images/phoneScreenshots/02 - workout detail.png and b/fastlane/metadata/android/hr/images/phoneScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/hr/images/phoneScreenshots/03 - gym mode.png b/fastlane/metadata/android/hr/images/phoneScreenshots/03 - gym mode.png
index e77f9ce0..72287f01 100644
Binary files a/fastlane/metadata/android/hr/images/phoneScreenshots/03 - gym mode.png and b/fastlane/metadata/android/hr/images/phoneScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/hr/images/phoneScreenshots/04 - measurements.png b/fastlane/metadata/android/hr/images/phoneScreenshots/04 - measurements.png
index 6c213752..78243b85 100644
Binary files a/fastlane/metadata/android/hr/images/phoneScreenshots/04 - measurements.png and b/fastlane/metadata/android/hr/images/phoneScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/hr/images/phoneScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/hr/images/phoneScreenshots/05 - nutritional plan.png
index 0b58c9a7..add06c9b 100644
Binary files a/fastlane/metadata/android/hr/images/phoneScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/hr/images/phoneScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/hr/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/hr/images/phoneScreenshots/06 - weight.png
index 8c663197..1b9257f6 100644
Binary files a/fastlane/metadata/android/hr/images/phoneScreenshots/06 - weight.png and b/fastlane/metadata/android/hr/images/phoneScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/hr/images/sevenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/hr/images/sevenInchScreenshots/01 - dashboard.png
index 9fa87991..004c6104 100644
Binary files a/fastlane/metadata/android/hr/images/sevenInchScreenshots/01 - dashboard.png and b/fastlane/metadata/android/hr/images/sevenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/hr/images/sevenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/hr/images/sevenInchScreenshots/02 - workout detail.png
index 221df64f..7faf5e2d 100644
Binary files a/fastlane/metadata/android/hr/images/sevenInchScreenshots/02 - workout detail.png and b/fastlane/metadata/android/hr/images/sevenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/hr/images/sevenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/hr/images/sevenInchScreenshots/03 - gym mode.png
index 9436e0a9..f8a496a0 100644
Binary files a/fastlane/metadata/android/hr/images/sevenInchScreenshots/03 - gym mode.png and b/fastlane/metadata/android/hr/images/sevenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/hr/images/sevenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/hr/images/sevenInchScreenshots/04 - measurements.png
index 2d96fe01..6dddd621 100644
Binary files a/fastlane/metadata/android/hr/images/sevenInchScreenshots/04 - measurements.png and b/fastlane/metadata/android/hr/images/sevenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/hr/images/sevenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/hr/images/sevenInchScreenshots/05 - nutritional plan.png
index 1c3ef033..17b2b755 100644
Binary files a/fastlane/metadata/android/hr/images/sevenInchScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/hr/images/sevenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/hr/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/hr/images/sevenInchScreenshots/06 - weight.png
index aee4fde3..1b59831a 100644
Binary files a/fastlane/metadata/android/hr/images/sevenInchScreenshots/06 - weight.png and b/fastlane/metadata/android/hr/images/sevenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/hr/images/tenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/hr/images/tenInchScreenshots/01 - dashboard.png
index 7bff9fde..424a02c5 100644
Binary files a/fastlane/metadata/android/hr/images/tenInchScreenshots/01 - dashboard.png and b/fastlane/metadata/android/hr/images/tenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/hr/images/tenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/hr/images/tenInchScreenshots/02 - workout detail.png
index bf28d1a6..244f29b1 100644
Binary files a/fastlane/metadata/android/hr/images/tenInchScreenshots/02 - workout detail.png and b/fastlane/metadata/android/hr/images/tenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/hr/images/tenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/hr/images/tenInchScreenshots/03 - gym mode.png
index 15739064..921485ce 100644
Binary files a/fastlane/metadata/android/hr/images/tenInchScreenshots/03 - gym mode.png and b/fastlane/metadata/android/hr/images/tenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/hr/images/tenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/hr/images/tenInchScreenshots/04 - measurements.png
index 958bd135..c4975a51 100644
Binary files a/fastlane/metadata/android/hr/images/tenInchScreenshots/04 - measurements.png and b/fastlane/metadata/android/hr/images/tenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/hr/images/tenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/hr/images/tenInchScreenshots/05 - nutritional plan.png
index f63cb1b2..cc5e9258 100644
Binary files a/fastlane/metadata/android/hr/images/tenInchScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/hr/images/tenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/hr/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/hr/images/tenInchScreenshots/06 - weight.png
index 6a53b04a..3c4e8422 100644
Binary files a/fastlane/metadata/android/hr/images/tenInchScreenshots/06 - weight.png and b/fastlane/metadata/android/hr/images/tenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/hr/video.txt b/fastlane/metadata/android/hr/video.txt
deleted file mode 100644
index 8d1c8b69..00000000
--- a/fastlane/metadata/android/hr/video.txt
+++ /dev/null
@@ -1 +0,0 @@
- 
diff --git a/fastlane/metadata/android/it-IT/full_description.txt b/fastlane/metadata/android/it-IT/full_description.txt
index b8a5f2f1..2b8523d5 100644
--- a/fastlane/metadata/android/it-IT/full_description.txt
+++ b/fastlane/metadata/android/it-IT/full_description.txt
@@ -2,7 +2,7 @@ Da amanti del fitness per amanti del fitness – Organizza la tua salute con WGE
 
 Hai già trovato la tua applicazione per il fitness nº 1 e ti piace creare le tue routines sportive? Non importa che tipo di sportivo sei – Abbiamo tutti qualcosa in comune: Amiamo tenere sotto controllo i dati sulla nostra salute <3
 
-Quindi non ti giudichiamo se stai ancora tenendo traccia dei tuoi allenamenti con un vecchio quaderno, ma ora ti diamo il benvenuto nel 2024!
+Quindi non ti giudichiamo se stai ancora tenendo traccia dei tuoi allenamenti con un vecchio quaderno, ma ora ti diamo il benvenuto nel 2025!
 
 Abbiamo sviluppato una applicazione 100% gratuita, questa applicazione tiene traccia dei tuoi allenamenti per te alleggerita alle funzionalità più importanti per semplificarti la vita. Inizia, monitora, e celebra i tuoi progressi!
 
diff --git a/fastlane/metadata/android/it-IT/images/phoneScreenshots/01 - dashboard.png b/fastlane/metadata/android/it-IT/images/phoneScreenshots/01 - dashboard.png
index f49db523..c0e8d59d 100644
Binary files a/fastlane/metadata/android/it-IT/images/phoneScreenshots/01 - dashboard.png and b/fastlane/metadata/android/it-IT/images/phoneScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/it-IT/images/phoneScreenshots/02 - workout detail.png b/fastlane/metadata/android/it-IT/images/phoneScreenshots/02 - workout detail.png
index 9733d3dd..2cb7d62f 100644
Binary files a/fastlane/metadata/android/it-IT/images/phoneScreenshots/02 - workout detail.png and b/fastlane/metadata/android/it-IT/images/phoneScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/it-IT/images/phoneScreenshots/03 - gym mode.png b/fastlane/metadata/android/it-IT/images/phoneScreenshots/03 - gym mode.png
index f9c3ee26..a0e9da7d 100644
Binary files a/fastlane/metadata/android/it-IT/images/phoneScreenshots/03 - gym mode.png and b/fastlane/metadata/android/it-IT/images/phoneScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/it-IT/images/phoneScreenshots/04 - measurements.png b/fastlane/metadata/android/it-IT/images/phoneScreenshots/04 - measurements.png
index 54984b37..3b199564 100644
Binary files a/fastlane/metadata/android/it-IT/images/phoneScreenshots/04 - measurements.png and b/fastlane/metadata/android/it-IT/images/phoneScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/it-IT/images/phoneScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/it-IT/images/phoneScreenshots/05 - nutritional plan.png
index c82b4ba3..a7ea034b 100644
Binary files a/fastlane/metadata/android/it-IT/images/phoneScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/it-IT/images/phoneScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/it-IT/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/it-IT/images/phoneScreenshots/06 - weight.png
index 0cc55987..481b9f13 100644
Binary files a/fastlane/metadata/android/it-IT/images/phoneScreenshots/06 - weight.png and b/fastlane/metadata/android/it-IT/images/phoneScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/it-IT/images/sevenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/it-IT/images/sevenInchScreenshots/01 - dashboard.png
index 7e2cdc68..fb441cee 100644
Binary files a/fastlane/metadata/android/it-IT/images/sevenInchScreenshots/01 - dashboard.png and b/fastlane/metadata/android/it-IT/images/sevenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/it-IT/images/sevenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/it-IT/images/sevenInchScreenshots/02 - workout detail.png
index c8f8b43f..10b37dc1 100644
Binary files a/fastlane/metadata/android/it-IT/images/sevenInchScreenshots/02 - workout detail.png and b/fastlane/metadata/android/it-IT/images/sevenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/it-IT/images/sevenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/it-IT/images/sevenInchScreenshots/03 - gym mode.png
index a2ee7928..aa2d2826 100644
Binary files a/fastlane/metadata/android/it-IT/images/sevenInchScreenshots/03 - gym mode.png and b/fastlane/metadata/android/it-IT/images/sevenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/it-IT/images/sevenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/it-IT/images/sevenInchScreenshots/04 - measurements.png
index b6e9583b..225bb48e 100644
Binary files a/fastlane/metadata/android/it-IT/images/sevenInchScreenshots/04 - measurements.png and b/fastlane/metadata/android/it-IT/images/sevenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/it-IT/images/sevenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/it-IT/images/sevenInchScreenshots/05 - nutritional plan.png
index 3a1e4f31..ab71db56 100644
Binary files a/fastlane/metadata/android/it-IT/images/sevenInchScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/it-IT/images/sevenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/it-IT/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/it-IT/images/sevenInchScreenshots/06 - weight.png
index a3310179..075718e1 100644
Binary files a/fastlane/metadata/android/it-IT/images/sevenInchScreenshots/06 - weight.png and b/fastlane/metadata/android/it-IT/images/sevenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/it-IT/images/tenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/it-IT/images/tenInchScreenshots/01 - dashboard.png
index 4e9d027d..cb939489 100644
Binary files a/fastlane/metadata/android/it-IT/images/tenInchScreenshots/01 - dashboard.png and b/fastlane/metadata/android/it-IT/images/tenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/it-IT/images/tenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/it-IT/images/tenInchScreenshots/02 - workout detail.png
index aec0ffe2..6fc37ca4 100644
Binary files a/fastlane/metadata/android/it-IT/images/tenInchScreenshots/02 - workout detail.png and b/fastlane/metadata/android/it-IT/images/tenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/it-IT/images/tenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/it-IT/images/tenInchScreenshots/03 - gym mode.png
index d05af8a9..1208ef0e 100644
Binary files a/fastlane/metadata/android/it-IT/images/tenInchScreenshots/03 - gym mode.png and b/fastlane/metadata/android/it-IT/images/tenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/it-IT/images/tenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/it-IT/images/tenInchScreenshots/04 - measurements.png
index 52f05aaf..c163d53d 100644
Binary files a/fastlane/metadata/android/it-IT/images/tenInchScreenshots/04 - measurements.png and b/fastlane/metadata/android/it-IT/images/tenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/it-IT/images/tenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/it-IT/images/tenInchScreenshots/05 - nutritional plan.png
index b5b1fb79..1f084a95 100644
Binary files a/fastlane/metadata/android/it-IT/images/tenInchScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/it-IT/images/tenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/it-IT/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/it-IT/images/tenInchScreenshots/06 - weight.png
index c2cccf1b..64ded046 100644
Binary files a/fastlane/metadata/android/it-IT/images/tenInchScreenshots/06 - weight.png and b/fastlane/metadata/android/it-IT/images/tenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/iw-IL/full_description.txt b/fastlane/metadata/android/iw-IL/full_description.txt
new file mode 100644
index 00000000..8e72f266
--- /dev/null
+++ b/fastlane/metadata/android/iw-IL/full_description.txt
@@ -0,0 +1,39 @@
+From fitness lovers to fitness lovers – get your health organized with WGER, your Workout Manager!
+
+Have you already found your #1 fitness app and do you love to create your own sports routines? No matter what type of sporty beast you are – we all have something in common: We love to keep track of our health data <3
+
+So we don’t judge you for still managing your fitness journey with your handy little workout log book but welcome to 2025!
+
+We have developed a 100% free digital health and fitness tracker app for you, sized down to the most relevant features to make your life easier. Get started, keep training and celebrate your progress!
+
+wger is an Open Source project and all about:
+* Your Body
+* Your Workouts
+* Your Progress
+* Your Data
+
+Your Body:
+No need to google for the ingredients of your favourite treats – choose your daily meals from more than 78000 products and see the nutritional values. Add meals to the nutritional plan and keep an overview of your diet in the calendar.
+
+Your Workouts:
+You know what is best for your body. Create your own workouts out of a growing variety from 200 different exercises. Then, use the Gym Mode to guide you through the training while you log your weights with one tap.
+
+Your Progress:
+Never lose sight of your goals. Track your weight and keep your statistics.
+
+Your Data:
+wger is your personalized fitness diary – but you own your data. Use the REST API to access and do amazing things with it.
+
+Please note: This free app is not based on additional fundings and we don’t ask you to donate money. More than that it is a community project which is growing constantly. So be prepared for new features anytime!
+
+#OpenSource – what does that mean?
+
+Open Source means that the whole source code for this app and the server it talks to is free and available to anybody:
+* Do you want to run wger on your own server for you or your local gym? Go ahead!
+* Do you miss a feature and want to implement it? Start now!
+* Do you want to check that nothing is being sent anywhere? You can!
+
+Join our community and become a part of sport enthusiasts and IT geeks from all over the world. We keep working on adjusting and optimizing the app customized to our needs. We love your input so feel free to jump in anytime and contribute your wishes and ideas!
+
+-> find the source code on https://github.com/wger-project
+-> ask your questions or just say hello on our discord Server https://discord.gg/rPWFv6W
\ No newline at end of file
diff --git a/fastlane/metadata/android/iw-IL/short_description.txt b/fastlane/metadata/android/iw-IL/short_description.txt
new file mode 100644
index 00000000..bdcc931c
--- /dev/null
+++ b/fastlane/metadata/android/iw-IL/short_description.txt
@@ -0,0 +1 @@
+מעקב אחר כושר גופני, תזונה ומשקל
diff --git a/fastlane/metadata/android/iw-IL/title.txt b/fastlane/metadata/android/iw-IL/title.txt
new file mode 100644
index 00000000..ea0df956
--- /dev/null
+++ b/fastlane/metadata/android/iw-IL/title.txt
@@ -0,0 +1 @@
+wger Workout Manager
\ No newline at end of file
diff --git a/fastlane/metadata/android/ko-KR/full_description.txt b/fastlane/metadata/android/ko-KR/full_description.txt
new file mode 100644
index 00000000..6686c5ad
--- /dev/null
+++ b/fastlane/metadata/android/ko-KR/full_description.txt
@@ -0,0 +1,56 @@
+운동을 사랑하는 사람들로부터 운동을 사랑하는 사람들을 위해 – WGER와 함께 건강을 체계적으로 관리하세요, 당신의 워크아웃 매니저!
+
+이미 당신만의 최고의 피트니스 앱을 찾았나요? 자신만의 운동 루틴을 만드는 걸 좋아하나요? 어떤 운동 스타일이든 우리는 공통점이 있습니다: 건강 데이터를 기록하는 걸 좋아한다는 점이죠. ❤️
+
+아직도 작은 운동 일지에 피트니스 여정을 기록하고 있다면 괜찮아요. 하지만 이제 2025년에 오신 걸 환영합니다!
+
+우리는 여러분의 삶을 더 쉽게 만들어주는, 꼭 필요한 기능만 담은 100% 무료 디지털 건강 & 피트니스 트래커 앱을 개발했습니다.
+지금 바로 시작하고, 꾸준히 운동하며, 성장하는 모습을 축하하세요!
+
+WGER는 오픈소스 프로젝트이며, 중심 철학은 다음과 같습니다:
+
+당신의 몸 (Your Body)
+
+당신의 운동 (Your Workouts)
+
+당신의 성장 (Your Progress)
+
+당신의 데이터 (Your Data)
+
+당신의 몸 (Your Body):
+좋아하는 간식의 영양 성분을 검색할 필요가 없습니다.
+78,000개 이상의 식품 데이터베이스에서 하루 식단을 고르고, 영양 계획에 추가해보세요.
+캘린더에서 식단을 한눈에 확인할 수 있습니다.
+
+당신의 운동 (Your Workouts):
+당신의 몸에 가장 잘 맞는 운동은 바로 당신이 가장 잘 압니다.
+200가지 이상의 다양한 운동 중에서 자신만의 운동 루틴을 만들어보세요.
+그런 다음 ‘Gym Mode’를 활용해 운동을 진행하면서 원터치로 무게를 기록할 수 있습니다.
+
+당신의 성장 (Your Progress):
+목표를 잊지 마세요. 체중을 추적하고 통계 데이터를 통해 자신의 발전을 확인할 수 있습니다.
+
+당신의 데이터 (Your Data):
+WGER는 개인 맞춤형 피트니스 다이어리입니다 – 당신의 데이터는 오직 당신의 것입니다.
+REST API를 사용해 데이터를 자유롭게 접근하고 원하는 대로 활용하세요.
+
+참고:
+이 앱은 별도의 자금 지원을 받지 않으며, 기부를 요구하지도 않습니다.
+커뮤니티 기반 프로젝트로, 지속적으로 성장 중입니다. 언제든지 새로운 기능이 추가될 예정이니 기대하세요!
+
+#오픈소스 – 그게 뭔가요?
+
+오픈소스란, 이 앱과 서버의 전체 소스 코드가 누구에게나 공개되어 있다는 뜻입니다:
+
+WGER를 본인 서버나 지역 체육관에서 직접 운영하고 싶나요? 가능합니다!
+
+원하는 기능이 없나요? 직접 구현해보세요!
+
+데이터가 다른 곳으로 전송되지 않는지 확인하고 싶나요? 얼마든지 확인할 수 있습니다!
+
+우리 커뮤니티에 참여해보세요. 전 세계 운동 애호가와 IT 개발자들이 함께하고 있습니다.
+우리의 니즈에 맞춰 앱을 지속적으로 조정하고 최적화하고 있습니다.
+여러분의 아이디어와 의견을 언제든지 환영합니다. 자유롭게 참여하고 기여해주세요!
+
+→ 소스 코드는 https://github.com/wger-project 에서 확인할 수 있습니다.
+→ 궁금한 점이 있거나 인사하고 싶다면 디스코드 서버로 오세요: https://discord.gg/rPWFv6W
diff --git a/fastlane/metadata/android/ko-KR/images/phoneScreenshots/01 - dashboard.png b/fastlane/metadata/android/ko-KR/images/phoneScreenshots/01 - dashboard.png
new file mode 100644
index 00000000..acb44780
Binary files /dev/null and b/fastlane/metadata/android/ko-KR/images/phoneScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/ko-KR/images/phoneScreenshots/02 - workout detail.png b/fastlane/metadata/android/ko-KR/images/phoneScreenshots/02 - workout detail.png
new file mode 100644
index 00000000..f76fa96c
Binary files /dev/null and b/fastlane/metadata/android/ko-KR/images/phoneScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/ko-KR/images/phoneScreenshots/03 - gym mode.png b/fastlane/metadata/android/ko-KR/images/phoneScreenshots/03 - gym mode.png
new file mode 100644
index 00000000..61879299
Binary files /dev/null and b/fastlane/metadata/android/ko-KR/images/phoneScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/ko-KR/images/phoneScreenshots/04 - measurements.png b/fastlane/metadata/android/ko-KR/images/phoneScreenshots/04 - measurements.png
new file mode 100644
index 00000000..5ca2095b
Binary files /dev/null and b/fastlane/metadata/android/ko-KR/images/phoneScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/ko-KR/images/phoneScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/ko-KR/images/phoneScreenshots/05 - nutritional plan.png
new file mode 100644
index 00000000..2419c66c
Binary files /dev/null and b/fastlane/metadata/android/ko-KR/images/phoneScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/ko-KR/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/ko-KR/images/phoneScreenshots/06 - weight.png
new file mode 100644
index 00000000..641061a6
Binary files /dev/null and b/fastlane/metadata/android/ko-KR/images/phoneScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/ko-KR/images/sevenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/ko-KR/images/sevenInchScreenshots/01 - dashboard.png
new file mode 100644
index 00000000..5fc40ad5
Binary files /dev/null and b/fastlane/metadata/android/ko-KR/images/sevenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/ko-KR/images/sevenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/ko-KR/images/sevenInchScreenshots/02 - workout detail.png
new file mode 100644
index 00000000..7faf5e2d
Binary files /dev/null and b/fastlane/metadata/android/ko-KR/images/sevenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/ko-KR/images/sevenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/ko-KR/images/sevenInchScreenshots/03 - gym mode.png
new file mode 100644
index 00000000..9e3558aa
Binary files /dev/null and b/fastlane/metadata/android/ko-KR/images/sevenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/ko-KR/images/sevenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/ko-KR/images/sevenInchScreenshots/04 - measurements.png
new file mode 100644
index 00000000..5bd7b795
Binary files /dev/null and b/fastlane/metadata/android/ko-KR/images/sevenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/ko-KR/images/sevenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/ko-KR/images/sevenInchScreenshots/05 - nutritional plan.png
new file mode 100644
index 00000000..8c94e518
Binary files /dev/null and b/fastlane/metadata/android/ko-KR/images/sevenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/ko-KR/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/ko-KR/images/sevenInchScreenshots/06 - weight.png
new file mode 100644
index 00000000..e0354376
Binary files /dev/null and b/fastlane/metadata/android/ko-KR/images/sevenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/ko-KR/images/tenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/ko-KR/images/tenInchScreenshots/01 - dashboard.png
new file mode 100644
index 00000000..06b7e567
Binary files /dev/null and b/fastlane/metadata/android/ko-KR/images/tenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/ko-KR/images/tenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/ko-KR/images/tenInchScreenshots/02 - workout detail.png
new file mode 100644
index 00000000..244f29b1
Binary files /dev/null and b/fastlane/metadata/android/ko-KR/images/tenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/ko-KR/images/tenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/ko-KR/images/tenInchScreenshots/03 - gym mode.png
new file mode 100644
index 00000000..d3af3e72
Binary files /dev/null and b/fastlane/metadata/android/ko-KR/images/tenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/ko-KR/images/tenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/ko-KR/images/tenInchScreenshots/04 - measurements.png
new file mode 100644
index 00000000..4fe9be63
Binary files /dev/null and b/fastlane/metadata/android/ko-KR/images/tenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/ko-KR/images/tenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/ko-KR/images/tenInchScreenshots/05 - nutritional plan.png
new file mode 100644
index 00000000..20d7a01c
Binary files /dev/null and b/fastlane/metadata/android/ko-KR/images/tenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/ko-KR/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/ko-KR/images/tenInchScreenshots/06 - weight.png
new file mode 100644
index 00000000..030065cc
Binary files /dev/null and b/fastlane/metadata/android/ko-KR/images/tenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/ko-KR/short_description.txt b/fastlane/metadata/android/ko-KR/short_description.txt
new file mode 100644
index 00000000..c18c84ce
--- /dev/null
+++ b/fastlane/metadata/android/ko-KR/short_description.txt
@@ -0,0 +1 @@
+피트니스/운동, 영양소, 몸무게 추적기, 영양소, 몸무게 추적기
diff --git a/fastlane/metadata/android/ko-KR/title.txt b/fastlane/metadata/android/ko-KR/title.txt
new file mode 100644
index 00000000..d35e4087
--- /dev/null
+++ b/fastlane/metadata/android/ko-KR/title.txt
@@ -0,0 +1 @@
+wger Workout Manager
diff --git a/fastlane/metadata/android/nb-NO/images/phoneScreenshots/01 - dashboard.png b/fastlane/metadata/android/nb-NO/images/phoneScreenshots/01 - dashboard.png
index 1b55bb78..f47d9931 100644
Binary files a/fastlane/metadata/android/nb-NO/images/phoneScreenshots/01 - dashboard.png and b/fastlane/metadata/android/nb-NO/images/phoneScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/nb-NO/images/phoneScreenshots/02 - workout detail.png b/fastlane/metadata/android/nb-NO/images/phoneScreenshots/02 - workout detail.png
index a0b5c792..f76fa96c 100644
Binary files a/fastlane/metadata/android/nb-NO/images/phoneScreenshots/02 - workout detail.png and b/fastlane/metadata/android/nb-NO/images/phoneScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/nb-NO/images/phoneScreenshots/03 - gym mode.png b/fastlane/metadata/android/nb-NO/images/phoneScreenshots/03 - gym mode.png
index e7439c9d..475be41d 100644
Binary files a/fastlane/metadata/android/nb-NO/images/phoneScreenshots/03 - gym mode.png and b/fastlane/metadata/android/nb-NO/images/phoneScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/nb-NO/images/phoneScreenshots/04 - measurements.png b/fastlane/metadata/android/nb-NO/images/phoneScreenshots/04 - measurements.png
index 2c193853..9a96c782 100644
Binary files a/fastlane/metadata/android/nb-NO/images/phoneScreenshots/04 - measurements.png and b/fastlane/metadata/android/nb-NO/images/phoneScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/nb-NO/images/phoneScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/nb-NO/images/phoneScreenshots/05 - nutritional plan.png
index 6c53643e..e027379a 100644
Binary files a/fastlane/metadata/android/nb-NO/images/phoneScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/nb-NO/images/phoneScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/nb-NO/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/nb-NO/images/phoneScreenshots/06 - weight.png
index 0161a876..de3fb759 100644
Binary files a/fastlane/metadata/android/nb-NO/images/phoneScreenshots/06 - weight.png and b/fastlane/metadata/android/nb-NO/images/phoneScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/nb-NO/images/sevenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/nb-NO/images/sevenInchScreenshots/01 - dashboard.png
index 0af9f0c4..f3a4aadb 100644
Binary files a/fastlane/metadata/android/nb-NO/images/sevenInchScreenshots/01 - dashboard.png and b/fastlane/metadata/android/nb-NO/images/sevenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/nb-NO/images/sevenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/nb-NO/images/sevenInchScreenshots/02 - workout detail.png
index 655530db..7faf5e2d 100644
Binary files a/fastlane/metadata/android/nb-NO/images/sevenInchScreenshots/02 - workout detail.png and b/fastlane/metadata/android/nb-NO/images/sevenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/nb-NO/images/sevenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/nb-NO/images/sevenInchScreenshots/03 - gym mode.png
index 16985d01..191f32fe 100644
Binary files a/fastlane/metadata/android/nb-NO/images/sevenInchScreenshots/03 - gym mode.png and b/fastlane/metadata/android/nb-NO/images/sevenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/nb-NO/images/sevenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/nb-NO/images/sevenInchScreenshots/04 - measurements.png
index 50a5b13f..01e77fc7 100644
Binary files a/fastlane/metadata/android/nb-NO/images/sevenInchScreenshots/04 - measurements.png and b/fastlane/metadata/android/nb-NO/images/sevenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/nb-NO/images/sevenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/nb-NO/images/sevenInchScreenshots/05 - nutritional plan.png
index 1c910c65..24dab825 100644
Binary files a/fastlane/metadata/android/nb-NO/images/sevenInchScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/nb-NO/images/sevenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/nb-NO/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/nb-NO/images/sevenInchScreenshots/06 - weight.png
index c8ae45d5..73c58d5b 100644
Binary files a/fastlane/metadata/android/nb-NO/images/sevenInchScreenshots/06 - weight.png and b/fastlane/metadata/android/nb-NO/images/sevenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/nb-NO/images/tenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/nb-NO/images/tenInchScreenshots/01 - dashboard.png
index 4210f52f..db1b88f4 100644
Binary files a/fastlane/metadata/android/nb-NO/images/tenInchScreenshots/01 - dashboard.png and b/fastlane/metadata/android/nb-NO/images/tenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/nb-NO/images/tenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/nb-NO/images/tenInchScreenshots/02 - workout detail.png
index 4809b52c..244f29b1 100644
Binary files a/fastlane/metadata/android/nb-NO/images/tenInchScreenshots/02 - workout detail.png and b/fastlane/metadata/android/nb-NO/images/tenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/nb-NO/images/tenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/nb-NO/images/tenInchScreenshots/03 - gym mode.png
index 3aad3261..5fb16610 100644
Binary files a/fastlane/metadata/android/nb-NO/images/tenInchScreenshots/03 - gym mode.png and b/fastlane/metadata/android/nb-NO/images/tenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/nb-NO/images/tenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/nb-NO/images/tenInchScreenshots/04 - measurements.png
index a81fcab7..35c2cf86 100644
Binary files a/fastlane/metadata/android/nb-NO/images/tenInchScreenshots/04 - measurements.png and b/fastlane/metadata/android/nb-NO/images/tenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/nb-NO/images/tenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/nb-NO/images/tenInchScreenshots/05 - nutritional plan.png
index f5711479..170d4905 100644
Binary files a/fastlane/metadata/android/nb-NO/images/tenInchScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/nb-NO/images/tenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/nb-NO/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/nb-NO/images/tenInchScreenshots/06 - weight.png
index e02e1dda..72bcd37b 100644
Binary files a/fastlane/metadata/android/nb-NO/images/tenInchScreenshots/06 - weight.png and b/fastlane/metadata/android/nb-NO/images/tenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/pl-PL/full_description.txt b/fastlane/metadata/android/pl-PL/full_description.txt
index af244e7c..11391c19 100644
--- a/fastlane/metadata/android/pl-PL/full_description.txt
+++ b/fastlane/metadata/android/pl-PL/full_description.txt
@@ -2,7 +2,7 @@ Od miłośników fitnessu dla miłośników fitnessu – zorganizuj zdrowy tryb
 
 Znalazłeś już swoją najlepszą aplikację do fitnessu i lubisz tworzyć własne programy sportowe? Bez względu na to, jakim jesteś typem wysportowanej bestii – wszyscy mamy coś wspólnego: uwielbiamy śledzić nasze dane dotyczące zdrowia <3
 
-Więc nie oceniamy Cię za to, że nadal zarządzasz swoją podróżą przez świat fitness za pomocą poręcznego małego zeszytu treningowego, ale witaj w 2024 roku!
+Więc nie oceniamy Cię za to, że nadal zarządzasz swoją podróżą przez świat fitness za pomocą poręcznego małego zeszytu treningowego, ale witaj w 2025 roku!
 
 Opracowaliśmy dla Ciebie w 100% darmową cyfrową aplikację do monitorowania zdrowia i kondycji, dostosowaną do najistotniejszych funkcji, aby ułatwić Ci życie. Rozpocznij, kontynuuj trening i świętuj swoje postępy!
 
diff --git a/fastlane/metadata/android/pl-PL/images/phoneScreenshots/01 - dashboard.png b/fastlane/metadata/android/pl-PL/images/phoneScreenshots/01 - dashboard.png
index 80da38cb..a3c72bda 100644
Binary files a/fastlane/metadata/android/pl-PL/images/phoneScreenshots/01 - dashboard.png and b/fastlane/metadata/android/pl-PL/images/phoneScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/pl-PL/images/phoneScreenshots/02 - workout detail.png b/fastlane/metadata/android/pl-PL/images/phoneScreenshots/02 - workout detail.png
index f71883a2..f76fa96c 100644
Binary files a/fastlane/metadata/android/pl-PL/images/phoneScreenshots/02 - workout detail.png and b/fastlane/metadata/android/pl-PL/images/phoneScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/pl-PL/images/phoneScreenshots/03 - gym mode.png b/fastlane/metadata/android/pl-PL/images/phoneScreenshots/03 - gym mode.png
index fcaad7a2..a269a0f1 100644
Binary files a/fastlane/metadata/android/pl-PL/images/phoneScreenshots/03 - gym mode.png and b/fastlane/metadata/android/pl-PL/images/phoneScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/pl-PL/images/phoneScreenshots/04 - measurements.png b/fastlane/metadata/android/pl-PL/images/phoneScreenshots/04 - measurements.png
index c1e25f18..eb206a3c 100644
Binary files a/fastlane/metadata/android/pl-PL/images/phoneScreenshots/04 - measurements.png and b/fastlane/metadata/android/pl-PL/images/phoneScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/pl-PL/images/phoneScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/pl-PL/images/phoneScreenshots/05 - nutritional plan.png
index 240fb540..a3f97e16 100644
Binary files a/fastlane/metadata/android/pl-PL/images/phoneScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/pl-PL/images/phoneScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/pl-PL/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/pl-PL/images/phoneScreenshots/06 - weight.png
index 026bc77e..415c43c0 100644
Binary files a/fastlane/metadata/android/pl-PL/images/phoneScreenshots/06 - weight.png and b/fastlane/metadata/android/pl-PL/images/phoneScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/pl-PL/images/sevenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/pl-PL/images/sevenInchScreenshots/01 - dashboard.png
index fbfc0657..8c572036 100644
Binary files a/fastlane/metadata/android/pl-PL/images/sevenInchScreenshots/01 - dashboard.png and b/fastlane/metadata/android/pl-PL/images/sevenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/pl-PL/images/sevenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/pl-PL/images/sevenInchScreenshots/02 - workout detail.png
index 8372c393..7faf5e2d 100644
Binary files a/fastlane/metadata/android/pl-PL/images/sevenInchScreenshots/02 - workout detail.png and b/fastlane/metadata/android/pl-PL/images/sevenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/pl-PL/images/sevenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/pl-PL/images/sevenInchScreenshots/03 - gym mode.png
index af5c636a..b67cb1e4 100644
Binary files a/fastlane/metadata/android/pl-PL/images/sevenInchScreenshots/03 - gym mode.png and b/fastlane/metadata/android/pl-PL/images/sevenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/pl-PL/images/sevenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/pl-PL/images/sevenInchScreenshots/04 - measurements.png
index 1aedcacf..3f33dde7 100644
Binary files a/fastlane/metadata/android/pl-PL/images/sevenInchScreenshots/04 - measurements.png and b/fastlane/metadata/android/pl-PL/images/sevenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/pl-PL/images/sevenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/pl-PL/images/sevenInchScreenshots/05 - nutritional plan.png
index d7d921bd..7fce499b 100644
Binary files a/fastlane/metadata/android/pl-PL/images/sevenInchScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/pl-PL/images/sevenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/pl-PL/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/pl-PL/images/sevenInchScreenshots/06 - weight.png
index ca15bb59..d9be69f1 100644
Binary files a/fastlane/metadata/android/pl-PL/images/sevenInchScreenshots/06 - weight.png and b/fastlane/metadata/android/pl-PL/images/sevenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/pl-PL/images/tenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/pl-PL/images/tenInchScreenshots/01 - dashboard.png
index d1c5b508..d3e68787 100644
Binary files a/fastlane/metadata/android/pl-PL/images/tenInchScreenshots/01 - dashboard.png and b/fastlane/metadata/android/pl-PL/images/tenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/pl-PL/images/tenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/pl-PL/images/tenInchScreenshots/02 - workout detail.png
index 6a63236e..244f29b1 100644
Binary files a/fastlane/metadata/android/pl-PL/images/tenInchScreenshots/02 - workout detail.png and b/fastlane/metadata/android/pl-PL/images/tenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/pl-PL/images/tenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/pl-PL/images/tenInchScreenshots/03 - gym mode.png
index fb3982e3..d0819992 100644
Binary files a/fastlane/metadata/android/pl-PL/images/tenInchScreenshots/03 - gym mode.png and b/fastlane/metadata/android/pl-PL/images/tenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/pl-PL/images/tenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/pl-PL/images/tenInchScreenshots/04 - measurements.png
index 957698f3..91645cf6 100644
Binary files a/fastlane/metadata/android/pl-PL/images/tenInchScreenshots/04 - measurements.png and b/fastlane/metadata/android/pl-PL/images/tenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/pl-PL/images/tenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/pl-PL/images/tenInchScreenshots/05 - nutritional plan.png
index a7a3a261..abea98ee 100644
Binary files a/fastlane/metadata/android/pl-PL/images/tenInchScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/pl-PL/images/tenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/pl-PL/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/pl-PL/images/tenInchScreenshots/06 - weight.png
index 284aa2db..6fb439e7 100644
Binary files a/fastlane/metadata/android/pl-PL/images/tenInchScreenshots/06 - weight.png and b/fastlane/metadata/android/pl-PL/images/tenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/pl-PL/video.txt b/fastlane/metadata/android/pl-PL/video.txt
deleted file mode 100644
index 8d1c8b69..00000000
--- a/fastlane/metadata/android/pl-PL/video.txt
+++ /dev/null
@@ -1 +0,0 @@
- 
diff --git a/fastlane/metadata/android/pt-BR/images/phoneScreenshots/01 - dashboard.png b/fastlane/metadata/android/pt-BR/images/phoneScreenshots/01 - dashboard.png
index ccda3b8e..116ddfc0 100644
Binary files a/fastlane/metadata/android/pt-BR/images/phoneScreenshots/01 - dashboard.png and b/fastlane/metadata/android/pt-BR/images/phoneScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/pt-BR/images/phoneScreenshots/02 - workout detail.png b/fastlane/metadata/android/pt-BR/images/phoneScreenshots/02 - workout detail.png
index 8fcbaccc..d5ce1228 100644
Binary files a/fastlane/metadata/android/pt-BR/images/phoneScreenshots/02 - workout detail.png and b/fastlane/metadata/android/pt-BR/images/phoneScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/pt-BR/images/phoneScreenshots/03 - gym mode.png b/fastlane/metadata/android/pt-BR/images/phoneScreenshots/03 - gym mode.png
index 731f2b4f..0acfaee8 100644
Binary files a/fastlane/metadata/android/pt-BR/images/phoneScreenshots/03 - gym mode.png and b/fastlane/metadata/android/pt-BR/images/phoneScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/pt-BR/images/phoneScreenshots/04 - measurements.png b/fastlane/metadata/android/pt-BR/images/phoneScreenshots/04 - measurements.png
index 18286dee..7274ecba 100644
Binary files a/fastlane/metadata/android/pt-BR/images/phoneScreenshots/04 - measurements.png and b/fastlane/metadata/android/pt-BR/images/phoneScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/pt-BR/images/phoneScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/pt-BR/images/phoneScreenshots/05 - nutritional plan.png
index 2ab1dfbf..c75ef094 100644
Binary files a/fastlane/metadata/android/pt-BR/images/phoneScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/pt-BR/images/phoneScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/pt-BR/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/pt-BR/images/phoneScreenshots/06 - weight.png
index 0ab5155e..f6273a2f 100644
Binary files a/fastlane/metadata/android/pt-BR/images/phoneScreenshots/06 - weight.png and b/fastlane/metadata/android/pt-BR/images/phoneScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/pt-BR/images/sevenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/pt-BR/images/sevenInchScreenshots/01 - dashboard.png
index a0f15459..4b54d618 100644
Binary files a/fastlane/metadata/android/pt-BR/images/sevenInchScreenshots/01 - dashboard.png and b/fastlane/metadata/android/pt-BR/images/sevenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/pt-BR/images/sevenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/pt-BR/images/sevenInchScreenshots/02 - workout detail.png
index c04a972c..201918e1 100644
Binary files a/fastlane/metadata/android/pt-BR/images/sevenInchScreenshots/02 - workout detail.png and b/fastlane/metadata/android/pt-BR/images/sevenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/pt-BR/images/sevenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/pt-BR/images/sevenInchScreenshots/03 - gym mode.png
index 79bdd0de..ca551f01 100644
Binary files a/fastlane/metadata/android/pt-BR/images/sevenInchScreenshots/03 - gym mode.png and b/fastlane/metadata/android/pt-BR/images/sevenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/pt-BR/images/sevenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/pt-BR/images/sevenInchScreenshots/04 - measurements.png
index 39de185c..93de968e 100644
Binary files a/fastlane/metadata/android/pt-BR/images/sevenInchScreenshots/04 - measurements.png and b/fastlane/metadata/android/pt-BR/images/sevenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/pt-BR/images/sevenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/pt-BR/images/sevenInchScreenshots/05 - nutritional plan.png
index e10aa7bc..3707a49b 100644
Binary files a/fastlane/metadata/android/pt-BR/images/sevenInchScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/pt-BR/images/sevenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/pt-BR/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/pt-BR/images/sevenInchScreenshots/06 - weight.png
index 79fc4887..d6dcf30d 100644
Binary files a/fastlane/metadata/android/pt-BR/images/sevenInchScreenshots/06 - weight.png and b/fastlane/metadata/android/pt-BR/images/sevenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/pt-BR/images/tenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/pt-BR/images/tenInchScreenshots/01 - dashboard.png
index 553501b2..49e6120f 100644
Binary files a/fastlane/metadata/android/pt-BR/images/tenInchScreenshots/01 - dashboard.png and b/fastlane/metadata/android/pt-BR/images/tenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/pt-BR/images/tenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/pt-BR/images/tenInchScreenshots/02 - workout detail.png
index 7bb07ca4..1d1860ba 100644
Binary files a/fastlane/metadata/android/pt-BR/images/tenInchScreenshots/02 - workout detail.png and b/fastlane/metadata/android/pt-BR/images/tenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/pt-BR/images/tenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/pt-BR/images/tenInchScreenshots/03 - gym mode.png
index 08dea45f..73a0fdca 100644
Binary files a/fastlane/metadata/android/pt-BR/images/tenInchScreenshots/03 - gym mode.png and b/fastlane/metadata/android/pt-BR/images/tenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/pt-BR/images/tenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/pt-BR/images/tenInchScreenshots/04 - measurements.png
index 1d254684..8497f1cb 100644
Binary files a/fastlane/metadata/android/pt-BR/images/tenInchScreenshots/04 - measurements.png and b/fastlane/metadata/android/pt-BR/images/tenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/pt-BR/images/tenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/pt-BR/images/tenInchScreenshots/05 - nutritional plan.png
index 46091d34..fff2dd82 100644
Binary files a/fastlane/metadata/android/pt-BR/images/tenInchScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/pt-BR/images/tenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/pt-BR/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/pt-BR/images/tenInchScreenshots/06 - weight.png
index 7270edbb..8fd84c6f 100644
Binary files a/fastlane/metadata/android/pt-BR/images/tenInchScreenshots/06 - weight.png and b/fastlane/metadata/android/pt-BR/images/tenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/pt-PT/full_description.txt b/fastlane/metadata/android/pt-PT/full_description.txt
index 60e8c3d9..abb82544 100644
--- a/fastlane/metadata/android/pt-PT/full_description.txt
+++ b/fastlane/metadata/android/pt-PT/full_description.txt
@@ -1,39 +1,39 @@
-Feito por amantes da vida fitness - organize sua saúde com o WGER, seu Gerenciador de Treinos!
+De amantes do exercício para amantes do exercício - Organiza a tua saúde com WGER, o gestor de treinos!
 
-Você já encontrou o seu aplicativo de fitness nº1? Você adora criar suas próprias rotinas de treino? Não importa que tipo de fera esportiva você seja - todos nós temos algo em comum: adoramos acompanhar nossos dados de saúde <3
+Já encontraste a tua aplicação fitness n.º 1 e adoras criar as tuas próprias rotinas desportivas? Independentemente do animal desportivo que sejas, todos temos algo em comum: adoramos dominar os nossos dados biométricos <3
 
-Nós não te julgamos por ainda gerenciar sua jornada fitness em um caderno, mas bem-vindo(a) ao século 21!
+Por isso não te julgamos se ainda fazes os teus registos no teu lindo caderninho de treino, mas bem-vindo a 2025!
 
-Desenvolvemos um aplicativo de acompanhemento de saúde e fitness 100% gratuito para você, reduzido aos recursos mais relevantes para facilitar sua vida. Comece, treine e comemore seu progresso!
+Desenvolvemos uma aplicação digital de controle de treino e saúde 100% livre para ti, simplificada às funções mais importantes para simplificar a tua vida. Começa, continua a treinar e celebra os teus progressos!
 
-O wger é um projeto open-source que é sobre:
-* Seu Corpo
-* Seus Treinos
-* Seu Progresso
-* Seus Dados
+wger é um projeto open source e comprometido com:
+* O teu corpo
+* Os teus treinos
+* O teu progresso
+* Os teus dados
 
-Seu Corpo:
-Não precisa pesquisar no Google os ingredientes de suas receitas favoritas - escolha suas refeições diárias entre mais de 78.000 itens e veja os valores nutricionais. Adicione as refeições ao plano nutricional e mantenha uma visão geral de sua dieta no calendário.
+O teu corpo
+Não é preciso googlar os ingredientes dos teus petiscos favoritos - escolhe as tuas refeições diárias de mais de 78000 produtos e verifica os valores nutricionais. Adiciona refeições ao plano nutricional e tem uma visão de conjunto da tua dieta no calendário.
 
-Seus Treinos:
-Você sabe o que é melhor para o seu corpo. Crie seus próprios treinos a partir de uma variedade de mais de 200 exercícios. Em seguida, use o Modo Academia para orientá-lo durante o treino, enquanto registra suas cargas com um clique.
+Os teus treinos
+Tu sabes o que é melhor para o teu corpo. Cria os teus treinos a partir duma grande variedade de 200 exercícios diferentes. Depois, usa o modo ginásio para te guiar no treino enquanto registas os pesos com um toque.
 
-Seu Progresso:
-Nunca perca de vista seus objetivos. Acompanhe seu peso e mantenha suas estatísticas.
+O teu progresso
+Nunca percas os teus objetivos de vista. Regista o teu peso e guarda as tuas estatísticas.
 
-Seus Dados:
-O wger é o seu diário fitness personalizado - mas você é dono(a) dos seus dados. Use a REST API para acessá-los e fazer coisas incríveis com eles.
+Os teus dados
+wger é o teu diário de treino personalizado - mas tu possuis os teus dados. Usa a API REST para aceder e fazer coisas espantosas com eles.
 
-Obs.: Este aplicativo gratuito não é baseado em financiamentos adicionais e não pedimos que você doe dinheiro. Mais do que isso, é um projeto comunitário em constante crescimento. Portanto, esteja preparado(a) para novos recursos a qualquer momento!
+Por favor nota: Esta app gratuita não está baseada em fundos adicionais e não pedimos que dês dinheiro. Mais do que isso, é um projeto comunitário que tem evoluído constantemente. Por isso, espera novas funcionalidades a qualquer momento!
 
-#CódigoAberto - o que isso significa?
+#Código aberto - O que quer isso dizer?
 
-Código aberto significa que todo o código-fonte deste aplicativo e do servidor ao qual ele se conecta é gratuito e está disponível para qualquer pessoa:
-* Você quer executar o wger em seu próprio servidor, para você ou para sua academia? Sinta-se à vontade!
-* Está sentindo falta de um recurso e quer implementá-lo? Comece agora!
-* Quer verificar se nenhum dado está sendo compartilhado? Você pode!
+Código aberto quer dizer que todo o código fonte desta aplicação e do servidor com que comunica é livre e disponível para toda a gente:
+* Queres correr o wger no teu servidor para ti e para o teu ginásio? Força!
+* Sentes falta duma funcionalidade e queres implementá-la? Começa já!
+* Queres verificar que nada está a ser enviado para lado nenhum? Podes!
 
-Junte-se à nossa comunidade e faça parte dos entusiastas do esporte e geeks de TI de todo o mundo. Continuamos trabalhando para ajustar e otimizar o aplicativo de acordo com nossas necessidades. Amamos suas contribuições, então sinta-se à vontade para participar a qualquer momento e contribuir com seus desejos e ideias!
+Junta-te à nossa comunidade e torna-te parte de entusiastas do exercício e geeks das TI de todo o mundo. Nós continuamos a ajustar e otimizar a app talhada para as nossas necessidades. Adoramos o teu contributo, por isso sente-te à vontade para aparecer com sugestões e ideias!
 
--> encontre o código-fonte em https://github.com/wger-project
--> faça suas perguntas ou apenas diga Olá no nosso servidor do Discord https://discord.gg/rPWFv6W
+-> encontra o código fonte em https://github.com/wger-project
+-> faz as tuas perguntas ou simplesmente diz olá no nosso servidor discord https://discord.gg/rPWFv6W
diff --git a/fastlane/metadata/android/pt-PT/images/phoneScreenshots/01 - dashboard.png b/fastlane/metadata/android/pt-PT/images/phoneScreenshots/01 - dashboard.png
index c11e7498..4f896917 100644
Binary files a/fastlane/metadata/android/pt-PT/images/phoneScreenshots/01 - dashboard.png and b/fastlane/metadata/android/pt-PT/images/phoneScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/pt-PT/images/phoneScreenshots/02 - workout detail.png b/fastlane/metadata/android/pt-PT/images/phoneScreenshots/02 - workout detail.png
index 8fcbaccc..d5ce1228 100644
Binary files a/fastlane/metadata/android/pt-PT/images/phoneScreenshots/02 - workout detail.png and b/fastlane/metadata/android/pt-PT/images/phoneScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/pt-PT/images/phoneScreenshots/03 - gym mode.png b/fastlane/metadata/android/pt-PT/images/phoneScreenshots/03 - gym mode.png
index 731f2b4f..0acfaee8 100644
Binary files a/fastlane/metadata/android/pt-PT/images/phoneScreenshots/03 - gym mode.png and b/fastlane/metadata/android/pt-PT/images/phoneScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/pt-PT/images/phoneScreenshots/04 - measurements.png b/fastlane/metadata/android/pt-PT/images/phoneScreenshots/04 - measurements.png
index 18286dee..7274ecba 100644
Binary files a/fastlane/metadata/android/pt-PT/images/phoneScreenshots/04 - measurements.png and b/fastlane/metadata/android/pt-PT/images/phoneScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/pt-PT/images/phoneScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/pt-PT/images/phoneScreenshots/05 - nutritional plan.png
index 12c499cf..779fde40 100644
Binary files a/fastlane/metadata/android/pt-PT/images/phoneScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/pt-PT/images/phoneScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/pt-PT/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/pt-PT/images/phoneScreenshots/06 - weight.png
index 0ab5155e..f6273a2f 100644
Binary files a/fastlane/metadata/android/pt-PT/images/phoneScreenshots/06 - weight.png and b/fastlane/metadata/android/pt-PT/images/phoneScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/pt-PT/images/sevenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/pt-PT/images/sevenInchScreenshots/01 - dashboard.png
index 2a8b49fe..1faf1bc5 100644
Binary files a/fastlane/metadata/android/pt-PT/images/sevenInchScreenshots/01 - dashboard.png and b/fastlane/metadata/android/pt-PT/images/sevenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/pt-PT/images/sevenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/pt-PT/images/sevenInchScreenshots/02 - workout detail.png
index c04a972c..201918e1 100644
Binary files a/fastlane/metadata/android/pt-PT/images/sevenInchScreenshots/02 - workout detail.png and b/fastlane/metadata/android/pt-PT/images/sevenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/pt-PT/images/sevenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/pt-PT/images/sevenInchScreenshots/03 - gym mode.png
index 79bdd0de..ca551f01 100644
Binary files a/fastlane/metadata/android/pt-PT/images/sevenInchScreenshots/03 - gym mode.png and b/fastlane/metadata/android/pt-PT/images/sevenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/pt-PT/images/sevenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/pt-PT/images/sevenInchScreenshots/04 - measurements.png
index 39de185c..93de968e 100644
Binary files a/fastlane/metadata/android/pt-PT/images/sevenInchScreenshots/04 - measurements.png and b/fastlane/metadata/android/pt-PT/images/sevenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/pt-PT/images/sevenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/pt-PT/images/sevenInchScreenshots/05 - nutritional plan.png
index 189c8ad2..1d7c226e 100644
Binary files a/fastlane/metadata/android/pt-PT/images/sevenInchScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/pt-PT/images/sevenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/pt-PT/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/pt-PT/images/sevenInchScreenshots/06 - weight.png
index 79fc4887..d6dcf30d 100644
Binary files a/fastlane/metadata/android/pt-PT/images/sevenInchScreenshots/06 - weight.png and b/fastlane/metadata/android/pt-PT/images/sevenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/pt-PT/images/tenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/pt-PT/images/tenInchScreenshots/01 - dashboard.png
index 4ba62639..24c1f1b7 100644
Binary files a/fastlane/metadata/android/pt-PT/images/tenInchScreenshots/01 - dashboard.png and b/fastlane/metadata/android/pt-PT/images/tenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/pt-PT/images/tenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/pt-PT/images/tenInchScreenshots/02 - workout detail.png
index 7bb07ca4..1d1860ba 100644
Binary files a/fastlane/metadata/android/pt-PT/images/tenInchScreenshots/02 - workout detail.png and b/fastlane/metadata/android/pt-PT/images/tenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/pt-PT/images/tenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/pt-PT/images/tenInchScreenshots/03 - gym mode.png
index 08dea45f..73a0fdca 100644
Binary files a/fastlane/metadata/android/pt-PT/images/tenInchScreenshots/03 - gym mode.png and b/fastlane/metadata/android/pt-PT/images/tenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/pt-PT/images/tenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/pt-PT/images/tenInchScreenshots/04 - measurements.png
index 1d254684..8497f1cb 100644
Binary files a/fastlane/metadata/android/pt-PT/images/tenInchScreenshots/04 - measurements.png and b/fastlane/metadata/android/pt-PT/images/tenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/pt-PT/images/tenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/pt-PT/images/tenInchScreenshots/05 - nutritional plan.png
index 1d30d223..33aad2ef 100644
Binary files a/fastlane/metadata/android/pt-PT/images/tenInchScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/pt-PT/images/tenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/pt-PT/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/pt-PT/images/tenInchScreenshots/06 - weight.png
index 7270edbb..8fd84c6f 100644
Binary files a/fastlane/metadata/android/pt-PT/images/tenInchScreenshots/06 - weight.png and b/fastlane/metadata/android/pt-PT/images/tenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/pt-PT/short_description.txt b/fastlane/metadata/android/pt-PT/short_description.txt
index 064060fe..3b018c2c 100644
--- a/fastlane/metadata/android/pt-PT/short_description.txt
+++ b/fastlane/metadata/android/pt-PT/short_description.txt
@@ -1 +1 @@
-Monitore seus treinos e dieta
+Gestor de treinos, nutrição e peso
diff --git a/fastlane/metadata/android/ru-RU/full_description.txt b/fastlane/metadata/android/ru-RU/full_description.txt
index f7be1cdb..3ded1c12 100644
--- a/fastlane/metadata/android/ru-RU/full_description.txt
+++ b/fastlane/metadata/android/ru-RU/full_description.txt
@@ -2,7 +2,7 @@
 
 Вы уже нашли свое фитнес-приложение №1 и любите создавать свои собственные спортивные программы? Независимо от того, какой вы спортивный зверь - у всех нас есть нечто общее: мы любим отслеживать данные о своем здоровье <3
 
-Поэтому мы не осуждаем вас за то, что вы все еще ведете свой фитнес-путь с помощью удобного маленького журнала тренировок, но добро пожаловать в 2024 год!
+Поэтому мы не осуждаем вас за то, что вы все еще ведете свой фитнес-путь с помощью удобного маленького журнала тренировок, но добро пожаловать в 2025 год!
 
 Мы разработали для вас на 100% свободное цифровое приложение для отслеживания состояния здоровья и фитнес-тренировок, сократив его до самых необходимых функций, чтобы облегчить вам жизнь. Начните, продолжайте тренироваться и отмечайте свой прогресс!
 
diff --git a/fastlane/metadata/android/ru-RU/images/phoneScreenshots/01 - dashboard.png b/fastlane/metadata/android/ru-RU/images/phoneScreenshots/01 - dashboard.png
index 82e52642..0b127940 100644
Binary files a/fastlane/metadata/android/ru-RU/images/phoneScreenshots/01 - dashboard.png and b/fastlane/metadata/android/ru-RU/images/phoneScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/ru-RU/images/phoneScreenshots/02 - workout detail.png b/fastlane/metadata/android/ru-RU/images/phoneScreenshots/02 - workout detail.png
index 7eba0cce..f76fa96c 100644
Binary files a/fastlane/metadata/android/ru-RU/images/phoneScreenshots/02 - workout detail.png and b/fastlane/metadata/android/ru-RU/images/phoneScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/ru-RU/images/phoneScreenshots/03 - gym mode.png b/fastlane/metadata/android/ru-RU/images/phoneScreenshots/03 - gym mode.png
index 009efa84..45f69c0c 100644
Binary files a/fastlane/metadata/android/ru-RU/images/phoneScreenshots/03 - gym mode.png and b/fastlane/metadata/android/ru-RU/images/phoneScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/ru-RU/images/phoneScreenshots/04 - measurements.png b/fastlane/metadata/android/ru-RU/images/phoneScreenshots/04 - measurements.png
index 6deecf43..796640b0 100644
Binary files a/fastlane/metadata/android/ru-RU/images/phoneScreenshots/04 - measurements.png and b/fastlane/metadata/android/ru-RU/images/phoneScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/ru-RU/images/phoneScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/ru-RU/images/phoneScreenshots/05 - nutritional plan.png
index c1bccef2..f14d1abe 100644
Binary files a/fastlane/metadata/android/ru-RU/images/phoneScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/ru-RU/images/phoneScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/ru-RU/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/ru-RU/images/phoneScreenshots/06 - weight.png
index 64d1f6c5..547fd053 100644
Binary files a/fastlane/metadata/android/ru-RU/images/phoneScreenshots/06 - weight.png and b/fastlane/metadata/android/ru-RU/images/phoneScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/ru-RU/images/sevenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/ru-RU/images/sevenInchScreenshots/01 - dashboard.png
index ffcb4a52..f52bbb2b 100644
Binary files a/fastlane/metadata/android/ru-RU/images/sevenInchScreenshots/01 - dashboard.png and b/fastlane/metadata/android/ru-RU/images/sevenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/ru-RU/images/sevenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/ru-RU/images/sevenInchScreenshots/02 - workout detail.png
index 662a0826..7faf5e2d 100644
Binary files a/fastlane/metadata/android/ru-RU/images/sevenInchScreenshots/02 - workout detail.png and b/fastlane/metadata/android/ru-RU/images/sevenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/ru-RU/images/sevenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/ru-RU/images/sevenInchScreenshots/03 - gym mode.png
index 53391ece..e0aef9f2 100644
Binary files a/fastlane/metadata/android/ru-RU/images/sevenInchScreenshots/03 - gym mode.png and b/fastlane/metadata/android/ru-RU/images/sevenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/ru-RU/images/sevenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/ru-RU/images/sevenInchScreenshots/04 - measurements.png
index 17e88ff7..33481986 100644
Binary files a/fastlane/metadata/android/ru-RU/images/sevenInchScreenshots/04 - measurements.png and b/fastlane/metadata/android/ru-RU/images/sevenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/ru-RU/images/sevenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/ru-RU/images/sevenInchScreenshots/05 - nutritional plan.png
index 9055ce43..4d771078 100644
Binary files a/fastlane/metadata/android/ru-RU/images/sevenInchScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/ru-RU/images/sevenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/ru-RU/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/ru-RU/images/sevenInchScreenshots/06 - weight.png
index d4c5f8fb..0eaf67c3 100644
Binary files a/fastlane/metadata/android/ru-RU/images/sevenInchScreenshots/06 - weight.png and b/fastlane/metadata/android/ru-RU/images/sevenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/ru-RU/images/tenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/ru-RU/images/tenInchScreenshots/01 - dashboard.png
index 30c9ebd6..f3c49874 100644
Binary files a/fastlane/metadata/android/ru-RU/images/tenInchScreenshots/01 - dashboard.png and b/fastlane/metadata/android/ru-RU/images/tenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/ru-RU/images/tenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/ru-RU/images/tenInchScreenshots/02 - workout detail.png
index a0632e5c..244f29b1 100644
Binary files a/fastlane/metadata/android/ru-RU/images/tenInchScreenshots/02 - workout detail.png and b/fastlane/metadata/android/ru-RU/images/tenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/ru-RU/images/tenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/ru-RU/images/tenInchScreenshots/03 - gym mode.png
index 6ecff21d..81762983 100644
Binary files a/fastlane/metadata/android/ru-RU/images/tenInchScreenshots/03 - gym mode.png and b/fastlane/metadata/android/ru-RU/images/tenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/ru-RU/images/tenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/ru-RU/images/tenInchScreenshots/04 - measurements.png
index 9a818f6d..b7cfc899 100644
Binary files a/fastlane/metadata/android/ru-RU/images/tenInchScreenshots/04 - measurements.png and b/fastlane/metadata/android/ru-RU/images/tenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/ru-RU/images/tenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/ru-RU/images/tenInchScreenshots/05 - nutritional plan.png
index 1d60a9d3..7b49a452 100644
Binary files a/fastlane/metadata/android/ru-RU/images/tenInchScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/ru-RU/images/tenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/ru-RU/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/ru-RU/images/tenInchScreenshots/06 - weight.png
index dd8e3d62..9bcbe571 100644
Binary files a/fastlane/metadata/android/ru-RU/images/tenInchScreenshots/06 - weight.png and b/fastlane/metadata/android/ru-RU/images/tenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/sr/full_description.txt b/fastlane/metadata/android/sr/full_description.txt
new file mode 100644
index 00000000..9dfe2c9d
--- /dev/null
+++ b/fastlane/metadata/android/sr/full_description.txt
@@ -0,0 +1,39 @@
+Од љубитеља фитнеса за љубитеље фитнеса – узми здравље у своје руке са WGER, твојим менаџером тренинга!
+
+Већ си пронашао/ла омиљени програм за фитнес и волиш да уводиш спортстку рутину? Без обзира на врсту спортске активности - сви имамо нешто заједничко: волимо да пратимо наше здравствене податке! <3
+
+Ми те не осуђујемо што још увек управљаш са својим фитнесом својим класичним дневником, али ипак се налазимо у 2025. години!
+
+Развили смо 100% бесплатан програм за дигитално праћење здравља и фитнеса, са најрелевантнијим функцијама које ће ти олакшати живот. Започни тренинг и прослави своје прве кораке!
+
+wger је пројекат отвореног кода у ком ћеш наћи све за:
+* Твоје тело
+* Твоје тренинге
+* Твој напредак
+* Твоје податке
+
+Твоје тело:
+Нема потребе за гуглањем садржаја омиљених посластица – одабери дневне оброке и више од 78.000 производа из базе и погледај нутритивне вредности. Додај оброке у план искране и чувај преглед своје исхране у календару.
+
+Твоји тренинзи:
+Ти знаш шта је најбоље за твоје тело. Изгради прилагођене тренинге угледајући се на више од 200 различитих предефинисаних вежби. Затим користи модул тератане за вођени тренинг у ком можеш једним додиром можеш бележити тежине оптерећења.
+
+Твој напредак:
+Никада не губи из вида своје циљеве. Прати оптерећење и води статистику.
+
+Твоји подаци:
+wger је твој персонализовани дневник фитнеса – али сви подаци припадају теби. Користи REST API-је за приступ и направи са нјима невероватне ствари.
+
+Напомена: Овај бесплатни програм не зависи од додатних спонзорстава и не тражимо од вас да донирате новац. Овај бесплатни програм се темељи на заједници која стално расте. Зато, буди спреман/на на нове функционалности у били ком тренутку!
+
+#Отворени код – шта то значи?
+
+Отворени код значи да је цео изворни код ових апликација отворен и доступан свима:
+* Желиш ли да покрећеш wger на сопственом серверу или негде локално? Изволи, можеш!
+* Недостаје ти функционалност и желиш је направити сам? Почни одмах!
+* Желиш ли да провериш да ли подаци остају само на твојим уређајима? Можеш!
+
+Придружи се нашој заједници и постани део заједнице спортских ентузијаста и ИТ залуђеника из целог света. Настављамо да радимо на прилагођавању и оптимизацији програма вашим потребама. Ценимо и твој допринос, слободно се прикључи у вило које време и предложи своје идеје о унапређењу пројекта!
+
+-> изворни код можеш увек пронаћи на https://github.com/wger-project
+-> укључи се у заједницу, постави питанја и представи се на нашем Дискорд(Discord) серверу: https://discord.gg/rPWFv6W
diff --git a/fastlane/metadata/android/sr/images/phoneScreenshots/01 - dashboard.png b/fastlane/metadata/android/sr/images/phoneScreenshots/01 - dashboard.png
new file mode 100644
index 00000000..1856628b
Binary files /dev/null and b/fastlane/metadata/android/sr/images/phoneScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/sr/images/phoneScreenshots/02 - workout detail.png b/fastlane/metadata/android/sr/images/phoneScreenshots/02 - workout detail.png
new file mode 100644
index 00000000..f76fa96c
Binary files /dev/null and b/fastlane/metadata/android/sr/images/phoneScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/sr/images/phoneScreenshots/03 - gym mode.png b/fastlane/metadata/android/sr/images/phoneScreenshots/03 - gym mode.png
new file mode 100644
index 00000000..475be41d
Binary files /dev/null and b/fastlane/metadata/android/sr/images/phoneScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/sr/images/phoneScreenshots/04 - measurements.png b/fastlane/metadata/android/sr/images/phoneScreenshots/04 - measurements.png
new file mode 100644
index 00000000..6f43309a
Binary files /dev/null and b/fastlane/metadata/android/sr/images/phoneScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/sr/images/phoneScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/sr/images/phoneScreenshots/05 - nutritional plan.png
new file mode 100644
index 00000000..93643df4
Binary files /dev/null and b/fastlane/metadata/android/sr/images/phoneScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/sr/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/sr/images/phoneScreenshots/06 - weight.png
new file mode 100644
index 00000000..4b6ad3b8
Binary files /dev/null and b/fastlane/metadata/android/sr/images/phoneScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/sr/images/sevenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/sr/images/sevenInchScreenshots/01 - dashboard.png
new file mode 100644
index 00000000..30866e69
Binary files /dev/null and b/fastlane/metadata/android/sr/images/sevenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/sr/images/sevenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/sr/images/sevenInchScreenshots/02 - workout detail.png
new file mode 100644
index 00000000..7faf5e2d
Binary files /dev/null and b/fastlane/metadata/android/sr/images/sevenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/sr/images/sevenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/sr/images/sevenInchScreenshots/03 - gym mode.png
new file mode 100644
index 00000000..191f32fe
Binary files /dev/null and b/fastlane/metadata/android/sr/images/sevenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/sr/images/sevenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/sr/images/sevenInchScreenshots/04 - measurements.png
new file mode 100644
index 00000000..4e7d43bd
Binary files /dev/null and b/fastlane/metadata/android/sr/images/sevenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/sr/images/sevenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/sr/images/sevenInchScreenshots/05 - nutritional plan.png
new file mode 100644
index 00000000..18237018
Binary files /dev/null and b/fastlane/metadata/android/sr/images/sevenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/sr/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/sr/images/sevenInchScreenshots/06 - weight.png
new file mode 100644
index 00000000..de1b35bc
Binary files /dev/null and b/fastlane/metadata/android/sr/images/sevenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/sr/images/tenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/sr/images/tenInchScreenshots/01 - dashboard.png
new file mode 100644
index 00000000..c9320d52
Binary files /dev/null and b/fastlane/metadata/android/sr/images/tenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/sr/images/tenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/sr/images/tenInchScreenshots/02 - workout detail.png
new file mode 100644
index 00000000..244f29b1
Binary files /dev/null and b/fastlane/metadata/android/sr/images/tenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/sr/images/tenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/sr/images/tenInchScreenshots/03 - gym mode.png
new file mode 100644
index 00000000..5fb16610
Binary files /dev/null and b/fastlane/metadata/android/sr/images/tenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/sr/images/tenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/sr/images/tenInchScreenshots/04 - measurements.png
new file mode 100644
index 00000000..6d1575cd
Binary files /dev/null and b/fastlane/metadata/android/sr/images/tenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/sr/images/tenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/sr/images/tenInchScreenshots/05 - nutritional plan.png
new file mode 100644
index 00000000..2982318f
Binary files /dev/null and b/fastlane/metadata/android/sr/images/tenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/sr/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/sr/images/tenInchScreenshots/06 - weight.png
new file mode 100644
index 00000000..aeeabd16
Binary files /dev/null and b/fastlane/metadata/android/sr/images/tenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/sr/short_description.txt b/fastlane/metadata/android/sr/short_description.txt
new file mode 100644
index 00000000..c8c171c3
--- /dev/null
+++ b/fastlane/metadata/android/sr/short_description.txt
@@ -0,0 +1 @@
+Фитнес/тренинг, исхрана и праћење тежине
diff --git a/fastlane/metadata/android/sr/title.txt b/fastlane/metadata/android/sr/title.txt
new file mode 100644
index 00000000..d35e4087
--- /dev/null
+++ b/fastlane/metadata/android/sr/title.txt
@@ -0,0 +1 @@
+wger Workout Manager
diff --git a/fastlane/metadata/android/ta-IN/full_description.txt b/fastlane/metadata/android/ta-IN/full_description.txt
new file mode 100644
index 00000000..ebb35c00
--- /dev/null
+++ b/fastlane/metadata/android/ta-IN/full_description.txt
@@ -0,0 +1,39 @@
+உடற்பயிற்சி பிரியர்கள் முதல் உடற்பயிற்சி பிரியர்கள்வரை - உங்கள் உடற்பயிற்சி மேலாளரான WGER உடன் உங்கள் ஆரோக்கியத்தை ஒழுங்கமைக்கவும்!
+
+நீங்கள் ஏற்கனவே உங்கள் #1 உடற்பயிற்சி செயலியைக் கண்டுபிடித்துவிட்டீர்களா, மேலும் உங்கள் சொந்த விளையாட்டு வழக்கங்களை உருவாக்க விரும்புகிறீர்களா? நீங்கள் எந்த வகையான விளையாட்டு மிருகமாக இருந்தாலும் சரி - நம் அனைவருக்கும் பொதுவான ஒன்று உள்ளது: எங்கள் உடல்நலத் தரவைக் கண்காணிக்க நாங்கள் விரும்புகிறோம் <3
+
+எனவே, உங்கள் உடற்பயிற்சி பயணத்தை உங்கள் எளிமையான சிறிய உடற்பயிற்சி பதிவு புத்தகத்துடன் நிர்வகிப்பதற்காக நாங்கள் உங்களை மதிப்பிடவில்லை, ஆனால் 2025 க்கு வரவேற்கிறோம்!
+
+உங்களுக்காக 100% இலவச டிஜிட்டல் உடல்நலம் மற்றும் உடற்பயிற்சி கண்காணிப்பு செயலியை நாங்கள் உருவாக்கியுள்ளோம், இது உங்கள் வாழ்க்கையை எளிதாக்க மிகவும் பொருத்தமான அம்சங்களுக்கு அளவிடப்பட்டுள்ளது. தொடங்குங்கள், பயிற்சியைத் தொடருங்கள் மற்றும் உங்கள் முன்னேற்றத்தைக் கொண்டாடுங்கள்!
+
+wger என்பது ஒரு திறந்த மூல திட்டம் மற்றும் இதுபற்றிய அனைத்தும்:
+* உங்கள் உடல்
+* உங்கள் உடற்பயிற்சிகள்
+* உங்கள் முன்னேற்றம்
+* உங்கள் தரவு
+
+உங்கள் உடல்:
+உங்களுக்குப் பிடித்த உணவு வகைகளின் பொருட்களைக் கூகிள் மூலம் தேட வேண்டிய அவசியமில்லை - 78000க்கும் மேற்பட்ட பொருட்களிலிருந்து உங்கள் தினசரி உணவைத் தேர்ந்தெடுத்து ஊட்டச்சத்து மதிப்புகளைப் பாருங்கள். ஊட்டச்சத்து திட்டத்தில் உணவுகளைச் சேர்த்து, உங்கள் உணவின் கண்ணோட்டத்தை காலண்டரில் வைத்திருங்கள்.
+
+உங்கள் உடற்பயிற்சிகள்:
+உங்கள் உடலுக்கு எது சிறந்தது என்பது உங்களுக்குத் தெரியும். 200 வெவ்வேறு பயிற்சிகளிலிருந்து வளர்ந்து வரும் வகைகளிலிருந்து உங்கள் சொந்த உடற்பயிற்சிகளை உருவாக்குங்கள். பின்னர், ஒரே தட்டலில் உங்கள் எடைகளைப் பதிவு செய்யும்போது பயிற்சியின் மூலம் உங்களை வழிநடத்த ஜிம் பயன்முறையைப் பயன்படுத்தவும்.
+
+உங்கள் முன்னேற்றம்:
+உங்கள் இலக்குகளை ஒருபோதும் மறந்துவிடாதீர்கள். உங்கள் எடையைக் கண்காணித்து, உங்கள் புள்ளிவிவரங்களை வைத்திருங்கள்.
+
+உங்கள் தரவு:
+wger என்பது உங்கள் தனிப்பயனாக்கப்பட்ட உடற்பயிற்சி நாட்குறிப்பு - ஆனால் உங்கள் தரவு உங்களுடையது. REST API ஐப் பயன்படுத்தி அதை அணுகி அற்புதமான விஷயங்களைச் செய்யுங்கள்.
+
+தயவுசெய்து கவனிக்கவும்: இந்த இலவச பயன்பாடு கூடுதல் நிதியை அடிப்படையாகக் கொண்டது அல்ல, மேலும் நாங்கள் உங்களிடம் பணத்தை நன்கொடையாகக் கேட்பதில்லை. அதைவிட இது தொடர்ந்து வளர்ந்து வரும் ஒரு சமூகத் திட்டம். எனவே எந்த நேரத்திலும் புதிய அம்சங்களுக்குத் தயாராக இருங்கள்!
+
+#ஓப்பன்சோர்ஸ் – அது என்ன அர்த்தம்?
+திறந்த மூலமானது இந்தப் பயன்பாட்டிற்கான முழு மூலக் குறியீடும் அது பேசும் சேவையகமும் இலவசம் மற்றும் யாருக்கும் கிடைக்கும் என்பதாகும்:
+
+* உங்கள் சொந்த சர்வரில் அல்லது உங்கள் உள்ளூர் ஜிம்மில் wger ஐ இயக்க விரும்புகிறீர்களா? தொடருங்கள்!
+* நீங்கள் ஒரு அம்சத்தைத் தவறவிட்டு அதைச் செயல்படுத்த விரும்புகிறீர்களா? இப்போதே தொடங்குங்கள்!
+* எதுவும் எங்கும் அனுப்பப்படவில்லை என்பதை நீங்கள் சரிபார்க்க விரும்புகிறீர்களா? உங்களால் முடியும்!
+
+எங்கள் சமூகத்தில் சேர்ந்து, உலகம் முழுவதிலுமிருந்து வரும் விளையாட்டு ஆர்வலர்கள் மற்றும் ஐடி ஆர்வலர்களின் ஒரு பகுதியாகுங்கள். எங்கள் தேவைகளுக்கு ஏற்பத் தனிப்பயனாக்கப்பட்ட பயன்பாட்டைச் சரிசெய்து மேம்படுத்துவதில் நாங்கள் தொடர்ந்து பணியாற்றி வருகிறோம். உங்கள் உள்ளீட்டை நாங்கள் விரும்புகிறோம், எனவே எந்த நேரத்திலும் குதித்து உங்கள் விருப்பங்களையும் யோசனைகளையும் பங்களிக்க தயங்காதீர்கள்!
+
+-> https://github.com/wger-project இல் மூலக் குறியீட்டைக் கண்டறியவும்.
+-> உங்கள் கேள்விகளைக் கேளுங்கள் அல்லது எங்கள் டிஸ்கார்ட் சர்வரில் ஹலோ சொல்லுங்கள் https://discord.gg/rPWFv6W
diff --git a/fastlane/metadata/android/ta-IN/images/phoneScreenshots/01 - dashboard.png b/fastlane/metadata/android/ta-IN/images/phoneScreenshots/01 - dashboard.png
new file mode 100644
index 00000000..4c4dbb86
Binary files /dev/null and b/fastlane/metadata/android/ta-IN/images/phoneScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/ta-IN/images/phoneScreenshots/02 - workout detail.png b/fastlane/metadata/android/ta-IN/images/phoneScreenshots/02 - workout detail.png
new file mode 100644
index 00000000..f76fa96c
Binary files /dev/null and b/fastlane/metadata/android/ta-IN/images/phoneScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/ta-IN/images/phoneScreenshots/03 - gym mode.png b/fastlane/metadata/android/ta-IN/images/phoneScreenshots/03 - gym mode.png
new file mode 100644
index 00000000..6111c6a0
Binary files /dev/null and b/fastlane/metadata/android/ta-IN/images/phoneScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/ta-IN/images/phoneScreenshots/04 - measurements.png b/fastlane/metadata/android/ta-IN/images/phoneScreenshots/04 - measurements.png
new file mode 100644
index 00000000..874b9b5d
Binary files /dev/null and b/fastlane/metadata/android/ta-IN/images/phoneScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/ta-IN/images/phoneScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/ta-IN/images/phoneScreenshots/05 - nutritional plan.png
new file mode 100644
index 00000000..901fd50b
Binary files /dev/null and b/fastlane/metadata/android/ta-IN/images/phoneScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/ta-IN/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/ta-IN/images/phoneScreenshots/06 - weight.png
new file mode 100644
index 00000000..012d97e0
Binary files /dev/null and b/fastlane/metadata/android/ta-IN/images/phoneScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/ta-IN/images/sevenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/ta-IN/images/sevenInchScreenshots/01 - dashboard.png
new file mode 100644
index 00000000..a61136d5
Binary files /dev/null and b/fastlane/metadata/android/ta-IN/images/sevenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/ta-IN/images/sevenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/ta-IN/images/sevenInchScreenshots/02 - workout detail.png
new file mode 100644
index 00000000..7faf5e2d
Binary files /dev/null and b/fastlane/metadata/android/ta-IN/images/sevenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/ta-IN/images/sevenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/ta-IN/images/sevenInchScreenshots/03 - gym mode.png
new file mode 100644
index 00000000..ded8f167
Binary files /dev/null and b/fastlane/metadata/android/ta-IN/images/sevenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/ta-IN/images/sevenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/ta-IN/images/sevenInchScreenshots/04 - measurements.png
new file mode 100644
index 00000000..39d1ace8
Binary files /dev/null and b/fastlane/metadata/android/ta-IN/images/sevenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/ta-IN/images/sevenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/ta-IN/images/sevenInchScreenshots/05 - nutritional plan.png
new file mode 100644
index 00000000..b32fba6c
Binary files /dev/null and b/fastlane/metadata/android/ta-IN/images/sevenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/ta-IN/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/ta-IN/images/sevenInchScreenshots/06 - weight.png
new file mode 100644
index 00000000..a877cae7
Binary files /dev/null and b/fastlane/metadata/android/ta-IN/images/sevenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/ta-IN/images/tenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/ta-IN/images/tenInchScreenshots/01 - dashboard.png
new file mode 100644
index 00000000..ea851fca
Binary files /dev/null and b/fastlane/metadata/android/ta-IN/images/tenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/ta-IN/images/tenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/ta-IN/images/tenInchScreenshots/02 - workout detail.png
new file mode 100644
index 00000000..244f29b1
Binary files /dev/null and b/fastlane/metadata/android/ta-IN/images/tenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/ta-IN/images/tenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/ta-IN/images/tenInchScreenshots/03 - gym mode.png
new file mode 100644
index 00000000..27fa6426
Binary files /dev/null and b/fastlane/metadata/android/ta-IN/images/tenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/ta-IN/images/tenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/ta-IN/images/tenInchScreenshots/04 - measurements.png
new file mode 100644
index 00000000..1bb9c272
Binary files /dev/null and b/fastlane/metadata/android/ta-IN/images/tenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/ta-IN/images/tenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/ta-IN/images/tenInchScreenshots/05 - nutritional plan.png
new file mode 100644
index 00000000..951a9652
Binary files /dev/null and b/fastlane/metadata/android/ta-IN/images/tenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/ta-IN/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/ta-IN/images/tenInchScreenshots/06 - weight.png
new file mode 100644
index 00000000..01792d7f
Binary files /dev/null and b/fastlane/metadata/android/ta-IN/images/tenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/ta-IN/short_description.txt b/fastlane/metadata/android/ta-IN/short_description.txt
new file mode 100644
index 00000000..4391c682
--- /dev/null
+++ b/fastlane/metadata/android/ta-IN/short_description.txt
@@ -0,0 +1 @@
+உடற்தகுதி/உடற்பயிற்சி, ஊட்டச்சத்து மற்றும் எடை கண்காணிப்பு
diff --git a/fastlane/metadata/android/ta-IN/title.txt b/fastlane/metadata/android/ta-IN/title.txt
new file mode 100644
index 00000000..d35e4087
--- /dev/null
+++ b/fastlane/metadata/android/ta-IN/title.txt
@@ -0,0 +1 @@
+wger Workout Manager
diff --git a/fastlane/metadata/android/tr-TR/full_description.txt b/fastlane/metadata/android/tr-TR/full_description.txt
index 6a32c601..fdec591a 100644
--- a/fastlane/metadata/android/tr-TR/full_description.txt
+++ b/fastlane/metadata/android/tr-TR/full_description.txt
@@ -2,7 +2,7 @@ Fitness tutkunlarından fitness severlere - Egzersiz Yöneticiniz WGER ile sağl
 
 1 numaralı fitness uygulamanızı zaten buldunuz mu ve kendi spor rutinlerinizi oluşturmayı seviyor musunuz? Ne tür bir sportif canavar olursanız olun - hepimizin ortak bir yanı var: Sağlık verilerimizi takip etmeyi seviyoruz <3
 
-Bu nedenle, fitness yolculuğunuzu kullanışlı küçük egzersiz kayıt defterinizle hala yönettiğiniz için sizi yargılamıyoruz, ancak 2024'e hoş geldiniz!
+Bu nedenle, fitness yolculuğunuzu kullanışlı küçük egzersiz kayıt defterinizle hala yönettiğiniz için sizi yargılamıyoruz, ancak 2025'e hoş geldiniz!
 
 Sizin için hayatınızı kolaylaştırmak için en alakalı özelliklere göre boyutlandırılmış %100 ücretsiz bir dijital sağlık ve fitness takip uygulaması geliştirdik. Başlayın, antrenmana devam edin ve ilerlemenizi kutlayın!
 
diff --git a/fastlane/metadata/android/tr-TR/images/phoneScreenshots/01 - dashboard.png b/fastlane/metadata/android/tr-TR/images/phoneScreenshots/01 - dashboard.png
index 426051d7..e0ac786b 100644
Binary files a/fastlane/metadata/android/tr-TR/images/phoneScreenshots/01 - dashboard.png and b/fastlane/metadata/android/tr-TR/images/phoneScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/tr-TR/images/phoneScreenshots/02 - workout detail.png b/fastlane/metadata/android/tr-TR/images/phoneScreenshots/02 - workout detail.png
index 804472c2..93687303 100644
Binary files a/fastlane/metadata/android/tr-TR/images/phoneScreenshots/02 - workout detail.png and b/fastlane/metadata/android/tr-TR/images/phoneScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/tr-TR/images/phoneScreenshots/03 - gym mode.png b/fastlane/metadata/android/tr-TR/images/phoneScreenshots/03 - gym mode.png
index a67725ba..7f6a551f 100644
Binary files a/fastlane/metadata/android/tr-TR/images/phoneScreenshots/03 - gym mode.png and b/fastlane/metadata/android/tr-TR/images/phoneScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/tr-TR/images/phoneScreenshots/04 - measurements.png b/fastlane/metadata/android/tr-TR/images/phoneScreenshots/04 - measurements.png
index 3c484cba..8b62755e 100644
Binary files a/fastlane/metadata/android/tr-TR/images/phoneScreenshots/04 - measurements.png and b/fastlane/metadata/android/tr-TR/images/phoneScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/tr-TR/images/phoneScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/tr-TR/images/phoneScreenshots/05 - nutritional plan.png
index b50b077b..f46e87a5 100644
Binary files a/fastlane/metadata/android/tr-TR/images/phoneScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/tr-TR/images/phoneScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/tr-TR/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/tr-TR/images/phoneScreenshots/06 - weight.png
index 75a3649b..7922288b 100644
Binary files a/fastlane/metadata/android/tr-TR/images/phoneScreenshots/06 - weight.png and b/fastlane/metadata/android/tr-TR/images/phoneScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/tr-TR/images/sevenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/tr-TR/images/sevenInchScreenshots/01 - dashboard.png
index 40b0c411..25f6bc98 100644
Binary files a/fastlane/metadata/android/tr-TR/images/sevenInchScreenshots/01 - dashboard.png and b/fastlane/metadata/android/tr-TR/images/sevenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/tr-TR/images/sevenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/tr-TR/images/sevenInchScreenshots/02 - workout detail.png
index 87873dcd..fd38e958 100644
Binary files a/fastlane/metadata/android/tr-TR/images/sevenInchScreenshots/02 - workout detail.png and b/fastlane/metadata/android/tr-TR/images/sevenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/tr-TR/images/sevenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/tr-TR/images/sevenInchScreenshots/03 - gym mode.png
index 602df33d..0a150ca4 100644
Binary files a/fastlane/metadata/android/tr-TR/images/sevenInchScreenshots/03 - gym mode.png and b/fastlane/metadata/android/tr-TR/images/sevenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/tr-TR/images/sevenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/tr-TR/images/sevenInchScreenshots/04 - measurements.png
index 654b6124..1d688d9b 100644
Binary files a/fastlane/metadata/android/tr-TR/images/sevenInchScreenshots/04 - measurements.png and b/fastlane/metadata/android/tr-TR/images/sevenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/tr-TR/images/sevenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/tr-TR/images/sevenInchScreenshots/05 - nutritional plan.png
index 15842339..a3235750 100644
Binary files a/fastlane/metadata/android/tr-TR/images/sevenInchScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/tr-TR/images/sevenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/tr-TR/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/tr-TR/images/sevenInchScreenshots/06 - weight.png
index 0db7c130..117dd865 100644
Binary files a/fastlane/metadata/android/tr-TR/images/sevenInchScreenshots/06 - weight.png and b/fastlane/metadata/android/tr-TR/images/sevenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/tr-TR/images/tenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/tr-TR/images/tenInchScreenshots/01 - dashboard.png
index 71f73ade..4cc651a9 100644
Binary files a/fastlane/metadata/android/tr-TR/images/tenInchScreenshots/01 - dashboard.png and b/fastlane/metadata/android/tr-TR/images/tenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/tr-TR/images/tenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/tr-TR/images/tenInchScreenshots/02 - workout detail.png
index 355b4661..9959ccb8 100644
Binary files a/fastlane/metadata/android/tr-TR/images/tenInchScreenshots/02 - workout detail.png and b/fastlane/metadata/android/tr-TR/images/tenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/tr-TR/images/tenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/tr-TR/images/tenInchScreenshots/03 - gym mode.png
index b4edf297..e539343b 100644
Binary files a/fastlane/metadata/android/tr-TR/images/tenInchScreenshots/03 - gym mode.png and b/fastlane/metadata/android/tr-TR/images/tenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/tr-TR/images/tenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/tr-TR/images/tenInchScreenshots/04 - measurements.png
index 3dd47075..5e74455e 100644
Binary files a/fastlane/metadata/android/tr-TR/images/tenInchScreenshots/04 - measurements.png and b/fastlane/metadata/android/tr-TR/images/tenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/tr-TR/images/tenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/tr-TR/images/tenInchScreenshots/05 - nutritional plan.png
index 3478fc3a..9f83a1f3 100644
Binary files a/fastlane/metadata/android/tr-TR/images/tenInchScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/tr-TR/images/tenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/tr-TR/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/tr-TR/images/tenInchScreenshots/06 - weight.png
index 33e5ce73..b968b3f5 100644
Binary files a/fastlane/metadata/android/tr-TR/images/tenInchScreenshots/06 - weight.png and b/fastlane/metadata/android/tr-TR/images/tenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/uk/full_description.txt b/fastlane/metadata/android/uk/full_description.txt
index b5244965..ecca238d 100644
--- a/fastlane/metadata/android/uk/full_description.txt
+++ b/fastlane/metadata/android/uk/full_description.txt
@@ -2,7 +2,7 @@
 
 Ви вже знайшли свій фітнес-застосунок №1 і любите створювати свої власні спортивні програми? Неважливо, який ви спортивний звір - у всіх нас є щось спільне: ми любимо стежити за даними про своє здоров'я <3
 
-Тому ми не засуджуємо вас за те, що ви все ще ведете свій фітнес-шлях за допомогою зручного маленького журналу тренувань, але ласкаво просимо у 2024 рік!
+Тому ми не засуджуємо вас за те, що ви все ще ведете свій фітнес-шлях за допомогою зручного маленького журналу тренувань, але ласкаво просимо у 2025 рік!
 
 Ми розробили для вас 100% безплатний цифровий застосунок для відстеження стану здоров'я та фітнесу, скоротивши його до найнеобхідніших функцій, щоб полегшити вам життя. Почніть, продовжуйте тренуватися і відзначайте свій спортивний поступ!
 
diff --git a/fastlane/metadata/android/uk/images/phoneScreenshots/01 - dashboard.png b/fastlane/metadata/android/uk/images/phoneScreenshots/01 - dashboard.png
index 95de5cc2..d890a911 100644
Binary files a/fastlane/metadata/android/uk/images/phoneScreenshots/01 - dashboard.png and b/fastlane/metadata/android/uk/images/phoneScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/uk/images/phoneScreenshots/02 - workout detail.png b/fastlane/metadata/android/uk/images/phoneScreenshots/02 - workout detail.png
index 40b8ee1c..f76fa96c 100644
Binary files a/fastlane/metadata/android/uk/images/phoneScreenshots/02 - workout detail.png and b/fastlane/metadata/android/uk/images/phoneScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/uk/images/phoneScreenshots/03 - gym mode.png b/fastlane/metadata/android/uk/images/phoneScreenshots/03 - gym mode.png
index b61db959..1361b510 100644
Binary files a/fastlane/metadata/android/uk/images/phoneScreenshots/03 - gym mode.png and b/fastlane/metadata/android/uk/images/phoneScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/uk/images/phoneScreenshots/04 - measurements.png b/fastlane/metadata/android/uk/images/phoneScreenshots/04 - measurements.png
index d5938c1c..b9b4092f 100644
Binary files a/fastlane/metadata/android/uk/images/phoneScreenshots/04 - measurements.png and b/fastlane/metadata/android/uk/images/phoneScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/uk/images/phoneScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/uk/images/phoneScreenshots/05 - nutritional plan.png
index e1b9933c..939fc93e 100644
Binary files a/fastlane/metadata/android/uk/images/phoneScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/uk/images/phoneScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/uk/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/uk/images/phoneScreenshots/06 - weight.png
index c3a80414..defce40c 100644
Binary files a/fastlane/metadata/android/uk/images/phoneScreenshots/06 - weight.png and b/fastlane/metadata/android/uk/images/phoneScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/uk/images/sevenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/uk/images/sevenInchScreenshots/01 - dashboard.png
index 34ed93bf..bd0403bd 100644
Binary files a/fastlane/metadata/android/uk/images/sevenInchScreenshots/01 - dashboard.png and b/fastlane/metadata/android/uk/images/sevenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/uk/images/sevenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/uk/images/sevenInchScreenshots/02 - workout detail.png
index d6e099ec..7faf5e2d 100644
Binary files a/fastlane/metadata/android/uk/images/sevenInchScreenshots/02 - workout detail.png and b/fastlane/metadata/android/uk/images/sevenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/uk/images/sevenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/uk/images/sevenInchScreenshots/03 - gym mode.png
index 969bc659..0484fbb2 100644
Binary files a/fastlane/metadata/android/uk/images/sevenInchScreenshots/03 - gym mode.png and b/fastlane/metadata/android/uk/images/sevenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/uk/images/sevenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/uk/images/sevenInchScreenshots/04 - measurements.png
index b9ae2cd8..9b701a55 100644
Binary files a/fastlane/metadata/android/uk/images/sevenInchScreenshots/04 - measurements.png and b/fastlane/metadata/android/uk/images/sevenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/uk/images/sevenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/uk/images/sevenInchScreenshots/05 - nutritional plan.png
index 61ecc0bf..a8d782ef 100644
Binary files a/fastlane/metadata/android/uk/images/sevenInchScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/uk/images/sevenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/uk/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/uk/images/sevenInchScreenshots/06 - weight.png
index ea8af0fe..11ba5504 100644
Binary files a/fastlane/metadata/android/uk/images/sevenInchScreenshots/06 - weight.png and b/fastlane/metadata/android/uk/images/sevenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/uk/images/tenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/uk/images/tenInchScreenshots/01 - dashboard.png
index f17b2416..9271eaa8 100644
Binary files a/fastlane/metadata/android/uk/images/tenInchScreenshots/01 - dashboard.png and b/fastlane/metadata/android/uk/images/tenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/uk/images/tenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/uk/images/tenInchScreenshots/02 - workout detail.png
index 1e98fd5b..244f29b1 100644
Binary files a/fastlane/metadata/android/uk/images/tenInchScreenshots/02 - workout detail.png and b/fastlane/metadata/android/uk/images/tenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/uk/images/tenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/uk/images/tenInchScreenshots/03 - gym mode.png
index f642a734..f13e11a4 100644
Binary files a/fastlane/metadata/android/uk/images/tenInchScreenshots/03 - gym mode.png and b/fastlane/metadata/android/uk/images/tenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/uk/images/tenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/uk/images/tenInchScreenshots/04 - measurements.png
index 2a519ada..92f46bb0 100644
Binary files a/fastlane/metadata/android/uk/images/tenInchScreenshots/04 - measurements.png and b/fastlane/metadata/android/uk/images/tenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/uk/images/tenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/uk/images/tenInchScreenshots/05 - nutritional plan.png
index e1fb20c4..fce72fdd 100644
Binary files a/fastlane/metadata/android/uk/images/tenInchScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/uk/images/tenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/uk/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/uk/images/tenInchScreenshots/06 - weight.png
index a415d3e7..26cb4793 100644
Binary files a/fastlane/metadata/android/uk/images/tenInchScreenshots/06 - weight.png and b/fastlane/metadata/android/uk/images/tenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/zh-CN/full_description.txt b/fastlane/metadata/android/zh-CN/full_description.txt
index caaad1bf..e12216c1 100644
--- a/fastlane/metadata/android/zh-CN/full_description.txt
+++ b/fastlane/metadata/android/zh-CN/full_description.txt
@@ -2,7 +2,7 @@
 
 你是否已经找到了排名第一的健身应用程序，并且喜欢创建自己的运动习惯？ 无论你是哪种运动野兽——我们都有一个共同点：我们喜欢跟踪我们的健康数据
 
-因此，我们不会因为你仍然使用小笔记本来管理你的健身旅程而评判你，但欢迎来到 2024 年！
+因此，我们不会因为你仍然使用小笔记本来管理你的健身旅程而评判你，但欢迎来到 2025 年！
 
 我们为你开发了 100% 免费的数字健康和健身追踪器应用程序，压缩到最相关的功能，让你的生活更轻松。开始吧，继续训练并庆祝你的进步！
 
diff --git a/fastlane/metadata/android/zh-CN/images/phoneScreenshots/01 - dashboard.png b/fastlane/metadata/android/zh-CN/images/phoneScreenshots/01 - dashboard.png
index 9b128ae8..eb115a18 100644
Binary files a/fastlane/metadata/android/zh-CN/images/phoneScreenshots/01 - dashboard.png and b/fastlane/metadata/android/zh-CN/images/phoneScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/zh-CN/images/phoneScreenshots/02 - workout detail.png b/fastlane/metadata/android/zh-CN/images/phoneScreenshots/02 - workout detail.png
index 7fd543d1..72a9b75f 100644
Binary files a/fastlane/metadata/android/zh-CN/images/phoneScreenshots/02 - workout detail.png and b/fastlane/metadata/android/zh-CN/images/phoneScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/zh-CN/images/phoneScreenshots/03 - gym mode.png b/fastlane/metadata/android/zh-CN/images/phoneScreenshots/03 - gym mode.png
index d2a53911..19d75a83 100644
Binary files a/fastlane/metadata/android/zh-CN/images/phoneScreenshots/03 - gym mode.png and b/fastlane/metadata/android/zh-CN/images/phoneScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/zh-CN/images/phoneScreenshots/04 - measurements.png b/fastlane/metadata/android/zh-CN/images/phoneScreenshots/04 - measurements.png
index 34cff206..bd21ea45 100644
Binary files a/fastlane/metadata/android/zh-CN/images/phoneScreenshots/04 - measurements.png and b/fastlane/metadata/android/zh-CN/images/phoneScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/zh-CN/images/phoneScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/zh-CN/images/phoneScreenshots/05 - nutritional plan.png
index d466a14f..5ef6afe2 100644
Binary files a/fastlane/metadata/android/zh-CN/images/phoneScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/zh-CN/images/phoneScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/zh-CN/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/zh-CN/images/phoneScreenshots/06 - weight.png
index e70ad92f..58e8a3f8 100644
Binary files a/fastlane/metadata/android/zh-CN/images/phoneScreenshots/06 - weight.png and b/fastlane/metadata/android/zh-CN/images/phoneScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/zh-CN/images/sevenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/zh-CN/images/sevenInchScreenshots/01 - dashboard.png
index c37f68aa..b3d17505 100644
Binary files a/fastlane/metadata/android/zh-CN/images/sevenInchScreenshots/01 - dashboard.png and b/fastlane/metadata/android/zh-CN/images/sevenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/zh-CN/images/sevenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/zh-CN/images/sevenInchScreenshots/02 - workout detail.png
index ccaa8461..fe112a70 100644
Binary files a/fastlane/metadata/android/zh-CN/images/sevenInchScreenshots/02 - workout detail.png and b/fastlane/metadata/android/zh-CN/images/sevenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/zh-CN/images/sevenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/zh-CN/images/sevenInchScreenshots/03 - gym mode.png
index 0c3f9121..7d59de74 100644
Binary files a/fastlane/metadata/android/zh-CN/images/sevenInchScreenshots/03 - gym mode.png and b/fastlane/metadata/android/zh-CN/images/sevenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/zh-CN/images/sevenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/zh-CN/images/sevenInchScreenshots/04 - measurements.png
index 09246dcd..838436c9 100644
Binary files a/fastlane/metadata/android/zh-CN/images/sevenInchScreenshots/04 - measurements.png and b/fastlane/metadata/android/zh-CN/images/sevenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/zh-CN/images/sevenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/zh-CN/images/sevenInchScreenshots/05 - nutritional plan.png
index abf93842..9b2eb7f5 100644
Binary files a/fastlane/metadata/android/zh-CN/images/sevenInchScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/zh-CN/images/sevenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/zh-CN/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/zh-CN/images/sevenInchScreenshots/06 - weight.png
index e3c46bb2..c4e17457 100644
Binary files a/fastlane/metadata/android/zh-CN/images/sevenInchScreenshots/06 - weight.png and b/fastlane/metadata/android/zh-CN/images/sevenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/zh-CN/images/tenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/zh-CN/images/tenInchScreenshots/01 - dashboard.png
index 54f98562..7bab9d07 100644
Binary files a/fastlane/metadata/android/zh-CN/images/tenInchScreenshots/01 - dashboard.png and b/fastlane/metadata/android/zh-CN/images/tenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/zh-CN/images/tenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/zh-CN/images/tenInchScreenshots/02 - workout detail.png
index fbe804a3..ad2a5718 100644
Binary files a/fastlane/metadata/android/zh-CN/images/tenInchScreenshots/02 - workout detail.png and b/fastlane/metadata/android/zh-CN/images/tenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/zh-CN/images/tenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/zh-CN/images/tenInchScreenshots/03 - gym mode.png
index 06368812..2bbed93a 100644
Binary files a/fastlane/metadata/android/zh-CN/images/tenInchScreenshots/03 - gym mode.png and b/fastlane/metadata/android/zh-CN/images/tenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/zh-CN/images/tenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/zh-CN/images/tenInchScreenshots/04 - measurements.png
index 2c7edec4..0568cf18 100644
Binary files a/fastlane/metadata/android/zh-CN/images/tenInchScreenshots/04 - measurements.png and b/fastlane/metadata/android/zh-CN/images/tenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/zh-CN/images/tenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/zh-CN/images/tenInchScreenshots/05 - nutritional plan.png
index b4f7894f..38887364 100644
Binary files a/fastlane/metadata/android/zh-CN/images/tenInchScreenshots/05 - nutritional plan.png and b/fastlane/metadata/android/zh-CN/images/tenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/zh-CN/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/zh-CN/images/tenInchScreenshots/06 - weight.png
index 1f135a32..56f91e0f 100644
Binary files a/fastlane/metadata/android/zh-CN/images/tenInchScreenshots/06 - weight.png and b/fastlane/metadata/android/zh-CN/images/tenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/zh-TW/full_description.txt b/fastlane/metadata/android/zh-TW/full_description.txt
index 66013f08..bdef0f15 100644
--- a/fastlane/metadata/android/zh-TW/full_description.txt
+++ b/fastlane/metadata/android/zh-TW/full_description.txt
@@ -1,39 +1,39 @@
 每一個健身愛好者 - 與您的健身教練 WGER 一起，讓你更健康！
 
-你是否已經找到了排名第一的健身應用程序，並且喜歡創建自己的運動習慣？ 無論你是哪種運動野獸——我們都有一個共同點：我們喜歡追蹤我們的健康數據
+你是否已經找到了排名第一的健身應用程式，並且喜歡建立自己的運動習慣？ 無論你是哪種運動野獸——我們都有一個共同點：我們喜歡追蹤我們的健康資料
 
-因此，我們不會因為你仍然使用小筆記本來管理你的健身旅程而批評你，但歡迎來到 2024 年！
+因此，我們不會因為你仍然使用小筆記本來管理你的健身旅程而批評你，但歡迎來到 2025 年！
 
-我們為你開發了 100% 免費的數位健康和健身追蹤器應用程序，壓縮到最相關的功能，讓你的生活更輕鬆。開始吧，繼續訓練並慶祝你的進步！
+我們為你開發了 100% 免費的數位健康和健身追蹤器應用程式，壓縮到最相關的功能，讓你的生活更輕鬆。開始吧，繼續訓練並慶祝你的進步！
 
-wger 是一個開源項目，關於：
+wger 是一個開源專案，關於：
 * 你的身體
 * 你的鍛煉
 * 你的進展
-* 你的數據
+* 你的資料
 
 你的身體：
-無需在谷歌上搜尋你最喜歡的食物的成分——從 78000 多種產品中選擇你的日常膳食並查看營養價值。將餐點加入營養計劃中，並在日曆中概述你的飲食。
+無需在谷歌上搜尋你最喜歡的食物的成分——從 78000 多種產品中選擇你的日常膳食並檢視營養價值。將餐點加入營養計劃中，並在日曆中概述你的飲食。
 
 你的鍛鍊：
-你知道什麼對你的身體最好。從 200 種不同的練習中選擇越來越多的練習來創建你自己的鍛鍊。然後，使用健身房模式引導你完成訓練，同時一鍵記錄你的體重。
+你知道什麼對你的身體最好。從 200 種不同的練習中選擇越來越多的練習來建立你自己的鍛鍊。然後，使用健身房模式引導你完成訓練，同時一鍵記錄你的體重。
 
 你的進展：
-永遠不要忘記你的目標。追蹤你的體重並保留你的統計數據。
+永遠不要忘記你的目標。追蹤你的體重並保留你的統計資料。
 
-你的數據：
-wger 是你的個人化健身日記——但你擁有自己的數據。使用 REST API 來存取它並用它做驚人的事情。
+你的資料：
+wger 是你的個人化健身日記——但你擁有自己的資料。使用 REST API 來存取它並用它做驚人的事情。
 
-請注意：這個免費的應用程式不是基於額外的資金，我們不要求你捐款。不僅如此，它還是一個不斷發展的社區計畫。因此，請隨時為新功能做好準備！
+請注意：這個免費的應用程式不是基於額外的資金，我們不要求你捐款。不僅如此，它還是一個不斷發展的社群計畫。因此，請隨時為新功能做好準備！
 
 #OpenSource – 這是什麼意思？
 
 開源意味著這個應用程式的整個原始碼和它與之通訊的伺服器都是免費的，任何人都可以使用：
-* 你想在自己的伺服器上為你還是為你當地的健身房運行 wger？都可以！
+* 你想在自己的伺服器上為你還是為你當地的健身房執行 wger？都可以！
 * 你是否錯過了某個功能並想要實現它？現在開始！
-* 你想檢查任何地方都沒有發送任何東西嗎？你可以！
+* 你想檢查任何地方都沒有傳送任何東西嗎？你可以！
 
-加入我們的社區，成為來自世界各地的體育愛好者和 IT 極客的一份子。我們一直致力於調整和優化根據我們的需求量身定制的應用程式。我們喜歡你的意見，因此請隨時加入並貢獻你的願望和想法！
+加入我們的社群，成為來自世界各地的體育愛好者和 IT 極客的一份子。我們一直致力於調整和最佳化根據我們的需求量身定製的應用程式。我們喜歡你的意見，因此請隨時加入並貢獻你的願望和想法！
 
 -> 在 https://github.com/wger-project 上找到原始碼
 -> 在我們的 Discord 伺服器上提問或打個招呼 https://discord.gg/rPWFv6W
diff --git a/fastlane/metadata/android/zh-TW/images/phoneScreenshots/01 - dashboard.png b/fastlane/metadata/android/zh-TW/images/phoneScreenshots/01 - dashboard.png
new file mode 100644
index 00000000..520bbe0b
Binary files /dev/null and b/fastlane/metadata/android/zh-TW/images/phoneScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/zh-TW/images/phoneScreenshots/02 - workout detail.png b/fastlane/metadata/android/zh-TW/images/phoneScreenshots/02 - workout detail.png
new file mode 100644
index 00000000..72a9b75f
Binary files /dev/null and b/fastlane/metadata/android/zh-TW/images/phoneScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/zh-TW/images/phoneScreenshots/03 - gym mode.png b/fastlane/metadata/android/zh-TW/images/phoneScreenshots/03 - gym mode.png
new file mode 100644
index 00000000..19d75a83
Binary files /dev/null and b/fastlane/metadata/android/zh-TW/images/phoneScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/zh-TW/images/phoneScreenshots/04 - measurements.png b/fastlane/metadata/android/zh-TW/images/phoneScreenshots/04 - measurements.png
new file mode 100644
index 00000000..bd21ea45
Binary files /dev/null and b/fastlane/metadata/android/zh-TW/images/phoneScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/zh-TW/images/phoneScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/zh-TW/images/phoneScreenshots/05 - nutritional plan.png
new file mode 100644
index 00000000..84ce8c1a
Binary files /dev/null and b/fastlane/metadata/android/zh-TW/images/phoneScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/zh-TW/images/phoneScreenshots/06 - weight.png b/fastlane/metadata/android/zh-TW/images/phoneScreenshots/06 - weight.png
new file mode 100644
index 00000000..58e8a3f8
Binary files /dev/null and b/fastlane/metadata/android/zh-TW/images/phoneScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/zh-TW/images/sevenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/zh-TW/images/sevenInchScreenshots/01 - dashboard.png
new file mode 100644
index 00000000..f60586b6
Binary files /dev/null and b/fastlane/metadata/android/zh-TW/images/sevenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/zh-TW/images/sevenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/zh-TW/images/sevenInchScreenshots/02 - workout detail.png
new file mode 100644
index 00000000..fe112a70
Binary files /dev/null and b/fastlane/metadata/android/zh-TW/images/sevenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/zh-TW/images/sevenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/zh-TW/images/sevenInchScreenshots/03 - gym mode.png
new file mode 100644
index 00000000..7d59de74
Binary files /dev/null and b/fastlane/metadata/android/zh-TW/images/sevenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/zh-TW/images/sevenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/zh-TW/images/sevenInchScreenshots/04 - measurements.png
new file mode 100644
index 00000000..838436c9
Binary files /dev/null and b/fastlane/metadata/android/zh-TW/images/sevenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/zh-TW/images/sevenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/zh-TW/images/sevenInchScreenshots/05 - nutritional plan.png
new file mode 100644
index 00000000..17a62111
Binary files /dev/null and b/fastlane/metadata/android/zh-TW/images/sevenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/zh-TW/images/sevenInchScreenshots/06 - weight.png b/fastlane/metadata/android/zh-TW/images/sevenInchScreenshots/06 - weight.png
new file mode 100644
index 00000000..c4e17457
Binary files /dev/null and b/fastlane/metadata/android/zh-TW/images/sevenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/zh-TW/images/tenInchScreenshots/01 - dashboard.png b/fastlane/metadata/android/zh-TW/images/tenInchScreenshots/01 - dashboard.png
new file mode 100644
index 00000000..729a65cf
Binary files /dev/null and b/fastlane/metadata/android/zh-TW/images/tenInchScreenshots/01 - dashboard.png differ
diff --git a/fastlane/metadata/android/zh-TW/images/tenInchScreenshots/02 - workout detail.png b/fastlane/metadata/android/zh-TW/images/tenInchScreenshots/02 - workout detail.png
new file mode 100644
index 00000000..ad2a5718
Binary files /dev/null and b/fastlane/metadata/android/zh-TW/images/tenInchScreenshots/02 - workout detail.png differ
diff --git a/fastlane/metadata/android/zh-TW/images/tenInchScreenshots/03 - gym mode.png b/fastlane/metadata/android/zh-TW/images/tenInchScreenshots/03 - gym mode.png
new file mode 100644
index 00000000..2bbed93a
Binary files /dev/null and b/fastlane/metadata/android/zh-TW/images/tenInchScreenshots/03 - gym mode.png differ
diff --git a/fastlane/metadata/android/zh-TW/images/tenInchScreenshots/04 - measurements.png b/fastlane/metadata/android/zh-TW/images/tenInchScreenshots/04 - measurements.png
new file mode 100644
index 00000000..0568cf18
Binary files /dev/null and b/fastlane/metadata/android/zh-TW/images/tenInchScreenshots/04 - measurements.png differ
diff --git a/fastlane/metadata/android/zh-TW/images/tenInchScreenshots/05 - nutritional plan.png b/fastlane/metadata/android/zh-TW/images/tenInchScreenshots/05 - nutritional plan.png
new file mode 100644
index 00000000..160b798f
Binary files /dev/null and b/fastlane/metadata/android/zh-TW/images/tenInchScreenshots/05 - nutritional plan.png differ
diff --git a/fastlane/metadata/android/zh-TW/images/tenInchScreenshots/06 - weight.png b/fastlane/metadata/android/zh-TW/images/tenInchScreenshots/06 - weight.png
new file mode 100644
index 00000000..56f91e0f
Binary files /dev/null and b/fastlane/metadata/android/zh-TW/images/tenInchScreenshots/06 - weight.png differ
diff --git a/fastlane/metadata/android/zh-TW/title.txt b/fastlane/metadata/android/zh-TW/title.txt
index ea0df956..d35e4087 100644
--- a/fastlane/metadata/android/zh-TW/title.txt
+++ b/fastlane/metadata/android/zh-TW/title.txt
@@ -1 +1 @@
-wger Workout Manager
\ No newline at end of file
+wger Workout Manager
diff --git a/fastlane/metadata/envfiles/decrypt_secrets.sh b/fastlane/metadata/envfiles/decrypt_secrets.sh
index e44097a1..0d1c7983 100755
--- a/fastlane/metadata/envfiles/decrypt_secrets.sh
+++ b/fastlane/metadata/envfiles/decrypt_secrets.sh
@@ -6,14 +6,20 @@
 # To encrypt a new version of the keys:
 # gpg -c filename.json
 
-echo "decrypting playstore API keys"
-gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPTKEY_PLAYSTORE" \
---output ./playstore.json playstore.json.gpg
+if [ -n "$DECRYPTKEY_PLAYSTORE" ]; then
+  echo "decrypting playstore API keys"
+  gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPTKEY_PLAYSTORE" \
+  --output ./playstore.json playstore.json.gpg
+fi
 
-echo "decrypting key.properties"
-gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPTKEY_PROPERTIES" \
---output ./key.properties key.properties.gpg
+if [ -n "$DECRYPTKEY_PROPERTIES" ]; then
+  echo "decrypting key.properties"
+  gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPTKEY_PROPERTIES" \
+  --output ./key.properties key.properties.gpg
+fi
 
-echo "decrypting playstore signing keys"
-gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPTKEY_PLAYSTORE_SIGNING_KEY" \
---output ./keys.jks keys.jks.gpg
\ No newline at end of file
+if [ -n "$DECRYPTKEY_PLAYSTORE_SIGNING_KEY" ]; then
+  echo "decrypting playstore signing keys"
+  gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPTKEY_PLAYSTORE_SIGNING_KEY" \
+  --output ./keys.jks keys.jks.gpg
+fi
\ No newline at end of file
diff --git a/fastlane/report.xml b/fastlane/report.xml
index 31b38440..fa0dbf67 100644
--- a/fastlane/report.xml
+++ b/fastlane/report.xml
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites>
-  <testsuite name="fastlane.lanes">
-    
-    
-    
-      
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000258">
-        
-      </testcase>
-    
-      
-      <testcase classname="fastlane.lanes" name="1: upload_to_play_store" time="178.169255">
-        
-      </testcase>
-    
-  </testsuite>
+    <testsuite name="fastlane.lanes">
+
+
+        <testcase name="0: default_platform" classname="fastlane.lanes" time="0.000238">
+
+        </testcase>
+
+
+        <testcase name="1: upload_to_play_store" classname="fastlane.lanes" time="344.265783">
+
+        </testcase>
+
+    </testsuite>
 </testsuites>
diff --git a/flatpak/app-icon-grid.svg b/flatpak/app-icon-grid.svg
new file mode 100644
index 00000000..33451bd1
--- /dev/null
+++ b/flatpak/app-icon-grid.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="svg1" width="128" height="128" version="1.1" viewBox="0 0 33.867 33.867" xml:space="preserve"><g id="layer1" transform="translate(-32.279167,-138.64166)"><circle style="display:inline;opacity:.2;fill:none;fill-opacity:1;stroke:currentColor;stroke-width:.261937;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new" id="circle2892" cx="49.213" cy="155.575" r="15.744"/><rect style="display:inline;opacity:.2;fill:none;fill-opacity:1;stroke:currentColor;stroke-width:.261937;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new" id="rect2896" width="27.255" height="27.255" x="35.585" y="141.948" rx="2.097" ry="2.097"/><g id="layer1-2" transform="matrix(0.32793309,0,0,0.32793309,9.2292922,118.73149)"><path style="fill:#2a4c7d;fill-opacity:1;stroke:#2a4c7d;stroke-width:.250912;stroke-opacity:1" id="path28-3" d="m 119.24535,156.14635 c -11.30087,-5.25195 -20.477151,-10.71647 -32.026846,-17.17666 -5.209585,-2.91363 -5.521935,-3.33309 -7.088981,-5.078 -0.628356,-0.69967 -0.949626,-1.5731 -0.949626,-2.09903 0,-6.25575 0,-19.57957 0,-19.57957 V 92.633492 c 0,-0.529453 0.388777,-1.437466 0.837451,-2.006725 1.905684,-2.417852 2.039373,-2.508366 7.456347,-5.44992 8.609232,-4.891712 17.881585,-8.879857 26.458905,-13.781576 5.60244,-3.206248 7.07027,-3.64232 9.87937,-2.934989 1.78871,0.450395 36.96673,19.013221 38.40647,20.356984 0.51333,0.479114 1.15499,1.151574 1.58609,1.835763 0.38406,0.609518 0.86538,1.428234 0.86538,1.980463 v 19.456238 19.45623 c 0,0.57418 -0.41316,1.08395 -0.74242,1.55435 -0.99791,1.42567 -2.19608,2.73782 -3.65592,3.72685 -0.37773,0.25591 -1.56393,1.00043 -2.30115,1.44708 -9.40184,5.02554 -18.58109,10.08136 -27.11373,14.61154 -0.77197,0.40923 -1.74807,0.94024 -2.16915,1.18002 -3.90779,2.22537 -4.24475,2.35774 -6.22884,2.44686 -1.42618,0.064 -2.27404,-0.0326 -3.21335,-0.36631 z"/><path style="fill:#fff;stroke-width:2.34985" id="path981" fill="#000" d="m 103.12614,95.844789 v 2.349812 h -5.87463 v 2.349919 h -5.874635 v 8.22445 h -2.34981 v 7.04954 h 2.34981 v 8.22446 h 5.874635 v 2.34981 h 5.87463 v 2.34991 h 8.22445 v -12.92418 h 21.14862 v 12.92418 h 8.22445 v -2.34991 h 5.87464 v -2.34981 h 5.87463 v -8.22446 h 2.34981 v -7.04954 h -2.34981 v -8.22445 H 146.5983 V 98.1946 h -5.87464 v -2.349812 h -8.22445 V 108.76897 H 111.35059 V 95.844789 Z m 2.34982,2.349812 h 3.52473 v 28.198179 h -3.52473 z m 29.37307,0 h 3.52481 v 28.198179 h -3.52481 z m -35.247707,2.349919 h 3.524817 v 23.49845 h -3.524817 z m 41.122337,0 h 3.52473 v 23.49845 h -3.52473 z m -46.996957,2.34982 h 3.524806 v 18.7988 h -3.524806 z m 52.871597,0 h 3.52472 v 18.7988 h -3.52472 z m -35.24771,8.22444 h 21.14862 v 2.34983 h -21.14862 z"/></g></g></svg>
\ No newline at end of file
diff --git a/flatpak/bump-flatpak-version.py b/flatpak/bump-flatpak-version.py
new file mode 100644
index 00000000..60a96f5c
--- /dev/null
+++ b/flatpak/bump-flatpak-version.py
@@ -0,0 +1,135 @@
+# This file is part of wger Workout Manager.
+#
+# wger Workout Manager is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# wger Workout Manager is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+
+# /// script
+# requires-python = ">=3.13"
+# dependencies = [
+#   "requests == 2.31.0",
+#   "markdown == 3.5.1",
+# ]
+# ///
+
+
+"""
+Updates the Flatpak metainfo.xml file with the given version.
+
+Usage:
+    uv run bump-flatpak-version.py x.y.z
+"""
+
+import sys
+import xml.etree.ElementTree as ET
+from datetime import datetime
+from typing import Tuple
+
+import markdown
+import requests
+
+REPO = "wger-project/flutter"
+
+
+def get_github_release_info(repo: str, version: str) -> Tuple[str, str]:
+    """
+    Fetches the release description and published_at date from GitHub for the given repository
+    and version. The description is converted fro markdown and returned as HTML.
+    """
+
+    print('Fetching release information from GitHub...')
+    url = f'https://api.github.com/repos/{repo}/releases/tags/{version}'
+    response = requests.get(url)
+    response.raise_for_status()
+    data = response.json()
+    html_desc = markdown.markdown(data.get('body', ''))
+
+    # Get the published_at date, formatted as YYYY-MM-DD, we don't need the time part
+    published_at = data.get('published_at', '')[:10]
+    return html_desc, published_at
+
+
+def add_release_to_metainfo(
+        repo: str,
+        xml_filename: str,
+        version: str,
+        date: str | None = None,
+        description: str | None = None
+) -> None:
+    """
+    Adds a <release> element with the specified version and date to the <releases>
+    section in the given metainfo.xml file.
+
+    If a description is provided, it will be added as a child element of the
+    <release> element.
+    """
+    print(f'Adding release to {xml_filename}...')
+
+    if date is None:
+        date = datetime.now().strftime('%Y-%m-%d')
+
+    if description is None:
+        description = '<p>Bug fixes and improvements.</p>'
+
+    tree = ET.parse(xml_filename)
+    root = tree.getroot()
+    releases = root.find('releases')
+    new_release = ET.Element('release', {'version': version, 'date': date})
+    if description:
+        desc_elem = ET.SubElement(new_release, 'description')
+
+        # Needed to add HTML content directly, otherwise it will be escaped
+        fragment = ET.fromstring(f'<root>{description}</root>')
+        for child in fragment:
+            desc_elem.append(child)
+
+    url_elem = ET.SubElement(new_release, 'url')
+    url_elem.text = f'https://github.com/{repo}/releases/tag/{version}'
+
+    releases.insert(0, new_release)
+    ET.indent(tree, space="    ", level=0)
+    tree.write(xml_filename, encoding="utf-8", xml_declaration=True)
+
+
+if __name__ == '__main__':
+    if len(sys.argv) != 2:
+        print('Usage: python bump-flatpak-version.py <x.y.z>')
+        sys.exit(1)
+
+    version = sys.argv[1]
+
+    print(f'Processing version {version}...')
+
+    # Note: it seems it's currently not possible to update existing releases on
+    #       GitHub with softprops/action-gh-release.
+    #
+    #       Once that's fixed, we can update the workflows to first create the
+    #       release and its changelog, and in a later step only update the artifacts.
+    #       We can then simply fetch the description and update the metainfo.xml file.
+    #
+    #       See
+    #       * https://github.com/softprops/action-gh-release/issues/616
+    #       * https://github.com/softprops/action-gh-release/issues/445
+
+    # description, published_at = get_github_release_info(
+    #     REPO,
+    #     version
+    # )
+
+    add_release_to_metainfo(
+        repo=REPO,
+        xml_filename='de.wger.flutter.metainfo.xml',
+        version=version,
+        date=None,  # published_at,
+        description=None  # description
+    )
+
+    print(f'Finished!')
diff --git a/flatpak/de.wger.flutter.metainfo.xml b/flatpak/de.wger.flutter.metainfo.xml
index 20ef36fe..c7417dc8 100755
--- a/flatpak/de.wger.flutter.metainfo.xml
+++ b/flatpak/de.wger.flutter.metainfo.xml
@@ -1,9 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <component type="desktop-application">
     <id>de.wger.flutter</id>
     <name>wger</name>
-    <summary>Fitness/workout, nutrition and weight tracker</summary>
-
+    <summary>Fitness and nutrition tracker</summary>
+    <description>
+        <p>wger is a free and open-source fitness application designed to help you achieve your
+            fitness goals.
+        </p>
+        <p>Workout Management</p>
+        <ul>
+            <li>Create and customize workout routines tailored to your fitness level and
+                goals
+            </li>
+            <li>Track your progress with detailed exercise logs</li>
+            <li>Access a vast library of exercises</li>
+        </ul>
+        <p>Nutrition Tracking</p>
+        <ul>
+            <li>Log your food intake using the Open Food Facts database</li>
+            <li>Calculate your calorie intake and macronutrient breakdown</li>
+            <li>Set personalized dietary goals and track your progress</li>
+        </ul>
+        <p>Body Measurement Tracking</p>
+        <ul>
+            <li>Monitor your body weight, body fat percentage, and other measurements</li>
+            <li>Visualize your progress with charts and graphs</li>
+        </ul>
+    </description>
     <metadata_license>CC0-1.0</metadata_license>
     <project_license>AGPL-3.0-or-later</project_license>
     <recommends>
@@ -13,80 +36,15 @@
     </recommends>
     <developer_name>wger</developer_name>
     <url type="homepage">https://wger.de/</url>
+    <url type="contact">https://fosstodon.org/@wger</url>
     <url type="bugtracker">https://github.com/wger-project/flutter/issues</url>
     <url type="donation">https://buymeacoffee.com/wger</url>
-
-    <description>
-        <p>
-            From fitness lovers to fitness lovers – get your health organized with WGER,
-            your Workout Manager!
-        </p>
-        <p>
-            Have you already found your #1 fitness app and do you love to create your own sports
-            routines? No matter what type of sporty beast you are – we all have something in common:
-            We love to keep track of our health data &lt;3
-        </p>
-        <p>
-            So we don’t judge you for still managing your fitness journey with your handy little
-            workout log book but welcome to 2021!
-        </p>
-        <p>
-            We have developed a 100% free digital health and fitness tracker app for you, sized down
-            to the most relevant features to make your life easier. Get started, keep training and
-            celebrate your progress!
-        </p>
-        <p>wger is an Open Source project and all about:</p>
-        <ul>
-            <li>
-                Your body:
-                No need to google for the ingredients of your favourite treats – choose your daily
-                meals from more than 78000 products and see the nutritional values. Add meals to the
-                nutritional plan and keep an overview of your diet in the calendar.
-            </li>
-            <li>
-                Your workouts:
-                You know what is best for your body. Create your own workouts out of a growing
-                variety from 200 different exercises. Then, use the Gym Mode to guide you through
-                the training while you log your weights with one tap.
-            </li>
-            <li>
-                Your progress:
-                Never lose sight of your goals. Track your weight and keep your statistics.
-            </li>
-            <li>
-                Your data:
-                wger is your personalized fitness diary – but you own your data. Use the REST API to
-                access and do amazing things with it.
-            </li>
-        </ul>
-        <p>Please note: This free app is not based on additional fundings and we don’t ask you to
-            donate money. More than that it is a community project which is growing constantly. So
-            be prepared for new features anytime!
-        </p>
-        <p>
-            OpenSource – what does that mean?
-            Open Source means that the whole source code for this app and the server it talks to is
-            free and available to anybody:
-        </p>
-        <ul>
-            <li>Do you want to run wger on your own server for you or your local gym? Go ahead!</li>
-            <li>Do you miss a feature and want to implement it? Start now!</li>
-            <li>Do you want to check that nothing is being sent anywhere? You can!</li>
-        </ul>
-        <p>Join our community and become a part of sport enthusiasts and IT geeks from all over the
-            world. We keep working on adjusting and optimizing the app customized to our needs. We
-            love your input so feel free to jump in anytime and contribute your wishes and ideas!
-        </p>
-        <ul>
-            <li>find the source code on https://github.com/wger-project
-            </li>
-            <li>
-                ask your questions or just say hello on our discord Server
-                https://discord.gg/rPWFv6W
-            </li>
-        </ul>
-    </description>
-
+    <url type="vcs-browser">https://github.com/wger-project/flutter</url>
+    <url type="translate">https://hosted.weblate.org/engage/wger/</url>
+    <branding>
+        <color scheme_preference="light" type="primary">#a2aedd</color>
+        <color scheme_preference="dark" type="primary">#687bd9</color>
+    </branding>
     <screenshots>
         <screenshot type="default">
             <caption>wger's dashboard</caption>
@@ -119,12 +77,27 @@
             </image>
         </screenshot>
     </screenshots>
-
     <releases>
+        <release version="1.9.0" date="2025-09-23">
+            <description>
+                <p>Bug fixes and improvements.</p>
+            </description>
+            <url>https://github.com/wger-project/flutter/releases/tag/1.9.0</url>
+        </release>
+        <release version="1.8.4" date="2025-08-28">
+            <description>
+                <p>Bug fixes and improvements.</p>
+            </description>
+            <url>https://github.com/wger-project/flutter/releases/tag/1.8.4</url>
+        </release>
+        <release version="1.8.3" date="2025-06-17">
+            <description>
+                <p>Bug fixes and improvements.</p>
+            </description>
+            <url>https://github.com/wger-project/flutter/releases/tag/1.8.3</url>
+        </release>
         <release version="1.5.3" date="2023-03-16" />
     </releases>
-
     <content_rating type="oars-1.1" />
-
     <launchable type="desktop-id">de.wger.flutter.desktop</launchable>
-</component>
+</component>
\ No newline at end of file
diff --git a/flatpak/flatpak_meta.json b/flatpak/flatpak_meta.json
index 253cf82e..f3c1a6a3 100644
--- a/flatpak/flatpak_meta.json
+++ b/flatpak/flatpak_meta.json
@@ -1,23 +1,23 @@
 {
-    "appId": "de.wger.flutter",
-    "lowercaseAppName": "wger",
-    "githubReleaseOrganization": "wger-project",
-    "githubReleaseProject": "flutter",
-    "localLinuxBuildDir": "../build/linux",
-    "appStreamPath": "de.wger.flutter.metainfo.xml",
-    "desktopPath": "de.wger.flutter.desktop",
-    "icons": {
-        "64x64": "logo64.png",
-        "128x126": "logo128.png",
-        "512x512": "logo512.png"
-    },
-    "freedesktopRuntime": "22.08",
-    "finishArgs": [
-        "--share=ipc",
-        "--share=network",
-        "--socket=fallback-x11",
-        "--socket=wayland",
-        "--socket=pulseaudio",
-        "--device=dri"
-    ]
+  "appId": "de.wger.flutter",
+  "lowercaseAppName": "wger",
+  "githubReleaseOrganization": "wger-project",
+  "githubReleaseProject": "flutter",
+  "localLinuxBuildDir": "../build/linux",
+  "appStreamPath": "de.wger.flutter.metainfo.xml",
+  "desktopPath": "de.wger.flutter.desktop",
+  "icons": {
+    "64x64": "logo64.png",
+    "128x126": "logo128.png",
+    "512x512": "logo512.png"
+  },
+  "freedesktopRuntime": "24.08",
+  "finishArgs": [
+    "--share=ipc",
+    "--share=network",
+    "--socket=fallback-x11",
+    "--socket=wayland",
+    "--socket=pulseaudio",
+    "--device=dri"
+  ]
 }
\ No newline at end of file
diff --git a/flatpak/logo128.png b/flatpak/logo128.png
index 98f5c2d5..726d5c09 100644
Binary files a/flatpak/logo128.png and b/flatpak/logo128.png differ
diff --git a/flatpak/logo512.png b/flatpak/logo512.png
index 7f0d0224..e84a976d 100644
Binary files a/flatpak/logo512.png and b/flatpak/logo512.png differ
diff --git a/flatpak/logo64.png b/flatpak/logo64.png
index c969d6a9..dba403d8 100644
Binary files a/flatpak/logo64.png and b/flatpak/logo64.png differ
diff --git a/flatpak/scripts/README.md b/flatpak/scripts/README.md
deleted file mode 100644
index 8d387451..00000000
--- a/flatpak/scripts/README.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# Prerequisites
-## Setting up the flathub_meta.json file
-The dart scripts here require a metadata file as input. This file is already prepared for this repository — see ../flatpak_meta.json.
-
-## Publishing on Flathub
-If uploading to Flathub for the first time, follow the official contributing guidelines: https://github.com/flathub/flathub/blob/master/CONTRIBUTING.md .
-
-# Local builds
-
-To run a local build:
-
-1. Build the Linux release using Flutter.
-2. Add the new release version and date to the start of the "releases" list in the "spec.json" file (and adjust other parameters in the file if needed).
-3. Run "dart flatpak_packager.dart --meta ../flatpak_meta.json -n pubspec.yaml" in this folder.
-4. Run "dart manifest_generator.dart --meta ../flatpak_meta.json -n pubspec.yaml" in this folder.
-5. Test the Flatpak using the guide at https://docs.flatpak.org/en/latest/first-build.html, using the generated json manifest as your Flatpak manifest.
-
-# Builds based on data fetched from Github
-
-To generate and publish a release on Github:
-
-1. Create a new release on Github using the app's version name for the tag (e.g. "1.0.0"), without any assets for now.
-2. Build the Linux release using Flutter.
-3. Run "dart flatpak_packager.dart --meta ../flatpak_meta.json --github -n pubspec.yaml" in this folder.
-4. Upload the generated tar.gz file as a Github release.
-5. Run "dart manifest_generator.dart --meta ../flatpak_meta.json --github -n pubspec.yaml" in this folder.
-6. Upload your Flathub manifest file to your Flathub Github repo, overwriting any old manifest file you may have there. If you're building for only certain architectures and the "flathub.json" file is not in your Flathub Github repo yet, upload that too.
-
-All of this can be automated via Github Actions.
\ No newline at end of file
diff --git a/flatpak/scripts/flatpak_packager.dart b/flatpak/scripts/flatpak_packager.dart
deleted file mode 100644
index 92cf2768..00000000
--- a/flatpak/scripts/flatpak_packager.dart
+++ /dev/null
@@ -1,167 +0,0 @@
-// ignore_for_file: avoid_print
-
-import 'dart:io';
-import 'flatpak_shared.dart';
-
-/// Creates an archive containing all the sources for the Flatpak package for a
-/// specific architecture.
-///
-/// arguments:
-/// --meta [file]
-///   Required argument for providing the metadata file for this script.
-
-/// --github
-///   Use this option to pull release info from Github rather than the metadata file.
-
-/// --addTodaysVersion [version]
-///   If pulling data from Github, this provides a way to specify the release to be released today.
-
-void main(List<String> arguments) async {
-  if (!Platform.isLinux) {
-    throw Exception('Must be run under Linux');
-  }
-
-  // PARSE ARGUMENTS
-  final metaIndex = arguments.indexOf('--meta');
-  if (metaIndex == -1) {
-    throw Exception(
-        'You must run this script with a metadata file argument, using the --meta flag.');
-  }
-  if (arguments.length == metaIndex + 1) {
-    throw Exception('The --meta flag must be followed by the path to the metadata file.');
-  }
-
-  final metaFile = File(arguments[metaIndex + 1]);
-  if (!(await metaFile.exists())) {
-    throw Exception('The provided metadata file does not exist.');
-  }
-
-  final fetchFromGithub = arguments.contains('--github');
-
-  final addTodaysVersionIndex = arguments.indexOf('--addTodaysVersion');
-  if (addTodaysVersionIndex != -1 && arguments.length == addTodaysVersionIndex + 1) {
-    throw Exception('The --addTodaysVersion flag must be followed by the version name.');
-  }
-
-  final addedTodaysVersion =
-      addTodaysVersionIndex != -1 ? arguments[addTodaysVersionIndex + 1] : null;
-
-  // GENERATE PACKAGE
-
-  final meta = FlatpakMeta.fromJson(metaFile, skipLocalReleases: fetchFromGithub);
-
-  final outputDir = Directory('${Directory.current.path}/flatpak_generator_exports');
-  await outputDir.create();
-
-  final packageGenerator = PackageGenerator(
-      inputDir: metaFile.parent, meta: meta, addedTodaysVersion: addedTodaysVersion);
-
-  await packageGenerator.generatePackage(
-      outputDir,
-      await PackageGenerator.runningOnARM() ? CPUArchitecture.aarch64 : CPUArchitecture.x86_64,
-      fetchFromGithub);
-}
-
-class PackageGenerator {
-  final Directory inputDir;
-  final FlatpakMeta meta;
-  final String? addedTodaysVersion;
-
-  PackageGenerator({required this.inputDir, required this.meta, required this.addedTodaysVersion});
-
-  Future<void> generatePackage(
-      Directory outputDir, CPUArchitecture arch, bool fetchReleasesFromGithub) async {
-    final tempDir = await outputDir.createTemp('flutter_generator_temp');
-    final appId = meta.appId;
-
-    // desktop file
-    final desktopFile = File('${inputDir.path}/${meta.desktopPath}');
-
-    if (!(await desktopFile.exists())) {
-      throw Exception(
-          'The desktop file does not exist under the specified path: ${desktopFile.path}');
-    }
-
-    await desktopFile.copy('${tempDir.path}/$appId.desktop');
-
-    // icons
-    final iconTempDir = Directory('${tempDir.path}/icons');
-
-    for (final icon in meta.icons) {
-      final iconFile = File('${inputDir.path}/${icon.path}');
-      if (!(await iconFile.exists())) {
-        throw Exception('The icon file ${iconFile.path} does not exist.');
-      }
-      final iconSubdir = Directory('${iconTempDir.path}/${icon.type}');
-      await iconSubdir.create(recursive: true);
-      await iconFile.copy('${iconSubdir.path}/${icon.getFilename(appId)}');
-    }
-
-    // AppStream metainfo file
-    final origAppStreamFile = File('${inputDir.path}/${meta.appStreamPath}');
-    if (!(await origAppStreamFile.exists())) {
-      throw Exception(
-          'The app data file does not exist under the specified path: ${origAppStreamFile.path}');
-    }
-
-    final editedAppStreamContent = AppStreamModifier.replaceVersions(
-        await origAppStreamFile.readAsString(),
-        await meta.getReleases(fetchReleasesFromGithub, addedTodaysVersion));
-
-    final editedAppStreamFile = File('${tempDir.path}/$appId.metainfo.xml');
-    await editedAppStreamFile.writeAsString(editedAppStreamContent);
-
-    // build files
-    final bundlePath =
-        '${inputDir.path}/${meta.localLinuxBuildDir}/${arch.flutterDirName}/release/bundle';
-    final buildDir = Directory(bundlePath);
-    if (!(await buildDir.exists())) {
-      throw Exception(
-          'The linux build directory does not exist under the specified path: ${buildDir.path}');
-    }
-    final destDir = Directory('${tempDir.path}/bin');
-    await destDir.create();
-
-    final baseFilename = '${meta.lowercaseAppName}-linux-${arch.flatpakArchCode}';
-    final packagePath = '${outputDir.absolute.path}/$baseFilename.tar.gz';
-    final shaPath = '${outputDir.absolute.path}/$baseFilename.sha256';
-
-    await Process.run('cp', ['-r', '${buildDir.absolute.path}/.', destDir.absolute.path]);
-    await Process.run('tar', ['-czvf', packagePath, '.'], workingDirectory: tempDir.absolute.path);
-
-    print('Generated $packagePath');
-
-    final preShasum = await Process.run('shasum', ['-a', '256', packagePath]);
-    final shasum = preShasum.stdout.toString().split(' ').first;
-
-    await File(shaPath).writeAsString(shasum);
-
-    print('Generated $shaPath');
-
-    await tempDir.delete(recursive: true);
-  }
-
-  static Future<bool> runningOnARM() async {
-    final unameRes = await Process.run('uname', ['-m']);
-    final unameString = unameRes.stdout.toString().trimLeft();
-    return unameString.startsWith('arm') || unameString.startsWith('aarch');
-  }
-}
-
-// updates releases in ${appName}.metainfo.xml
-class AppStreamModifier {
-  static String replaceVersions(String origAppStreamContent, List<Release> versions) {
-    final joinedReleases =
-        versions.map((v) => '\t\t<release version="${v.version}" date="${v.date}" />').join('\n');
-    final releasesSection = '<releases>\n$joinedReleases\n\t</releases>'; //TODO check this
-    if (origAppStreamContent.contains('<releases')) {
-      return origAppStreamContent
-          .replaceAll('\n', '<~>')
-          .replaceFirst(RegExp('<releases.*</releases>'), releasesSection)
-          .replaceAll('<~>', '\n');
-    } else {
-      return origAppStreamContent.replaceFirst(
-          '</component>', '\n\t$releasesSection\n</component>');
-    }
-  }
-}
diff --git a/flatpak/scripts/flatpak_shared.dart b/flatpak/scripts/flatpak_shared.dart
deleted file mode 100644
index 75ce96cf..00000000
--- a/flatpak/scripts/flatpak_shared.dart
+++ /dev/null
@@ -1,318 +0,0 @@
-import 'dart:convert';
-import 'dart:io';
-
-import 'package:http/http.dart' as http;
-
-/// Shared files for the two Flatpak-related scripts.
-
-class Release {
-  final String version;
-  final String date; //TODO add resources
-
-  Release({required this.version, required this.date});
-}
-
-enum CPUArchitecture {
-  x86_64('x86_64', 'x64'),
-  aarch64('aarch64', 'arm64');
-
-  final String flatpakArchCode;
-  final String flutterDirName;
-  const CPUArchitecture(this.flatpakArchCode, this.flutterDirName);
-}
-
-class ReleaseAsset {
-  final CPUArchitecture arch;
-  final String tarballUrlOrPath;
-  final bool isRelativeLocalPath;
-  final String tarballSha256;
-
-  ReleaseAsset(
-      {required this.arch,
-      required this.tarballUrlOrPath,
-      required this.isRelativeLocalPath,
-      required this.tarballSha256});
-}
-
-class Icon {
-  static const _symbolicType = 'symbolic';
-  final String type;
-  final String path;
-  late final String _fileExtension;
-
-  Icon({required this.type, required this.path}) {
-    _fileExtension = path.split('.').last;
-  }
-
-  String getFilename(String appId) =>
-      (type == _symbolicType) ? '$appId-symbolic.$_fileExtension' : '$appId.$_fileExtension';
-}
-
-class GithubReleases {
-  final String githubReleaseOrganization;
-  final String githubReleaseProject;
-  List<Release>? _releases;
-  List<ReleaseAsset>? _latestReleaseAssets;
-
-  GithubReleases(this.githubReleaseOrganization, this.githubReleaseProject);
-
-  Future<List<Release>> getReleases(bool canBeEmpty) async {
-    if (_releases == null) {
-      await _fetchReleasesAndAssets(canBeEmpty);
-    }
-    return _releases!;
-  }
-
-  Future<List<ReleaseAsset>?> getLatestReleaseAssets() async {
-    if (_releases == null) {
-      await _fetchReleasesAndAssets(false);
-    }
-    return _latestReleaseAssets;
-  }
-
-  Future<void> _fetchReleasesAndAssets(bool canBeEmpty) async {
-    final releaseJsonContent = (await http.get(Uri(
-            scheme: 'https',
-            host: 'api.github.com',
-            path: '/repos/$githubReleaseOrganization/$githubReleaseProject/releases')))
-        .body;
-    final decodedJson = jsonDecode(releaseJsonContent) as List;
-
-    DateTime? latestReleaseAssetDate;
-
-    final releases = List<Release>.empty(growable: true);
-
-    await Future.forEach<dynamic>(decodedJson, (dynamic releaseDynamic) async {
-      final releaseMap = releaseDynamic as Map;
-
-      final releaseDateAndTime = DateTime.parse(releaseMap['published_at'] as String);
-      final releaseDateString = releaseDateAndTime.toIso8601String().split('T').first;
-
-      if (latestReleaseAssetDate == null ||
-          (latestReleaseAssetDate?.compareTo(releaseDateAndTime) == -1)) {
-        final assets = await _parseGithubReleaseAssets(releaseMap['assets'] as List);
-        if (assets != null) {
-          _latestReleaseAssets = assets;
-          latestReleaseAssetDate = releaseDateAndTime;
-        }
-      }
-
-      releases.add(Release(version: releaseMap['name'] as String, date: releaseDateString));
-    });
-
-    if (releases.isNotEmpty || canBeEmpty) {
-      _releases = releases;
-    } else {
-      throw Exception('Github must contain at least 1 release.');
-    }
-  }
-
-  Future<List<ReleaseAsset>?> _parseGithubReleaseAssets(List assetMaps) async {
-    String? x64TarballUrl;
-    String? x64Sha;
-    String? aarch64TarballUrl;
-    String? aarch64Sha;
-    for (final am in assetMaps) {
-      final amMap = am as Map;
-
-      final downloadUrl = amMap['browser_download_url'] as String;
-      final filename = amMap['name'] as String;
-      final fileExtension = filename.substring(filename.indexOf('.') + 1);
-      final filenameWithoutExtension = filename.substring(0, filename.indexOf('.'));
-
-      final arch = filenameWithoutExtension.endsWith('aarch64')
-          ? CPUArchitecture.aarch64
-          : CPUArchitecture.x86_64;
-
-      switch (fileExtension) {
-        case 'sha256':
-          if (arch == CPUArchitecture.aarch64) {
-            aarch64Sha = await _readSha(downloadUrl);
-          } else {
-            x64Sha = await _readSha(downloadUrl);
-          }
-          break;
-        case 'tar':
-        case 'tar.gz':
-        case 'tgz':
-        case 'tar.xz':
-        case 'txz':
-        case 'tar.bz2':
-        case 'tbz2':
-        case 'zip':
-        case '7z':
-          if (arch == CPUArchitecture.aarch64) {
-            aarch64TarballUrl = downloadUrl;
-          } else {
-            x64TarballUrl = downloadUrl;
-          }
-          break;
-        default:
-          break;
-      }
-    }
-    final res = List<ReleaseAsset>.empty(growable: true);
-    if (x64TarballUrl != null && x64Sha != null) {
-      res.add(ReleaseAsset(
-          arch: CPUArchitecture.x86_64,
-          tarballUrlOrPath: x64TarballUrl,
-          isRelativeLocalPath: false,
-          tarballSha256: x64Sha));
-    }
-    if (aarch64TarballUrl != null && aarch64Sha != null) {
-      res.add(ReleaseAsset(
-          arch: CPUArchitecture.aarch64,
-          tarballUrlOrPath: aarch64TarballUrl,
-          isRelativeLocalPath: false,
-          tarballSha256: aarch64Sha));
-    }
-    return res.isEmpty ? null : res;
-  }
-
-  Future<String> _readSha(String shaUrl) async =>
-      (await http.get(Uri.parse(shaUrl))).body.split(' ').first;
-}
-
-class FlatpakMeta {
-  final String appId;
-  final String lowercaseAppName;
-  final String appStreamPath;
-  final String desktopPath;
-  final List<Icon> icons;
-
-  // Flatpak manifest releated properties
-  final String freedesktopRuntime;
-  final List<String>? buildCommandsAfterUnpack;
-  final List<dynamic>? extraModules;
-  final List<String> finishArgs;
-
-  // Properties relevant only for local releases
-  final List<Release>? _localReleases;
-  final List<ReleaseAsset>? _localReleaseAssets;
-  final String localLinuxBuildDir;
-
-  // Properties relevant only for releases fetched from Github
-  final String? githubReleaseOrganization;
-  final String? githubReleaseProject;
-  late final GithubReleases? _githubReleases;
-
-  FlatpakMeta(
-      {required this.appId,
-      required this.lowercaseAppName,
-      required this.githubReleaseOrganization,
-      required this.githubReleaseProject,
-      required List<Release>? localReleases,
-      required List<ReleaseAsset>? localReleaseAssets,
-      required this.localLinuxBuildDir,
-      required this.appStreamPath,
-      required this.desktopPath,
-      required this.icons,
-      required this.freedesktopRuntime,
-      required this.buildCommandsAfterUnpack,
-      required this.extraModules,
-      required this.finishArgs})
-      : _localReleases = localReleases,
-        _localReleaseAssets = localReleaseAssets {
-    if (githubReleaseOrganization != null && githubReleaseProject != null) {
-      _githubReleases = GithubReleases(githubReleaseOrganization!, githubReleaseProject!);
-    }
-  }
-
-  Future<List<Release>> getReleases(
-      bool fetchReleasesFromGithub, String? addedTodaysVersion) async {
-    final releases = List<Release>.empty(growable: true);
-    if (addedTodaysVersion != null) {
-      releases.add(Release(
-          version: addedTodaysVersion, date: DateTime.now().toIso8601String().split('T').first));
-    }
-    if (fetchReleasesFromGithub) {
-      if (_githubReleases == null) {
-        throw Exception(
-            'Metadata must include Github repository info if fetching releases from Github.');
-      }
-      releases.addAll(await _githubReleases!.getReleases(addedTodaysVersion != null));
-    } else {
-      if (_localReleases == null && addedTodaysVersion == null) {
-        throw Exception('Metadata must include releases if not fetching releases from Github.');
-      }
-      if (_localReleases?.isNotEmpty ?? false) {
-        releases.addAll(_localReleases!);
-      }
-    }
-    return releases;
-  }
-
-  Future<List<ReleaseAsset>?> getLatestReleaseAssets(bool fetchReleasesFromGithub) async {
-    if (fetchReleasesFromGithub) {
-      if (_githubReleases == null) {
-        throw Exception(
-            'Metadata must include Github repository info if fetching releases from Github.');
-      }
-      return _githubReleases!.getLatestReleaseAssets();
-    } else {
-      if (_localReleases == null) {
-        throw Exception('Metadata must include releases if not fetching releases from Github.');
-      }
-      return _localReleaseAssets;
-    }
-  }
-
-  static FlatpakMeta fromJson(File jsonFile, {bool skipLocalReleases = false}) {
-    try {
-      final dynamic json = jsonDecode(jsonFile.readAsStringSync());
-      return FlatpakMeta(
-          appId: json['appId'] as String,
-          lowercaseAppName: json['lowercaseAppName'] as String,
-          githubReleaseOrganization: json['githubReleaseOrganization'] as String?,
-          githubReleaseProject: json['githubReleaseProject'] as String?,
-          localReleases: skipLocalReleases
-              ? null
-              : (json['localReleases'] as List?)?.map((dynamic r) {
-                  final rMap = r as Map;
-                  return Release(version: rMap['version'] as String, date: rMap['date'] as String);
-                }).toList(),
-          localReleaseAssets: skipLocalReleases
-              ? null
-              : (json['localReleaseAssets'] as List?)?.map((dynamic ra) {
-                  final raMap = ra as Map;
-                  final archString = raMap['arch'] as String;
-                  final arch = (archString == CPUArchitecture.x86_64.flatpakArchCode)
-                      ? CPUArchitecture.x86_64
-                      : (archString == CPUArchitecture.aarch64.flatpakArchCode)
-                          ? CPUArchitecture.aarch64
-                          : null;
-                  if (arch == null) {
-                    throw Exception(
-                        'Architecture must be either "${CPUArchitecture.x86_64.flatpakArchCode}" or "${CPUArchitecture.aarch64.flatpakArchCode}"');
-                  }
-                  final tarballFile =
-                      File('${jsonFile.parent.path}/${raMap['tarballPath'] as String}');
-                  final tarballPath = tarballFile.absolute.path;
-                  final preShasum = Process.runSync('shasum', ['-a', '256', tarballPath]);
-                  final shasum = preShasum.stdout.toString().split(' ').first;
-                  if (preShasum.exitCode != 0) {
-                    throw Exception(preShasum.stderr);
-                  }
-                  return ReleaseAsset(
-                      arch: arch,
-                      tarballUrlOrPath: tarballPath,
-                      isRelativeLocalPath: true,
-                      tarballSha256: shasum);
-                }).toList(),
-          localLinuxBuildDir: json['localLinuxBuildDir'] as String,
-          appStreamPath: json['appStreamPath'] as String,
-          desktopPath: json['desktopPath'] as String,
-          icons: (json['icons'] as Map).entries.map((mapEntry) {
-            return Icon(type: mapEntry.key as String, path: mapEntry.value as String);
-          }).toList(),
-          freedesktopRuntime: json['freedesktopRuntime'] as String,
-          buildCommandsAfterUnpack: (json['buildCommandsAfterUnpack'] as List?)
-              ?.map((dynamic bc) => bc as String)
-              .toList(),
-          extraModules: json['extraModules'] as List?,
-          finishArgs: (json['finishArgs'] as List).map((dynamic fa) => fa as String).toList());
-    } catch (e) {
-      throw Exception('Could not parse JSON file, due to this error:\n$e');
-    }
-  }
-}
diff --git a/flatpak/scripts/manifest_generator.dart b/flatpak/scripts/manifest_generator.dart
deleted file mode 100644
index 254bb1ae..00000000
--- a/flatpak/scripts/manifest_generator.dart
+++ /dev/null
@@ -1,167 +0,0 @@
-// ignore_for_file: avoid_print
-
-import 'dart:convert';
-import 'dart:io';
-import 'flatpak_shared.dart';
-
-/// Generates the Flatpak manifest.
-/// (Separate from the package generation, as those are generated per each
-/// architecture.)
-///
-/// arguments:
-/// --meta [file]
-///   Required argument for providing the metadata file for this script.
-
-/// --github
-///   Use this option to pull release info from Github rather than the metadata file.
-
-void main(List<String> arguments) async {
-  if (Platform.isWindows) {
-    throw Exception('Must be run under a UNIX-like operating system.');
-  }
-
-  final metaIndex = arguments.indexOf('--meta');
-  if (metaIndex == -1) {
-    throw Exception(
-        'You must run this script with a metadata file argument, using the --meta flag.');
-  }
-  if (arguments.length == metaIndex + 1) {
-    throw Exception('The --meta flag must be followed by the path to the metadata file.');
-  }
-
-  final metaFile = File(arguments[metaIndex + 1]);
-  if (!metaFile.existsSync()) {
-    throw Exception('The provided metadata file does not exist.');
-  }
-
-  final fetchFromGithub = arguments.contains('--github');
-
-  final meta = FlatpakMeta.fromJson(metaFile, skipLocalReleases: fetchFromGithub);
-
-  final outputDir = Directory('${Directory.current.path}/flatpak_generator_exports');
-  outputDir.createSync();
-
-  final manifestGenerator = FlatpakManifestGenerator(meta);
-  final manifestContent = await manifestGenerator.generateFlatpakManifest(fetchFromGithub);
-  final manifestPath = '${outputDir.path}/${meta.appId}.json';
-  final manifestFile = File(manifestPath);
-  manifestFile.writeAsStringSync(manifestContent);
-  print('Generated $manifestPath');
-
-  final flathubJsonContent = await manifestGenerator.generateFlathubJson(fetchFromGithub);
-  if (flathubJsonContent != null) {
-    final flathubJsonPath = '${outputDir.path}/flathub.json';
-    final flathubJsonFile = File(flathubJsonPath);
-    flathubJsonFile.writeAsStringSync(flathubJsonContent);
-    print('Generated $flathubJsonPath');
-  }
-}
-
-// ${appId}.json
-class FlatpakManifestGenerator {
-  final FlatpakMeta meta;
-  Map<CPUArchitecture, bool>? _githubArchSupport;
-  Map<CPUArchitecture, bool>? _localArchSupport;
-
-  FlatpakManifestGenerator(this.meta);
-
-  Future<String> generateFlatpakManifest(bool fetchFromGithub) async {
-    final appName = meta.lowercaseAppName;
-    final appId = meta.appId;
-    final assets = await meta.getLatestReleaseAssets(fetchFromGithub);
-
-    if (assets == null) {
-      throw Exception('There are no associated assets.');
-    }
-
-    _lazyGenerateArchSupportMap(fetchFromGithub, assets);
-
-    const encoder = JsonEncoder.withIndent('  ');
-    return encoder.convert({
-      'app-id': appId,
-      'runtime': 'org.freedesktop.Platform',
-      'runtime-version': meta.freedesktopRuntime,
-      'sdk': 'org.freedesktop.Sdk',
-      'command': appName,
-      'separate-locales': false,
-      'finish-args': meta.finishArgs,
-      'modules': <dynamic>[
-        ...meta.extraModules ?? <dynamic>[],
-        {
-          'name': appName,
-          'buildsystem': 'simple',
-          'build-commands': <dynamic>[
-            'cp -R $appName/bin/ /app/$appName',
-            'chmod +x /app/$appName/$appName',
-            'mkdir -p /app/bin/',
-            'mkdir -p /app/lib/',
-            'ln -s /app/$appName/$appName /app/bin/$appName',
-            ...meta.buildCommandsAfterUnpack ?? [],
-            ...meta.icons.map((icon) =>
-                'install -Dm644 $appName/icons/${icon.type}/${icon.getFilename(appId)} /app/share/icons/hicolor/${icon.type}/apps/${icon.getFilename(appId)}'),
-            'install -Dm644 $appName/$appId.desktop /app/share/applications/$appId.desktop',
-            'install -Dm644 $appName/$appId.metainfo.xml /app/share/metainfo/$appId.metainfo.xml'
-          ],
-          'sources': assets
-              .map((a) => {
-                    'type': 'archive',
-                    'only-arches': [a.arch.flatpakArchCode],
-                    (fetchFromGithub ? 'url' : 'path'): a.tarballUrlOrPath,
-                    'sha256': a.tarballSha256,
-                    'dest': meta.lowercaseAppName
-                  })
-              .toList()
-        }
-      ]
-    });
-  }
-
-  Future<String?> generateFlathubJson(bool fetchFromGithub) async {
-    final assets = await meta.getLatestReleaseAssets(fetchFromGithub);
-
-    if (assets == null) {
-      throw Exception('There are no associated assets.');
-    }
-
-    _lazyGenerateArchSupportMap(fetchFromGithub, assets);
-
-    const encoder = JsonEncoder.withIndent('  ');
-
-    final onlyArchListInput = fetchFromGithub ? _githubArchSupport! : _localArchSupport!;
-
-    final onlyArchList = List<String>.empty(growable: true);
-    for (final e in onlyArchListInput.entries) {
-      if (e.value == true) {
-        onlyArchList.add(e.key.flatpakArchCode);
-      }
-    }
-
-    if (onlyArchList.length == CPUArchitecture.values.length) {
-      return null;
-    } else {
-      return encoder.convert({'only-arches': onlyArchList});
-    }
-  }
-
-  void _lazyGenerateArchSupportMap(bool fetchFromGithub, List<ReleaseAsset> assets) {
-    if (fetchFromGithub) {
-      if (_githubArchSupport == null) {
-        _githubArchSupport = <CPUArchitecture, bool>{
-          for (final arch in CPUArchitecture.values) arch: false
-        };
-        for (final a in assets) {
-          _githubArchSupport![a.arch] = true;
-        }
-      }
-    } else {
-      if (_localArchSupport == null) {
-        _localArchSupport = <CPUArchitecture, bool>{
-          for (final arch in CPUArchitecture.values) arch: false
-        };
-        for (final a in assets) {
-          _localArchSupport![a.arch] = true;
-        }
-      }
-    }
-  }
-}
diff --git a/flatpak/scripts/pubspec.lock b/flatpak/scripts/pubspec.lock
deleted file mode 100644
index 574ba55e..00000000
--- a/flatpak/scripts/pubspec.lock
+++ /dev/null
@@ -1,85 +0,0 @@
-# Generated by pub
-# See https://dart.dev/tools/pub/glossary#lockfile
-packages:
-  async:
-    dependency: transitive
-    description:
-      name: async
-      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.11.0"
-  collection:
-    dependency: transitive
-    description:
-      name: collection
-      sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.19.0"
-  http:
-    dependency: "direct main"
-    description:
-      name: http
-      sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.13.6"
-  http_parser:
-    dependency: transitive
-    description:
-      name: http_parser
-      sha256: "40f592dd352890c3b60fec1b68e786cefb9603e05ff303dbc4dda49b304ecdf4"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.1.0"
-  meta:
-    dependency: transitive
-    description:
-      name: meta
-      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.15.0"
-  path:
-    dependency: transitive
-    description:
-      name: path
-      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.9.0"
-  source_span:
-    dependency: transitive
-    description:
-      name: source_span
-      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.10.0"
-  string_scanner:
-    dependency: transitive
-    description:
-      name: string_scanner
-      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.0"
-  term_glyph:
-    dependency: transitive
-    description:
-      name: term_glyph
-      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.1"
-  typed_data:
-    dependency: transitive
-    description:
-      name: typed_data
-      sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.2"
-sdks:
-  dart: ">=3.4.0 <4.0.0"
diff --git a/flatpak/scripts/pubspec.yaml b/flatpak/scripts/pubspec.yaml
deleted file mode 100644
index d014b6ec..00000000
--- a/flatpak/scripts/pubspec.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-name: flatpak_generator
-version: 1.0.0
-
-environment:
-  sdk: '>=2.18.5'
-
-dependencies:
-  http: ^0.13.5
\ No newline at end of file
diff --git a/integration_test/1_dashboard.dart b/integration_test/1_dashboard.dart
index 9c72ea59..7580b828 100644
--- a/integration_test/1_dashboard.dart
+++ b/integration_test/1_dashboard.dart
@@ -2,52 +2,53 @@ import 'package:flutter/material.dart';
 import 'package:mockito/mockito.dart';
 import 'package:provider/provider.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/workouts/session.dart';
 import 'package:wger/providers/body_weight.dart';
 import 'package:wger/providers/measurement.dart';
 import 'package:wger/providers/nutrition.dart';
+import 'package:wger/providers/routines.dart';
 import 'package:wger/providers/user.dart';
-import 'package:wger/providers/workout_plans.dart';
 import 'package:wger/screens/dashboard.dart';
 import 'package:wger/theme/theme.dart';
 
 import '../test/exercises/contribute_exercise_test.mocks.dart';
 import '../test/measurements/measurement_categories_screen_test.mocks.dart';
-import '../test/nutrition/nutritional_plan_form_test.mocks.dart';
-import '../test/workout/weight_unit_form_widget_test.mocks.dart';
-import '../test/workout/workout_form_test.mocks.dart';
+import '../test/routine/weight_unit_form_widget_test.mocks.dart';
+import '../test/weight/weight_screen_test.mocks.dart' as weight;
 import '../test_data/body_weight.dart';
 import '../test_data/exercises.dart';
 import '../test_data/measurements.dart';
 import '../test_data/nutritional_plans.dart';
 import '../test_data/profile.dart';
-import '../test_data/workouts.dart';
+import '../test_data/routines.dart';
 
-Widget createDashboardScreen({locale = 'en'}) {
-  final mockWorkoutProvider = MockWorkoutPlansProvider();
-  when(mockWorkoutProvider.activePlan).thenReturn(getWorkout(exercises: getScreenshotExercises()));
+Widget createDashboardScreen({String locale = 'en'}) {
+  final mockWorkoutProvider = MockRoutinesProvider();
+  when(mockWorkoutProvider.items).thenReturn([getTestRoutine(exercises: getScreenshotExercises())]);
+  when(
+    mockWorkoutProvider.currentRoutine,
+  ).thenReturn(getTestRoutine(exercises: getScreenshotExercises()));
 
-  final Map<String, dynamic> logs = {
-    'results': [
-      {
-        'id': 1,
-        'workout': 1,
-        'date': '2022-12-01',
-        'impression': '3',
-        'time_start': '17:00',
-        'time_end': '19:00',
-      },
-    ],
-  };
-  when(mockWorkoutProvider.fetchSessionData()).thenAnswer((a) => Future.value(logs));
+  when(mockWorkoutProvider.fetchSessionData()).thenAnswer(
+    (a) => Future.value([
+      WorkoutSession(
+        routineId: 1,
+        date: DateTime.now().add(const Duration(days: -1)),
+        timeStart: const TimeOfDay(hour: 17, minute: 34),
+        timeEnd: const TimeOfDay(hour: 19, minute: 3),
+        impression: 3,
+      ),
+    ]),
+  );
 
-  final mockNutritionProvider = MockNutritionPlansProvider();
+  final mockNutritionProvider = weight.MockNutritionPlansProvider();
 
   when(
     mockNutritionProvider.currentPlan,
   ).thenAnswer((realInvocation) => getNutritionalPlanScreenshot());
   when(mockNutritionProvider.items).thenReturn([getNutritionalPlanScreenshot()]);
 
-  final mockWeightProvider = MockBodyWeightProvider();
+  final mockWeightProvider = weight.MockBodyWeightProvider();
   when(mockWeightProvider.items).thenReturn(getScreenshotWeightEntries());
 
   final mockMeasurementProvider = MockMeasurementProvider();
@@ -58,11 +59,21 @@ Widget createDashboardScreen({locale = 'en'}) {
 
   return MultiProvider(
     providers: [
-      ChangeNotifierProvider<UserProvider>(create: (context) => mockUserProvider),
-      ChangeNotifierProvider<WorkoutPlansProvider>(create: (context) => mockWorkoutProvider),
-      ChangeNotifierProvider<NutritionPlansProvider>(create: (context) => mockNutritionProvider),
-      ChangeNotifierProvider<BodyWeightProvider>(create: (context) => mockWeightProvider),
-      ChangeNotifierProvider<MeasurementProvider>(create: (context) => mockMeasurementProvider),
+      ChangeNotifierProvider<UserProvider>(
+        create: (context) => mockUserProvider,
+      ),
+      ChangeNotifierProvider<RoutinesProvider>(
+        create: (context) => mockWorkoutProvider,
+      ),
+      ChangeNotifierProvider<NutritionPlansProvider>(
+        create: (context) => mockNutritionProvider,
+      ),
+      ChangeNotifierProvider<BodyWeightProvider>(
+        create: (context) => mockWeightProvider,
+      ),
+      ChangeNotifierProvider<MeasurementProvider>(
+        create: (context) => mockMeasurementProvider,
+      ),
     ],
     child: MaterialApp(
       locale: Locale(locale),
diff --git a/integration_test/2_workout.dart b/integration_test/2_workout.dart
index 8e5fc12a..9abe0767 100644
--- a/integration_test/2_workout.dart
+++ b/integration_test/2_workout.dart
@@ -2,25 +2,28 @@ import 'package:flutter/material.dart';
 import 'package:mockito/mockito.dart';
 import 'package:provider/provider.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
-import 'package:wger/providers/workout_plans.dart';
-import 'package:wger/screens/workout_plan_screen.dart';
+import 'package:wger/providers/routines.dart';
+import 'package:wger/screens/routine_screen.dart';
 import 'package:wger/theme/theme.dart';
 
-import '../test/workout/workout_form_test.mocks.dart';
+import '../test/routine/routine_form_test.mocks.dart';
 import '../test_data/exercises.dart';
-import '../test_data/workouts.dart';
+import '../test_data/routines.dart';
 
 Widget createWorkoutDetailScreen({locale = 'en'}) {
   final key = GlobalKey<NavigatorState>();
 
-  final mockWorkoutProvider = MockWorkoutPlansProvider();
-  final workout = getWorkout(exercises: getScreenshotExercises());
-  when(mockWorkoutProvider.activePlan).thenReturn(workout);
-  when(mockWorkoutProvider.fetchAndSetWorkoutPlanFull(1)).thenAnswer((_) => Future.value(workout));
+  final mockRoutinesProvider = MockRoutinesProvider();
+  final routine = getTestRoutine(exercises: getScreenshotExercises());
+  // when(mockRoutinesProvider.activeRoutine).thenReturn(routine);
+  when(mockRoutinesProvider.findById(1)).thenReturn(routine);
+  // when(mockRoutinesProvider.fetchAndSetRoutineFull(1)).thenAnswer((_) => Future.value(routine));
 
   return MultiProvider(
     providers: [
-      ChangeNotifierProvider<WorkoutPlansProvider>(create: (context) => mockWorkoutProvider),
+      ChangeNotifierProvider<RoutinesProvider>(
+        create: (context) => mockRoutinesProvider,
+      ),
     ],
     child: MaterialApp(
       locale: Locale(locale),
@@ -32,8 +35,8 @@ Widget createWorkoutDetailScreen({locale = 'en'}) {
       home: TextButton(
         onPressed: () => key.currentState!.push(
           MaterialPageRoute<void>(
-            settings: RouteSettings(arguments: workout),
-            builder: (_) => const WorkoutPlanScreen(),
+            settings: RouteSettings(arguments: routine.id),
+            builder: (_) => const RoutineScreen(),
           ),
         ),
         child: const SizedBox(),
diff --git a/integration_test/3_gym_mode.dart b/integration_test/3_gym_mode.dart
index b6f469bd..76431f08 100644
--- a/integration_test/3_gym_mode.dart
+++ b/integration_test/3_gym_mode.dart
@@ -1,34 +1,43 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart' as riverpod;
 import 'package:mockito/mockito.dart';
 import 'package:provider/provider.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/providers/exercises.dart';
-import 'package:wger/providers/workout_plans.dart';
+import 'package:wger/providers/routines.dart';
 import 'package:wger/screens/gym_mode.dart';
-import 'package:wger/screens/workout_plan_screen.dart';
+import 'package:wger/screens/routine_screen.dart';
 import 'package:wger/theme/theme.dart';
 
-import '../test/utils.dart';
-import '../test/workout/gym_mode_screen_test.mocks.dart';
+import '../test/routine/gym_mode_screen_test.mocks.dart';
 import '../test_data/exercises.dart';
-import '../test_data/workouts.dart';
+import '../test_data/routines.dart';
 
 Widget createGymModeScreen({locale = 'en'}) {
   final key = GlobalKey<NavigatorState>();
-  final bases = getTestExercises();
-  final workout = getWorkout(exercises: getScreenshotExercises());
-
+  final exercises = getTestExercises();
+  final routine = getTestRoutine(exercises: getScreenshotExercises());
+  final mockRoutinesProvider = MockRoutinesProvider();
   final mockExerciseProvider = MockExercisesProvider();
 
-  when(mockExerciseProvider.findExerciseById(1)).thenReturn(bases[0]); // bench press
-  when(mockExerciseProvider.findExerciseById(6)).thenReturn(bases[5]); // side raises
+  when(mockRoutinesProvider.fetchAndSetRoutineFull(1)).thenAnswer((_) async => routine);
+  when(mockRoutinesProvider.findById(1)).thenAnswer((_) => routine);
+
+  when(mockExerciseProvider.findExerciseById(1)).thenReturn(exercises[0]); // bench press
+  when(mockExerciseProvider.findExerciseById(6)).thenReturn(exercises[5]); // side raises
   //when(mockExerciseProvider.findExerciseBaseById(2)).thenReturn(bases[1]); // crunches
   //when(mockExerciseProvider.findExerciseBaseById(3)).thenReturn(bases[2]); // dead lift
 
-  return ChangeNotifierProvider<WorkoutPlansProvider>(
-    create: (context) => WorkoutPlansProvider(mockBaseProvider, mockExerciseProvider, [workout]),
-    child: ChangeNotifierProvider<ExercisesProvider>(
-      create: (context) => mockExerciseProvider,
+  return riverpod.ProviderScope(
+    child: MultiProvider(
+      providers: [
+        ChangeNotifierProvider<RoutinesProvider>(
+          create: (context) => mockRoutinesProvider,
+        ),
+        ChangeNotifierProvider<ExercisesProvider>(
+          create: (context) => mockExerciseProvider,
+        ),
+      ],
       child: MaterialApp(
         locale: Locale(locale),
         debugShowCheckedModeBanner: false,
@@ -39,13 +48,17 @@ Widget createGymModeScreen({locale = 'en'}) {
         home: TextButton(
           onPressed: () => key.currentState!.push(
             MaterialPageRoute<void>(
-              settings: RouteSettings(arguments: workout.days.first),
+              settings: RouteSettings(
+                arguments: GymModeArguments(routine.id!, routine.days.first.id!, 1),
+              ),
               builder: (_) => const GymModeScreen(),
             ),
           ),
           child: const SizedBox(),
         ),
-        routes: {WorkoutPlanScreen.routeName: (ctx) => const WorkoutPlanScreen()},
+        routes: {
+          RoutineScreen.routeName: (ctx) => const RoutineScreen(),
+        },
       ),
     ),
   );
diff --git a/integration_test/5_nutritional_plan.dart b/integration_test/5_nutritional_plan.dart
index 7381e39e..dacb1725 100644
--- a/integration_test/5_nutritional_plan.dart
+++ b/integration_test/5_nutritional_plan.dart
@@ -1,5 +1,7 @@
+import 'package:drift/native.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
+import 'package:wger/database/ingredients/ingredients_database.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/providers/body_weight.dart';
 import 'package:wger/providers/nutrition.dart';
@@ -17,7 +19,11 @@ Widget createNutritionalPlanScreen({locale = 'en'}) {
   return MultiProvider(
     providers: [
       ChangeNotifierProvider<NutritionPlansProvider>(
-        create: (context) => NutritionPlansProvider(mockBaseProvider, []),
+        create: (context) => NutritionPlansProvider(
+          mockBaseProvider,
+          [],
+          database: IngredientDatabase.inMemory(NativeDatabase.memory()),
+        ),
       ),
       ChangeNotifierProvider<BodyWeightProvider>(
         create: (context) => BodyWeightProvider(mockBaseProvider),
diff --git a/integration_test/6_weight.dart b/integration_test/6_weight.dart
index aaeb9abc..f02c059d 100644
--- a/integration_test/6_weight.dart
+++ b/integration_test/6_weight.dart
@@ -3,6 +3,7 @@ import 'package:mockito/mockito.dart';
 import 'package:provider/provider.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/providers/body_weight.dart';
+import 'package:wger/providers/nutrition.dart';
 import 'package:wger/providers/user.dart';
 import 'package:wger/screens/form_screen.dart';
 import 'package:wger/screens/weight_screen.dart';
@@ -11,19 +12,31 @@ import 'package:wger/theme/theme.dart';
 import '../test/utils.dart';
 import '../test/weight/weight_screen_test.mocks.dart';
 import '../test_data/body_weight.dart';
+import '../test_data/nutritional_plans.dart';
 import '../test_data/profile.dart';
 
 Widget createWeightScreen({locale = 'en'}) {
-  final mockWeightProvider = BodyWeightProvider(mockBaseProvider);
-  mockWeightProvider.items = getScreenshotWeightEntries();
+  final weightProvider = BodyWeightProvider(mockBaseProvider);
+  weightProvider.items = getScreenshotWeightEntries();
 
   final mockUserProvider = MockUserProvider();
   when(mockUserProvider.profile).thenReturn(tProfile1);
 
+  final mockNutritionPlansProvider = MockNutritionPlansProvider();
+  when(mockNutritionPlansProvider.currentPlan).thenReturn(null);
+  when(mockNutritionPlansProvider.items).thenReturn([getNutritionalPlan()]);
+
   return MultiProvider(
     providers: [
-      ChangeNotifierProvider<UserProvider>(create: (context) => mockUserProvider),
-      ChangeNotifierProvider<BodyWeightProvider>(create: (context) => mockWeightProvider),
+      ChangeNotifierProvider<UserProvider>(
+        create: (context) => mockUserProvider,
+      ),
+      ChangeNotifierProvider<BodyWeightProvider>(
+        create: (context) => weightProvider,
+      ),
+      ChangeNotifierProvider<NutritionPlansProvider>(
+        create: (context) => mockNutritionPlansProvider,
+      ),
     ],
     child: MaterialApp(
       locale: Locale(locale),
diff --git a/integration_test/make_screenshots_test.dart b/integration_test/make_screenshots_test.dart
index 78ce1222..3d475363 100644
--- a/integration_test/make_screenshots_test.dart
+++ b/integration_test/make_screenshots_test.dart
@@ -17,12 +17,17 @@ enum DeviceType {
   sevenInchScreenshots,
   tenInchScreenshots,
   tvScreenshots,
-  wearScreenshots
+  wearScreenshots,
 }
 
 final destination = DeviceType.phoneScreenshots.name;
 
-Future<void> takeScreenshot(tester, binding, String language, String name) async {
+Future<void> takeScreenshot(
+  WidgetTester tester,
+  IntegrationTestWidgetsFlutterBinding binding,
+  String language,
+  String name,
+) async {
   if (Platform.isAndroid) {
     await tester.pumpAndSettle();
     await binding.convertFlutterSurfaceToImage();
@@ -37,27 +42,31 @@ Future<void> takeScreenshot(tester, binding, String language, String name) async
 const languages = [
   // Note: it seems if too many languages are processed at once, some processes
   // disappear and no images are written. Doing this in smaller steps works fine
-
-  // 'ca',
-  // 'cs-CZ',
-  // 'de-DE',
-  // 'el-GR',
-  // 'en-US',
-  // 'es-ES',
+  'ar',
+  'ca',
+  'cs-CZ',
+  'de-DE',
+  'el-GR',
+  'en-US',
+  'es-ES',
 
   'fr-FR',
   'hi-IN',
   'hr',
   'it-IT',
+  'ko-KR',
   'nb-NO',
   'pl-PL',
 
   'pt-BR',
   'pt-PT',
   'ru-RU',
+  'sr',
+  'ta-IN',
   'tr-TR',
   'uk',
   'zh-CN',
+  'zh-TW',
 ];
 
 void main() {
diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist
index 8c6e5614..d57061dd 100644
--- a/ios/Flutter/AppFrameworkInfo.plist
+++ b/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>12.0</string>
+  <string>13.0</string>
 </dict>
 </plist>
diff --git a/ios/Gemfile b/ios/Gemfile
new file mode 100644
index 00000000..7a118b49
--- /dev/null
+++ b/ios/Gemfile
@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "fastlane"
diff --git a/ios/Gemfile.lock b/ios/Gemfile.lock
new file mode 100644
index 00000000..5447a46b
--- /dev/null
+++ b/ios/Gemfile.lock
@@ -0,0 +1,222 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (3.0.7)
+      base64
+      nkf
+      rexml
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    artifactory (3.0.17)
+    atomos (0.1.3)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.1018.0)
+    aws-sdk-core (3.214.0)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.96.0)
+      aws-sdk-core (~> 3, >= 3.210.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.176.0)
+      aws-sdk-core (~> 3, >= 3.210.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.10.1)
+      aws-eventstream (~> 1, >= 1.0.2)
+    babosa (1.0.4)
+    base64 (0.2.0)
+    claide (1.1.0)
+    colored (1.2)
+    colored2 (3.1.2)
+    commander (4.6.0)
+      highline (~> 2.0.0)
+    declarative (0.0.20)
+    digest-crc (0.6.5)
+      rake (>= 12.0.0, < 14.0.0)
+    domain_name (0.6.20240107)
+    dotenv (2.8.1)
+    emoji_regex (3.2.3)
+    excon (0.112.0)
+    faraday (1.10.4)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-cookie_jar (0.0.7)
+      faraday (>= 0.8.0)
+      http-cookie (~> 1.0.0)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (1.0.2)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    faraday_middleware (1.2.1)
+      faraday (~> 1.0)
+    fastimage (2.3.1)
+    fastlane (2.225.0)
+      CFPropertyList (>= 2.3, < 4.0.0)
+      addressable (>= 2.8, < 3.0.0)
+      artifactory (~> 3.0)
+      aws-sdk-s3 (~> 1.0)
+      babosa (>= 1.0.3, < 2.0.0)
+      bundler (>= 1.12.0, < 3.0.0)
+      colored (~> 1.2)
+      commander (~> 4.6)
+      dotenv (>= 2.1.1, < 3.0.0)
+      emoji_regex (>= 0.1, < 4.0)
+      excon (>= 0.71.0, < 1.0.0)
+      faraday (~> 1.0)
+      faraday-cookie_jar (~> 0.0.6)
+      faraday_middleware (~> 1.0)
+      fastimage (>= 2.1.0, < 3.0.0)
+      fastlane-sirp (>= 1.0.0)
+      gh_inspector (>= 1.1.2, < 2.0.0)
+      google-apis-androidpublisher_v3 (~> 0.3)
+      google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-env (>= 1.6.0, < 2.0.0)
+      google-cloud-storage (~> 1.31)
+      highline (~> 2.0)
+      http-cookie (~> 1.0.5)
+      json (< 3.0.0)
+      jwt (>= 2.1.0, < 3)
+      mini_magick (>= 4.9.4, < 5.0.0)
+      multipart-post (>= 2.0.0, < 3.0.0)
+      naturally (~> 2.2)
+      optparse (>= 0.1.1, < 1.0.0)
+      plist (>= 3.1.0, < 4.0.0)
+      rubyzip (>= 2.0.0, < 3.0.0)
+      security (= 0.1.5)
+      simctl (~> 1.6.3)
+      terminal-notifier (>= 2.0.0, < 3.0.0)
+      terminal-table (~> 3)
+      tty-screen (>= 0.6.3, < 1.0.0)
+      tty-spinner (>= 0.8.0, < 1.0.0)
+      word_wrap (~> 1.0.0)
+      xcodeproj (>= 1.13.0, < 2.0.0)
+      xcpretty (~> 0.3.0)
+      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
+    fastlane-sirp (1.0.0)
+      sysrandom (~> 1.0)
+    gh_inspector (1.1.3)
+    google-apis-androidpublisher_v3 (0.54.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-core (0.11.3)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (>= 0.16.2, < 2.a)
+      httpclient (>= 2.8.1, < 3.a)
+      mini_mime (~> 1.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.a)
+      rexml
+    google-apis-iamcredentials_v1 (0.17.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.13.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-storage_v1 (0.31.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-cloud-core (1.7.1)
+      google-cloud-env (>= 1.0, < 3.a)
+      google-cloud-errors (~> 1.0)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
+    google-cloud-errors (1.4.0)
+    google-cloud-storage (1.47.0)
+      addressable (~> 2.8)
+      digest-crc (~> 0.4)
+      google-apis-iamcredentials_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.31.0)
+      google-cloud-core (~> 1.6)
+      googleauth (>= 0.16.2, < 2.a)
+      mini_mime (~> 1.0)
+    googleauth (1.8.1)
+      faraday (>= 0.17.3, < 3.a)
+      jwt (>= 1.4, < 3.0)
+      multi_json (~> 1.11)
+      os (>= 0.9, < 2.0)
+      signet (>= 0.16, < 2.a)
+    highline (2.0.3)
+    http-cookie (1.0.8)
+      domain_name (~> 0.5)
+    httpclient (2.8.3)
+    jmespath (1.6.2)
+    json (2.9.0)
+    jwt (2.9.3)
+      base64
+    mini_magick (4.13.2)
+    mini_mime (1.1.5)
+    multi_json (1.15.0)
+    multipart-post (2.4.1)
+    nanaimo (0.4.0)
+    naturally (2.2.1)
+    nkf (0.2.0)
+    optparse (0.6.0)
+    os (1.1.4)
+    plist (3.7.1)
+    public_suffix (6.0.1)
+    rake (13.2.1)
+    representable (3.2.0)
+      declarative (< 0.1.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
+      uber (< 0.2.0)
+    retriable (3.1.2)
+    rexml (3.4.2)
+    rouge (2.0.7)
+    ruby2_keywords (0.0.5)
+    rubyzip (2.3.2)
+    security (0.1.5)
+    signet (0.19.0)
+      addressable (~> 2.8)
+      faraday (>= 0.17.5, < 3.a)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
+    simctl (1.6.10)
+      CFPropertyList
+      naturally
+    sysrandom (1.0.5)
+    terminal-notifier (2.0.0)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    trailblazer-option (0.1.2)
+    tty-cursor (0.7.1)
+    tty-screen (0.8.2)
+    tty-spinner (0.9.3)
+      tty-cursor (~> 0.7)
+    uber (0.1.0)
+    unicode-display_width (2.6.0)
+    word_wrap (1.0.0)
+    xcodeproj (1.27.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.4.0)
+      rexml (>= 3.3.6, < 4.0)
+    xcpretty (0.3.0)
+      rouge (~> 2.0.7)
+    xcpretty-travis-formatter (1.0.1)
+      xcpretty (~> 0.2, >= 0.0.7)
+
+PLATFORMS
+  arm64-darwin-24
+  ruby
+
+DEPENDENCIES
+  fastlane
+
+BUNDLED WITH
+   2.5.18
diff --git a/ios/Podfile b/ios/Podfile
index 2c068c40..fe628cb8 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-platform :ios, '12.0'
+platform :ios, '17.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 0cdb23fc..e2a08f6f 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -2,8 +2,6 @@ PODS:
   - camera_avfoundation (0.0.1):
     - Flutter
   - Flutter (1.0.0)
-  - flutter_barcode_scanner (2.0.0):
-    - Flutter
   - flutter_keyboard_visibility (0.0.1):
     - Flutter
   - flutter_zxing (0.0.1):
@@ -17,26 +15,38 @@ PODS:
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
+  - pointer_interceptor_ios (0.0.1):
+    - Flutter
   - rive_common (0.0.1):
     - Flutter
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - sqlite3 (3.45.0):
-    - sqlite3/common (= 3.45.0)
-  - sqlite3/common (3.45.0)
-  - sqlite3/fts5 (3.45.0):
+  - sqlite3 (3.50.4):
+    - sqlite3/common (= 3.50.4)
+  - sqlite3/common (3.50.4)
+  - sqlite3/dbstatvtab (3.50.4):
     - sqlite3/common
-  - sqlite3/perf-threadsafe (3.45.0):
+  - sqlite3/fts5 (3.50.4):
     - sqlite3/common
-  - sqlite3/rtree (3.45.0):
+  - sqlite3/math (3.50.4):
+    - sqlite3/common
+  - sqlite3/perf-threadsafe (3.50.4):
+    - sqlite3/common
+  - sqlite3/rtree (3.50.4):
+    - sqlite3/common
+  - sqlite3/session (3.50.4):
     - sqlite3/common
   - sqlite3_flutter_libs (0.0.1):
     - Flutter
-    - sqlite3 (~> 3.45.0)
+    - FlutterMacOS
+    - sqlite3 (~> 3.50.4)
+    - sqlite3/dbstatvtab
     - sqlite3/fts5
+    - sqlite3/math
     - sqlite3/perf-threadsafe
     - sqlite3/rtree
+    - sqlite3/session
   - url_launcher_ios (0.0.1):
     - Flutter
   - video_player_avfoundation (0.0.1):
@@ -46,16 +56,16 @@ PODS:
 DEPENDENCIES:
   - camera_avfoundation (from `.symlinks/plugins/camera_avfoundation/ios`)
   - Flutter (from `Flutter`)
-  - flutter_barcode_scanner (from `.symlinks/plugins/flutter_barcode_scanner/ios`)
   - flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/ios`)
   - flutter_zxing (from `.symlinks/plugins/flutter_zxing/ios`)
   - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
   - integration_test (from `.symlinks/plugins/integration_test/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
+  - pointer_interceptor_ios (from `.symlinks/plugins/pointer_interceptor_ios/ios`)
   - rive_common (from `.symlinks/plugins/rive_common/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
-  - sqlite3_flutter_libs (from `.symlinks/plugins/sqlite3_flutter_libs/ios`)
+  - sqlite3_flutter_libs (from `.symlinks/plugins/sqlite3_flutter_libs/darwin`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
   - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`)
 
@@ -68,8 +78,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/camera_avfoundation/ios"
   Flutter:
     :path: Flutter
-  flutter_barcode_scanner:
-    :path: ".symlinks/plugins/flutter_barcode_scanner/ios"
   flutter_keyboard_visibility:
     :path: ".symlinks/plugins/flutter_keyboard_visibility/ios"
   flutter_zxing:
@@ -82,34 +90,36 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/package_info_plus/ios"
   path_provider_foundation:
     :path: ".symlinks/plugins/path_provider_foundation/darwin"
+  pointer_interceptor_ios:
+    :path: ".symlinks/plugins/pointer_interceptor_ios/ios"
   rive_common:
     :path: ".symlinks/plugins/rive_common/ios"
   shared_preferences_foundation:
     :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
   sqlite3_flutter_libs:
-    :path: ".symlinks/plugins/sqlite3_flutter_libs/ios"
+    :path: ".symlinks/plugins/sqlite3_flutter_libs/darwin"
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
   video_player_avfoundation:
     :path: ".symlinks/plugins/video_player_avfoundation/darwin"
 
 SPEC CHECKSUMS:
-  camera_avfoundation: 3125e8cd1a4387f6f31c6c63abb8a55892a9eeeb
-  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_barcode_scanner: 7a1144744c28dc0c57a8de7218ffe5ec59a9e4bf
-  flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069
-  flutter_zxing: 19a866d17c8a87ee1026d68521c69d2f008635f6
-  image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5
-  integration_test: 13825b8a9334a850581300559b8839134b124670
-  package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
-  path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
-  rive_common: 3a4c254c6e4db7e4b9e05daeb3d1f47ae4f7bf76
-  shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
-  sqlite3: f307b6291c4db7b5086c38d6237446b98a738581
-  sqlite3_flutter_libs: aeb4d37509853dfa79d9b59386a2dac5dd079428
-  url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b
-  video_player_avfoundation: e9e6f9cae7d7a6d9b43519b0aab382bca60fcfd1
+  camera_avfoundation: be3be85408cd4126f250386828e9b1dfa40ab436
+  Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
+  flutter_keyboard_visibility: 4625131e43015dbbe759d9b20daaf77e0e3f6619
+  flutter_zxing: e8bcc43bd3056c70c271b732ed94e7a16fd62f93
+  image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a
+  integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e
+  package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
+  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
+  pointer_interceptor_ios: ec847ef8b0915778bed2b2cef636f4d177fa8eed
+  rive_common: dd421daaf9ae69f0125aa761dd96abd278399952
+  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
+  sqlite3: 73513155ec6979715d3904ef53a8d68892d4032b
+  sqlite3_flutter_libs: 83f8e9f5b6554077f1d93119fe20ebaa5f3a9ef1
+  url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
+  video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b
 
-PODFILE CHECKSUM: 4e8f8b2be68aeea4c0d5beb6ff1e79fface1d048
+PODFILE CHECKSUM: 5a367937f10bf0c459576e5e472a1159ee029c13
 
-COCOAPODS: 1.14.3
+COCOAPODS: 1.16.2
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index eaa06d26..650ff389 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -8,9 +8,9 @@
 
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
+		3845DFE0762714C6680D5DFA /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AFA44D9DB464FB85F130C5B5 /* Pods_Runner.framework */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
-		78C727F12E8C2C2BF5ED5703 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DAC1C25406C5CD78CE59E547 /* Pods_Runner.framework */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
@@ -30,14 +30,15 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		0661B42137D743038BB7032F /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
-		0AA56188CB2769B47E250516 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
+		0ED96167FF623FAB319C6E99 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
+		89F44165E15E0A7B109A05EB /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
+		8D383D452D8E929100066A20 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
 		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -45,8 +46,8 @@
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		C19FA8F529BB2B899AB0C23A /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
-		DAC1C25406C5CD78CE59E547 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		AFA44D9DB464FB85F130C5B5 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		C71BAD15819A771165D784B0 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -54,17 +55,17 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				78C727F12E8C2C2BF5ED5703 /* Pods_Runner.framework in Frameworks */,
+				3845DFE0762714C6680D5DFA /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		631B4307BD65C9D08E514EBB /* Frameworks */ = {
+		23E168F95D2790D29E207E68 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				DAC1C25406C5CD78CE59E547 /* Pods_Runner.framework */,
+				AFA44D9DB464FB85F130C5B5 /* Pods_Runner.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -87,7 +88,7 @@
 				97C146F01CF9000F007C117D /* Runner */,
 				97C146EF1CF9000F007C117D /* Products */,
 				BB0286322FD60C00014F981C /* Pods */,
-				631B4307BD65C9D08E514EBB /* Frameworks */,
+				23E168F95D2790D29E207E68 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -102,6 +103,7 @@
 		97C146F01CF9000F007C117D /* Runner */ = {
 			isa = PBXGroup;
 			children = (
+				8D383D452D8E929100066A20 /* Runner.entitlements */,
 				97C146FA1CF9000F007C117D /* Main.storyboard */,
 				97C146FD1CF9000F007C117D /* Assets.xcassets */,
 				97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
@@ -117,9 +119,9 @@
 		BB0286322FD60C00014F981C /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				0661B42137D743038BB7032F /* Pods-Runner.debug.xcconfig */,
-				C19FA8F529BB2B899AB0C23A /* Pods-Runner.release.xcconfig */,
-				0AA56188CB2769B47E250516 /* Pods-Runner.profile.xcconfig */,
+				C71BAD15819A771165D784B0 /* Pods-Runner.debug.xcconfig */,
+				0ED96167FF623FAB319C6E99 /* Pods-Runner.release.xcconfig */,
+				89F44165E15E0A7B109A05EB /* Pods-Runner.profile.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -131,14 +133,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
-				55A9F1D1670043D7444258F2 /* [CP] Check Pods Manifest.lock */,
+				49A79EC3F389C902853B9186 /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-				8D4C3EABCD024FF4FF37C7E4 /* [CP] Embed Pods Frameworks */,
+				0A9E38C31DF3DC192213822E /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -155,7 +157,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -197,6 +199,23 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
+		0A9E38C31DF3DC192213822E /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@@ -213,7 +232,7 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
-		55A9F1D1670043D7444258F2 /* [CP] Check Pods Manifest.lock */ = {
+		49A79EC3F389C902853B9186 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -235,23 +254,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		8D4C3EABCD024FF4FF37C7E4 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@@ -342,7 +344,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -357,8 +359,9 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = 643RNGR6QG;
+				DEVELOPMENT_TEAM = U92KZ4HZ4C;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -373,7 +376,8 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = de.wger.flutter;
+				MARKETING_VERSION = 1.8.0;
+				PRODUCT_BUNDLE_IDENTIFIER = de.wger.flutter.community;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -428,7 +432,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -477,7 +481,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -494,8 +498,9 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = 643RNGR6QG;
+				DEVELOPMENT_TEAM = U92KZ4HZ4C;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -510,7 +515,8 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = de.wger.flutter;
+				MARKETING_VERSION = 1.8.0;
+				PRODUCT_BUNDLE_IDENTIFIER = de.wger.flutter.community;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -525,8 +531,9 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = 643RNGR6QG;
+				DEVELOPMENT_TEAM = U92KZ4HZ4C;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -541,7 +548,8 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = de.wger.flutter;
+				MARKETING_VERSION = 1.8.0;
+				PRODUCT_BUNDLE_IDENTIFIER = de.wger.flutter.community;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index b52b2e69..fc5ae031 100644
--- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -45,11 +46,13 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
+      enableGPUValidationMode = "1"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift
index 70693e4a..b6363034 100644
--- a/ios/Runner/AppDelegate.swift
+++ b/ios/Runner/AppDelegate.swift
@@ -1,7 +1,7 @@
 import UIKit
 import Flutter
 
-@UIApplicationMain
+@main
 @objc class AppDelegate: FlutterAppDelegate {
   override func application(
     _ application: UIApplication,
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/100.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/100.png
new file mode 100644
index 00000000..444053f9
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/100.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/1024.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/1024.png
new file mode 100644
index 00000000..70709651
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/1024.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/114.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/114.png
new file mode 100644
index 00000000..02f1a793
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/114.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/120.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/120.png
new file mode 100644
index 00000000..1b430d7c
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/120.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/144.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/144.png
new file mode 100644
index 00000000..1519c1e1
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/144.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/152.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/152.png
new file mode 100644
index 00000000..730026f7
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/152.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/167.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/167.png
new file mode 100644
index 00000000..e2d4d758
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/167.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/180.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/180.png
new file mode 100644
index 00000000..4dcc9949
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/180.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/20.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/20.png
new file mode 100644
index 00000000..4de0c847
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/20.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/29.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/29.png
new file mode 100644
index 00000000..7013299e
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/29.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/40.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/40.png
new file mode 100644
index 00000000..0ddf6c86
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/40.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/50.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/50.png
new file mode 100644
index 00000000..2e7c1321
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/50.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/57.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/57.png
new file mode 100644
index 00000000..dcbc2adb
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/57.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/58.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/58.png
new file mode 100644
index 00000000..67801503
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/58.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/60.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/60.png
new file mode 100644
index 00000000..5001a897
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/60.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/72.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/72.png
new file mode 100644
index 00000000..22dc03b6
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/72.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/76.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/76.png
new file mode 100644
index 00000000..122d875c
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/76.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/80.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/80.png
new file mode 100644
index 00000000..efbc4dcf
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/80.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/87.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/87.png
new file mode 100644
index 00000000..2421a4f9
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/87.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
index d36b1fab..4fdf8826 100644
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,122 +1,158 @@
 {
   "images" : [
     {
-      "size" : "20x20",
+      "filename" : "40.png",
       "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
-      "size" : "20x20",
+      "filename" : "60.png",
       "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@3x.png",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "20x20"
     },
     {
-      "size" : "29x29",
+      "filename" : "29.png",
       "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "29x29"
     },
     {
-      "size" : "29x29",
+      "filename" : "58.png",
       "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "29x29"
     },
     {
-      "size" : "29x29",
+      "filename" : "87.png",
       "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@3x.png",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "29x29"
     },
     {
-      "size" : "40x40",
+      "filename" : "80.png",
       "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "40x40"
     },
     {
-      "size" : "40x40",
+      "filename" : "120.png",
       "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@3x.png",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "40x40"
     },
     {
-      "size" : "60x60",
+      "filename" : "57.png",
       "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@2x.png",
-      "scale" : "2x"
+      "scale" : "1x",
+      "size" : "57x57"
     },
     {
-      "size" : "60x60",
+      "filename" : "114.png",
       "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@3x.png",
-      "scale" : "3x"
+      "scale" : "2x",
+      "size" : "57x57"
     },
     {
-      "size" : "20x20",
+      "filename" : "120.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "180.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "20.png",
       "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@1x.png",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "20x20"
     },
     {
-      "size" : "20x20",
+      "filename" : "40.png",
       "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
-      "size" : "29x29",
+      "filename" : "29.png",
       "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "29x29"
     },
     {
-      "size" : "29x29",
+      "filename" : "58.png",
       "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "29x29"
     },
     {
-      "size" : "40x40",
+      "filename" : "40.png",
       "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@1x.png",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "40x40"
     },
     {
-      "size" : "40x40",
+      "filename" : "80.png",
       "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "40x40"
     },
     {
-      "size" : "76x76",
+      "filename" : "50.png",
       "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@1x.png",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "50x50"
     },
     {
-      "size" : "76x76",
+      "filename" : "100.png",
       "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "50x50"
     },
     {
-      "size" : "83.5x83.5",
+      "filename" : "72.png",
       "idiom" : "ipad",
-      "filename" : "Icon-App-83.5x83.5@2x.png",
-      "scale" : "2x"
+      "scale" : "1x",
+      "size" : "72x72"
     },
     {
-      "size" : "1024x1024",
+      "filename" : "144.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "72x72"
+    },
+    {
+      "filename" : "76.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "152.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "167.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
+    },
+    {
+      "filename" : "1024.png",
       "idiom" : "ios-marketing",
-      "filename" : "Icon-App-1024x1024@1x.png",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "1024x1024"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
 }
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
deleted file mode 100644
index da9a6094..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
deleted file mode 100644
index 2b3b1a94..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
deleted file mode 100644
index 0c5443fe..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
deleted file mode 100644
index 4f2bc865..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
deleted file mode 100644
index b7539761..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
deleted file mode 100644
index 956eb4bd..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
deleted file mode 100644
index 1c4c2dae..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
deleted file mode 100644
index 0c5443fe..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
deleted file mode 100644
index 81ed89bc..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
deleted file mode 100644
index af6c4429..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
deleted file mode 100644
index af6c4429..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
deleted file mode 100644
index 91145264..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
deleted file mode 100644
index a538920e..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
deleted file mode 100644
index 9579c5e3..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
deleted file mode 100644
index 211d8e57..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/Contents.json b/ios/Runner/Assets.xcassets/Contents.json
new file mode 100644
index 00000000..73c00596
--- /dev/null
+++ b/ios/Runner/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 9aa740a2..7049504d 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>NSCameraUsageDescription</key>
+	<string>Workout photos</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleExecutable</key>
diff --git a/ios/Runner/Runner.entitlements b/ios/Runner/Runner.entitlements
new file mode 100644
index 00000000..903def2a
--- /dev/null
+++ b/ios/Runner/Runner.entitlements
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>aps-environment</key>
+	<string>development</string>
+</dict>
+</plist>
diff --git a/ios/build/.last_build_id b/ios/build/.last_build_id
new file mode 100644
index 00000000..7769d20e
--- /dev/null
+++ b/ios/build/.last_build_id
@@ -0,0 +1 @@
+ce49e7d90cd902197f9a9cbc84219d23
\ No newline at end of file
diff --git a/ios/fastlane/Appfile b/ios/fastlane/Appfile
new file mode 100644
index 00000000..2ba8d12b
--- /dev/null
+++ b/ios/fastlane/Appfile
@@ -0,0 +1,5 @@
+app_identifier("de.wger.flutter.community") # The bundle identifier of your app
+apple_id(ENV["APPLE_ID"]) # Your Apple Developer Portal username
+
+itc_team_id(ENV["ITC_TEAM_ID"]) # App Store Connect Team ID
+team_id(ENV["TEAM_ID"]) # Developer Portal Team ID
diff --git a/ios/fastlane/Deliverfile b/ios/fastlane/Deliverfile
new file mode 100644
index 00000000..74739f74
--- /dev/null
+++ b/ios/fastlane/Deliverfile
@@ -0,0 +1,3 @@
+# The Deliverfile allows you to store various App Store Connect metadata
+# For more information, check out the docs
+# https://docs.fastlane.tools/actions/deliver/
diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile
new file mode 100644
index 00000000..2dc804f8
--- /dev/null
+++ b/ios/fastlane/Fastfile
@@ -0,0 +1,61 @@
+default_platform(:ios)
+
+platform :ios do
+
+  desc "Set AppStore Connect API KEY using the provided environment variables."
+  lane :apikey do
+    app_store_connect_api_key(
+      key_id: ENV["APP_STORE_API_KEY_ID"],
+      issuer_id: ENV["APP_STORE_API_ISSUER_ID"],
+      key_filepath: ENV["APP_STORE_API_KEY_PATH"],
+      duration: 1200, # optional (maximum 1200)
+      in_house: false # optional but may be required if using match/sigh
+    )
+  end
+
+  ###############################################################################
+
+  desc "Push a new release build to AppStore Connect for manual submission to TestFlight beta testing or App Store Release."
+  lane :release do
+    apikey
+    build_app(workspace: "Runner.xcworkspace", scheme: "Runner")
+    upload_to_app_store(
+      precheck_include_in_app_purchases: false
+    )
+  end
+
+  ###############################################################################
+
+  desc "Test if all environment variables are present and check if API key is working properly."
+  lane :test_env do
+    UI.message "🔍 Testing environment variables..."
+
+    UI.message "APP_STORE_API_KEY_ID: #{ENV['APP_STORE_API_KEY_ID']}"
+    UI.message "APP_STORE_API_ISSUER_ID: #{ENV['APP_STORE_API_ISSUER_ID']}"
+    UI.message "APP_STORE_API_KEY_PATH: #{ENV['APP_STORE_API_KEY_PATH']}"
+    UI.message "APPLE_ID: #{ENV['APPLE_ID']}"
+    UI.message "ITC_TEAM_ID: #{ENV['ITC_TEAM_ID']}"
+    UI.message "TEAM_ID: #{ENV['TEAM_ID']}"
+
+    UI.success "✅ Environment variables loaded."
+
+    UI.message "🔐 Testing App Store Connect API key authentication..."
+
+    app_store_connect_api_key(
+      key_id: ENV["APP_STORE_API_KEY_ID"],
+      issuer_id: ENV["APP_STORE_API_ISSUER_ID"],
+      key_filepath: ENV["APP_STORE_API_KEY_PATH"],
+      duration: 1200,
+      in_house: false
+    )
+
+    # Test: Fetch list of apps to verify authentication
+    apps = Spaceship::ConnectAPI::App.all
+    UI.success "✅ API Key is valid! Found #{apps.count} apps in your App Store Connect account."
+
+  rescue => ex
+    UI.error "❌ API Key authentication failed: #{ex.message}"
+    UI.user_error!("Please check your API key environment variables and credentials.")
+  end
+
+end
diff --git a/ios/fastlane/README.md b/ios/fastlane/README.md
new file mode 100644
index 00000000..08fd87f3
--- /dev/null
+++ b/ios/fastlane/README.md
@@ -0,0 +1,48 @@
+fastlane documentation
+----
+
+# Installation
+
+Make sure you have the latest version of the Xcode command line tools installed:
+
+```sh
+xcode-select --install
+```
+
+For _fastlane_ installation instructions, see [Installing _fastlane_](https://docs.fastlane.tools/#installing-fastlane)
+
+# Available Actions
+
+## iOS
+
+### ios apikey
+
+```sh
+[bundle exec] fastlane ios apikey
+```
+
+Set AppStore Connect API KEY using the provided environment variables.
+
+### ios release
+
+```sh
+[bundle exec] fastlane ios release
+```
+
+Push a new release build to AppStore Connect for manual submission to TestFlight beta testing or App Store Release.
+
+### ios test_env
+
+```sh
+[bundle exec] fastlane ios test_env
+```
+
+Test if all environment variables are present and check if API key is working properly.
+
+----
+
+This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.
+
+More information about _fastlane_ can be found on [fastlane.tools](https://fastlane.tools).
+
+The documentation of _fastlane_ can be found on [docs.fastlane.tools](https://docs.fastlane.tools).
diff --git a/ios/fastlane/metadata/copyright.txt b/ios/fastlane/metadata/copyright.txt
new file mode 100644
index 00000000..3d870c90
--- /dev/null
+++ b/ios/fastlane/metadata/copyright.txt
@@ -0,0 +1 @@
+wger Project
diff --git a/ios/fastlane/metadata/de-DE/apple_tv_privacy_policy.txt b/ios/fastlane/metadata/de-DE/apple_tv_privacy_policy.txt
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/ios/fastlane/metadata/de-DE/apple_tv_privacy_policy.txt
@@ -0,0 +1 @@
+
diff --git a/ios/fastlane/metadata/de-DE/description.txt b/ios/fastlane/metadata/de-DE/description.txt
new file mode 100644
index 00000000..677e4da1
--- /dev/null
+++ b/ios/fastlane/metadata/de-DE/description.txt
@@ -0,0 +1,39 @@
+Von Fitnessliebhabern für Fitnessliebhaber, organisiere deine Gesundheit mit wger, deinem Trainingsverwaltungsprogramm!
+
+Hast du schon deine Nr. 1 Fitness-Anwendung gefunden und liebst es, deine eigene Trainingspläne zu erstellen? Egal was für ein sportliches Biest du bist sind – wir haben alle etwas gemeinsam: wir lieben es, den Überblick über unsere Gesundheitsdaten zu behalten.
+
+Wir verurteilen dich also nicht dafür, dass du deine Fitness-Reise immer noch mit deinem kleinen Tagebuch verwaltest, aber willkommen im 21. Jahrhundert!
+
+Wir haben eine 100 % kostenlose digitale Gesundheits- und Fitnesstracker-Anwendung für dich entwickelt, die auf die wichtigsten Funktionen reduziert ist, um dein Leben einfacher zu machen. Lege jetzt lost, trainiere weiter und feiere deine Fortschritte!
+
+wger ist ein quelloffenes Projekt und dreht sich um:
+* Deinen Körper
+* Deine Workouts
+* Deine Fortschritte
+* Deine Daten
+
+Dein Körper:
+Du musst nicht mehr nach den Zutaten deiner Lieblingsspeise suchen – stelle deine täglichen Mahlzeiten aus mehr als 78.000 Produkten und deren Nährwerte zusammen. Füge diese deinem Ernährungsplan hinzu und behalte den Überblick über deine Ernährung im Kalender.
+
+Deine Workouts:
+Du weißt, was das Beste für deinen Körper ist. Erstelle deine eigenen Workouts aus einer wachsenden Vielfalt von 200 verschiedenen Übungen. Verwende den Gym-Modus, um dich durch das Training führen zu lassen, während du deine Gewichte und Wiederholungen mit einem Tippen protokollieren kannst.
+
+Dein Fortschritt:
+Verlieren nie deine Ziele aus den Augen, tracke dein Gewicht und behalte deine Statistiken.
+
+Deine Daten:
+wger ist dein persönliches Fitness-Tagebuch - aber deine Daten gehören dir. Nutze die REST-API, um darauf zuzugreifen und erstaunliche Dinge damit zu tun.
+
+Bitte beachte: Diese kostenlose Anwendung basiert nicht auf zusätzlichen Finanzierungen und wir bitten dich nicht um Geldspenden. Vielmehr handelt es sich um ein Community-Projekt, das ständig wächst. Sei also jederzeit auf neue Funktionen vorbereitet!
+
+Quelloffen – was bedeutet das?
+
+Quelloffen bedeutet, dass der gesamte Quellcode für diese Anwendung und den damit verbundenen Server, frei und für jeden verfügbar ist:
+* Willst du wger auf deinem eigenen Server für dich oder dein lokales Fitnessstudio laufen lassen? Nur zu!
+* Vermisst du ein Feature und willst es implementieren? Fang jetzt an!
+* Willst du überprüfen, dass etwas an Dritte gesendet wird? Das kannst du!
+
+Trete unserer Gemeinschaft bei und werde ein Teil von Sportbegeisterten und IT-Freaks aus aller Welt. Wir arbeiten ständig daran, die Anwendung an unsere Bedürfnisse anzupassen und zu optimieren. Wir freuen uns über deinen Input, du kannst jederzeit einsteigen und deine Wünsche und Ideen einbringen!
+
+-> finde den Quellcode auf https://github.com/wger-project
+-> stelle deine Fragen oder sag einfach Hallo auf unserem Discord-Server https://discord.gg/rPWFv6W
diff --git a/ios/fastlane/metadata/de-DE/keywords.txt b/ios/fastlane/metadata/de-DE/keywords.txt
new file mode 100644
index 00000000..bd88e814
--- /dev/null
+++ b/ios/fastlane/metadata/de-DE/keywords.txt
@@ -0,0 +1 @@
+wger Workout Ernährung Fitness
diff --git a/ios/fastlane/metadata/de-DE/marketing_url.txt b/ios/fastlane/metadata/de-DE/marketing_url.txt
new file mode 100644
index 00000000..697495c2
--- /dev/null
+++ b/ios/fastlane/metadata/de-DE/marketing_url.txt
@@ -0,0 +1 @@
+https://wger.de/de/software/features
diff --git a/ios/fastlane/metadata/de-DE/name.txt b/ios/fastlane/metadata/de-DE/name.txt
new file mode 100644
index 00000000..d35e4087
--- /dev/null
+++ b/ios/fastlane/metadata/de-DE/name.txt
@@ -0,0 +1 @@
+wger Workout Manager
diff --git a/ios/fastlane/metadata/de-DE/privacy_url.txt b/ios/fastlane/metadata/de-DE/privacy_url.txt
new file mode 100644
index 00000000..fd0b0bb0
--- /dev/null
+++ b/ios/fastlane/metadata/de-DE/privacy_url.txt
@@ -0,0 +1 @@
+https://wger.de/de/software/terms-of-service
diff --git a/ios/fastlane/metadata/de-DE/promotional_text.txt b/ios/fastlane/metadata/de-DE/promotional_text.txt
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/ios/fastlane/metadata/de-DE/promotional_text.txt
@@ -0,0 +1 @@
+
diff --git a/ios/fastlane/metadata/de-DE/release_notes.txt b/ios/fastlane/metadata/de-DE/release_notes.txt
new file mode 100644
index 00000000..713d4615
--- /dev/null
+++ b/ios/fastlane/metadata/de-DE/release_notes.txt
@@ -0,0 +1 @@
+UI Verbesserungen, Übersetzungen aktualisiert, Fehlerbehebungen
diff --git a/ios/fastlane/metadata/de-DE/subtitle.txt b/ios/fastlane/metadata/de-DE/subtitle.txt
new file mode 100644
index 00000000..d5f6172e
--- /dev/null
+++ b/ios/fastlane/metadata/de-DE/subtitle.txt
@@ -0,0 +1 @@
+OpenSource Fitness-Tracker
diff --git a/ios/fastlane/metadata/de-DE/support_url.txt b/ios/fastlane/metadata/de-DE/support_url.txt
new file mode 100644
index 00000000..c7a2218b
--- /dev/null
+++ b/ios/fastlane/metadata/de-DE/support_url.txt
@@ -0,0 +1 @@
+https://wger.de/en/software/about-us
diff --git a/ios/fastlane/metadata/primary_category.txt b/ios/fastlane/metadata/primary_category.txt
new file mode 100644
index 00000000..16340f75
--- /dev/null
+++ b/ios/fastlane/metadata/primary_category.txt
@@ -0,0 +1 @@
+HEALTH_AND_FITNESS
diff --git a/ios/fastlane/metadata/primary_first_sub_category.txt b/ios/fastlane/metadata/primary_first_sub_category.txt
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/ios/fastlane/metadata/primary_first_sub_category.txt
@@ -0,0 +1 @@
+
diff --git a/ios/fastlane/metadata/primary_second_sub_category.txt b/ios/fastlane/metadata/primary_second_sub_category.txt
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/ios/fastlane/metadata/primary_second_sub_category.txt
@@ -0,0 +1 @@
+
diff --git a/ios/fastlane/metadata/review_information/demo_password.txt b/ios/fastlane/metadata/review_information/demo_password.txt
new file mode 100644
index 00000000..7e0defbb
--- /dev/null
+++ b/ios/fastlane/metadata/review_information/demo_password.txt
@@ -0,0 +1 @@
+flutteruser
diff --git a/ios/fastlane/metadata/review_information/demo_user.txt b/ios/fastlane/metadata/review_information/demo_user.txt
new file mode 100644
index 00000000..4eb8387f
--- /dev/null
+++ b/ios/fastlane/metadata/review_information/demo_user.txt
@@ -0,0 +1 @@
+user
diff --git a/ios/fastlane/metadata/review_information/email_address.txt b/ios/fastlane/metadata/review_information/email_address.txt
new file mode 100644
index 00000000..b115c6d9
--- /dev/null
+++ b/ios/fastlane/metadata/review_information/email_address.txt
@@ -0,0 +1 @@
+software@thweb.net
diff --git a/ios/fastlane/metadata/review_information/first_name.txt b/ios/fastlane/metadata/review_information/first_name.txt
new file mode 100644
index 00000000..5089231f
--- /dev/null
+++ b/ios/fastlane/metadata/review_information/first_name.txt
@@ -0,0 +1 @@
+Peter
diff --git a/ios/fastlane/metadata/review_information/last_name.txt b/ios/fastlane/metadata/review_information/last_name.txt
new file mode 100644
index 00000000..4c74f8e7
--- /dev/null
+++ b/ios/fastlane/metadata/review_information/last_name.txt
@@ -0,0 +1 @@
+Thaler
diff --git a/ios/fastlane/metadata/review_information/notes.txt b/ios/fastlane/metadata/review_information/notes.txt
new file mode 100644
index 00000000..37ceff1c
--- /dev/null
+++ b/ios/fastlane/metadata/review_information/notes.txt
@@ -0,0 +1,5 @@
+Testserver: https://wger-master.rge.uber.space
+
+ui improvements, bugfixes
+
+
diff --git a/ios/fastlane/metadata/review_information/phone_number.txt b/ios/fastlane/metadata/review_information/phone_number.txt
new file mode 100644
index 00000000..3203533e
--- /dev/null
+++ b/ios/fastlane/metadata/review_information/phone_number.txt
@@ -0,0 +1 @@
++436805529332
diff --git a/ios/fastlane/metadata/secondary_category.txt b/ios/fastlane/metadata/secondary_category.txt
new file mode 100644
index 00000000..90b0c7ba
--- /dev/null
+++ b/ios/fastlane/metadata/secondary_category.txt
@@ -0,0 +1 @@
+FOOD_AND_DRINK
diff --git a/ios/fastlane/metadata/secondary_first_sub_category.txt b/ios/fastlane/metadata/secondary_first_sub_category.txt
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/ios/fastlane/metadata/secondary_first_sub_category.txt
@@ -0,0 +1 @@
+
diff --git a/ios/fastlane/metadata/secondary_second_sub_category.txt b/ios/fastlane/metadata/secondary_second_sub_category.txt
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/ios/fastlane/metadata/secondary_second_sub_category.txt
@@ -0,0 +1 @@
+
diff --git a/ios/fastlane/screenshots/README.txt b/ios/fastlane/screenshots/README.txt
new file mode 100644
index 00000000..948c580c
--- /dev/null
+++ b/ios/fastlane/screenshots/README.txt
@@ -0,0 +1,30 @@
+## Screenshots Naming Rules
+
+Put all screenshots you want to use inside the folder of its language (e.g. `en-US`).
+The device type will automatically be recognized using the image resolution.
+
+The screenshots can be named whatever you want, but keep in mind they are sorted
+alphabetically, in a human-friendly way. See https://github.com/fastlane/fastlane/pull/18200 for more details.
+
+### Exceptions
+
+#### iPad Pro (3rd Gen) 12.9"
+
+Since iPad Pro (3rd Gen) 12.9" and iPad Pro (2nd Gen) 12.9" have the same image
+resolution, screenshots of the iPad Pro (3rd gen) 12.9" must contain either the
+string `iPad Pro (12.9-inch) (3rd generation)`, `IPAD_PRO_3GEN_129`, or `ipadPro129`
+(App Store Connect's internal naming of the display family for the 3rd generation iPad Pro)
+in its filename to be assigned the correct display family and to be uploaded to
+the correct screenshot slot in your app's metadata.
+
+### Other Platforms
+
+#### Apple TV
+
+Apple TV screenshots should be stored in a subdirectory named `appleTV` with language
+folders inside of it.
+
+#### iMessage
+
+iMessage screenshots, like the Apple TV ones, should also be stored in a subdirectory
+named `iMessage`, with language folders inside of it.
diff --git a/ios/fastlane/screenshots/de-DE/0_APP_IPHONE_55_0.png b/ios/fastlane/screenshots/de-DE/0_APP_IPHONE_55_0.png
new file mode 100644
index 00000000..0c310ad1
Binary files /dev/null and b/ios/fastlane/screenshots/de-DE/0_APP_IPHONE_55_0.png differ
diff --git a/ios/fastlane/screenshots/de-DE/0_APP_IPHONE_67_0.jpg b/ios/fastlane/screenshots/de-DE/0_APP_IPHONE_67_0.jpg
new file mode 100644
index 00000000..ce5912d2
Binary files /dev/null and b/ios/fastlane/screenshots/de-DE/0_APP_IPHONE_67_0.jpg differ
diff --git a/ios/fastlane/screenshots/de-DE/1_APP_IPHONE_55_1.png b/ios/fastlane/screenshots/de-DE/1_APP_IPHONE_55_1.png
new file mode 100644
index 00000000..f139cc10
Binary files /dev/null and b/ios/fastlane/screenshots/de-DE/1_APP_IPHONE_55_1.png differ
diff --git a/ios/fastlane/screenshots/de-DE/1_APP_IPHONE_67_1.jpg b/ios/fastlane/screenshots/de-DE/1_APP_IPHONE_67_1.jpg
new file mode 100644
index 00000000..d985ecf9
Binary files /dev/null and b/ios/fastlane/screenshots/de-DE/1_APP_IPHONE_67_1.jpg differ
diff --git a/ios/fastlane/screenshots/de-DE/2_APP_IPHONE_55_2.png b/ios/fastlane/screenshots/de-DE/2_APP_IPHONE_55_2.png
new file mode 100644
index 00000000..95efa1c7
Binary files /dev/null and b/ios/fastlane/screenshots/de-DE/2_APP_IPHONE_55_2.png differ
diff --git a/ios/fastlane/screenshots/de-DE/2_APP_IPHONE_67_2.jpg b/ios/fastlane/screenshots/de-DE/2_APP_IPHONE_67_2.jpg
new file mode 100644
index 00000000..ed795bbc
Binary files /dev/null and b/ios/fastlane/screenshots/de-DE/2_APP_IPHONE_67_2.jpg differ
diff --git a/ios/fastlane/screenshots/de-DE/3_APP_IPHONE_55_3.png b/ios/fastlane/screenshots/de-DE/3_APP_IPHONE_55_3.png
new file mode 100644
index 00000000..febc639d
Binary files /dev/null and b/ios/fastlane/screenshots/de-DE/3_APP_IPHONE_55_3.png differ
diff --git a/ios/fastlane/screenshots/de-DE/3_APP_IPHONE_67_3.jpg b/ios/fastlane/screenshots/de-DE/3_APP_IPHONE_67_3.jpg
new file mode 100644
index 00000000..78e989ec
Binary files /dev/null and b/ios/fastlane/screenshots/de-DE/3_APP_IPHONE_67_3.jpg differ
diff --git a/ios/fastlane/screenshots/de-DE/4_APP_IPHONE_55_4.png b/ios/fastlane/screenshots/de-DE/4_APP_IPHONE_55_4.png
new file mode 100644
index 00000000..5f0cb1e3
Binary files /dev/null and b/ios/fastlane/screenshots/de-DE/4_APP_IPHONE_55_4.png differ
diff --git a/ios/fastlane/screenshots/de-DE/4_APP_IPHONE_67_4.jpg b/ios/fastlane/screenshots/de-DE/4_APP_IPHONE_67_4.jpg
new file mode 100644
index 00000000..c8094da7
Binary files /dev/null and b/ios/fastlane/screenshots/de-DE/4_APP_IPHONE_67_4.jpg differ
diff --git a/l10n.yaml b/l10n.yaml
index 3c41bfca..56bfbe12 100644
--- a/l10n.yaml
+++ b/l10n.yaml
@@ -1,4 +1,5 @@
 arb-dir: lib/l10n
+output-dir: lib/l10n/generated
 template-arb-file: app_en.arb
 output-localization-file: app_localizations.dart
 nullable-getter: false
diff --git a/lib/core/validators.dart b/lib/core/validators.dart
new file mode 100644
index 00000000..c9e3e835
--- /dev/null
+++ b/lib/core/validators.dart
@@ -0,0 +1,29 @@
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+String? validateUrl(String? value, AppLocalizations i18n, {bool required = true}) {
+  // Required?
+  if (required && (value == null || value.trim().isEmpty)) {
+    return i18n.enterValue;
+  }
+
+  if (!required && (value == null || value.trim().isEmpty)) {
+    return null;
+  }
+  value = value!.trim();
+
+  if (!value.startsWith('http://') && !value.startsWith('https://')) {
+    return i18n.invalidUrl;
+  }
+
+  // Try to parse as URI
+  try {
+    final uri = Uri.parse(value);
+    if (!uri.hasScheme || !uri.hasAuthority) {
+      return i18n.invalidUrl;
+    }
+  } catch (e) {
+    return i18n.invalidUrl;
+  }
+
+  return null;
+}
diff --git a/lib/database/exercises/exercise_database.dart b/lib/database/exercises/exercise_database.dart
index 10c08ee0..e7c36a6e 100644
--- a/lib/database/exercises/exercise_database.dart
+++ b/lib/database/exercises/exercise_database.dart
@@ -2,6 +2,7 @@ import 'dart:io';
 
 import 'package:drift/drift.dart';
 import 'package:drift/native.dart';
+import 'package:logging/logging.dart';
 import 'package:path/path.dart' as p;
 import 'package:path_provider/path_provider.dart';
 import 'package:wger/database/exercises/type_converters.dart';
@@ -68,6 +69,8 @@ class Equipments extends Table {
 
 @DriftDatabase(tables: [Exercises, Muscles, Equipments, Categories, Languages])
 class ExerciseDatabase extends _$ExerciseDatabase {
+  final _logger = Logger('ExerciseDatabase');
+
   ExerciseDatabase() : super(_openConnection());
 
   // Named constructor for creating in-memory database
@@ -75,31 +78,32 @@ class ExerciseDatabase extends _$ExerciseDatabase {
 
   /// Note that this needs to be bumped if the JSON response from the server changes
   @override
-  int get schemaVersion => 1;
+  int get schemaVersion => 3;
 
   /// There is not really a migration strategy. If we bump the version
   /// number, delete everything and recreate the new tables. The provider
   /// will fetch everything as needed from the server
   @override
   MigrationStrategy get migration => MigrationStrategy(
-        onUpgrade: (m, from, to) async {
-          // no-op, but needs to be defined
-          return;
-        },
-        beforeOpen: (openingDetails) async {
-          if (openingDetails.hadUpgrade) {
-            final m = createMigrator();
-            for (final table in allTables) {
-              await m.deleteTable(table.actualTableName);
-              await m.createTable(table);
-            }
-          }
-        },
-      );
+    onUpgrade: (m, from, to) async {
+      // no-op, but needs to be defined
+      return;
+    },
+    beforeOpen: (openingDetails) async {
+      if (openingDetails.hadUpgrade) {
+        final m = createMigrator();
+        for (final table in allTables) {
+          await m.deleteTable(table.actualTableName);
+          await m.createTable(table);
+        }
+      }
+    },
+  );
 
   Future<void> deleteEverything() {
     return transaction(() async {
       for (final table in allTables) {
+        _logger.info('Deleting db cache table ${table.actualTableName}');
         await delete(table).go();
       }
     });
diff --git a/lib/database/exercises/exercise_database.g.dart b/lib/database/exercises/exercise_database.g.dart
index 86a984c8..6da378e2 100644
--- a/lib/database/exercises/exercise_database.g.dart
+++ b/lib/database/exercises/exercise_database.g.dart
@@ -3,44 +3,65 @@
 part of 'exercise_database.dart';
 
 // ignore_for_file: type=lint
-class $ExercisesTable extends Exercises
-    with TableInfo<$ExercisesTable, ExerciseTable> {
+class $ExercisesTable extends Exercises with TableInfo<$ExercisesTable, ExerciseTable> {
   @override
   final GeneratedDatabase attachedDatabase;
   final String? _alias;
+
   $ExercisesTable(this.attachedDatabase, [this._alias]);
+
   static const VerificationMeta _idMeta = const VerificationMeta('id');
   @override
   late final GeneratedColumn<int> id = GeneratedColumn<int>(
-      'id', aliasedName, false,
-      type: DriftSqlType.int, requiredDuringInsert: true);
+    'id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+  );
   static const VerificationMeta _dataMeta = const VerificationMeta('data');
   @override
   late final GeneratedColumn<String> data = GeneratedColumn<String>(
-      'data', aliasedName, false,
-      type: DriftSqlType.string, requiredDuringInsert: true);
-  static const VerificationMeta _lastUpdateMeta =
-      const VerificationMeta('lastUpdate');
+    'data',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  static const VerificationMeta _lastUpdateMeta = const VerificationMeta('lastUpdate');
   @override
   late final GeneratedColumn<DateTime> lastUpdate = GeneratedColumn<DateTime>(
-      'last_update', aliasedName, false,
-      type: DriftSqlType.dateTime, requiredDuringInsert: true);
-  static const VerificationMeta _lastFetchedMeta =
-      const VerificationMeta('lastFetched');
+    'last_update',
+    aliasedName,
+    false,
+    type: DriftSqlType.dateTime,
+    requiredDuringInsert: true,
+  );
+  static const VerificationMeta _lastFetchedMeta = const VerificationMeta('lastFetched');
   @override
   late final GeneratedColumn<DateTime> lastFetched = GeneratedColumn<DateTime>(
-      'last_fetched', aliasedName, false,
-      type: DriftSqlType.dateTime, requiredDuringInsert: true);
+    'last_fetched',
+    aliasedName,
+    false,
+    type: DriftSqlType.dateTime,
+    requiredDuringInsert: true,
+  );
+
   @override
   List<GeneratedColumn> get $columns => [id, data, lastUpdate, lastFetched];
+
   @override
   String get aliasedName => _alias ?? actualTableName;
+
   @override
   String get actualTableName => $name;
   static const String $name = 'exercises';
+
   @override
-  VerificationContext validateIntegrity(Insertable<ExerciseTable> instance,
-      {bool isInserting = false}) {
+  VerificationContext validateIntegrity(
+    Insertable<ExerciseTable> instance, {
+    bool isInserting = false,
+  }) {
     final context = VerificationContext();
     final data = instance.toColumns(true);
     if (data.containsKey('id')) {
@@ -49,24 +70,23 @@ class $ExercisesTable extends Exercises
       context.missing(_idMeta);
     }
     if (data.containsKey('data')) {
-      context.handle(
-          _dataMeta, this.data.isAcceptableOrUnknown(data['data']!, _dataMeta));
+      context.handle(_dataMeta, this.data.isAcceptableOrUnknown(data['data']!, _dataMeta));
     } else if (isInserting) {
       context.missing(_dataMeta);
     }
     if (data.containsKey('last_update')) {
       context.handle(
-          _lastUpdateMeta,
-          lastUpdate.isAcceptableOrUnknown(
-              data['last_update']!, _lastUpdateMeta));
+        _lastUpdateMeta,
+        lastUpdate.isAcceptableOrUnknown(data['last_update']!, _lastUpdateMeta),
+      );
     } else if (isInserting) {
       context.missing(_lastUpdateMeta);
     }
     if (data.containsKey('last_fetched')) {
       context.handle(
-          _lastFetchedMeta,
-          lastFetched.isAcceptableOrUnknown(
-              data['last_fetched']!, _lastFetchedMeta));
+        _lastFetchedMeta,
+        lastFetched.isAcceptableOrUnknown(data['last_fetched']!, _lastFetchedMeta),
+      );
     } else if (isInserting) {
       context.missing(_lastFetchedMeta);
     }
@@ -75,18 +95,21 @@ class $ExercisesTable extends Exercises
 
   @override
   Set<GeneratedColumn> get $primaryKey => const {};
+
   @override
   ExerciseTable map(Map<String, dynamic> data, {String? tablePrefix}) {
     final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
     return ExerciseTable(
-      id: attachedDatabase.typeMapping
-          .read(DriftSqlType.int, data['${effectivePrefix}id'])!,
-      data: attachedDatabase.typeMapping
-          .read(DriftSqlType.string, data['${effectivePrefix}data'])!,
-      lastUpdate: attachedDatabase.typeMapping
-          .read(DriftSqlType.dateTime, data['${effectivePrefix}last_update'])!,
-      lastFetched: attachedDatabase.typeMapping
-          .read(DriftSqlType.dateTime, data['${effectivePrefix}last_fetched'])!,
+      id: attachedDatabase.typeMapping.read(DriftSqlType.int, data['${effectivePrefix}id'])!,
+      data: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}data'])!,
+      lastUpdate: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}last_update'],
+      )!,
+      lastFetched: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}last_fetched'],
+      )!,
     );
   }
 
@@ -105,11 +128,14 @@ class ExerciseTable extends DataClass implements Insertable<ExerciseTable> {
   /// when the exercise itself was last updated in `lastUpdate`, we can save
   /// ourselves a lot of requests if we don't check too often
   final DateTime lastFetched;
-  const ExerciseTable(
-      {required this.id,
-      required this.data,
-      required this.lastUpdate,
-      required this.lastFetched});
+
+  const ExerciseTable({
+    required this.id,
+    required this.data,
+    required this.lastUpdate,
+    required this.lastFetched,
+  });
+
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
@@ -129,8 +155,7 @@ class ExerciseTable extends DataClass implements Insertable<ExerciseTable> {
     );
   }
 
-  factory ExerciseTable.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory ExerciseTable.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return ExerciseTable(
       id: serializer.fromJson<int>(json['id']),
@@ -139,6 +164,7 @@ class ExerciseTable extends DataClass implements Insertable<ExerciseTable> {
       lastFetched: serializer.fromJson<DateTime>(json['lastFetched']),
     );
   }
+
   @override
   Map<String, dynamic> toJson({ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
@@ -150,25 +176,20 @@ class ExerciseTable extends DataClass implements Insertable<ExerciseTable> {
     };
   }
 
-  ExerciseTable copyWith(
-          {int? id,
-          String? data,
-          DateTime? lastUpdate,
-          DateTime? lastFetched}) =>
+  ExerciseTable copyWith({int? id, String? data, DateTime? lastUpdate, DateTime? lastFetched}) =>
       ExerciseTable(
         id: id ?? this.id,
         data: data ?? this.data,
         lastUpdate: lastUpdate ?? this.lastUpdate,
         lastFetched: lastFetched ?? this.lastFetched,
       );
+
   ExerciseTable copyWithCompanion(ExercisesCompanion data) {
     return ExerciseTable(
       id: data.id.present ? data.id.value : this.id,
       data: data.data.present ? data.data.value : this.data,
-      lastUpdate:
-          data.lastUpdate.present ? data.lastUpdate.value : this.lastUpdate,
-      lastFetched:
-          data.lastFetched.present ? data.lastFetched.value : this.lastFetched,
+      lastUpdate: data.lastUpdate.present ? data.lastUpdate.value : this.lastUpdate,
+      lastFetched: data.lastFetched.present ? data.lastFetched.value : this.lastFetched,
     );
   }
 
@@ -185,6 +206,7 @@ class ExerciseTable extends DataClass implements Insertable<ExerciseTable> {
 
   @override
   int get hashCode => Object.hash(id, data, lastUpdate, lastFetched);
+
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -201,6 +223,7 @@ class ExercisesCompanion extends UpdateCompanion<ExerciseTable> {
   final Value<DateTime> lastUpdate;
   final Value<DateTime> lastFetched;
   final Value<int> rowid;
+
   const ExercisesCompanion({
     this.id = const Value.absent(),
     this.data = const Value.absent(),
@@ -208,16 +231,18 @@ class ExercisesCompanion extends UpdateCompanion<ExerciseTable> {
     this.lastFetched = const Value.absent(),
     this.rowid = const Value.absent(),
   });
+
   ExercisesCompanion.insert({
     required int id,
     required String data,
     required DateTime lastUpdate,
     required DateTime lastFetched,
     this.rowid = const Value.absent(),
-  })  : id = Value(id),
-        data = Value(data),
-        lastUpdate = Value(lastUpdate),
-        lastFetched = Value(lastFetched);
+  }) : id = Value(id),
+       data = Value(data),
+       lastUpdate = Value(lastUpdate),
+       lastFetched = Value(lastFetched);
+
   static Insertable<ExerciseTable> custom({
     Expression<int>? id,
     Expression<String>? data,
@@ -234,12 +259,13 @@ class ExercisesCompanion extends UpdateCompanion<ExerciseTable> {
     });
   }
 
-  ExercisesCompanion copyWith(
-      {Value<int>? id,
-      Value<String>? data,
-      Value<DateTime>? lastUpdate,
-      Value<DateTime>? lastFetched,
-      Value<int>? rowid}) {
+  ExercisesCompanion copyWith({
+    Value<int>? id,
+    Value<String>? data,
+    Value<DateTime>? lastUpdate,
+    Value<DateTime>? lastFetched,
+    Value<int>? rowid,
+  }) {
     return ExercisesCompanion(
       id: id ?? this.id,
       data: data ?? this.data,
@@ -287,28 +313,42 @@ class $MusclesTable extends Muscles with TableInfo<$MusclesTable, MuscleTable> {
   @override
   final GeneratedDatabase attachedDatabase;
   final String? _alias;
+
   $MusclesTable(this.attachedDatabase, [this._alias]);
+
   static const VerificationMeta _idMeta = const VerificationMeta('id');
   @override
   late final GeneratedColumn<int> id = GeneratedColumn<int>(
-      'id', aliasedName, false,
-      type: DriftSqlType.int, requiredDuringInsert: true);
-  static const VerificationMeta _dataMeta = const VerificationMeta('data');
+    'id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+  );
   @override
-  late final GeneratedColumnWithTypeConverter<Muscle, String> data =
-      GeneratedColumn<String>('data', aliasedName, false,
-              type: DriftSqlType.string, requiredDuringInsert: true)
-          .withConverter<Muscle>($MusclesTable.$converterdata);
+  late final GeneratedColumnWithTypeConverter<Muscle, String> data = GeneratedColumn<String>(
+    'data',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  ).withConverter<Muscle>($MusclesTable.$converterdata);
+
   @override
   List<GeneratedColumn> get $columns => [id, data];
+
   @override
   String get aliasedName => _alias ?? actualTableName;
+
   @override
   String get actualTableName => $name;
   static const String $name = 'muscles';
+
   @override
-  VerificationContext validateIntegrity(Insertable<MuscleTable> instance,
-      {bool isInserting = false}) {
+  VerificationContext validateIntegrity(
+    Insertable<MuscleTable> instance, {
+    bool isInserting = false,
+  }) {
     final context = VerificationContext();
     final data = instance.toColumns(true);
     if (data.containsKey('id')) {
@@ -316,20 +356,20 @@ class $MusclesTable extends Muscles with TableInfo<$MusclesTable, MuscleTable> {
     } else if (isInserting) {
       context.missing(_idMeta);
     }
-    context.handle(_dataMeta, const VerificationResult.success());
     return context;
   }
 
   @override
   Set<GeneratedColumn> get $primaryKey => const {};
+
   @override
   MuscleTable map(Map<String, dynamic> data, {String? tablePrefix}) {
     final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
     return MuscleTable(
-      id: attachedDatabase.typeMapping
-          .read(DriftSqlType.int, data['${effectivePrefix}id'])!,
-      data: $MusclesTable.$converterdata.fromSql(attachedDatabase.typeMapping
-          .read(DriftSqlType.string, data['${effectivePrefix}data'])!),
+      id: attachedDatabase.typeMapping.read(DriftSqlType.int, data['${effectivePrefix}id'])!,
+      data: $MusclesTable.$converterdata.fromSql(
+        attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}data'])!,
+      ),
     );
   }
 
@@ -344,7 +384,9 @@ class $MusclesTable extends Muscles with TableInfo<$MusclesTable, MuscleTable> {
 class MuscleTable extends DataClass implements Insertable<MuscleTable> {
   final int id;
   final Muscle data;
+
   const MuscleTable({required this.id, required this.data});
+
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
@@ -356,20 +398,17 @@ class MuscleTable extends DataClass implements Insertable<MuscleTable> {
   }
 
   MusclesCompanion toCompanion(bool nullToAbsent) {
-    return MusclesCompanion(
-      id: Value(id),
-      data: Value(data),
-    );
+    return MusclesCompanion(id: Value(id), data: Value(data));
   }
 
-  factory MuscleTable.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory MuscleTable.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return MuscleTable(
       id: serializer.fromJson<int>(json['id']),
       data: serializer.fromJson<Muscle>(json['data']),
     );
   }
+
   @override
   Map<String, dynamic> toJson({ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
@@ -379,10 +418,9 @@ class MuscleTable extends DataClass implements Insertable<MuscleTable> {
     };
   }
 
-  MuscleTable copyWith({int? id, Muscle? data}) => MuscleTable(
-        id: id ?? this.id,
-        data: data ?? this.data,
-      );
+  MuscleTable copyWith({int? id, Muscle? data}) =>
+      MuscleTable(id: id ?? this.id, data: data ?? this.data);
+
   MuscleTable copyWithCompanion(MusclesCompanion data) {
     return MuscleTable(
       id: data.id.present ? data.id.value : this.id,
@@ -401,6 +439,7 @@ class MuscleTable extends DataClass implements Insertable<MuscleTable> {
 
   @override
   int get hashCode => Object.hash(id, data);
+
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -411,17 +450,20 @@ class MusclesCompanion extends UpdateCompanion<MuscleTable> {
   final Value<int> id;
   final Value<Muscle> data;
   final Value<int> rowid;
+
   const MusclesCompanion({
     this.id = const Value.absent(),
     this.data = const Value.absent(),
     this.rowid = const Value.absent(),
   });
+
   MusclesCompanion.insert({
     required int id,
     required Muscle data,
     this.rowid = const Value.absent(),
-  })  : id = Value(id),
-        data = Value(data);
+  }) : id = Value(id),
+       data = Value(data);
+
   static Insertable<MuscleTable> custom({
     Expression<int>? id,
     Expression<String>? data,
@@ -434,13 +476,8 @@ class MusclesCompanion extends UpdateCompanion<MuscleTable> {
     });
   }
 
-  MusclesCompanion copyWith(
-      {Value<int>? id, Value<Muscle>? data, Value<int>? rowid}) {
-    return MusclesCompanion(
-      id: id ?? this.id,
-      data: data ?? this.data,
-      rowid: rowid ?? this.rowid,
-    );
+  MusclesCompanion copyWith({Value<int>? id, Value<Muscle>? data, Value<int>? rowid}) {
+    return MusclesCompanion(id: id ?? this.id, data: data ?? this.data, rowid: rowid ?? this.rowid);
   }
 
   @override
@@ -450,8 +487,7 @@ class MusclesCompanion extends UpdateCompanion<MuscleTable> {
       map['id'] = Variable<int>(id.value);
     }
     if (data.present) {
-      map['data'] =
-          Variable<String>($MusclesTable.$converterdata.toSql(data.value));
+      map['data'] = Variable<String>($MusclesTable.$converterdata.toSql(data.value));
     }
     if (rowid.present) {
       map['rowid'] = Variable<int>(rowid.value);
@@ -470,33 +506,46 @@ class MusclesCompanion extends UpdateCompanion<MuscleTable> {
   }
 }
 
-class $EquipmentsTable extends Equipments
-    with TableInfo<$EquipmentsTable, EquipmentTable> {
+class $EquipmentsTable extends Equipments with TableInfo<$EquipmentsTable, EquipmentTable> {
   @override
   final GeneratedDatabase attachedDatabase;
   final String? _alias;
+
   $EquipmentsTable(this.attachedDatabase, [this._alias]);
+
   static const VerificationMeta _idMeta = const VerificationMeta('id');
   @override
   late final GeneratedColumn<int> id = GeneratedColumn<int>(
-      'id', aliasedName, false,
-      type: DriftSqlType.int, requiredDuringInsert: true);
-  static const VerificationMeta _dataMeta = const VerificationMeta('data');
+    'id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+  );
   @override
-  late final GeneratedColumnWithTypeConverter<Equipment, String> data =
-      GeneratedColumn<String>('data', aliasedName, false,
-              type: DriftSqlType.string, requiredDuringInsert: true)
-          .withConverter<Equipment>($EquipmentsTable.$converterdata);
+  late final GeneratedColumnWithTypeConverter<Equipment, String> data = GeneratedColumn<String>(
+    'data',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  ).withConverter<Equipment>($EquipmentsTable.$converterdata);
+
   @override
   List<GeneratedColumn> get $columns => [id, data];
+
   @override
   String get aliasedName => _alias ?? actualTableName;
+
   @override
   String get actualTableName => $name;
   static const String $name = 'equipments';
+
   @override
-  VerificationContext validateIntegrity(Insertable<EquipmentTable> instance,
-      {bool isInserting = false}) {
+  VerificationContext validateIntegrity(
+    Insertable<EquipmentTable> instance, {
+    bool isInserting = false,
+  }) {
     final context = VerificationContext();
     final data = instance.toColumns(true);
     if (data.containsKey('id')) {
@@ -504,20 +553,20 @@ class $EquipmentsTable extends Equipments
     } else if (isInserting) {
       context.missing(_idMeta);
     }
-    context.handle(_dataMeta, const VerificationResult.success());
     return context;
   }
 
   @override
   Set<GeneratedColumn> get $primaryKey => const {};
+
   @override
   EquipmentTable map(Map<String, dynamic> data, {String? tablePrefix}) {
     final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
     return EquipmentTable(
-      id: attachedDatabase.typeMapping
-          .read(DriftSqlType.int, data['${effectivePrefix}id'])!,
-      data: $EquipmentsTable.$converterdata.fromSql(attachedDatabase.typeMapping
-          .read(DriftSqlType.string, data['${effectivePrefix}data'])!),
+      id: attachedDatabase.typeMapping.read(DriftSqlType.int, data['${effectivePrefix}id'])!,
+      data: $EquipmentsTable.$converterdata.fromSql(
+        attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}data'])!,
+      ),
     );
   }
 
@@ -526,40 +575,37 @@ class $EquipmentsTable extends Equipments
     return $EquipmentsTable(attachedDatabase, alias);
   }
 
-  static TypeConverter<Equipment, String> $converterdata =
-      const EquipmentConverter();
+  static TypeConverter<Equipment, String> $converterdata = const EquipmentConverter();
 }
 
 class EquipmentTable extends DataClass implements Insertable<EquipmentTable> {
   final int id;
   final Equipment data;
+
   const EquipmentTable({required this.id, required this.data});
+
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
     map['id'] = Variable<int>(id);
     {
-      map['data'] =
-          Variable<String>($EquipmentsTable.$converterdata.toSql(data));
+      map['data'] = Variable<String>($EquipmentsTable.$converterdata.toSql(data));
     }
     return map;
   }
 
   EquipmentsCompanion toCompanion(bool nullToAbsent) {
-    return EquipmentsCompanion(
-      id: Value(id),
-      data: Value(data),
-    );
+    return EquipmentsCompanion(id: Value(id), data: Value(data));
   }
 
-  factory EquipmentTable.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory EquipmentTable.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return EquipmentTable(
       id: serializer.fromJson<int>(json['id']),
       data: serializer.fromJson<Equipment>(json['data']),
     );
   }
+
   @override
   Map<String, dynamic> toJson({ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
@@ -569,10 +615,9 @@ class EquipmentTable extends DataClass implements Insertable<EquipmentTable> {
     };
   }
 
-  EquipmentTable copyWith({int? id, Equipment? data}) => EquipmentTable(
-        id: id ?? this.id,
-        data: data ?? this.data,
-      );
+  EquipmentTable copyWith({int? id, Equipment? data}) =>
+      EquipmentTable(id: id ?? this.id, data: data ?? this.data);
+
   EquipmentTable copyWithCompanion(EquipmentsCompanion data) {
     return EquipmentTable(
       id: data.id.present ? data.id.value : this.id,
@@ -591,29 +636,31 @@ class EquipmentTable extends DataClass implements Insertable<EquipmentTable> {
 
   @override
   int get hashCode => Object.hash(id, data);
+
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
-      (other is EquipmentTable &&
-          other.id == this.id &&
-          other.data == this.data);
+      (other is EquipmentTable && other.id == this.id && other.data == this.data);
 }
 
 class EquipmentsCompanion extends UpdateCompanion<EquipmentTable> {
   final Value<int> id;
   final Value<Equipment> data;
   final Value<int> rowid;
+
   const EquipmentsCompanion({
     this.id = const Value.absent(),
     this.data = const Value.absent(),
     this.rowid = const Value.absent(),
   });
+
   EquipmentsCompanion.insert({
     required int id,
     required Equipment data,
     this.rowid = const Value.absent(),
-  })  : id = Value(id),
-        data = Value(data);
+  }) : id = Value(id),
+       data = Value(data);
+
   static Insertable<EquipmentTable> custom({
     Expression<int>? id,
     Expression<String>? data,
@@ -626,8 +673,7 @@ class EquipmentsCompanion extends UpdateCompanion<EquipmentTable> {
     });
   }
 
-  EquipmentsCompanion copyWith(
-      {Value<int>? id, Value<Equipment>? data, Value<int>? rowid}) {
+  EquipmentsCompanion copyWith({Value<int>? id, Value<Equipment>? data, Value<int>? rowid}) {
     return EquipmentsCompanion(
       id: id ?? this.id,
       data: data ?? this.data,
@@ -642,8 +688,7 @@ class EquipmentsCompanion extends UpdateCompanion<EquipmentTable> {
       map['id'] = Variable<int>(id.value);
     }
     if (data.present) {
-      map['data'] =
-          Variable<String>($EquipmentsTable.$converterdata.toSql(data.value));
+      map['data'] = Variable<String>($EquipmentsTable.$converterdata.toSql(data.value));
     }
     if (rowid.present) {
       map['rowid'] = Variable<int>(rowid.value);
@@ -662,33 +707,47 @@ class EquipmentsCompanion extends UpdateCompanion<EquipmentTable> {
   }
 }
 
-class $CategoriesTable extends Categories
-    with TableInfo<$CategoriesTable, CategoryTable> {
+class $CategoriesTable extends Categories with TableInfo<$CategoriesTable, CategoryTable> {
   @override
   final GeneratedDatabase attachedDatabase;
   final String? _alias;
+
   $CategoriesTable(this.attachedDatabase, [this._alias]);
+
   static const VerificationMeta _idMeta = const VerificationMeta('id');
   @override
   late final GeneratedColumn<int> id = GeneratedColumn<int>(
-      'id', aliasedName, false,
-      type: DriftSqlType.int, requiredDuringInsert: true);
-  static const VerificationMeta _dataMeta = const VerificationMeta('data');
+    'id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+  );
   @override
   late final GeneratedColumnWithTypeConverter<ExerciseCategory, String> data =
-      GeneratedColumn<String>('data', aliasedName, false,
-              type: DriftSqlType.string, requiredDuringInsert: true)
-          .withConverter<ExerciseCategory>($CategoriesTable.$converterdata);
+      GeneratedColumn<String>(
+        'data',
+        aliasedName,
+        false,
+        type: DriftSqlType.string,
+        requiredDuringInsert: true,
+      ).withConverter<ExerciseCategory>($CategoriesTable.$converterdata);
+
   @override
   List<GeneratedColumn> get $columns => [id, data];
+
   @override
   String get aliasedName => _alias ?? actualTableName;
+
   @override
   String get actualTableName => $name;
   static const String $name = 'categories';
+
   @override
-  VerificationContext validateIntegrity(Insertable<CategoryTable> instance,
-      {bool isInserting = false}) {
+  VerificationContext validateIntegrity(
+    Insertable<CategoryTable> instance, {
+    bool isInserting = false,
+  }) {
     final context = VerificationContext();
     final data = instance.toColumns(true);
     if (data.containsKey('id')) {
@@ -696,20 +755,20 @@ class $CategoriesTable extends Categories
     } else if (isInserting) {
       context.missing(_idMeta);
     }
-    context.handle(_dataMeta, const VerificationResult.success());
     return context;
   }
 
   @override
   Set<GeneratedColumn> get $primaryKey => const {};
+
   @override
   CategoryTable map(Map<String, dynamic> data, {String? tablePrefix}) {
     final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
     return CategoryTable(
-      id: attachedDatabase.typeMapping
-          .read(DriftSqlType.int, data['${effectivePrefix}id'])!,
-      data: $CategoriesTable.$converterdata.fromSql(attachedDatabase.typeMapping
-          .read(DriftSqlType.string, data['${effectivePrefix}data'])!),
+      id: attachedDatabase.typeMapping.read(DriftSqlType.int, data['${effectivePrefix}id'])!,
+      data: $CategoriesTable.$converterdata.fromSql(
+        attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}data'])!,
+      ),
     );
   }
 
@@ -718,40 +777,37 @@ class $CategoriesTable extends Categories
     return $CategoriesTable(attachedDatabase, alias);
   }
 
-  static TypeConverter<ExerciseCategory, String> $converterdata =
-      const ExerciseCategoryConverter();
+  static TypeConverter<ExerciseCategory, String> $converterdata = const ExerciseCategoryConverter();
 }
 
 class CategoryTable extends DataClass implements Insertable<CategoryTable> {
   final int id;
   final ExerciseCategory data;
+
   const CategoryTable({required this.id, required this.data});
+
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
     map['id'] = Variable<int>(id);
     {
-      map['data'] =
-          Variable<String>($CategoriesTable.$converterdata.toSql(data));
+      map['data'] = Variable<String>($CategoriesTable.$converterdata.toSql(data));
     }
     return map;
   }
 
   CategoriesCompanion toCompanion(bool nullToAbsent) {
-    return CategoriesCompanion(
-      id: Value(id),
-      data: Value(data),
-    );
+    return CategoriesCompanion(id: Value(id), data: Value(data));
   }
 
-  factory CategoryTable.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory CategoryTable.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return CategoryTable(
       id: serializer.fromJson<int>(json['id']),
       data: serializer.fromJson<ExerciseCategory>(json['data']),
     );
   }
+
   @override
   Map<String, dynamic> toJson({ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
@@ -761,10 +817,9 @@ class CategoryTable extends DataClass implements Insertable<CategoryTable> {
     };
   }
 
-  CategoryTable copyWith({int? id, ExerciseCategory? data}) => CategoryTable(
-        id: id ?? this.id,
-        data: data ?? this.data,
-      );
+  CategoryTable copyWith({int? id, ExerciseCategory? data}) =>
+      CategoryTable(id: id ?? this.id, data: data ?? this.data);
+
   CategoryTable copyWithCompanion(CategoriesCompanion data) {
     return CategoryTable(
       id: data.id.present ? data.id.value : this.id,
@@ -783,29 +838,31 @@ class CategoryTable extends DataClass implements Insertable<CategoryTable> {
 
   @override
   int get hashCode => Object.hash(id, data);
+
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
-      (other is CategoryTable &&
-          other.id == this.id &&
-          other.data == this.data);
+      (other is CategoryTable && other.id == this.id && other.data == this.data);
 }
 
 class CategoriesCompanion extends UpdateCompanion<CategoryTable> {
   final Value<int> id;
   final Value<ExerciseCategory> data;
   final Value<int> rowid;
+
   const CategoriesCompanion({
     this.id = const Value.absent(),
     this.data = const Value.absent(),
     this.rowid = const Value.absent(),
   });
+
   CategoriesCompanion.insert({
     required int id,
     required ExerciseCategory data,
     this.rowid = const Value.absent(),
-  })  : id = Value(id),
-        data = Value(data);
+  }) : id = Value(id),
+       data = Value(data);
+
   static Insertable<CategoryTable> custom({
     Expression<int>? id,
     Expression<String>? data,
@@ -818,8 +875,7 @@ class CategoriesCompanion extends UpdateCompanion<CategoryTable> {
     });
   }
 
-  CategoriesCompanion copyWith(
-      {Value<int>? id, Value<ExerciseCategory>? data, Value<int>? rowid}) {
+  CategoriesCompanion copyWith({Value<int>? id, Value<ExerciseCategory>? data, Value<int>? rowid}) {
     return CategoriesCompanion(
       id: id ?? this.id,
       data: data ?? this.data,
@@ -834,8 +890,7 @@ class CategoriesCompanion extends UpdateCompanion<CategoryTable> {
       map['id'] = Variable<int>(id.value);
     }
     if (data.present) {
-      map['data'] =
-          Variable<String>($CategoriesTable.$converterdata.toSql(data.value));
+      map['data'] = Variable<String>($CategoriesTable.$converterdata.toSql(data.value));
     }
     if (rowid.present) {
       map['rowid'] = Variable<int>(rowid.value);
@@ -854,33 +909,46 @@ class CategoriesCompanion extends UpdateCompanion<CategoryTable> {
   }
 }
 
-class $LanguagesTable extends Languages
-    with TableInfo<$LanguagesTable, LanguagesTable> {
+class $LanguagesTable extends Languages with TableInfo<$LanguagesTable, LanguagesTable> {
   @override
   final GeneratedDatabase attachedDatabase;
   final String? _alias;
+
   $LanguagesTable(this.attachedDatabase, [this._alias]);
+
   static const VerificationMeta _idMeta = const VerificationMeta('id');
   @override
   late final GeneratedColumn<int> id = GeneratedColumn<int>(
-      'id', aliasedName, false,
-      type: DriftSqlType.int, requiredDuringInsert: true);
-  static const VerificationMeta _dataMeta = const VerificationMeta('data');
+    'id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+  );
   @override
-  late final GeneratedColumnWithTypeConverter<Language, String> data =
-      GeneratedColumn<String>('data', aliasedName, false,
-              type: DriftSqlType.string, requiredDuringInsert: true)
-          .withConverter<Language>($LanguagesTable.$converterdata);
+  late final GeneratedColumnWithTypeConverter<Language, String> data = GeneratedColumn<String>(
+    'data',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  ).withConverter<Language>($LanguagesTable.$converterdata);
+
   @override
   List<GeneratedColumn> get $columns => [id, data];
+
   @override
   String get aliasedName => _alias ?? actualTableName;
+
   @override
   String get actualTableName => $name;
   static const String $name = 'languages';
+
   @override
-  VerificationContext validateIntegrity(Insertable<LanguagesTable> instance,
-      {bool isInserting = false}) {
+  VerificationContext validateIntegrity(
+    Insertable<LanguagesTable> instance, {
+    bool isInserting = false,
+  }) {
     final context = VerificationContext();
     final data = instance.toColumns(true);
     if (data.containsKey('id')) {
@@ -888,20 +956,20 @@ class $LanguagesTable extends Languages
     } else if (isInserting) {
       context.missing(_idMeta);
     }
-    context.handle(_dataMeta, const VerificationResult.success());
     return context;
   }
 
   @override
   Set<GeneratedColumn> get $primaryKey => const {};
+
   @override
   LanguagesTable map(Map<String, dynamic> data, {String? tablePrefix}) {
     final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
     return LanguagesTable(
-      id: attachedDatabase.typeMapping
-          .read(DriftSqlType.int, data['${effectivePrefix}id'])!,
-      data: $LanguagesTable.$converterdata.fromSql(attachedDatabase.typeMapping
-          .read(DriftSqlType.string, data['${effectivePrefix}data'])!),
+      id: attachedDatabase.typeMapping.read(DriftSqlType.int, data['${effectivePrefix}id'])!,
+      data: $LanguagesTable.$converterdata.fromSql(
+        attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}data'])!,
+      ),
     );
   }
 
@@ -910,40 +978,37 @@ class $LanguagesTable extends Languages
     return $LanguagesTable(attachedDatabase, alias);
   }
 
-  static TypeConverter<Language, String> $converterdata =
-      const LanguageConverter();
+  static TypeConverter<Language, String> $converterdata = const LanguageConverter();
 }
 
 class LanguagesTable extends DataClass implements Insertable<LanguagesTable> {
   final int id;
   final Language data;
+
   const LanguagesTable({required this.id, required this.data});
+
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
     map['id'] = Variable<int>(id);
     {
-      map['data'] =
-          Variable<String>($LanguagesTable.$converterdata.toSql(data));
+      map['data'] = Variable<String>($LanguagesTable.$converterdata.toSql(data));
     }
     return map;
   }
 
   LanguagesCompanion toCompanion(bool nullToAbsent) {
-    return LanguagesCompanion(
-      id: Value(id),
-      data: Value(data),
-    );
+    return LanguagesCompanion(id: Value(id), data: Value(data));
   }
 
-  factory LanguagesTable.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory LanguagesTable.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return LanguagesTable(
       id: serializer.fromJson<int>(json['id']),
       data: serializer.fromJson<Language>(json['data']),
     );
   }
+
   @override
   Map<String, dynamic> toJson({ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
@@ -953,10 +1018,9 @@ class LanguagesTable extends DataClass implements Insertable<LanguagesTable> {
     };
   }
 
-  LanguagesTable copyWith({int? id, Language? data}) => LanguagesTable(
-        id: id ?? this.id,
-        data: data ?? this.data,
-      );
+  LanguagesTable copyWith({int? id, Language? data}) =>
+      LanguagesTable(id: id ?? this.id, data: data ?? this.data);
+
   LanguagesTable copyWithCompanion(LanguagesCompanion data) {
     return LanguagesTable(
       id: data.id.present ? data.id.value : this.id,
@@ -975,29 +1039,31 @@ class LanguagesTable extends DataClass implements Insertable<LanguagesTable> {
 
   @override
   int get hashCode => Object.hash(id, data);
+
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
-      (other is LanguagesTable &&
-          other.id == this.id &&
-          other.data == this.data);
+      (other is LanguagesTable && other.id == this.id && other.data == this.data);
 }
 
 class LanguagesCompanion extends UpdateCompanion<LanguagesTable> {
   final Value<int> id;
   final Value<Language> data;
   final Value<int> rowid;
+
   const LanguagesCompanion({
     this.id = const Value.absent(),
     this.data = const Value.absent(),
     this.rowid = const Value.absent(),
   });
+
   LanguagesCompanion.insert({
     required int id,
     required Language data,
     this.rowid = const Value.absent(),
-  })  : id = Value(id),
-        data = Value(data);
+  }) : id = Value(id),
+       data = Value(data);
+
   static Insertable<LanguagesTable> custom({
     Expression<int>? id,
     Expression<String>? data,
@@ -1010,8 +1076,7 @@ class LanguagesCompanion extends UpdateCompanion<LanguagesTable> {
     });
   }
 
-  LanguagesCompanion copyWith(
-      {Value<int>? id, Value<Language>? data, Value<int>? rowid}) {
+  LanguagesCompanion copyWith({Value<int>? id, Value<Language>? data, Value<int>? rowid}) {
     return LanguagesCompanion(
       id: id ?? this.id,
       data: data ?? this.data,
@@ -1026,8 +1091,7 @@ class LanguagesCompanion extends UpdateCompanion<LanguagesTable> {
       map['id'] = Variable<int>(id.value);
     }
     if (data.present) {
-      map['data'] =
-          Variable<String>($LanguagesTable.$converterdata.toSql(data.value));
+      map['data'] = Variable<String>($LanguagesTable.$converterdata.toSql(data.value));
     }
     if (rowid.present) {
       map['rowid'] = Variable<int>(rowid.value);
@@ -1048,582 +1112,644 @@ class LanguagesCompanion extends UpdateCompanion<LanguagesTable> {
 
 abstract class _$ExerciseDatabase extends GeneratedDatabase {
   _$ExerciseDatabase(QueryExecutor e) : super(e);
+
   $ExerciseDatabaseManager get managers => $ExerciseDatabaseManager(this);
   late final $ExercisesTable exercises = $ExercisesTable(this);
   late final $MusclesTable muscles = $MusclesTable(this);
   late final $EquipmentsTable equipments = $EquipmentsTable(this);
   late final $CategoriesTable categories = $CategoriesTable(this);
   late final $LanguagesTable languages = $LanguagesTable(this);
+
   @override
   Iterable<TableInfo<Table, Object?>> get allTables =>
       allSchemaEntities.whereType<TableInfo<Table, Object?>>();
+
   @override
-  List<DatabaseSchemaEntity> get allSchemaEntities =>
-      [exercises, muscles, equipments, categories, languages];
+  List<DatabaseSchemaEntity> get allSchemaEntities => [
+    exercises,
+    muscles,
+    equipments,
+    categories,
+    languages,
+  ];
 }
 
-typedef $$ExercisesTableCreateCompanionBuilder = ExercisesCompanion Function({
-  required int id,
-  required String data,
-  required DateTime lastUpdate,
-  required DateTime lastFetched,
-  Value<int> rowid,
-});
-typedef $$ExercisesTableUpdateCompanionBuilder = ExercisesCompanion Function({
-  Value<int> id,
-  Value<String> data,
-  Value<DateTime> lastUpdate,
-  Value<DateTime> lastFetched,
-  Value<int> rowid,
-});
+typedef $$ExercisesTableCreateCompanionBuilder =
+    ExercisesCompanion Function({
+      required int id,
+      required String data,
+      required DateTime lastUpdate,
+      required DateTime lastFetched,
+      Value<int> rowid,
+    });
+typedef $$ExercisesTableUpdateCompanionBuilder =
+    ExercisesCompanion Function({
+      Value<int> id,
+      Value<String> data,
+      Value<DateTime> lastUpdate,
+      Value<DateTime> lastFetched,
+      Value<int> rowid,
+    });
 
-class $$ExercisesTableFilterComposer
-    extends FilterComposer<_$ExerciseDatabase, $ExercisesTable> {
-  $$ExercisesTableFilterComposer(super.$state);
-  ColumnFilters<int> get id => $state.composableBuilder(
-      column: $state.table.id,
-      builder: (column, joinBuilders) =>
-          ColumnFilters(column, joinBuilders: joinBuilders));
+class $$ExercisesTableFilterComposer extends Composer<_$ExerciseDatabase, $ExercisesTable> {
+  $$ExercisesTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
 
-  ColumnFilters<String> get data => $state.composableBuilder(
-      column: $state.table.data,
-      builder: (column, joinBuilders) =>
-          ColumnFilters(column, joinBuilders: joinBuilders));
+  ColumnFilters<int> get id =>
+      $composableBuilder(column: $table.id, builder: (column) => ColumnFilters(column));
 
-  ColumnFilters<DateTime> get lastUpdate => $state.composableBuilder(
-      column: $state.table.lastUpdate,
-      builder: (column, joinBuilders) =>
-          ColumnFilters(column, joinBuilders: joinBuilders));
+  ColumnFilters<String> get data =>
+      $composableBuilder(column: $table.data, builder: (column) => ColumnFilters(column));
 
-  ColumnFilters<DateTime> get lastFetched => $state.composableBuilder(
-      column: $state.table.lastFetched,
-      builder: (column, joinBuilders) =>
-          ColumnFilters(column, joinBuilders: joinBuilders));
+  ColumnFilters<DateTime> get lastUpdate =>
+      $composableBuilder(column: $table.lastUpdate, builder: (column) => ColumnFilters(column));
+
+  ColumnFilters<DateTime> get lastFetched =>
+      $composableBuilder(column: $table.lastFetched, builder: (column) => ColumnFilters(column));
 }
 
-class $$ExercisesTableOrderingComposer
-    extends OrderingComposer<_$ExerciseDatabase, $ExercisesTable> {
-  $$ExercisesTableOrderingComposer(super.$state);
-  ColumnOrderings<int> get id => $state.composableBuilder(
-      column: $state.table.id,
-      builder: (column, joinBuilders) =>
-          ColumnOrderings(column, joinBuilders: joinBuilders));
+class $$ExercisesTableOrderingComposer extends Composer<_$ExerciseDatabase, $ExercisesTable> {
+  $$ExercisesTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
 
-  ColumnOrderings<String> get data => $state.composableBuilder(
-      column: $state.table.data,
-      builder: (column, joinBuilders) =>
-          ColumnOrderings(column, joinBuilders: joinBuilders));
+  ColumnOrderings<int> get id =>
+      $composableBuilder(column: $table.id, builder: (column) => ColumnOrderings(column));
 
-  ColumnOrderings<DateTime> get lastUpdate => $state.composableBuilder(
-      column: $state.table.lastUpdate,
-      builder: (column, joinBuilders) =>
-          ColumnOrderings(column, joinBuilders: joinBuilders));
+  ColumnOrderings<String> get data =>
+      $composableBuilder(column: $table.data, builder: (column) => ColumnOrderings(column));
 
-  ColumnOrderings<DateTime> get lastFetched => $state.composableBuilder(
-      column: $state.table.lastFetched,
-      builder: (column, joinBuilders) =>
-          ColumnOrderings(column, joinBuilders: joinBuilders));
+  ColumnOrderings<DateTime> get lastUpdate =>
+      $composableBuilder(column: $table.lastUpdate, builder: (column) => ColumnOrderings(column));
+
+  ColumnOrderings<DateTime> get lastFetched =>
+      $composableBuilder(column: $table.lastFetched, builder: (column) => ColumnOrderings(column));
 }
 
-class $$ExercisesTableTableManager extends RootTableManager<
-    _$ExerciseDatabase,
-    $ExercisesTable,
-    ExerciseTable,
-    $$ExercisesTableFilterComposer,
-    $$ExercisesTableOrderingComposer,
-    $$ExercisesTableCreateCompanionBuilder,
-    $$ExercisesTableUpdateCompanionBuilder,
-    (
-      ExerciseTable,
-      BaseReferences<_$ExerciseDatabase, $ExercisesTable, ExerciseTable>
-    ),
-    ExerciseTable,
-    PrefetchHooks Function()> {
+class $$ExercisesTableAnnotationComposer extends Composer<_$ExerciseDatabase, $ExercisesTable> {
+  $$ExercisesTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+
+  GeneratedColumn<int> get id => $composableBuilder(column: $table.id, builder: (column) => column);
+
+  GeneratedColumn<String> get data =>
+      $composableBuilder(column: $table.data, builder: (column) => column);
+
+  GeneratedColumn<DateTime> get lastUpdate =>
+      $composableBuilder(column: $table.lastUpdate, builder: (column) => column);
+
+  GeneratedColumn<DateTime> get lastFetched =>
+      $composableBuilder(column: $table.lastFetched, builder: (column) => column);
+}
+
+class $$ExercisesTableTableManager
+    extends
+        RootTableManager<
+          _$ExerciseDatabase,
+          $ExercisesTable,
+          ExerciseTable,
+          $$ExercisesTableFilterComposer,
+          $$ExercisesTableOrderingComposer,
+          $$ExercisesTableAnnotationComposer,
+          $$ExercisesTableCreateCompanionBuilder,
+          $$ExercisesTableUpdateCompanionBuilder,
+          (ExerciseTable, BaseReferences<_$ExerciseDatabase, $ExercisesTable, ExerciseTable>),
+          ExerciseTable,
+          PrefetchHooks Function()
+        > {
   $$ExercisesTableTableManager(_$ExerciseDatabase db, $ExercisesTable table)
-      : super(TableManagerState(
+    : super(
+        TableManagerState(
           db: db,
           table: table,
-          filteringComposer:
-              $$ExercisesTableFilterComposer(ComposerState(db, table)),
-          orderingComposer:
-              $$ExercisesTableOrderingComposer(ComposerState(db, table)),
-          updateCompanionCallback: ({
-            Value<int> id = const Value.absent(),
-            Value<String> data = const Value.absent(),
-            Value<DateTime> lastUpdate = const Value.absent(),
-            Value<DateTime> lastFetched = const Value.absent(),
-            Value<int> rowid = const Value.absent(),
-          }) =>
-              ExercisesCompanion(
-            id: id,
-            data: data,
-            lastUpdate: lastUpdate,
-            lastFetched: lastFetched,
-            rowid: rowid,
-          ),
-          createCompanionCallback: ({
-            required int id,
-            required String data,
-            required DateTime lastUpdate,
-            required DateTime lastFetched,
-            Value<int> rowid = const Value.absent(),
-          }) =>
-              ExercisesCompanion.insert(
-            id: id,
-            data: data,
-            lastUpdate: lastUpdate,
-            lastFetched: lastFetched,
-            rowid: rowid,
-          ),
-          withReferenceMapper: (p0) => p0
-              .map((e) => (e.readTable(table), BaseReferences(db, table, e)))
-              .toList(),
+          createFilteringComposer: () => $$ExercisesTableFilterComposer($db: db, $table: table),
+          createOrderingComposer: () => $$ExercisesTableOrderingComposer($db: db, $table: table),
+          createComputedFieldComposer: () =>
+              $$ExercisesTableAnnotationComposer($db: db, $table: table),
+          updateCompanionCallback:
+              ({
+                Value<int> id = const Value.absent(),
+                Value<String> data = const Value.absent(),
+                Value<DateTime> lastUpdate = const Value.absent(),
+                Value<DateTime> lastFetched = const Value.absent(),
+                Value<int> rowid = const Value.absent(),
+              }) => ExercisesCompanion(
+                id: id,
+                data: data,
+                lastUpdate: lastUpdate,
+                lastFetched: lastFetched,
+                rowid: rowid,
+              ),
+          createCompanionCallback:
+              ({
+                required int id,
+                required String data,
+                required DateTime lastUpdate,
+                required DateTime lastFetched,
+                Value<int> rowid = const Value.absent(),
+              }) => ExercisesCompanion.insert(
+                id: id,
+                data: data,
+                lastUpdate: lastUpdate,
+                lastFetched: lastFetched,
+                rowid: rowid,
+              ),
+          withReferenceMapper: (p0) =>
+              p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(),
           prefetchHooksCallback: null,
-        ));
+        ),
+      );
 }
 
-typedef $$ExercisesTableProcessedTableManager = ProcessedTableManager<
-    _$ExerciseDatabase,
-    $ExercisesTable,
-    ExerciseTable,
-    $$ExercisesTableFilterComposer,
-    $$ExercisesTableOrderingComposer,
-    $$ExercisesTableCreateCompanionBuilder,
-    $$ExercisesTableUpdateCompanionBuilder,
-    (
+typedef $$ExercisesTableProcessedTableManager =
+    ProcessedTableManager<
+      _$ExerciseDatabase,
+      $ExercisesTable,
       ExerciseTable,
-      BaseReferences<_$ExerciseDatabase, $ExercisesTable, ExerciseTable>
-    ),
-    ExerciseTable,
-    PrefetchHooks Function()>;
-typedef $$MusclesTableCreateCompanionBuilder = MusclesCompanion Function({
-  required int id,
-  required Muscle data,
-  Value<int> rowid,
-});
-typedef $$MusclesTableUpdateCompanionBuilder = MusclesCompanion Function({
-  Value<int> id,
-  Value<Muscle> data,
-  Value<int> rowid,
-});
+      $$ExercisesTableFilterComposer,
+      $$ExercisesTableOrderingComposer,
+      $$ExercisesTableAnnotationComposer,
+      $$ExercisesTableCreateCompanionBuilder,
+      $$ExercisesTableUpdateCompanionBuilder,
+      (ExerciseTable, BaseReferences<_$ExerciseDatabase, $ExercisesTable, ExerciseTable>),
+      ExerciseTable,
+      PrefetchHooks Function()
+    >;
+typedef $$MusclesTableCreateCompanionBuilder =
+    MusclesCompanion Function({required int id, required Muscle data, Value<int> rowid});
+typedef $$MusclesTableUpdateCompanionBuilder =
+    MusclesCompanion Function({Value<int> id, Value<Muscle> data, Value<int> rowid});
 
-class $$MusclesTableFilterComposer
-    extends FilterComposer<_$ExerciseDatabase, $MusclesTable> {
-  $$MusclesTableFilterComposer(super.$state);
-  ColumnFilters<int> get id => $state.composableBuilder(
-      column: $state.table.id,
-      builder: (column, joinBuilders) =>
-          ColumnFilters(column, joinBuilders: joinBuilders));
+class $$MusclesTableFilterComposer extends Composer<_$ExerciseDatabase, $MusclesTable> {
+  $$MusclesTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
 
-  ColumnWithTypeConverterFilters<Muscle, Muscle, String> get data =>
-      $state.composableBuilder(
-          column: $state.table.data,
-          builder: (column, joinBuilders) => ColumnWithTypeConverterFilters(
-              column,
-              joinBuilders: joinBuilders));
+  ColumnFilters<int> get id =>
+      $composableBuilder(column: $table.id, builder: (column) => ColumnFilters(column));
+
+  ColumnWithTypeConverterFilters<Muscle, Muscle, String> get data => $composableBuilder(
+    column: $table.data,
+    builder: (column) => ColumnWithTypeConverterFilters(column),
+  );
 }
 
-class $$MusclesTableOrderingComposer
-    extends OrderingComposer<_$ExerciseDatabase, $MusclesTable> {
-  $$MusclesTableOrderingComposer(super.$state);
-  ColumnOrderings<int> get id => $state.composableBuilder(
-      column: $state.table.id,
-      builder: (column, joinBuilders) =>
-          ColumnOrderings(column, joinBuilders: joinBuilders));
+class $$MusclesTableOrderingComposer extends Composer<_$ExerciseDatabase, $MusclesTable> {
+  $$MusclesTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
 
-  ColumnOrderings<String> get data => $state.composableBuilder(
-      column: $state.table.data,
-      builder: (column, joinBuilders) =>
-          ColumnOrderings(column, joinBuilders: joinBuilders));
+  ColumnOrderings<int> get id =>
+      $composableBuilder(column: $table.id, builder: (column) => ColumnOrderings(column));
+
+  ColumnOrderings<String> get data =>
+      $composableBuilder(column: $table.data, builder: (column) => ColumnOrderings(column));
 }
 
-class $$MusclesTableTableManager extends RootTableManager<
-    _$ExerciseDatabase,
-    $MusclesTable,
-    MuscleTable,
-    $$MusclesTableFilterComposer,
-    $$MusclesTableOrderingComposer,
-    $$MusclesTableCreateCompanionBuilder,
-    $$MusclesTableUpdateCompanionBuilder,
-    (
-      MuscleTable,
-      BaseReferences<_$ExerciseDatabase, $MusclesTable, MuscleTable>
-    ),
-    MuscleTable,
-    PrefetchHooks Function()> {
+class $$MusclesTableAnnotationComposer extends Composer<_$ExerciseDatabase, $MusclesTable> {
+  $$MusclesTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+
+  GeneratedColumn<int> get id => $composableBuilder(column: $table.id, builder: (column) => column);
+
+  GeneratedColumnWithTypeConverter<Muscle, String> get data =>
+      $composableBuilder(column: $table.data, builder: (column) => column);
+}
+
+class $$MusclesTableTableManager
+    extends
+        RootTableManager<
+          _$ExerciseDatabase,
+          $MusclesTable,
+          MuscleTable,
+          $$MusclesTableFilterComposer,
+          $$MusclesTableOrderingComposer,
+          $$MusclesTableAnnotationComposer,
+          $$MusclesTableCreateCompanionBuilder,
+          $$MusclesTableUpdateCompanionBuilder,
+          (MuscleTable, BaseReferences<_$ExerciseDatabase, $MusclesTable, MuscleTable>),
+          MuscleTable,
+          PrefetchHooks Function()
+        > {
   $$MusclesTableTableManager(_$ExerciseDatabase db, $MusclesTable table)
-      : super(TableManagerState(
+    : super(
+        TableManagerState(
           db: db,
           table: table,
-          filteringComposer:
-              $$MusclesTableFilterComposer(ComposerState(db, table)),
-          orderingComposer:
-              $$MusclesTableOrderingComposer(ComposerState(db, table)),
-          updateCompanionCallback: ({
-            Value<int> id = const Value.absent(),
-            Value<Muscle> data = const Value.absent(),
-            Value<int> rowid = const Value.absent(),
-          }) =>
-              MusclesCompanion(
-            id: id,
-            data: data,
-            rowid: rowid,
-          ),
-          createCompanionCallback: ({
-            required int id,
-            required Muscle data,
-            Value<int> rowid = const Value.absent(),
-          }) =>
-              MusclesCompanion.insert(
-            id: id,
-            data: data,
-            rowid: rowid,
-          ),
-          withReferenceMapper: (p0) => p0
-              .map((e) => (e.readTable(table), BaseReferences(db, table, e)))
-              .toList(),
+          createFilteringComposer: () => $$MusclesTableFilterComposer($db: db, $table: table),
+          createOrderingComposer: () => $$MusclesTableOrderingComposer($db: db, $table: table),
+          createComputedFieldComposer: () =>
+              $$MusclesTableAnnotationComposer($db: db, $table: table),
+          updateCompanionCallback:
+              ({
+                Value<int> id = const Value.absent(),
+                Value<Muscle> data = const Value.absent(),
+                Value<int> rowid = const Value.absent(),
+              }) => MusclesCompanion(id: id, data: data, rowid: rowid),
+          createCompanionCallback:
+              ({required int id, required Muscle data, Value<int> rowid = const Value.absent()}) =>
+                  MusclesCompanion.insert(id: id, data: data, rowid: rowid),
+          withReferenceMapper: (p0) =>
+              p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(),
           prefetchHooksCallback: null,
-        ));
+        ),
+      );
 }
 
-typedef $$MusclesTableProcessedTableManager = ProcessedTableManager<
-    _$ExerciseDatabase,
-    $MusclesTable,
-    MuscleTable,
-    $$MusclesTableFilterComposer,
-    $$MusclesTableOrderingComposer,
-    $$MusclesTableCreateCompanionBuilder,
-    $$MusclesTableUpdateCompanionBuilder,
-    (
+typedef $$MusclesTableProcessedTableManager =
+    ProcessedTableManager<
+      _$ExerciseDatabase,
+      $MusclesTable,
       MuscleTable,
-      BaseReferences<_$ExerciseDatabase, $MusclesTable, MuscleTable>
-    ),
-    MuscleTable,
-    PrefetchHooks Function()>;
-typedef $$EquipmentsTableCreateCompanionBuilder = EquipmentsCompanion Function({
-  required int id,
-  required Equipment data,
-  Value<int> rowid,
-});
-typedef $$EquipmentsTableUpdateCompanionBuilder = EquipmentsCompanion Function({
-  Value<int> id,
-  Value<Equipment> data,
-  Value<int> rowid,
-});
+      $$MusclesTableFilterComposer,
+      $$MusclesTableOrderingComposer,
+      $$MusclesTableAnnotationComposer,
+      $$MusclesTableCreateCompanionBuilder,
+      $$MusclesTableUpdateCompanionBuilder,
+      (MuscleTable, BaseReferences<_$ExerciseDatabase, $MusclesTable, MuscleTable>),
+      MuscleTable,
+      PrefetchHooks Function()
+    >;
+typedef $$EquipmentsTableCreateCompanionBuilder =
+    EquipmentsCompanion Function({required int id, required Equipment data, Value<int> rowid});
+typedef $$EquipmentsTableUpdateCompanionBuilder =
+    EquipmentsCompanion Function({Value<int> id, Value<Equipment> data, Value<int> rowid});
 
-class $$EquipmentsTableFilterComposer
-    extends FilterComposer<_$ExerciseDatabase, $EquipmentsTable> {
-  $$EquipmentsTableFilterComposer(super.$state);
-  ColumnFilters<int> get id => $state.composableBuilder(
-      column: $state.table.id,
-      builder: (column, joinBuilders) =>
-          ColumnFilters(column, joinBuilders: joinBuilders));
+class $$EquipmentsTableFilterComposer extends Composer<_$ExerciseDatabase, $EquipmentsTable> {
+  $$EquipmentsTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
 
-  ColumnWithTypeConverterFilters<Equipment, Equipment, String> get data =>
-      $state.composableBuilder(
-          column: $state.table.data,
-          builder: (column, joinBuilders) => ColumnWithTypeConverterFilters(
-              column,
-              joinBuilders: joinBuilders));
+  ColumnFilters<int> get id =>
+      $composableBuilder(column: $table.id, builder: (column) => ColumnFilters(column));
+
+  ColumnWithTypeConverterFilters<Equipment, Equipment, String> get data => $composableBuilder(
+    column: $table.data,
+    builder: (column) => ColumnWithTypeConverterFilters(column),
+  );
 }
 
-class $$EquipmentsTableOrderingComposer
-    extends OrderingComposer<_$ExerciseDatabase, $EquipmentsTable> {
-  $$EquipmentsTableOrderingComposer(super.$state);
-  ColumnOrderings<int> get id => $state.composableBuilder(
-      column: $state.table.id,
-      builder: (column, joinBuilders) =>
-          ColumnOrderings(column, joinBuilders: joinBuilders));
+class $$EquipmentsTableOrderingComposer extends Composer<_$ExerciseDatabase, $EquipmentsTable> {
+  $$EquipmentsTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
 
-  ColumnOrderings<String> get data => $state.composableBuilder(
-      column: $state.table.data,
-      builder: (column, joinBuilders) =>
-          ColumnOrderings(column, joinBuilders: joinBuilders));
+  ColumnOrderings<int> get id =>
+      $composableBuilder(column: $table.id, builder: (column) => ColumnOrderings(column));
+
+  ColumnOrderings<String> get data =>
+      $composableBuilder(column: $table.data, builder: (column) => ColumnOrderings(column));
 }
 
-class $$EquipmentsTableTableManager extends RootTableManager<
-    _$ExerciseDatabase,
-    $EquipmentsTable,
-    EquipmentTable,
-    $$EquipmentsTableFilterComposer,
-    $$EquipmentsTableOrderingComposer,
-    $$EquipmentsTableCreateCompanionBuilder,
-    $$EquipmentsTableUpdateCompanionBuilder,
-    (
-      EquipmentTable,
-      BaseReferences<_$ExerciseDatabase, $EquipmentsTable, EquipmentTable>
-    ),
-    EquipmentTable,
-    PrefetchHooks Function()> {
+class $$EquipmentsTableAnnotationComposer extends Composer<_$ExerciseDatabase, $EquipmentsTable> {
+  $$EquipmentsTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+
+  GeneratedColumn<int> get id => $composableBuilder(column: $table.id, builder: (column) => column);
+
+  GeneratedColumnWithTypeConverter<Equipment, String> get data =>
+      $composableBuilder(column: $table.data, builder: (column) => column);
+}
+
+class $$EquipmentsTableTableManager
+    extends
+        RootTableManager<
+          _$ExerciseDatabase,
+          $EquipmentsTable,
+          EquipmentTable,
+          $$EquipmentsTableFilterComposer,
+          $$EquipmentsTableOrderingComposer,
+          $$EquipmentsTableAnnotationComposer,
+          $$EquipmentsTableCreateCompanionBuilder,
+          $$EquipmentsTableUpdateCompanionBuilder,
+          (EquipmentTable, BaseReferences<_$ExerciseDatabase, $EquipmentsTable, EquipmentTable>),
+          EquipmentTable,
+          PrefetchHooks Function()
+        > {
   $$EquipmentsTableTableManager(_$ExerciseDatabase db, $EquipmentsTable table)
-      : super(TableManagerState(
+    : super(
+        TableManagerState(
           db: db,
           table: table,
-          filteringComposer:
-              $$EquipmentsTableFilterComposer(ComposerState(db, table)),
-          orderingComposer:
-              $$EquipmentsTableOrderingComposer(ComposerState(db, table)),
-          updateCompanionCallback: ({
-            Value<int> id = const Value.absent(),
-            Value<Equipment> data = const Value.absent(),
-            Value<int> rowid = const Value.absent(),
-          }) =>
-              EquipmentsCompanion(
-            id: id,
-            data: data,
-            rowid: rowid,
-          ),
-          createCompanionCallback: ({
-            required int id,
-            required Equipment data,
-            Value<int> rowid = const Value.absent(),
-          }) =>
-              EquipmentsCompanion.insert(
-            id: id,
-            data: data,
-            rowid: rowid,
-          ),
-          withReferenceMapper: (p0) => p0
-              .map((e) => (e.readTable(table), BaseReferences(db, table, e)))
-              .toList(),
+          createFilteringComposer: () => $$EquipmentsTableFilterComposer($db: db, $table: table),
+          createOrderingComposer: () => $$EquipmentsTableOrderingComposer($db: db, $table: table),
+          createComputedFieldComposer: () =>
+              $$EquipmentsTableAnnotationComposer($db: db, $table: table),
+          updateCompanionCallback:
+              ({
+                Value<int> id = const Value.absent(),
+                Value<Equipment> data = const Value.absent(),
+                Value<int> rowid = const Value.absent(),
+              }) => EquipmentsCompanion(id: id, data: data, rowid: rowid),
+          createCompanionCallback:
+              ({
+                required int id,
+                required Equipment data,
+                Value<int> rowid = const Value.absent(),
+              }) => EquipmentsCompanion.insert(id: id, data: data, rowid: rowid),
+          withReferenceMapper: (p0) =>
+              p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(),
           prefetchHooksCallback: null,
-        ));
+        ),
+      );
 }
 
-typedef $$EquipmentsTableProcessedTableManager = ProcessedTableManager<
-    _$ExerciseDatabase,
-    $EquipmentsTable,
-    EquipmentTable,
-    $$EquipmentsTableFilterComposer,
-    $$EquipmentsTableOrderingComposer,
-    $$EquipmentsTableCreateCompanionBuilder,
-    $$EquipmentsTableUpdateCompanionBuilder,
-    (
+typedef $$EquipmentsTableProcessedTableManager =
+    ProcessedTableManager<
+      _$ExerciseDatabase,
+      $EquipmentsTable,
       EquipmentTable,
-      BaseReferences<_$ExerciseDatabase, $EquipmentsTable, EquipmentTable>
-    ),
-    EquipmentTable,
-    PrefetchHooks Function()>;
-typedef $$CategoriesTableCreateCompanionBuilder = CategoriesCompanion Function({
-  required int id,
-  required ExerciseCategory data,
-  Value<int> rowid,
-});
-typedef $$CategoriesTableUpdateCompanionBuilder = CategoriesCompanion Function({
-  Value<int> id,
-  Value<ExerciseCategory> data,
-  Value<int> rowid,
-});
+      $$EquipmentsTableFilterComposer,
+      $$EquipmentsTableOrderingComposer,
+      $$EquipmentsTableAnnotationComposer,
+      $$EquipmentsTableCreateCompanionBuilder,
+      $$EquipmentsTableUpdateCompanionBuilder,
+      (EquipmentTable, BaseReferences<_$ExerciseDatabase, $EquipmentsTable, EquipmentTable>),
+      EquipmentTable,
+      PrefetchHooks Function()
+    >;
+typedef $$CategoriesTableCreateCompanionBuilder =
+    CategoriesCompanion Function({
+      required int id,
+      required ExerciseCategory data,
+      Value<int> rowid,
+    });
+typedef $$CategoriesTableUpdateCompanionBuilder =
+    CategoriesCompanion Function({Value<int> id, Value<ExerciseCategory> data, Value<int> rowid});
 
-class $$CategoriesTableFilterComposer
-    extends FilterComposer<_$ExerciseDatabase, $CategoriesTable> {
-  $$CategoriesTableFilterComposer(super.$state);
-  ColumnFilters<int> get id => $state.composableBuilder(
-      column: $state.table.id,
-      builder: (column, joinBuilders) =>
-          ColumnFilters(column, joinBuilders: joinBuilders));
+class $$CategoriesTableFilterComposer extends Composer<_$ExerciseDatabase, $CategoriesTable> {
+  $$CategoriesTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
 
-  ColumnWithTypeConverterFilters<ExerciseCategory, ExerciseCategory, String>
-      get data => $state.composableBuilder(
-          column: $state.table.data,
-          builder: (column, joinBuilders) => ColumnWithTypeConverterFilters(
-              column,
-              joinBuilders: joinBuilders));
+  ColumnFilters<int> get id =>
+      $composableBuilder(column: $table.id, builder: (column) => ColumnFilters(column));
+
+  ColumnWithTypeConverterFilters<ExerciseCategory, ExerciseCategory, String> get data =>
+      $composableBuilder(
+        column: $table.data,
+        builder: (column) => ColumnWithTypeConverterFilters(column),
+      );
 }
 
-class $$CategoriesTableOrderingComposer
-    extends OrderingComposer<_$ExerciseDatabase, $CategoriesTable> {
-  $$CategoriesTableOrderingComposer(super.$state);
-  ColumnOrderings<int> get id => $state.composableBuilder(
-      column: $state.table.id,
-      builder: (column, joinBuilders) =>
-          ColumnOrderings(column, joinBuilders: joinBuilders));
+class $$CategoriesTableOrderingComposer extends Composer<_$ExerciseDatabase, $CategoriesTable> {
+  $$CategoriesTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
 
-  ColumnOrderings<String> get data => $state.composableBuilder(
-      column: $state.table.data,
-      builder: (column, joinBuilders) =>
-          ColumnOrderings(column, joinBuilders: joinBuilders));
+  ColumnOrderings<int> get id =>
+      $composableBuilder(column: $table.id, builder: (column) => ColumnOrderings(column));
+
+  ColumnOrderings<String> get data =>
+      $composableBuilder(column: $table.data, builder: (column) => ColumnOrderings(column));
 }
 
-class $$CategoriesTableTableManager extends RootTableManager<
-    _$ExerciseDatabase,
-    $CategoriesTable,
-    CategoryTable,
-    $$CategoriesTableFilterComposer,
-    $$CategoriesTableOrderingComposer,
-    $$CategoriesTableCreateCompanionBuilder,
-    $$CategoriesTableUpdateCompanionBuilder,
-    (
-      CategoryTable,
-      BaseReferences<_$ExerciseDatabase, $CategoriesTable, CategoryTable>
-    ),
-    CategoryTable,
-    PrefetchHooks Function()> {
+class $$CategoriesTableAnnotationComposer extends Composer<_$ExerciseDatabase, $CategoriesTable> {
+  $$CategoriesTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+
+  GeneratedColumn<int> get id => $composableBuilder(column: $table.id, builder: (column) => column);
+
+  GeneratedColumnWithTypeConverter<ExerciseCategory, String> get data =>
+      $composableBuilder(column: $table.data, builder: (column) => column);
+}
+
+class $$CategoriesTableTableManager
+    extends
+        RootTableManager<
+          _$ExerciseDatabase,
+          $CategoriesTable,
+          CategoryTable,
+          $$CategoriesTableFilterComposer,
+          $$CategoriesTableOrderingComposer,
+          $$CategoriesTableAnnotationComposer,
+          $$CategoriesTableCreateCompanionBuilder,
+          $$CategoriesTableUpdateCompanionBuilder,
+          (CategoryTable, BaseReferences<_$ExerciseDatabase, $CategoriesTable, CategoryTable>),
+          CategoryTable,
+          PrefetchHooks Function()
+        > {
   $$CategoriesTableTableManager(_$ExerciseDatabase db, $CategoriesTable table)
-      : super(TableManagerState(
+    : super(
+        TableManagerState(
           db: db,
           table: table,
-          filteringComposer:
-              $$CategoriesTableFilterComposer(ComposerState(db, table)),
-          orderingComposer:
-              $$CategoriesTableOrderingComposer(ComposerState(db, table)),
-          updateCompanionCallback: ({
-            Value<int> id = const Value.absent(),
-            Value<ExerciseCategory> data = const Value.absent(),
-            Value<int> rowid = const Value.absent(),
-          }) =>
-              CategoriesCompanion(
-            id: id,
-            data: data,
-            rowid: rowid,
-          ),
-          createCompanionCallback: ({
-            required int id,
-            required ExerciseCategory data,
-            Value<int> rowid = const Value.absent(),
-          }) =>
-              CategoriesCompanion.insert(
-            id: id,
-            data: data,
-            rowid: rowid,
-          ),
-          withReferenceMapper: (p0) => p0
-              .map((e) => (e.readTable(table), BaseReferences(db, table, e)))
-              .toList(),
+          createFilteringComposer: () => $$CategoriesTableFilterComposer($db: db, $table: table),
+          createOrderingComposer: () => $$CategoriesTableOrderingComposer($db: db, $table: table),
+          createComputedFieldComposer: () =>
+              $$CategoriesTableAnnotationComposer($db: db, $table: table),
+          updateCompanionCallback:
+              ({
+                Value<int> id = const Value.absent(),
+                Value<ExerciseCategory> data = const Value.absent(),
+                Value<int> rowid = const Value.absent(),
+              }) => CategoriesCompanion(id: id, data: data, rowid: rowid),
+          createCompanionCallback:
+              ({
+                required int id,
+                required ExerciseCategory data,
+                Value<int> rowid = const Value.absent(),
+              }) => CategoriesCompanion.insert(id: id, data: data, rowid: rowid),
+          withReferenceMapper: (p0) =>
+              p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(),
           prefetchHooksCallback: null,
-        ));
+        ),
+      );
 }
 
-typedef $$CategoriesTableProcessedTableManager = ProcessedTableManager<
-    _$ExerciseDatabase,
-    $CategoriesTable,
-    CategoryTable,
-    $$CategoriesTableFilterComposer,
-    $$CategoriesTableOrderingComposer,
-    $$CategoriesTableCreateCompanionBuilder,
-    $$CategoriesTableUpdateCompanionBuilder,
-    (
+typedef $$CategoriesTableProcessedTableManager =
+    ProcessedTableManager<
+      _$ExerciseDatabase,
+      $CategoriesTable,
       CategoryTable,
-      BaseReferences<_$ExerciseDatabase, $CategoriesTable, CategoryTable>
-    ),
-    CategoryTable,
-    PrefetchHooks Function()>;
-typedef $$LanguagesTableCreateCompanionBuilder = LanguagesCompanion Function({
-  required int id,
-  required Language data,
-  Value<int> rowid,
-});
-typedef $$LanguagesTableUpdateCompanionBuilder = LanguagesCompanion Function({
-  Value<int> id,
-  Value<Language> data,
-  Value<int> rowid,
-});
+      $$CategoriesTableFilterComposer,
+      $$CategoriesTableOrderingComposer,
+      $$CategoriesTableAnnotationComposer,
+      $$CategoriesTableCreateCompanionBuilder,
+      $$CategoriesTableUpdateCompanionBuilder,
+      (CategoryTable, BaseReferences<_$ExerciseDatabase, $CategoriesTable, CategoryTable>),
+      CategoryTable,
+      PrefetchHooks Function()
+    >;
+typedef $$LanguagesTableCreateCompanionBuilder =
+    LanguagesCompanion Function({required int id, required Language data, Value<int> rowid});
+typedef $$LanguagesTableUpdateCompanionBuilder =
+    LanguagesCompanion Function({Value<int> id, Value<Language> data, Value<int> rowid});
 
-class $$LanguagesTableFilterComposer
-    extends FilterComposer<_$ExerciseDatabase, $LanguagesTable> {
-  $$LanguagesTableFilterComposer(super.$state);
-  ColumnFilters<int> get id => $state.composableBuilder(
-      column: $state.table.id,
-      builder: (column, joinBuilders) =>
-          ColumnFilters(column, joinBuilders: joinBuilders));
+class $$LanguagesTableFilterComposer extends Composer<_$ExerciseDatabase, $LanguagesTable> {
+  $$LanguagesTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
 
-  ColumnWithTypeConverterFilters<Language, Language, String> get data =>
-      $state.composableBuilder(
-          column: $state.table.data,
-          builder: (column, joinBuilders) => ColumnWithTypeConverterFilters(
-              column,
-              joinBuilders: joinBuilders));
+  ColumnFilters<int> get id =>
+      $composableBuilder(column: $table.id, builder: (column) => ColumnFilters(column));
+
+  ColumnWithTypeConverterFilters<Language, Language, String> get data => $composableBuilder(
+    column: $table.data,
+    builder: (column) => ColumnWithTypeConverterFilters(column),
+  );
 }
 
-class $$LanguagesTableOrderingComposer
-    extends OrderingComposer<_$ExerciseDatabase, $LanguagesTable> {
-  $$LanguagesTableOrderingComposer(super.$state);
-  ColumnOrderings<int> get id => $state.composableBuilder(
-      column: $state.table.id,
-      builder: (column, joinBuilders) =>
-          ColumnOrderings(column, joinBuilders: joinBuilders));
+class $$LanguagesTableOrderingComposer extends Composer<_$ExerciseDatabase, $LanguagesTable> {
+  $$LanguagesTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
 
-  ColumnOrderings<String> get data => $state.composableBuilder(
-      column: $state.table.data,
-      builder: (column, joinBuilders) =>
-          ColumnOrderings(column, joinBuilders: joinBuilders));
+  ColumnOrderings<int> get id =>
+      $composableBuilder(column: $table.id, builder: (column) => ColumnOrderings(column));
+
+  ColumnOrderings<String> get data =>
+      $composableBuilder(column: $table.data, builder: (column) => ColumnOrderings(column));
 }
 
-class $$LanguagesTableTableManager extends RootTableManager<
-    _$ExerciseDatabase,
-    $LanguagesTable,
-    LanguagesTable,
-    $$LanguagesTableFilterComposer,
-    $$LanguagesTableOrderingComposer,
-    $$LanguagesTableCreateCompanionBuilder,
-    $$LanguagesTableUpdateCompanionBuilder,
-    (
-      LanguagesTable,
-      BaseReferences<_$ExerciseDatabase, $LanguagesTable, LanguagesTable>
-    ),
-    LanguagesTable,
-    PrefetchHooks Function()> {
+class $$LanguagesTableAnnotationComposer extends Composer<_$ExerciseDatabase, $LanguagesTable> {
+  $$LanguagesTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+
+  GeneratedColumn<int> get id => $composableBuilder(column: $table.id, builder: (column) => column);
+
+  GeneratedColumnWithTypeConverter<Language, String> get data =>
+      $composableBuilder(column: $table.data, builder: (column) => column);
+}
+
+class $$LanguagesTableTableManager
+    extends
+        RootTableManager<
+          _$ExerciseDatabase,
+          $LanguagesTable,
+          LanguagesTable,
+          $$LanguagesTableFilterComposer,
+          $$LanguagesTableOrderingComposer,
+          $$LanguagesTableAnnotationComposer,
+          $$LanguagesTableCreateCompanionBuilder,
+          $$LanguagesTableUpdateCompanionBuilder,
+          (LanguagesTable, BaseReferences<_$ExerciseDatabase, $LanguagesTable, LanguagesTable>),
+          LanguagesTable,
+          PrefetchHooks Function()
+        > {
   $$LanguagesTableTableManager(_$ExerciseDatabase db, $LanguagesTable table)
-      : super(TableManagerState(
+    : super(
+        TableManagerState(
           db: db,
           table: table,
-          filteringComposer:
-              $$LanguagesTableFilterComposer(ComposerState(db, table)),
-          orderingComposer:
-              $$LanguagesTableOrderingComposer(ComposerState(db, table)),
-          updateCompanionCallback: ({
-            Value<int> id = const Value.absent(),
-            Value<Language> data = const Value.absent(),
-            Value<int> rowid = const Value.absent(),
-          }) =>
-              LanguagesCompanion(
-            id: id,
-            data: data,
-            rowid: rowid,
-          ),
-          createCompanionCallback: ({
-            required int id,
-            required Language data,
-            Value<int> rowid = const Value.absent(),
-          }) =>
-              LanguagesCompanion.insert(
-            id: id,
-            data: data,
-            rowid: rowid,
-          ),
-          withReferenceMapper: (p0) => p0
-              .map((e) => (e.readTable(table), BaseReferences(db, table, e)))
-              .toList(),
+          createFilteringComposer: () => $$LanguagesTableFilterComposer($db: db, $table: table),
+          createOrderingComposer: () => $$LanguagesTableOrderingComposer($db: db, $table: table),
+          createComputedFieldComposer: () =>
+              $$LanguagesTableAnnotationComposer($db: db, $table: table),
+          updateCompanionCallback:
+              ({
+                Value<int> id = const Value.absent(),
+                Value<Language> data = const Value.absent(),
+                Value<int> rowid = const Value.absent(),
+              }) => LanguagesCompanion(id: id, data: data, rowid: rowid),
+          createCompanionCallback:
+              ({
+                required int id,
+                required Language data,
+                Value<int> rowid = const Value.absent(),
+              }) => LanguagesCompanion.insert(id: id, data: data, rowid: rowid),
+          withReferenceMapper: (p0) =>
+              p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(),
           prefetchHooksCallback: null,
-        ));
+        ),
+      );
 }
 
-typedef $$LanguagesTableProcessedTableManager = ProcessedTableManager<
-    _$ExerciseDatabase,
-    $LanguagesTable,
-    LanguagesTable,
-    $$LanguagesTableFilterComposer,
-    $$LanguagesTableOrderingComposer,
-    $$LanguagesTableCreateCompanionBuilder,
-    $$LanguagesTableUpdateCompanionBuilder,
-    (
+typedef $$LanguagesTableProcessedTableManager =
+    ProcessedTableManager<
+      _$ExerciseDatabase,
+      $LanguagesTable,
       LanguagesTable,
-      BaseReferences<_$ExerciseDatabase, $LanguagesTable, LanguagesTable>
-    ),
-    LanguagesTable,
-    PrefetchHooks Function()>;
+      $$LanguagesTableFilterComposer,
+      $$LanguagesTableOrderingComposer,
+      $$LanguagesTableAnnotationComposer,
+      $$LanguagesTableCreateCompanionBuilder,
+      $$LanguagesTableUpdateCompanionBuilder,
+      (LanguagesTable, BaseReferences<_$ExerciseDatabase, $LanguagesTable, LanguagesTable>),
+      LanguagesTable,
+      PrefetchHooks Function()
+    >;
 
 class $ExerciseDatabaseManager {
   final _$ExerciseDatabase _db;
+
   $ExerciseDatabaseManager(this._db);
-  $$ExercisesTableTableManager get exercises =>
-      $$ExercisesTableTableManager(_db, _db.exercises);
-  $$MusclesTableTableManager get muscles =>
-      $$MusclesTableTableManager(_db, _db.muscles);
+
+  $$ExercisesTableTableManager get exercises => $$ExercisesTableTableManager(_db, _db.exercises);
+
+  $$MusclesTableTableManager get muscles => $$MusclesTableTableManager(_db, _db.muscles);
+
   $$EquipmentsTableTableManager get equipments =>
       $$EquipmentsTableTableManager(_db, _db.equipments);
+
   $$CategoriesTableTableManager get categories =>
       $$CategoriesTableTableManager(_db, _db.categories);
-  $$LanguagesTableTableManager get languages =>
-      $$LanguagesTableTableManager(_db, _db.languages);
+
+  $$LanguagesTableTableManager get languages => $$LanguagesTableTableManager(_db, _db.languages);
 }
diff --git a/lib/database/exercises/type_converters.dart b/lib/database/exercises/type_converters.dart
index b494aa2a..77d54559 100644
--- a/lib/database/exercises/type_converters.dart
+++ b/lib/database/exercises/type_converters.dart
@@ -1,67 +1,11 @@
 import 'dart:convert';
 
 import 'package:drift/drift.dart';
-import 'package:wger/models/exercises/alias.dart';
 import 'package:wger/models/exercises/category.dart';
-import 'package:wger/models/exercises/comment.dart';
 import 'package:wger/models/exercises/equipment.dart';
-import 'package:wger/models/exercises/exercise.dart';
-import 'package:wger/models/exercises/image.dart';
 import 'package:wger/models/exercises/language.dart';
 import 'package:wger/models/exercises/muscle.dart';
-import 'package:wger/models/exercises/translation.dart';
 import 'package:wger/models/exercises/variation.dart';
-import 'package:wger/models/exercises/video.dart';
-
-class ExerciseBaseConverter extends TypeConverter<Exercise, String> {
-  const ExerciseBaseConverter();
-
-  @override
-  Exercise fromSql(String fromDb) {
-    final Map<String, dynamic> baseData = json.decode(fromDb);
-
-    final category = ExerciseCategory.fromJson(baseData['categories']);
-    final musclesPrimary = baseData['muscless'].map((e) => Muscle.fromJson(e)).toList();
-    final musclesSecondary = baseData['musclesSecondary'].map((e) => Muscle.fromJson(e)).toList();
-    final equipment = baseData['equipments'].map((e) => Equipment.fromJson(e)).toList();
-    final images = baseData['images'].map((e) => ExerciseImage.fromJson(e)).toList();
-    final videos = baseData['videos'].map((e) => Video.fromJson(e)).toList();
-
-    final List<Translation> translations = [];
-    for (final exerciseData in baseData['translations']) {
-      final translation = Translation(
-        id: exerciseData['id'],
-        name: exerciseData['name'],
-        description: exerciseData['description'],
-        exerciseId: baseData['id'],
-      );
-      translation.aliases = exerciseData['aliases'].map((e) => Alias.fromJson(e)).toList();
-      translation.notes = exerciseData['notes'].map((e) => Comment.fromJson(e)).toList();
-      translation.language = Language.fromJson(exerciseData['languageObj']);
-      translations.add(translation);
-    }
-
-    final exerciseBase = Exercise(
-      id: baseData['id'],
-      uuid: baseData['uuid'],
-      created: null,
-      //creationDate: toDate(baseData['creation_date']),
-      musclesSecondary: musclesSecondary.cast<Muscle>(),
-      muscles: musclesPrimary.cast<Muscle>(),
-      equipment: equipment.cast<Equipment>(),
-      category: category,
-      images: images.cast<ExerciseImage>(),
-      translations: translations,
-      videos: videos.cast<Video>(),
-    );
-    return exerciseBase;
-  }
-
-  @override
-  String toSql(Exercise value) {
-    return json.encode(value.toJson());
-  }
-}
 
 class MuscleConverter extends TypeConverter<Muscle, String> {
   const MuscleConverter();
diff --git a/lib/database/ingredients/ingredients_database.dart b/lib/database/ingredients/ingredients_database.dart
index 6f53dff9..28f839ed 100644
--- a/lib/database/ingredients/ingredients_database.dart
+++ b/lib/database/ingredients/ingredients_database.dart
@@ -2,6 +2,7 @@ import 'dart:io';
 
 import 'package:drift/drift.dart';
 import 'package:drift/native.dart';
+import 'package:logging/logging.dart';
 import 'package:path/path.dart' as p;
 import 'package:path_provider/path_provider.dart';
 
@@ -21,6 +22,8 @@ class Ingredients extends Table {
 
 @DriftDatabase(tables: [Ingredients])
 class IngredientDatabase extends _$IngredientDatabase {
+  final _logger = Logger('IngredientDatabase');
+
   IngredientDatabase() : super(_openConnection());
 
   // Named constructor for creating in-memory database
@@ -35,24 +38,25 @@ class IngredientDatabase extends _$IngredientDatabase {
   /// will fetch everything as needed from the server
   @override
   MigrationStrategy get migration => MigrationStrategy(
-        onUpgrade: (m, from, to) async {
-          // no-op, but needs to be defined
-          return;
-        },
-        beforeOpen: (openingDetails) async {
-          if (openingDetails.hadUpgrade) {
-            final m = createMigrator();
-            for (final table in allTables) {
-              await m.deleteTable(table.actualTableName);
-              await m.createTable(table);
-            }
-          }
-        },
-      );
+    onUpgrade: (m, from, to) async {
+      // no-op, but needs to be defined
+      return;
+    },
+    beforeOpen: (openingDetails) async {
+      if (openingDetails.hadUpgrade) {
+        final m = createMigrator();
+        for (final table in allTables) {
+          await m.deleteTable(table.actualTableName);
+          await m.createTable(table);
+        }
+      }
+    },
+  );
 
   Future<void> deleteEverything() {
     return transaction(() async {
       for (final table in allTables) {
+        _logger.info('Deleting db cache table ${table.actualTableName}');
         await delete(table).go();
       }
     });
diff --git a/lib/database/ingredients/ingredients_database.g.dart b/lib/database/ingredients/ingredients_database.g.dart
index 1f5deb86..a8bc8006 100644
--- a/lib/database/ingredients/ingredients_database.g.dart
+++ b/lib/database/ingredients/ingredients_database.g.dart
@@ -3,38 +3,56 @@
 part of 'ingredients_database.dart';
 
 // ignore_for_file: type=lint
-class $IngredientsTable extends Ingredients
-    with TableInfo<$IngredientsTable, IngredientTable> {
+class $IngredientsTable extends Ingredients with TableInfo<$IngredientsTable, IngredientTable> {
   @override
   final GeneratedDatabase attachedDatabase;
   final String? _alias;
+
   $IngredientsTable(this.attachedDatabase, [this._alias]);
+
   static const VerificationMeta _idMeta = const VerificationMeta('id');
   @override
   late final GeneratedColumn<int> id = GeneratedColumn<int>(
-      'id', aliasedName, false,
-      type: DriftSqlType.int, requiredDuringInsert: true);
+    'id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+  );
   static const VerificationMeta _dataMeta = const VerificationMeta('data');
   @override
   late final GeneratedColumn<String> data = GeneratedColumn<String>(
-      'data', aliasedName, false,
-      type: DriftSqlType.string, requiredDuringInsert: true);
-  static const VerificationMeta _lastFetchedMeta =
-      const VerificationMeta('lastFetched');
+    'data',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  static const VerificationMeta _lastFetchedMeta = const VerificationMeta('lastFetched');
   @override
   late final GeneratedColumn<DateTime> lastFetched = GeneratedColumn<DateTime>(
-      'last_fetched', aliasedName, false,
-      type: DriftSqlType.dateTime, requiredDuringInsert: true);
+    'last_fetched',
+    aliasedName,
+    false,
+    type: DriftSqlType.dateTime,
+    requiredDuringInsert: true,
+  );
+
   @override
   List<GeneratedColumn> get $columns => [id, data, lastFetched];
+
   @override
   String get aliasedName => _alias ?? actualTableName;
+
   @override
   String get actualTableName => $name;
   static const String $name = 'ingredients';
+
   @override
-  VerificationContext validateIntegrity(Insertable<IngredientTable> instance,
-      {bool isInserting = false}) {
+  VerificationContext validateIntegrity(
+    Insertable<IngredientTable> instance, {
+    bool isInserting = false,
+  }) {
     final context = VerificationContext();
     final data = instance.toColumns(true);
     if (data.containsKey('id')) {
@@ -43,16 +61,15 @@ class $IngredientsTable extends Ingredients
       context.missing(_idMeta);
     }
     if (data.containsKey('data')) {
-      context.handle(
-          _dataMeta, this.data.isAcceptableOrUnknown(data['data']!, _dataMeta));
+      context.handle(_dataMeta, this.data.isAcceptableOrUnknown(data['data']!, _dataMeta));
     } else if (isInserting) {
       context.missing(_dataMeta);
     }
     if (data.containsKey('last_fetched')) {
       context.handle(
-          _lastFetchedMeta,
-          lastFetched.isAcceptableOrUnknown(
-              data['last_fetched']!, _lastFetchedMeta));
+        _lastFetchedMeta,
+        lastFetched.isAcceptableOrUnknown(data['last_fetched']!, _lastFetchedMeta),
+      );
     } else if (isInserting) {
       context.missing(_lastFetchedMeta);
     }
@@ -61,16 +78,17 @@ class $IngredientsTable extends Ingredients
 
   @override
   Set<GeneratedColumn> get $primaryKey => const {};
+
   @override
   IngredientTable map(Map<String, dynamic> data, {String? tablePrefix}) {
     final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
     return IngredientTable(
-      id: attachedDatabase.typeMapping
-          .read(DriftSqlType.int, data['${effectivePrefix}id'])!,
-      data: attachedDatabase.typeMapping
-          .read(DriftSqlType.string, data['${effectivePrefix}data'])!,
-      lastFetched: attachedDatabase.typeMapping
-          .read(DriftSqlType.dateTime, data['${effectivePrefix}last_fetched'])!,
+      id: attachedDatabase.typeMapping.read(DriftSqlType.int, data['${effectivePrefix}id'])!,
+      data: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}data'])!,
+      lastFetched: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}last_fetched'],
+      )!,
     );
   }
 
@@ -86,8 +104,9 @@ class IngredientTable extends DataClass implements Insertable<IngredientTable> {
 
   /// The date when the ingredient was last fetched from the server
   final DateTime lastFetched;
-  const IngredientTable(
-      {required this.id, required this.data, required this.lastFetched});
+
+  const IngredientTable({required this.id, required this.data, required this.lastFetched});
+
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
@@ -98,15 +117,10 @@ class IngredientTable extends DataClass implements Insertable<IngredientTable> {
   }
 
   IngredientsCompanion toCompanion(bool nullToAbsent) {
-    return IngredientsCompanion(
-      id: Value(id),
-      data: Value(data),
-      lastFetched: Value(lastFetched),
-    );
+    return IngredientsCompanion(id: Value(id), data: Value(data), lastFetched: Value(lastFetched));
   }
 
-  factory IngredientTable.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory IngredientTable.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return IngredientTable(
       id: serializer.fromJson<int>(json['id']),
@@ -114,6 +128,7 @@ class IngredientTable extends DataClass implements Insertable<IngredientTable> {
       lastFetched: serializer.fromJson<DateTime>(json['lastFetched']),
     );
   }
+
   @override
   Map<String, dynamic> toJson({ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
@@ -124,18 +139,17 @@ class IngredientTable extends DataClass implements Insertable<IngredientTable> {
     };
   }
 
-  IngredientTable copyWith({int? id, String? data, DateTime? lastFetched}) =>
-      IngredientTable(
-        id: id ?? this.id,
-        data: data ?? this.data,
-        lastFetched: lastFetched ?? this.lastFetched,
-      );
+  IngredientTable copyWith({int? id, String? data, DateTime? lastFetched}) => IngredientTable(
+    id: id ?? this.id,
+    data: data ?? this.data,
+    lastFetched: lastFetched ?? this.lastFetched,
+  );
+
   IngredientTable copyWithCompanion(IngredientsCompanion data) {
     return IngredientTable(
       id: data.id.present ? data.id.value : this.id,
       data: data.data.present ? data.data.value : this.data,
-      lastFetched:
-          data.lastFetched.present ? data.lastFetched.value : this.lastFetched,
+      lastFetched: data.lastFetched.present ? data.lastFetched.value : this.lastFetched,
     );
   }
 
@@ -151,6 +165,7 @@ class IngredientTable extends DataClass implements Insertable<IngredientTable> {
 
   @override
   int get hashCode => Object.hash(id, data, lastFetched);
+
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -165,20 +180,23 @@ class IngredientsCompanion extends UpdateCompanion<IngredientTable> {
   final Value<String> data;
   final Value<DateTime> lastFetched;
   final Value<int> rowid;
+
   const IngredientsCompanion({
     this.id = const Value.absent(),
     this.data = const Value.absent(),
     this.lastFetched = const Value.absent(),
     this.rowid = const Value.absent(),
   });
+
   IngredientsCompanion.insert({
     required int id,
     required String data,
     required DateTime lastFetched,
     this.rowid = const Value.absent(),
-  })  : id = Value(id),
-        data = Value(data),
-        lastFetched = Value(lastFetched);
+  }) : id = Value(id),
+       data = Value(data),
+       lastFetched = Value(lastFetched);
+
   static Insertable<IngredientTable> custom({
     Expression<int>? id,
     Expression<String>? data,
@@ -193,11 +211,12 @@ class IngredientsCompanion extends UpdateCompanion<IngredientTable> {
     });
   }
 
-  IngredientsCompanion copyWith(
-      {Value<int>? id,
-      Value<String>? data,
-      Value<DateTime>? lastFetched,
-      Value<int>? rowid}) {
+  IngredientsCompanion copyWith({
+    Value<int>? id,
+    Value<String>? data,
+    Value<DateTime>? lastFetched,
+    Value<int>? rowid,
+  }) {
     return IngredientsCompanion(
       id: id ?? this.id,
       data: data ?? this.data,
@@ -238,140 +257,164 @@ class IngredientsCompanion extends UpdateCompanion<IngredientTable> {
 
 abstract class _$IngredientDatabase extends GeneratedDatabase {
   _$IngredientDatabase(QueryExecutor e) : super(e);
+
   $IngredientDatabaseManager get managers => $IngredientDatabaseManager(this);
   late final $IngredientsTable ingredients = $IngredientsTable(this);
+
   @override
   Iterable<TableInfo<Table, Object?>> get allTables =>
       allSchemaEntities.whereType<TableInfo<Table, Object?>>();
+
   @override
   List<DatabaseSchemaEntity> get allSchemaEntities => [ingredients];
 }
 
-typedef $$IngredientsTableCreateCompanionBuilder = IngredientsCompanion
-    Function({
-  required int id,
-  required String data,
-  required DateTime lastFetched,
-  Value<int> rowid,
-});
-typedef $$IngredientsTableUpdateCompanionBuilder = IngredientsCompanion
-    Function({
-  Value<int> id,
-  Value<String> data,
-  Value<DateTime> lastFetched,
-  Value<int> rowid,
-});
+typedef $$IngredientsTableCreateCompanionBuilder =
+    IngredientsCompanion Function({
+      required int id,
+      required String data,
+      required DateTime lastFetched,
+      Value<int> rowid,
+    });
+typedef $$IngredientsTableUpdateCompanionBuilder =
+    IngredientsCompanion Function({
+      Value<int> id,
+      Value<String> data,
+      Value<DateTime> lastFetched,
+      Value<int> rowid,
+    });
 
-class $$IngredientsTableFilterComposer
-    extends FilterComposer<_$IngredientDatabase, $IngredientsTable> {
-  $$IngredientsTableFilterComposer(super.$state);
-  ColumnFilters<int> get id => $state.composableBuilder(
-      column: $state.table.id,
-      builder: (column, joinBuilders) =>
-          ColumnFilters(column, joinBuilders: joinBuilders));
+class $$IngredientsTableFilterComposer extends Composer<_$IngredientDatabase, $IngredientsTable> {
+  $$IngredientsTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
 
-  ColumnFilters<String> get data => $state.composableBuilder(
-      column: $state.table.data,
-      builder: (column, joinBuilders) =>
-          ColumnFilters(column, joinBuilders: joinBuilders));
+  ColumnFilters<int> get id =>
+      $composableBuilder(column: $table.id, builder: (column) => ColumnFilters(column));
 
-  ColumnFilters<DateTime> get lastFetched => $state.composableBuilder(
-      column: $state.table.lastFetched,
-      builder: (column, joinBuilders) =>
-          ColumnFilters(column, joinBuilders: joinBuilders));
+  ColumnFilters<String> get data =>
+      $composableBuilder(column: $table.data, builder: (column) => ColumnFilters(column));
+
+  ColumnFilters<DateTime> get lastFetched =>
+      $composableBuilder(column: $table.lastFetched, builder: (column) => ColumnFilters(column));
 }
 
-class $$IngredientsTableOrderingComposer
-    extends OrderingComposer<_$IngredientDatabase, $IngredientsTable> {
-  $$IngredientsTableOrderingComposer(super.$state);
-  ColumnOrderings<int> get id => $state.composableBuilder(
-      column: $state.table.id,
-      builder: (column, joinBuilders) =>
-          ColumnOrderings(column, joinBuilders: joinBuilders));
+class $$IngredientsTableOrderingComposer extends Composer<_$IngredientDatabase, $IngredientsTable> {
+  $$IngredientsTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
 
-  ColumnOrderings<String> get data => $state.composableBuilder(
-      column: $state.table.data,
-      builder: (column, joinBuilders) =>
-          ColumnOrderings(column, joinBuilders: joinBuilders));
+  ColumnOrderings<int> get id =>
+      $composableBuilder(column: $table.id, builder: (column) => ColumnOrderings(column));
 
-  ColumnOrderings<DateTime> get lastFetched => $state.composableBuilder(
-      column: $state.table.lastFetched,
-      builder: (column, joinBuilders) =>
-          ColumnOrderings(column, joinBuilders: joinBuilders));
+  ColumnOrderings<String> get data =>
+      $composableBuilder(column: $table.data, builder: (column) => ColumnOrderings(column));
+
+  ColumnOrderings<DateTime> get lastFetched =>
+      $composableBuilder(column: $table.lastFetched, builder: (column) => ColumnOrderings(column));
 }
 
-class $$IngredientsTableTableManager extends RootTableManager<
-    _$IngredientDatabase,
-    $IngredientsTable,
-    IngredientTable,
-    $$IngredientsTableFilterComposer,
-    $$IngredientsTableOrderingComposer,
-    $$IngredientsTableCreateCompanionBuilder,
-    $$IngredientsTableUpdateCompanionBuilder,
-    (
-      IngredientTable,
-      BaseReferences<_$IngredientDatabase, $IngredientsTable, IngredientTable>
-    ),
-    IngredientTable,
-    PrefetchHooks Function()> {
-  $$IngredientsTableTableManager(
-      _$IngredientDatabase db, $IngredientsTable table)
-      : super(TableManagerState(
+class $$IngredientsTableAnnotationComposer
+    extends Composer<_$IngredientDatabase, $IngredientsTable> {
+  $$IngredientsTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+
+  GeneratedColumn<int> get id => $composableBuilder(column: $table.id, builder: (column) => column);
+
+  GeneratedColumn<String> get data =>
+      $composableBuilder(column: $table.data, builder: (column) => column);
+
+  GeneratedColumn<DateTime> get lastFetched =>
+      $composableBuilder(column: $table.lastFetched, builder: (column) => column);
+}
+
+class $$IngredientsTableTableManager
+    extends
+        RootTableManager<
+          _$IngredientDatabase,
+          $IngredientsTable,
+          IngredientTable,
+          $$IngredientsTableFilterComposer,
+          $$IngredientsTableOrderingComposer,
+          $$IngredientsTableAnnotationComposer,
+          $$IngredientsTableCreateCompanionBuilder,
+          $$IngredientsTableUpdateCompanionBuilder,
+          (
+            IngredientTable,
+            BaseReferences<_$IngredientDatabase, $IngredientsTable, IngredientTable>,
+          ),
+          IngredientTable,
+          PrefetchHooks Function()
+        > {
+  $$IngredientsTableTableManager(_$IngredientDatabase db, $IngredientsTable table)
+    : super(
+        TableManagerState(
           db: db,
           table: table,
-          filteringComposer:
-              $$IngredientsTableFilterComposer(ComposerState(db, table)),
-          orderingComposer:
-              $$IngredientsTableOrderingComposer(ComposerState(db, table)),
-          updateCompanionCallback: ({
-            Value<int> id = const Value.absent(),
-            Value<String> data = const Value.absent(),
-            Value<DateTime> lastFetched = const Value.absent(),
-            Value<int> rowid = const Value.absent(),
-          }) =>
-              IngredientsCompanion(
-            id: id,
-            data: data,
-            lastFetched: lastFetched,
-            rowid: rowid,
-          ),
-          createCompanionCallback: ({
-            required int id,
-            required String data,
-            required DateTime lastFetched,
-            Value<int> rowid = const Value.absent(),
-          }) =>
-              IngredientsCompanion.insert(
-            id: id,
-            data: data,
-            lastFetched: lastFetched,
-            rowid: rowid,
-          ),
-          withReferenceMapper: (p0) => p0
-              .map((e) => (e.readTable(table), BaseReferences(db, table, e)))
-              .toList(),
+          createFilteringComposer: () => $$IngredientsTableFilterComposer($db: db, $table: table),
+          createOrderingComposer: () => $$IngredientsTableOrderingComposer($db: db, $table: table),
+          createComputedFieldComposer: () =>
+              $$IngredientsTableAnnotationComposer($db: db, $table: table),
+          updateCompanionCallback:
+              ({
+                Value<int> id = const Value.absent(),
+                Value<String> data = const Value.absent(),
+                Value<DateTime> lastFetched = const Value.absent(),
+                Value<int> rowid = const Value.absent(),
+              }) =>
+                  IngredientsCompanion(id: id, data: data, lastFetched: lastFetched, rowid: rowid),
+          createCompanionCallback:
+              ({
+                required int id,
+                required String data,
+                required DateTime lastFetched,
+                Value<int> rowid = const Value.absent(),
+              }) => IngredientsCompanion.insert(
+                id: id,
+                data: data,
+                lastFetched: lastFetched,
+                rowid: rowid,
+              ),
+          withReferenceMapper: (p0) =>
+              p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(),
           prefetchHooksCallback: null,
-        ));
+        ),
+      );
 }
 
-typedef $$IngredientsTableProcessedTableManager = ProcessedTableManager<
-    _$IngredientDatabase,
-    $IngredientsTable,
-    IngredientTable,
-    $$IngredientsTableFilterComposer,
-    $$IngredientsTableOrderingComposer,
-    $$IngredientsTableCreateCompanionBuilder,
-    $$IngredientsTableUpdateCompanionBuilder,
-    (
+typedef $$IngredientsTableProcessedTableManager =
+    ProcessedTableManager<
+      _$IngredientDatabase,
+      $IngredientsTable,
       IngredientTable,
-      BaseReferences<_$IngredientDatabase, $IngredientsTable, IngredientTable>
-    ),
-    IngredientTable,
-    PrefetchHooks Function()>;
+      $$IngredientsTableFilterComposer,
+      $$IngredientsTableOrderingComposer,
+      $$IngredientsTableAnnotationComposer,
+      $$IngredientsTableCreateCompanionBuilder,
+      $$IngredientsTableUpdateCompanionBuilder,
+      (IngredientTable, BaseReferences<_$IngredientDatabase, $IngredientsTable, IngredientTable>),
+      IngredientTable,
+      PrefetchHooks Function()
+    >;
 
 class $IngredientDatabaseManager {
   final _$IngredientDatabase _db;
+
   $IngredientDatabaseManager(this._db);
+
   $$IngredientsTableTableManager get ingredients =>
       $$IngredientsTableTableManager(_db, _db.ingredients);
 }
diff --git a/lib/exceptions/http_exception.dart b/lib/exceptions/http_exception.dart
index ca38f0a2..06cd2915 100644
--- a/lib/exceptions/http_exception.dart
+++ b/lib/exceptions/http_exception.dart
@@ -19,7 +19,7 @@
 import 'dart:convert';
 
 class WgerHttpException implements Exception {
-  Map<String, dynamic>? errors;
+  Map<String, dynamic> errors = {};
 
   /// Custom http exception.
   /// Expects the response body of the REST call and will try to parse it to
@@ -37,8 +37,12 @@ class WgerHttpException implements Exception {
     }
   }
 
+  WgerHttpException.fromMap(Map<String, dynamic> map) {
+    errors = map;
+  }
+
   @override
   String toString() {
-    return errors!.values.toList().join(', ');
+    return errors.values.toList().join(', ');
   }
 }
diff --git a/lib/exceptions/no_such_entry_exception.dart b/lib/exceptions/no_such_entry_exception.dart
index 862e2ba0..34dde9e9 100644
--- a/lib/exceptions/no_such_entry_exception.dart
+++ b/lib/exceptions/no_such_entry_exception.dart
@@ -1,3 +1,8 @@
 class NoSuchEntryException implements Exception {
   const NoSuchEntryException();
+
+  @override
+  String toString() {
+    return 'No such entry found';
+  }
 }
diff --git a/lib/helpers/charts.dart b/lib/helpers/charts.dart
index 64a0b6e8..1a4b1574 100644
--- a/lib/helpers/charts.dart
+++ b/lib/helpers/charts.dart
@@ -1,5 +1,9 @@
+import 'consts.dart';
+
 double chartGetInterval(DateTime first, DateTime last, {divider = 3}) {
   final dayDiff = last.difference(first);
 
-  return dayDiff.inMilliseconds == 0 ? 1000 : dayDiff.inMilliseconds.abs() / divider;
+  return dayDiff.inMilliseconds == 0
+      ? CHART_MILLISECOND_FACTOR
+      : dayDiff.inMilliseconds.abs() / divider;
 }
diff --git a/lib/helpers/colors.dart b/lib/helpers/colors.dart
index b454bbaf..1ed1cf2c 100644
--- a/lib/helpers/colors.dart
+++ b/lib/helpers/colors.dart
@@ -1,4 +1,4 @@
-import 'dart:ui';
+import 'package:flutter/material.dart';
 
 const LIST_OF_COLORS8 = [
   Color(0xFF2A4C7D),
@@ -41,4 +41,9 @@ Iterable<Color> generateChartColors(int nrOfItems) sync* {
   for (final color in colors) {
     yield color;
   }
+
+  // Always return black after generating nrOfItems colors
+  while (true) {
+    yield Colors.black;
+  }
 }
diff --git a/lib/helpers/consts.dart b/lib/helpers/consts.dart
index 6482ec3a..cf2193e1 100644
--- a/lib/helpers/consts.dart
+++ b/lib/helpers/consts.dart
@@ -31,19 +31,12 @@ 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_API = 'wger.api_key';
-const MANIFEST_KEY_CHECK_UPDATE = 'wger.check_min_app_version';
-
-/// Default weight unit is "kg"
-const DEFAULT_WEIGHT_UNIT = 1;
-
 /// Default impression for a workout session (neutral)
 const DEFAULT_IMPRESSION = 2;
 
 // Weight and repetition units for the workout logs
-const REP_UNIT_REPETITIONS = 1;
-const REP_UNIT_TILL_FAILURE = 2;
+const REP_UNIT_REPETITIONS_ID = 1;
+const REP_UNIT_TILL_FAILURE_ID = 2;
 
 const WEIGHT_UNIT_KG = 1;
 const WEIGHT_UNIT_LB = 2;
@@ -63,6 +56,7 @@ const PREFS_LAST_UPDATED_LANGUAGES = 'lastUpdatedLanguages';
 const PREFS_INGREDIENTS = 'ingredientData';
 const PREFS_WORKOUT_UNITS = 'workoutUnits';
 const PREFS_USER = 'userData';
+const PREFS_USER_DARK_THEME = 'userDarkMode';
 const PREFS_LAST_SERVER = 'lastServer';
 
 const DEFAULT_ANIMATION_DURATION = Duration(milliseconds: 200);
@@ -118,3 +112,37 @@ const COLOR_SECONDARY_MUSCLES = Colors.orange;
 // Min account age to contribute exercises. Needs to be kept in sync with
 // the value on the backend
 const MIN_ACCOUNT_AGE = 14;
+
+/// Different project URLs
+const GITHUB_PROJECT_URL = 'https://github.com/wger-project';
+const GITHUB_REPO_URL = '$GITHUB_PROJECT_URL/flutter';
+const GITHUB_ISSUES_URL = '$GITHUB_REPO_URL/issues/new/choose';
+const GITHUB_ISSUES_BUG_URL = '$GITHUB_REPO_URL/issues/new?template=1_bug.yml';
+const GITHUB_SPONSORS_URL = 'https://github.com/sponsors/wger-project';
+const DISCORD_URL = 'https://discord.gg/rPWFv6W';
+const MASTODON_URL = 'https://fosstodon.org/@wger';
+const WEBLATE_URL = 'https://hosted.weblate.org/engage/wger';
+const BUY_ME_A_COFFEE_URL = 'https://buymeacoffee.com/wger';
+const LIBERAPAY_URL = 'https://liberapay.com/wger';
+
+/// Factor to multiply / divide in the charts when converting dates to milliseconds
+/// from epoch since fl_charts does not support real time series charts and using
+/// the milliseconds themselves can cause the application to crash since it runs
+/// out of memory...
+const double CHART_MILLISECOND_FACTOR = 100000.0;
+
+enum WeightUnitEnum { kg, lb }
+
+/// TextInputType for decimal numbers
+const textInputTypeDecimal = TextInputType.numberWithOptions(decimal: true);
+
+const String API_MAX_PAGE_SIZE = '999';
+
+const String API_RESULTS_PAGE_SIZE = '100';
+
+/// Marker used for identifying interpolated values in a list, e.g. for measurements
+/// the milliseconds in the entry date are set to this value
+const INTERPOLATION_MARKER = 123;
+
+/// Creative Commons license IDs
+const CC_BY_SA_4_ID = 2;
diff --git a/lib/helpers/date.dart b/lib/helpers/date.dart
new file mode 100644
index 00000000..9177b8fc
--- /dev/null
+++ b/lib/helpers/date.dart
@@ -0,0 +1,40 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/// Returns a timezone aware DateTime object from a date and time string.
+DateTime getDateTimeFromDateAndTime(String date, String time) {
+  return DateTime.parse('$date $time');
+}
+
+/// Returns a list of [DateTime] objects from [first] to [last], inclusive.
+List<DateTime> daysInRange(DateTime first, DateTime last) {
+  final dayCount = last.difference(first).inDays + 1;
+  return List.generate(
+    dayCount,
+    (index) => DateTime.utc(first.year, first.month, first.day + index),
+  );
+}
+
+extension DateTimeExtension on DateTime {
+  bool isSameDayAs(DateTime other) {
+    final thisDay = DateTime(year, month, day);
+    final otherDay = DateTime(other.year, other.month, other.day);
+
+    return thisDay.isAtSameMomentAs(otherDay);
+  }
+}
diff --git a/lib/helpers/errors.dart b/lib/helpers/errors.dart
new file mode 100644
index 00000000..77d03a0a
--- /dev/null
+++ b/lib/helpers/errors.dart
@@ -0,0 +1,463 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'dart:async';
+import 'dart:io';
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:json_annotation/json_annotation.dart';
+import 'package:logging/logging.dart';
+import 'package:provider/provider.dart';
+import 'package:url_launcher/url_launcher.dart';
+import 'package:wger/exceptions/http_exception.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/main.dart';
+import 'package:wger/models/workouts/log.dart';
+import 'package:wger/providers/routines.dart';
+
+import 'consts.dart';
+import 'logs.dart';
+
+void showHttpExceptionErrorDialog(WgerHttpException exception, {BuildContext? context}) {
+  final logger = Logger('showHttpExceptionErrorDialog');
+
+  // Attempt to get the BuildContext from our global navigatorKey.
+  // This allows us to show a dialog even if the error occurs outside
+  // of a widget's build method.
+  final BuildContext? dialogContext = context ?? navigatorKey.currentContext;
+
+  if (dialogContext == null) {
+    if (kDebugMode) {
+      logger.warning('Error: Could not error show http error dialog because the context is null.');
+    }
+    return;
+  }
+
+  final errorList = formatApiErrors(extractErrors(exception.errors));
+
+  showDialog(
+    context: dialogContext,
+    builder: (ctx) => AlertDialog(
+      title: Text(AppLocalizations.of(ctx).anErrorOccurred),
+      content: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        mainAxisSize: MainAxisSize.min,
+        children: [...errorList],
+      ),
+      actions: [
+        TextButton(
+          child: Text(MaterialLocalizations.of(ctx).closeButtonLabel),
+          onPressed: () {
+            Navigator.of(ctx).pop();
+          },
+        ),
+      ],
+    ),
+  );
+}
+
+void showGeneralErrorDialog(dynamic error, StackTrace? stackTrace, {BuildContext? context}) {
+  // Attempt to get the BuildContext from our global navigatorKey.
+  // This allows us to show a dialog even if the error occurs outside
+  // of a widget's build method.
+  final BuildContext? dialogContext = context ?? navigatorKey.currentContext;
+
+  final logger = Logger('showHttpExceptionErrorDialog');
+
+  if (dialogContext == null) {
+    if (kDebugMode) {
+      logger.warning('Error: Could not error show dialog because the context is null.');
+    }
+    return;
+  }
+
+  final i18n = AppLocalizations.of(dialogContext);
+
+  // If possible, determine the error title and message based on the error type.
+  // (Note that issue titles and error messages are not localized)
+  bool allowReportIssue = true;
+  String issueTitle = 'An error occurred';
+  String issueErrorMessage = error.toString();
+  String errorTitle = i18n.anErrorOccurred;
+  String errorDescription = i18n.errorInfoDescription;
+  var icon = Icons.error;
+
+  if (error is TimeoutException) {
+    issueTitle = 'Network Timeout';
+    issueErrorMessage =
+        'The connection to the server timed out. Please check your '
+        'internet connection and try again.';
+  } else if (error is FlutterErrorDetails) {
+    issueTitle = 'Application Error';
+    issueErrorMessage = error.exceptionAsString();
+  } else if (error is MissingRequiredKeysException) {
+    issueTitle = 'Missing Required Key';
+  } else if (error is SocketException) {
+    allowReportIssue = false;
+    icon = Icons.signal_wifi_connected_no_internet_4_outlined;
+    errorTitle = i18n.errorCouldNotConnectToServer;
+    errorDescription = i18n.errorCouldNotConnectToServerDetails;
+  }
+
+  final String fullStackTrace = stackTrace?.toString() ?? 'No stack trace available.';
+  final applicationLogs = InMemoryLogStore().getFormattedLogs();
+
+  showDialog(
+    context: dialogContext,
+    barrierDismissible: false,
+    builder: (BuildContext context) {
+      return AlertDialog(
+        title: Row(
+          spacing: 8,
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Icon(icon, color: Theme.of(context).colorScheme.error),
+            Expanded(
+              child: Text(errorTitle, style: TextStyle(color: Theme.of(context).colorScheme.error)),
+            ),
+          ],
+        ),
+        content: SingleChildScrollView(
+          child: ListBody(
+            children: [
+              Text(errorDescription),
+              const SizedBox(height: 8),
+              Text(i18n.errorInfoDescription2),
+              const SizedBox(height: 10),
+              ExpansionTile(
+                tilePadding: EdgeInsets.zero,
+                title: Text(i18n.errorViewDetails),
+                children: [
+                  Text(issueErrorMessage, style: const TextStyle(fontWeight: FontWeight.bold)),
+                  Container(
+                    alignment: Alignment.topLeft,
+                    padding: const EdgeInsets.symmetric(vertical: 8.0),
+                    constraints: const BoxConstraints(maxHeight: 250),
+                    child: SingleChildScrollView(
+                      child: Text(
+                        fullStackTrace,
+                        style: TextStyle(fontSize: 12.0, color: Colors.grey[700]),
+                      ),
+                    ),
+                  ),
+                  CopyToClipboardButton(
+                    text:
+                        'Error Title: $issueTitle\n'
+                        'Error Message: $issueErrorMessage\n\n'
+                        'Stack Trace:\n$fullStackTrace',
+                  ),
+                  const SizedBox(height: 8),
+                  Text(i18n.applicationLogs, style: const TextStyle(fontWeight: FontWeight.bold)),
+                  Container(
+                    alignment: Alignment.topLeft,
+                    padding: const EdgeInsets.symmetric(vertical: 8.0),
+                    constraints: const BoxConstraints(maxHeight: 250),
+                    child: SingleChildScrollView(
+                      child: Column(
+                        children: [
+                          ...applicationLogs.map(
+                            (entry) => Text(
+                              entry,
+                              style: TextStyle(fontSize: 12.0, color: Colors.grey[700]),
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                  ),
+                  CopyToClipboardButton(text: applicationLogs.join('\n')),
+                ],
+              ),
+            ],
+          ),
+        ),
+        actions: [
+          if (allowReportIssue)
+            TextButton(
+              child: const Text('Report issue'),
+              onPressed: () async {
+                final logText = applicationLogs.isEmpty
+                    ? '-- No logs available --'
+                    : applicationLogs.join('\n');
+                final description = Uri.encodeComponent(
+                  '## Description\n\n'
+                  '[Please describe what you were doing when the error occurred.]\n\n'
+                  '## Error details\n\n'
+                  'Error title: $issueTitle\n'
+                  'Error message: $issueErrorMessage\n'
+                  'Stack trace:\n'
+                  '```\n$stackTrace\n```\n\n'
+                  'App logs (last ${applicationLogs.length} entries):\n'
+                  '```\n$logText\n```',
+                );
+                final githubIssueUrl =
+                    '$GITHUB_ISSUES_BUG_URL'
+                    '&title=$issueTitle'
+                    '&description=$description';
+                final Uri reportUri = Uri.parse(githubIssueUrl);
+
+                try {
+                  await launchUrl(reportUri, mode: LaunchMode.externalApplication);
+                } catch (e) {
+                  if (kDebugMode) {
+                    logger.warning('Error launching URL: $e');
+                  }
+                  ScaffoldMessenger.of(
+                    context,
+                  ).showSnackBar(SnackBar(content: Text('Error opening issue tracker: $e')));
+                }
+              },
+            ),
+          FilledButton(
+            child: Text(MaterialLocalizations.of(context).okButtonLabel),
+            onPressed: () {
+              Navigator.of(context).pop();
+            },
+          ),
+        ],
+      );
+    },
+  );
+}
+
+class CopyToClipboardButton extends StatelessWidget {
+  final logger = Logger('CopyToClipboardButton');
+  final String text;
+
+  CopyToClipboardButton({required this.text, super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
+
+    return TextButton.icon(
+      icon: const Icon(Icons.copy_all_outlined, size: 18),
+      label: Text(i18n.copyToClipboard),
+      style: TextButton.styleFrom(
+        padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+        tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+      ),
+      onPressed: () {
+        Clipboard.setData(ClipboardData(text: text))
+            .then((_) {
+              if (context.mounted) {
+                ScaffoldMessenger.of(
+                  context,
+                ).showSnackBar(const SnackBar(content: Text('Details copied to clipboard!')));
+              }
+            })
+            .catchError((copyError) {
+              logger.warning('Error copying to clipboard: $copyError');
+
+              if (context.mounted) {
+                ScaffoldMessenger.of(
+                  context,
+                ).showSnackBar(const SnackBar(content: Text('Could not copy details.')));
+              }
+            });
+      },
+    );
+  }
+}
+
+void showDeleteDialog(BuildContext context, String confirmDeleteName, Log log) async {
+  final res = await showDialog(
+    context: context,
+    builder: (BuildContext contextDialog) {
+      return AlertDialog(
+        content: Text(AppLocalizations.of(context).confirmDelete(confirmDeleteName)),
+        actions: [
+          TextButton(
+            key: const ValueKey('cancel-button'),
+            child: Text(MaterialLocalizations.of(context).cancelButtonLabel),
+            onPressed: () => Navigator.of(contextDialog).pop(),
+          ),
+          TextButton(
+            key: const ValueKey('delete-button'),
+            child: Text(
+              AppLocalizations.of(context).delete,
+              style: TextStyle(color: Theme.of(context).colorScheme.error),
+            ),
+            onPressed: () {
+              context.read<RoutinesProvider>().deleteLog(log.id!, log.routineId);
+
+              Navigator.of(contextDialog).pop();
+
+              ScaffoldMessenger.of(context).showSnackBar(
+                SnackBar(
+                  content: Text(
+                    AppLocalizations.of(context).successfullyDeleted,
+                    textAlign: TextAlign.center,
+                  ),
+                ),
+              );
+            },
+          ),
+        ],
+      );
+    },
+  );
+  return res;
+}
+
+class ApiError {
+  final String key;
+  late List<String> errorMessages = [];
+
+  ApiError({required this.key, this.errorMessages = const []});
+
+  @override
+  String toString() {
+    return 'ApiError(key: $key, errorMessage: $errorMessages)';
+  }
+}
+
+/// Extracts error messages from the server response,
+/// including nested error structures.
+List<ApiError> extractErrors(Map<String, dynamic> errors) {
+  final List<ApiError> errorList = [];
+  _extractErrorsRecursive(errors, errorList);
+  return errorList;
+}
+
+void _extractErrorsRecursive(dynamic errors, List<ApiError> errorList, [String? parentKey]) {
+  if (errors is Map<String, dynamic>) {
+    for (final key in errors.keys) {
+      final value = errors[key];
+      final fullKey = parentKey != null ? '$parentKey | ${_formatHeader(key)}' : key;
+      _extractErrorsRecursive(value, errorList, fullKey);
+    }
+  } else if (errors is List) {
+    // List of Maps (nested errors)
+    if (errors.isNotEmpty && errors.first is Map<String, dynamic>) {
+      for (final item in errors) {
+        _extractErrorsRecursive(item, errorList, parentKey);
+      }
+    } else {
+      // List of Strings
+      final header = _formatHeader(parentKey ?? '');
+      final error = ApiError(key: header, errorMessages: errors.cast<String>());
+      errorList.add(error);
+    }
+  } else if (errors is String) {
+    final header = _formatHeader(parentKey ?? '');
+    final error = ApiError(key: header, errorMessages: [errors]);
+    errorList.add(error);
+  }
+}
+
+String _formatHeader(String key) {
+  var header = key[0].toUpperCase() + key.substring(1, key.length);
+  header = header.replaceAll('_', ' ');
+  return header.replaceAll('.', ' ');
+}
+
+/// Processes the error messages from the server and returns a list of widgets
+List<Widget> formatApiErrors(List<ApiError> errors, {Color? color}) {
+  final textColor = color ?? Colors.black;
+
+  final List<Widget> errorList = [];
+
+  for (final error in errors) {
+    errorList.add(
+      Text(
+        error.key,
+        style: TextStyle(fontWeight: FontWeight.bold, color: textColor),
+      ),
+    );
+
+    print(error.errorMessages);
+    for (final message in error.errorMessages) {
+      errorList.add(Text(message, style: TextStyle(color: textColor)));
+    }
+    errorList.add(const SizedBox(height: 8));
+  }
+
+  return errorList;
+}
+
+/// Processes the error messages from the server and returns a list of widgets
+List<Widget> formatTextErrors(List<String> errors, {String? title, Color? color}) {
+  final textColor = color ?? Colors.black;
+
+  final List<Widget> errorList = [];
+
+  if (title != null) {
+    errorList.add(
+      Text(
+        title,
+        style: TextStyle(fontWeight: FontWeight.bold, color: textColor),
+      ),
+    );
+  }
+
+  for (final message in errors) {
+    errorList.add(Text(message, style: TextStyle(color: textColor)));
+  }
+  errorList.add(const SizedBox(height: 8));
+
+  return errorList;
+}
+
+class FormHttpErrorsWidget extends StatelessWidget {
+  final WgerHttpException exception;
+
+  const FormHttpErrorsWidget(this.exception, {super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      constraints: const BoxConstraints(maxHeight: 250),
+      child: SingleChildScrollView(
+        child: Column(
+          children: [
+            Icon(Icons.error_outline, color: Theme.of(context).colorScheme.error),
+            ...formatApiErrors(
+              extractErrors(exception.errors),
+              color: Theme.of(context).colorScheme.error,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class GeneralErrorsWidget extends StatelessWidget {
+  final String? title;
+  final List<String> widgets;
+
+  const GeneralErrorsWidget(this.widgets, {this.title, super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      constraints: const BoxConstraints(maxHeight: 250),
+      child: SingleChildScrollView(
+        child: Column(
+          children: [
+            Icon(Icons.error_outline, color: Theme.of(context).colorScheme.error),
+            ...formatTextErrors(widgets, title: title, color: Theme.of(context).colorScheme.error),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/helpers/exercises/forms.dart b/lib/helpers/exercises/validators.dart
similarity index 66%
rename from lib/helpers/exercises/forms.dart
rename to lib/helpers/exercises/validators.dart
index d1d3e3b9..2af07d8b 100644
--- a/lib/helpers/exercises/forms.dart
+++ b/lib/helpers/exercises/validators.dart
@@ -14,19 +14,29 @@ String? validateName(String? name, BuildContext context) {
   }
 
   if (name.length < MIN_CHARS_NAME || name.length > MAX_CHARS_NAME) {
-    return AppLocalizations.of(context).enterCharacters(MIN_CHARS_NAME, MAX_CHARS_NAME);
+    return AppLocalizations.of(
+      context,
+    ).enterCharacters(MIN_CHARS_NAME.toString(), MAX_CHARS_NAME.toString());
   }
 
   return null;
 }
 
-String? validateDescription(String? name, BuildContext context) {
+String? validateAuthorName(String? name, BuildContext context) {
+  if (name!.isEmpty) {
+    return AppLocalizations.of(context).enterValue;
+  }
+
+  return null;
+}
+
+String? validateExerciseDescription(String? name, BuildContext context) {
   if (name!.isEmpty) {
     return AppLocalizations.of(context).enterValue;
   }
 
   if (name.length < MIN_CHARS_DESCRIPTION) {
-    return AppLocalizations.of(context).enterMinCharacters(MIN_CHARS_DESCRIPTION);
+    return AppLocalizations.of(context).enterMinCharacters(MIN_CHARS_DESCRIPTION.toString());
   }
 
   return null;
diff --git a/lib/helpers/gym_mode.dart b/lib/helpers/gym_mode.dart
index ffad3e26..9a62f437 100644
--- a/lib/helpers/gym_mode.dart
+++ b/lib/helpers/gym_mode.dart
@@ -18,30 +18,35 @@
 
 /// Calculates the number of plates needed to reach a specific weight
 List<num> plateCalculator(num totalWeight, num barWeight, List<num> plates) {
-  final List<num> ans = [];
+  final List<num> result = [];
+  final sortedPlates = List.of(plates)..sort();
 
   // Weight is less than the bar
   if (totalWeight < barWeight) {
     return [];
   }
 
+  if (sortedPlates.isEmpty) {
+    return [];
+  }
+
   // Remove the bar and divide by two to get weight on each side
   totalWeight = (totalWeight - barWeight) / 2;
 
   // Weight can't be divided with the smallest plate
-  if (totalWeight % plates.first > 0) {
+  if (totalWeight % sortedPlates.first > 0) {
     return [];
   }
 
   // Iterate through the plates, beginning with the biggest ones
-  for (final plate in plates.reversed) {
+  for (final plate in sortedPlates.reversed) {
     while (totalWeight >= plate) {
       totalWeight -= plate;
-      ans.add(plate);
+      result.add(plate);
     }
   }
 
-  return ans;
+  return result;
 }
 
 /// Groups a list of plates as calculated by [plateCalculator]
diff --git a/lib/helpers/i18n.dart b/lib/helpers/i18n.dart
index 161bc110..8a270686 100644
--- a/lib/helpers/i18n.dart
+++ b/lib/helpers/i18n.dart
@@ -1,5 +1,4 @@
 /// This code is autogenerated in the backend repo in extract-i18n.py do not edit!
-library;
 
 /// Translate dynamic strings that are returned from the server
 /// These strings such as categories or equipment are returned by the server
@@ -7,9 +6,12 @@ library;
 /// probably better ways to do this, but that's the way it is right now).
 
 import 'package:flutter/widgets.dart';
+import 'package:logging/logging.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 
 String getTranslation(String value, BuildContext context) {
+  final logger = Logger('getTranslation');
+
   switch (value) {
     case 'Abs':
       return AppLocalizations.of(context).abs;
@@ -98,6 +100,9 @@ String getTranslation(String value, BuildContext context) {
     case 'Repetitions':
       return AppLocalizations.of(context).repetitions;
 
+    case 'Resistance band':
+      return AppLocalizations.of(context).resistance_band;
+
     case 'SZ-Bar':
       return AppLocalizations.of(context).sz_bar;
 
@@ -126,6 +131,7 @@ String getTranslation(String value, BuildContext context) {
       return AppLocalizations.of(context).none__bodyweight_exercise_;
 
     default:
-      throw FormatException('Could not translate the server string $value');
+      logger.warning('Could not translate the server string $value');
+      return value;
   }
 }
diff --git a/lib/helpers/json.dart b/lib/helpers/json.dart
index bca18194..a80fba71 100644
--- a/lib/helpers/json.dart
+++ b/lib/helpers/json.dart
@@ -23,6 +23,17 @@ num stringToNum(String? e) {
   return e == null ? 0 : num.parse(e);
 }
 
+num stringOrIntToNum(dynamic e) {
+  if (e is int) {
+    return e.toDouble(); // Convert int to double (a type of num)
+  }
+  return num.tryParse(e) ?? 0;
+}
+
+num? stringToNumNull(String? e) {
+  return e == null ? null : num.parse(e);
+}
+
 String? numToString(num? e) {
   if (e == null) {
     return null;
@@ -35,20 +46,37 @@ String? numToString(num? e) {
  * Converts a datetime to ISO8601 date format, but only the date.
  * Needed e.g. when the wger api only expects a date and no time information.
  */
-String? toDate(DateTime? dateTime) {
+String? dateToYYYYMMDD(DateTime? dateTime) {
   if (dateTime == null) {
     return null;
   }
   return DateFormat('yyyy-MM-dd').format(dateTime);
 }
 
+/// Convert a date to UTC and then to an ISO8601 string.
+///
+/// This makes sure that the serialized data has correct timezone information.
+/// Otherwise the django backend will possibly treat the date as local time,
+/// which will not be correct in most cases.
+String dateToUtcIso8601(DateTime dateTime) {
+  return dateTime.toUtc().toIso8601String();
+}
+
 /*
  * Converts a time to a date object.
  * Needed e.g. when the wger api only sends a time but no date information.
  */
 TimeOfDay stringToTime(String? time) {
-  final String out = time ?? '00:00';
-  return TimeOfDay.fromDateTime(DateTime.parse('2020-01-01 $out'));
+  time ??= '00:00';
+  return TimeOfDay.fromDateTime(DateTime.parse('2020-01-01 $time'));
+}
+
+TimeOfDay? stringToTimeNull(String? time) {
+  if (time == null) {
+    return null;
+  }
+
+  return TimeOfDay.fromDateTime(DateTime.parse('2020-01-01 $time'));
 }
 
 /*
diff --git a/lib/helpers/logs.dart b/lib/helpers/logs.dart
new file mode 100644
index 00000000..e0dea032
--- /dev/null
+++ b/lib/helpers/logs.dart
@@ -0,0 +1,56 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:logging/logging.dart';
+
+/// Stores log entries in memory.
+///
+/// This means nothing is stored permanently anywhere and we loose everything
+/// when the application closes, but that's ok for our use case and can be
+/// changed in the future if the need arises.
+class InMemoryLogStore {
+  static final InMemoryLogStore _instance = InMemoryLogStore._internal();
+  final List<LogRecord> _logs = [];
+
+  factory InMemoryLogStore() => _instance;
+
+  InMemoryLogStore._internal();
+
+  // Adds a new log entry, but keeps the total number of entries limited
+  void add(LogRecord record) {
+    if (_logs.length >= 500) {
+      _logs.removeAt(0);
+    }
+    _logs.add(record);
+  }
+
+  List<LogRecord> get logs => List.unmodifiable(_logs);
+
+  List<String> getFormattedLogs({Level? minLevel}) {
+    final level = minLevel ?? Logger.root.level;
+    return _logs
+        .where((log) => log.level >= level)
+        .map(
+          (log) =>
+              '${log.time.toIso8601String()} ${log.level.name} [${log.loggerName}] ${log.message}',
+        )
+        .toList();
+  }
+
+  void clear() => _logs.clear();
+}
diff --git a/lib/helpers/measurements.dart b/lib/helpers/measurements.dart
new file mode 100644
index 00000000..bcde38fb
--- /dev/null
+++ b/lib/helpers/measurements.dart
@@ -0,0 +1,116 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:wger/helpers/consts.dart';
+import 'package:wger/helpers/date.dart';
+import 'package:wger/widgets/measurements/charts.dart';
+
+extension MeasurementChartEntryListExtensions on List<MeasurementChartEntry> {
+  List<MeasurementChartEntry> whereDate(DateTime start, DateTime? end) {
+    return where((e) => e.date.isAfter(start) && (end == null || e.date.isBefore(end))).toList();
+  }
+
+  // assures values on the start (and optionally end) dates exist, by interpolating if needed
+  // this is used for when you are looking at a specific time frame (e.g. for a nutrition plan)
+  // while gaps in the middle of a chart can be "visually interpolated", it's good to have a clearer
+  // explicit interpolation for the start and end dates (if needed)
+  // this also helps with computing delta's across the entire window
+  List<MeasurementChartEntry> whereDateWithInterpolation(DateTime start, DateTime? end) {
+    // Make sure our list is sorted by date
+    sort((a, b) => a.date.compareTo(b.date));
+
+    // Initialize result list
+    final List<MeasurementChartEntry> result = [];
+
+    // Check if we have any entries on the same day as start/end
+    bool hasEntryOnStartDay = false;
+    bool hasEntryOnEndDay = false;
+
+    // Track entries for potential interpolation
+    MeasurementChartEntry? lastBeforeStart;
+    MeasurementChartEntry? lastBeforeEnd;
+
+    // Single pass through the data
+    for (final entry in this) {
+      if (entry.date.isSameDayAs(start)) {
+        hasEntryOnStartDay = true;
+      }
+      if (end != null && entry.date.isSameDayAs(end)) {
+        hasEntryOnEndDay = true;
+      }
+
+      if (end != null && entry.date.isBefore(end)) {
+        lastBeforeEnd = entry;
+      }
+
+      if (entry.date.isBefore(start)) {
+        lastBeforeStart = entry;
+      } else {
+        // insert interpolated start value if needed
+        if (!hasEntryOnStartDay && lastBeforeStart != null) {
+          result.insert(0, interpolateBetween(lastBeforeStart, entry, start));
+          hasEntryOnStartDay = true;
+        }
+
+        if (end == null || entry.date.isBefore(end)) {
+          result.add(entry);
+        }
+        if (end != null && entry.date.isAfter(end)) {
+          // insert interpolated end value if needed
+          // note: we only interpolate end if we have data going beyond end
+          // if let's say your plan ends in a week from now, we wouldn't want to fake data until next week.
+          if (!hasEntryOnEndDay && lastBeforeEnd != null) {
+            result.add(interpolateBetween(lastBeforeEnd, entry, end));
+            hasEntryOnEndDay = true;
+          }
+          // we added all our values and did all interpolations
+          // surely all input values from here on are irrelevant.
+          return result;
+        }
+      }
+    }
+    return result;
+  }
+}
+
+// caller needs to make sure that before.date < date < after.date
+MeasurementChartEntry interpolateBetween(
+  MeasurementChartEntry before,
+  MeasurementChartEntry after,
+  DateTime date,
+) {
+  final totalDuration = after.date.difference(before.date).inMilliseconds;
+  final startDuration = date.difference(before.date).inMilliseconds;
+
+  // Create a special DateTime with milliseconds ending in 123 to mark it as interpolated
+  // which we leverage in the UI
+  final markedDate = DateTime(
+    date.year,
+    date.month,
+    date.day,
+    date.hour,
+    date.minute,
+    date.second,
+    INTERPOLATION_MARKER,
+  );
+
+  return MeasurementChartEntry(
+    before.value + (after.value - before.value) * (startDuration / totalDuration),
+    markedDate,
+  );
+}
diff --git a/lib/helpers/misc.dart b/lib/helpers/misc.dart
index b880e8c2..f99b2364 100644
--- a/lib/helpers/misc.dart
+++ b/lib/helpers/misc.dart
@@ -24,33 +24,35 @@ import 'package:wger/models/workouts/weight_unit.dart';
 
 /// Returns the text representation for a single setting, used in the gym mode
 String repText(
-  int? reps,
-  RepetitionUnit repetitionUnitObj,
+  num? repetitions,
+  RepetitionUnit? repetitionUnitObj,
   num? weight,
-  WeightUnit weightUnitObj,
-  String? rir,
+  WeightUnit? weightUnitObj,
+  num? rir,
 ) {
   // TODO(x): how to (easily?) translate strings like the units or 'RiR'
 
   final List<String> out = [];
 
-  if (reps != null) {
-    out.add(reps.toString());
+  if (repetitions != null) {
+    out.add(formatNum(repetitions).toString());
 
     // The default repetition unit is 'reps', which we don't show unless there
     // is no weight defined so that we don't just output something like "8" but
     // rather "8 repetitions". If there is weight we want to output "8 x 50kg",
     // since the repetitions are implied. If other units are used, we always
     // print them
-    if (repetitionUnitObj.id != REP_UNIT_REPETITIONS || weight == 0 || weight == null) {
-      out.add(repetitionUnitObj.name);
+    if (repetitionUnitObj != null && repetitionUnitObj.id != REP_UNIT_REPETITIONS_ID ||
+        weight == 0 ||
+        weight == null) {
+      out.add(repetitionUnitObj!.name);
     }
   }
 
   if (weight != null && weight != 0) {
     out.add('×');
-    out.add(weight.toString());
-    out.add(weightUnitObj.name);
+    out.add(formatNum(weight).toString());
+    out.add(weightUnitObj!.name);
   }
 
   if (rir != null && rir != '') {
@@ -61,46 +63,6 @@ String repText(
   return out.join(' ');
 }
 
-/// Returns a list of [DateTime] objects from [first] to [last], inclusive.
-List<DateTime> daysInRange(DateTime first, DateTime last) {
-  final dayCount = last.difference(first).inDays + 1;
-  return List.generate(
-    dayCount,
-    (index) => DateTime.utc(first.year, first.month, first.day + index),
-  );
-}
-
-extension TimeOfDayExtension on TimeOfDay {
-  bool isAfter(TimeOfDay other) {
-    if (toMinutes() > other.toMinutes()) {
-      return true;
-    } else {
-      return false;
-    }
-  }
-
-  bool isBefore(TimeOfDay other) {
-    if (toMinutes() < other.toMinutes()) {
-      return true;
-    } else {
-      return false;
-    }
-  }
-
-  int toMinutes() {
-    return (hour * 60) + minute;
-  }
-}
-
-extension DateTimeExtension on DateTime {
-  bool isSameDayAs(DateTime other) {
-    final thisDay = DateTime(year, month, day);
-    final otherDay = DateTime(other.year, other.month, other.day);
-
-    return thisDay.isAtSameMomentAs(otherDay);
-  }
-}
-
 void launchURL(String url, BuildContext context) async {
   final scaffoldMessenger = ScaffoldMessenger.of(context);
   final launched = await launchUrl(Uri.parse(url));
@@ -110,3 +72,11 @@ void launchURL(String url, BuildContext context) async {
     );
   }
 }
+
+/// Formats a number to an integer if it's a whole number
+num formatNum(num value) {
+  if (value is double && value == value.toInt()) {
+    return value.toInt();
+  }
+  return value;
+}
diff --git a/lib/helpers/shared_preferences.dart b/lib/helpers/shared_preferences.dart
new file mode 100644
index 00000000..92ef435e
--- /dev/null
+++ b/lib/helpers/shared_preferences.dart
@@ -0,0 +1,34 @@
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:shared_preferences/util/legacy_to_async_migration_util.dart';
+
+/// A helper class that manages preferences using SharedPreferencesAsync
+/// and handles migration from the legacy SharedPreferences to
+/// SharedPreferencesAsync.
+class PreferenceHelper {
+  SharedPreferencesAsync _asyncPref = SharedPreferencesAsync();
+
+  PreferenceHelper._instantiate();
+
+  static final PreferenceHelper _instance = PreferenceHelper._instantiate();
+
+  static SharedPreferencesAsync get asyncPref => _instance._asyncPref;
+
+  static PreferenceHelper get instance => _instance;
+
+  /// Migration function that ensures any legacy data stored in
+  /// SharedPreferences is migrated to SharedPreferencesAsync. This migration
+  /// only happens once, as checked by the migrationCompletedKey.
+  ///
+  /// [migrationCompletedKey] is used to track if the migration has been
+  /// completed.
+  Future<void> migrationSupportFunctionForSharedPreferences() async {
+    const SharedPreferencesOptions sharedPreferencesOptions = SharedPreferencesOptions();
+    final SharedPreferences prefs = await SharedPreferences.getInstance();
+    await migrateLegacySharedPreferencesToSharedPreferencesAsyncIfNecessary(
+      legacySharedPreferencesInstance: prefs,
+      sharedPreferencesAsyncOptions: sharedPreferencesOptions,
+      migrationCompletedKey: 'migrationCompleted',
+    );
+    _asyncPref = SharedPreferencesAsync();
+  }
+}
diff --git a/lib/helpers/ui.dart b/lib/helpers/ui.dart
deleted file mode 100644
index 7a2244bb..00000000
--- a/lib/helpers/ui.dart
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * This file is part of wger Workout Manager <https://github.com/wger-project>.
- * Copyright (C) 2020, 2021 wger Team
- *
- * wger Workout Manager is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import 'dart:developer';
-
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import 'package:wger/exceptions/http_exception.dart';
-import 'package:wger/l10n/generated/app_localizations.dart';
-import 'package:wger/models/exercises/exercise.dart';
-import 'package:wger/models/exercises/translation.dart';
-import 'package:wger/models/workouts/log.dart';
-import 'package:wger/providers/workout_plans.dart';
-
-void showErrorDialog(dynamic exception, BuildContext context) {
-  // log('showErrorDialog: ');
-  // log(exception.toString());
-  // log('=====================');
-
-  showDialog(
-    context: context,
-    builder: (ctx) => AlertDialog(
-      scrollable: true,
-      title: Text(AppLocalizations.of(context).anErrorOccurred),
-      content: SelectableText(exception.toString()),
-      actions: [
-        TextButton(
-          child: Text(MaterialLocalizations.of(context).closeButtonLabel),
-          onPressed: () {
-            Navigator.of(ctx).pop();
-          },
-        ),
-      ],
-    ),
-  );
-}
-
-void showHttpExceptionErrorDialog(WgerHttpException exception, BuildContext context) {
-  log('showHttpExceptionErrorDialog: ');
-  log(exception.toString());
-  log('-------------------');
-
-  final List<Widget> errorList = [];
-
-  for (final key in exception.errors!.keys) {
-    // Error headers
-    // Ensure that the error heading first letter is capitalized.
-    final String errorHeaderMsg = key[0].toUpperCase() + key.substring(1, key.length);
-
-    errorList.add(
-      Text(
-        errorHeaderMsg.replaceAll('_', ' '),
-        style: const TextStyle(fontWeight: FontWeight.bold),
-      ),
-    );
-
-    // Error messages
-    if (exception.errors![key] is String) {
-      errorList.add(Text(exception.errors![key]));
-    } else {
-      for (final value in exception.errors![key]) {
-        errorList.add(Text(value));
-      }
-    }
-    errorList.add(const SizedBox(height: 8));
-  }
-
-  showDialog(
-    context: context,
-    builder: (ctx) => AlertDialog(
-      title: Text(AppLocalizations.of(ctx).anErrorOccurred),
-      content: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        mainAxisSize: MainAxisSize.min,
-        children: [...errorList],
-      ),
-      actions: [
-        TextButton(
-          child: Text(MaterialLocalizations.of(ctx).closeButtonLabel),
-          onPressed: () {
-            Navigator.of(ctx).pop();
-          },
-        ),
-      ],
-    ),
-  );
-
-  // This call serves no purpose The dialog above doesn't seem to show
-  // unless this dummy call is present
-  showDialog(context: context, builder: (context) => Container());
-}
-
-dynamic showDeleteDialog(
-  BuildContext context,
-  String confirmDeleteName,
-  Log log,
-  Translation exercise,
-  Map<Exercise, List<Log>> exerciseData,
-) async {
-  final res = await showDialog(
-    context: context,
-    builder: (BuildContext contextDialog) {
-      return AlertDialog(
-        content: Text(AppLocalizations.of(context).confirmDelete(confirmDeleteName)),
-        actions: [
-          TextButton(
-            child: Text(MaterialLocalizations.of(context).cancelButtonLabel),
-            onPressed: () => Navigator.of(contextDialog).pop(),
-          ),
-          TextButton(
-            child: Text(
-              AppLocalizations.of(context).delete,
-              style: TextStyle(color: Theme.of(context).colorScheme.error),
-            ),
-            onPressed: () {
-              exerciseData[exercise]!.removeWhere((el) => el.id == log.id);
-              Provider.of<WorkoutPlansProvider>(context, listen: false).deleteLog(log);
-
-              Navigator.of(contextDialog).pop();
-
-              ScaffoldMessenger.of(context).showSnackBar(
-                SnackBar(
-                  content: Text(
-                    AppLocalizations.of(context).successfullyDeleted,
-                    textAlign: TextAlign.center,
-                  ),
-                ),
-              );
-            },
-          ),
-        ],
-      );
-    },
-  );
-  return res;
-}
diff --git a/lib/l10n/README.md b/lib/l10n/README.md
new file mode 100644
index 00000000..b87571e7
--- /dev/null
+++ b/lib/l10n/README.md
@@ -0,0 +1,21 @@
+# Translations for the app
+
+These files are usually edited on weblate, and not directly in the repo:
+
+<https://hosted.weblate.org/engage/wger/>
+
+## Maintenance
+
+Find keys that are not used in the code anymore:
+
+```bash
+flutter pub add --dev translations_cleaner
+flutter pub run translations_cleaner list-unused-terms
+```
+
+Remove unused keys from the arb files (this removes both `key` as well as `@key`):
+
+```bash
+cd lib/l10n
+dart remove_keys.dart arbKey1 anotherArbKey
+```
\ No newline at end of file
diff --git a/lib/l10n/app_am.arb b/lib/l10n/app_am.arb
index 88d3349f..b73d2025 100644
--- a/lib/l10n/app_am.arb
+++ b/lib/l10n/app_am.arb
@@ -15,10 +15,6 @@
   "@labelBottomNavWorkout": {
     "description": "Label used in bottom navigation, use a short word"
   },
-  "labelWorkoutPlans": "የአካል ብቃት እንቅስቃሴ እቅዶች",
-  "@labelWorkoutPlans": {
-    "description": "Title for screen workout plans"
-  },
   "loginInstead": "በምትኩ ይግቡ",
   "@loginInstead": {},
   "registerInstead": "በምትኩ ይመዝገቡ",
@@ -79,4 +75,4 @@
   "@login": {
     "description": "Text for login button"
   }
-}
+}
\ No newline at end of file
diff --git a/lib/l10n/app_ar.arb b/lib/l10n/app_ar.arb
index 03243ab2..5cd7da9d 100644
--- a/lib/l10n/app_ar.arb
+++ b/lib/l10n/app_ar.arb
@@ -48,7 +48,9 @@
   "alsoKnownAs": "يُعرف أيضًا باسم: {aliases}",
   "@alsoKnownAs": {
     "placeholders": {
-      "aliases": {}
+      "aliases": {
+        "type": "String"
+      }
     },
     "description": "List of alternative names for an exercise"
   },
@@ -78,10 +80,6 @@
   "@goToToday": {
     "description": "Label on button to jump back to 'today' in the calendar widget"
   },
-  "enterRepetitionsOrWeight": "يرجى ملء التكرارات أو الوزن لواحدة على الأقل من المجموعات",
-  "@enterRepetitionsOrWeight": {
-    "description": "Error message when the user hasn't filled in the forms for exercise sets"
-  },
   "baseData": "الأساسيات بالإنجليزية",
   "@baseData": {
     "description": "The base data for an exercise such as category, trained muscles, etc."
@@ -145,7 +143,9 @@
     "description": "Dialog info when product is not found with barcode",
     "type": "text",
     "placeholders": {
-      "barcode": {}
+      "barcode": {
+        "type": "String"
+      }
     }
   },
   "setNr": "مجموعة {nr}",
@@ -153,7 +153,9 @@
     "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.",
     "type": "text",
     "placeholders": {
-      "nr": {}
+      "nr": {
+        "type": "String"
+      }
     }
   },
   "next": "التالي",
@@ -172,14 +174,6 @@
   "@timeStartAhead": {},
   "carbohydrates": "كربوهيدرات",
   "@carbohydrates": {},
-  "noWorkoutPlans": "لا يوجد خطة تمارين",
-  "@noWorkoutPlans": {
-    "description": "Message shown when the user has no workout plans"
-  },
-  "aboutTranslationTitle": "ترجمة",
-  "@aboutTranslationTitle": {
-    "description": "Title for translation section in the about dialog"
-  },
   "date": "التاريخ",
   "@date": {
     "description": "The date of a workout log or body weight entry"
@@ -238,10 +232,6 @@
   },
   "edit": "تعديل",
   "@edit": {},
-  "aboutBugsText": "في حال مواجهتك لأي خلل أو الحاجة لإضافة ميزة جديدة للتطبيق، تواصل معنا",
-  "@aboutBugsText": {
-    "description": "Text for bugs section in the about dialog"
-  },
   "setUnitsAndRir": "تعيين الوحدات و RiR",
   "@setUnitsAndRir": {
     "description": "Label shown on the slider where the user can toggle showing units and RiR",
@@ -253,10 +243,6 @@
   },
   "anErrorOccurred": "حصل خطأ!",
   "@anErrorOccurred": {},
-  "aboutContactUsTitle": "قل اهلاً!",
-  "@aboutContactUsTitle": {
-    "description": "Title for contact us section in the about dialog"
-  },
   "selectExercise": "اختر تمرين",
   "@selectExercise": {
     "description": "Error message when the user hasn't selected an exercise in the form"
@@ -284,8 +270,12 @@
     "description": "Error message when the user hasn't entered the correct number of characters in a form",
     "type": "text",
     "placeholders": {
-      "min": {},
-      "max": {}
+      "min": {
+        "type": "String"
+      },
+      "max": {
+        "type": "String"
+      }
     }
   },
   "recentlyUsedIngredients": "المكونات المضافة مؤخرًا",
@@ -298,10 +288,6 @@
   "@addSet": {
     "description": "Label for the button that adds a set (to a workout day)"
   },
-  "newWorkout": "خطة تمارين جديدة",
-  "@newWorkout": {
-    "description": "Header when adding a new workout"
-  },
   "energyShort": "ط",
   "@energyShort": {
     "description": "The first letter or short name of the word 'Energy', used in overviews"
@@ -351,7 +337,9 @@
   "verifiedEmailInfo": "أُرسلت رسالة للتحقق إلى {email}",
   "@verifiedEmailInfo": {
     "placeholders": {
-      "email": {}
+      "email": {
+        "type": "String"
+      }
     }
   },
   "fatShort": "د",
@@ -427,9 +415,7 @@
   "registerInstead": "ليس لديك حساب ؟ سجّل الان",
   "@registerInstead": {},
   "aboutMastodonTitle": "Mastodon",
-  "@aboutMastodonTitle": {
-    "description": "Title for mastodon section in the about dialog"
-  },
+  "@aboutMastodonTitle": {},
   "repetitions": "التكرار",
   "@repetitions": {
     "description": "Generated entry for translation for server strings"
@@ -456,10 +442,6 @@
   "@nutritionalDiary": {},
   "protein": "بروتين",
   "@protein": {},
-  "labelWorkoutPlans": "خطط التمارين",
-  "@labelWorkoutPlans": {
-    "description": "Title for screen workout plans"
-  },
   "proteinShort": "ب",
   "@proteinShort": {
     "description": "The first letter or short name of the word 'Protein', used in overviews"
@@ -496,10 +478,6 @@
   "@labelWorkoutLogs": {
     "description": "(Workout) logs"
   },
-  "aboutTranslationText": "يُترجم التطبيق على weblate إذا كنت تريد المساعدة اضغط على الرابط وابدأ الترجمة",
-  "@aboutTranslationText": {
-    "description": "Text for translation section in the about dialog"
-  },
   "ingredient": "المكونات",
   "@ingredient": {},
   "measurementCategoriesHelpText": "فئة القياس، مثل \"العضلة ذات الرأسين\" أو \"دهون الجسم\"",
@@ -514,10 +492,6 @@
   },
   "todaysWorkout": "تمرينك اليوم",
   "@todaysWorkout": {},
-  "aboutSourceText": "اطلع على الكود المصدري للتطبيق والسيرفر في القت هب",
-  "@aboutSourceText": {
-    "description": "Text for source code section in the about dialog"
-  },
   "translateExercise": "ترجم التدريب الآن",
   "@translateExercise": {},
   "kJ": "كيلو جول",
@@ -532,10 +506,6 @@
   },
   "gallery": "الألبوم",
   "@gallery": {},
-  "aboutMastodonText": "تابعنا على Mastodon لأحدث الأخبار حول المشروع",
-  "@aboutMastodonText": {
-    "description": "Text for the mastodon section in the about dialog"
-  },
   "translation": "الترجمة",
   "@translation": {},
   "successfullySaved": "تم الحفظ",
@@ -570,10 +540,6 @@
   "@musclesSecondary": {
     "description": "secondary muscles trained by an exercise"
   },
-  "aboutContactUsText": "إذا كنت تريد مراسلتنا فنحن موجودين في Discord، اهلاً بك",
-  "@aboutContactUsText": {
-    "description": "Text for contact us section in the about dialog"
-  },
   "minutes": "دقائق",
   "@minutes": {
     "description": "Generated entry for translation for server strings"
@@ -644,20 +610,12 @@
   },
   "measurementEntriesHelpText": "الوحدة المستخدمة لقياس الفئة مثل \"سم\" أو \"%\"",
   "@measurementEntriesHelpText": {},
-  "supersetWith": "مجموعة شاملة مع",
-  "@supersetWith": {
-    "description": "Text used between exercise cards when adding a new set. Translate as something like 'in a superset with'"
-  },
   "sugars": "سكريات",
   "@sugars": {},
   "customServerUrl": "رابط عنصر wger",
   "@customServerUrl": {
     "description": "Label in the form where the users can enter their own wger instance"
   },
-  "aboutBugsTitle": "لديك مشكلة أو فكرة ؟",
-  "@aboutBugsTitle": {
-    "description": "Title for bugs section in the about dialog"
-  },
   "carbohydratesShort": "ك",
   "@carbohydratesShort": {
     "description": "The first letter or short name of the word 'Carbohydrates', used in overviews"
@@ -699,7 +657,9 @@
     "description": "Confirmation text before the user deletes an object",
     "type": "text",
     "placeholders": {
-      "toDelete": {}
+      "toDelete": {
+        "type": "String"
+      }
     }
   },
   "passwordsDontMatch": "كلمات المرور غير متطابقة",
@@ -731,7 +691,9 @@
     "description": "Error message when the user hasn't entered the minimum amount characters in a form",
     "type": "text",
     "placeholders": {
-      "min": {}
+      "min": {
+        "type": "String"
+      }
     }
   },
   "weekAverage": "متوسط سبع أيام",
@@ -759,7 +721,9 @@
     "description": "Label shown on the slider where the user selects the nr of sets",
     "type": "text",
     "placeholders": {
-      "nrOfSets": {}
+      "nrOfSets": {
+        "type": "String"
+      }
     }
   },
   "none__bodyweight_exercise_": "لا شيء (تمرين وزن الجسم)",
@@ -779,7 +743,9 @@
     "description": "Dialog info when product is found with barcode",
     "type": "text",
     "placeholders": {
-      "productName": {}
+      "productName": {
+        "type": "String"
+      }
     }
   },
   "exercises": "التمارين",
@@ -816,12 +782,28 @@
   "@hamstrings": {
     "description": "Generated entry for translation for server strings"
   },
-  "aboutSourceTitle": "كود المصدر",
-  "@aboutSourceTitle": {
-    "description": "Title for source code section in the about dialog"
-  },
   "textPromptSubheading": "اضغط على الزر للبدء",
   "@textPromptSubheading": {},
   "measurement": "القياس",
-  "@measurement": {}
+  "@measurement": {},
+  "useApiToken": "استخدم رمز API",
+  "@useApiToken": {},
+  "apiToken": "رمز API",
+  "@apiToken": {},
+  "invalidApiToken": "رجاءً أدخل مفتاح API صالح",
+  "@invalidApiToken": {
+    "description": "Error message when the user enters an invalid API key"
+  },
+  "useUsernameAndPassword": "استخدم اسم المستخدم وكلمة المرور",
+  "@useUsernameAndPassword": {},
+  "selectAvailablePlates": "اختر من الاطباق المتوفرة",
+  "@selectAvailablePlates": {},
+  "barWeight": "وزن القضيب الحديدي",
+  "@barWeight": {},
+  "useColors": "استخدم الالوان",
+  "@useColors": {},
+  "apiTokenValidChars": "إن مفتاح ال API لا يمكن أن يحتوي غير الأحرف من a-f، أرقام من 0-9، ويحب أن تكون 40 محرف تماما",
+  "@apiTokenValidChars": {
+    "description": "Error message when the user tries to input a API key with forbidden characters"
+  }
 }
diff --git a/lib/l10n/app_ca.arb b/lib/l10n/app_ca.arb
index 459f3c51..f327fc76 100644
--- a/lib/l10n/app_ca.arb
+++ b/lib/l10n/app_ca.arb
@@ -73,10 +73,6 @@
   "@searchExercise": {
     "description": "Label on set form. Selected exercises are added to the set"
   },
-  "supersetWith": "en conjunt amb",
-  "@supersetWith": {
-    "description": "Text used between exercise cards when adding a new set. Translate as something like 'in a superset with'"
-  },
   "equipment": "Equipament",
   "@equipment": {
     "description": "Equipment needed to perform an exercise"
@@ -93,14 +89,6 @@
   "@category": {
     "description": "Category for an exercise, ingredient, etc."
   },
-  "newWorkout": "Nou pla d'entrenament",
-  "@newWorkout": {
-    "description": "Header when adding a new workout"
-  },
-  "noWorkoutPlans": "No tens cap pla d'entrenament",
-  "@noWorkoutPlans": {
-    "description": "Message shown when the user has no workout plans"
-  },
   "repetitions": "Repeticions",
   "@repetitions": {
     "description": "Repetitions for an exercise set"
@@ -291,34 +279,6 @@
   },
   "goToDetailPage": "Vés a la pàgina dels detalls",
   "@goToDetailPage": {},
-  "aboutSourceTitle": "Codi font",
-  "@aboutSourceTitle": {
-    "description": "Title for source code section in the about dialog"
-  },
-  "aboutBugsTitle": "Teniu cap problema o idea?",
-  "@aboutBugsTitle": {
-    "description": "Title for bugs section in the about dialog"
-  },
-  "aboutBugsText": "Poseu-vos en contacte si alguna cosa no funciona com s'esperava o si hi ha alguna funció que penseu que manca.",
-  "@aboutBugsText": {
-    "description": "Text for bugs section in the about dialog"
-  },
-  "aboutContactUsTitle": "Saludeu!",
-  "@aboutContactUsTitle": {
-    "description": "Title for contact us section in the about dialog"
-  },
-  "aboutContactUsText": "Si voleu xatejar amb nosaltres, entreu al servidor de Discord i poseu-vos en contacte",
-  "@aboutContactUsText": {
-    "description": "Text for contact us section in the about dialog"
-  },
-  "aboutTranslationTitle": "Traducció",
-  "@aboutTranslationTitle": {
-    "description": "Title for translation section in the about dialog"
-  },
-  "aboutTranslationText": "Aquesta aplicació es tradueix a weblate. Si voleu ajudar-hi també, feu clic al vincle i comenceu a traduir",
-  "@aboutTranslationText": {
-    "description": "Text for translation section in the about dialog"
-  },
   "calendar": "Calendari",
   "@calendar": {},
   "enterValue": "Introduïu un valor",
@@ -330,7 +290,9 @@
     "description": "Label shown on the slider where the user selects the nr of sets",
     "type": "text",
     "placeholders": {
-      "nrOfSets": {}
+      "nrOfSets": {
+        "type": "String"
+      }
     }
   },
   "setUnitsAndRir": "Unitats de la sèrie i RER",
@@ -386,10 +348,6 @@
   },
   "loginInstead": "Ja tens un compte? Entra",
   "@loginInstead": {},
-  "labelWorkoutPlans": "Plans d'entrenament",
-  "@labelWorkoutPlans": {
-    "description": "Title for screen workout plans"
-  },
   "labelBottomNavNutrition": "Nutrició",
   "@labelBottomNavNutrition": {
     "description": "Label used in bottom navigation, use a short word"
@@ -401,7 +359,9 @@
     "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.",
     "type": "text",
     "placeholders": {
-      "nr": {}
+      "nr": {
+        "type": "String"
+      }
     }
   },
   "dayDescriptionHelp": "Descripció de què es fa aquest dia (p. e. «dia de tracció») o quines parts del cos d'exerciten (p. e. «pit i espatlles»)",
@@ -458,10 +418,6 @@
   "@proteinShort": {
     "description": "The first letter or short name of the word 'Protein', used in overviews"
   },
-  "enterRepetitionsOrWeight": "Ompliu les repeticions o bé el pes per a una de les sèries com a mínim",
-  "@enterRepetitionsOrWeight": {
-    "description": "Error message when the user hasn't filled in the forms for exercise sets"
-  },
   "fatShort": "G",
   "@fatShort": {
     "description": "The first letter or short name of the word 'Fat', used in overviews"
@@ -478,16 +434,14 @@
   "@sodium": {},
   "delete": "Esborra",
   "@delete": {},
-  "aboutSourceText": "Obtingueu el codi font d'aquesta aplicació i el seu servidor a Github",
-  "@aboutSourceText": {
-    "description": "Text for source code section in the about dialog"
-  },
   "confirmDelete": "Esteu segur de voler esborrar '{toDelete}'?",
   "@confirmDelete": {
     "description": "Confirmation text before the user deletes an object",
     "type": "text",
     "placeholders": {
-      "toDelete": {}
+      "toDelete": {
+        "type": "String"
+      }
     }
   },
   "goToToday": "Vés a avui",
@@ -503,8 +457,12 @@
     "description": "Error message when the user hasn't entered the correct number of characters in a form",
     "type": "text",
     "placeholders": {
-      "min": {},
-      "max": {}
+      "min": {
+        "type": "String"
+      },
+      "max": {
+        "type": "String"
+      }
     }
   },
   "recentlyUsedIngredients": "Ingredients afegits recentment",
@@ -513,6 +471,26 @@
   },
   "gallery": "Galeria",
   "@gallery": {},
+  "imageFormatNotSupported": "{imageFormat} no és compatible",
+  "@imageFormatNotSupported": {
+      "description": "Label shown on the error container when image format is not supported",
+      "type": "text",
+      "placeholders": {
+          "imageFormat": {
+              "type": "String"
+          }
+      }
+  },
+  "imageFormatNotSupportedDetail": "Les imatges {imageFormat} encara no són compatibles.",
+  "@imageFormatNotSupportedDetail": {
+      "description": "Label shown on the image preview container when image format is not supported",
+      "type": "text",
+      "placeholders": {
+          "imageFormat": {
+              "type": "String"
+          }
+      }
+  },
   "addImage": "Afegeix imatge",
   "@addImage": {},
   "dataCopied": "Dades copiades a una nova entrada",
@@ -542,7 +520,9 @@
     "description": "Dialog info when product is found with barcode",
     "type": "text",
     "placeholders": {
-      "productName": {}
+      "productName": {
+        "type": "String"
+      }
     }
   },
   "productNotFound": "No s'ha trobat el producte",
@@ -554,7 +534,9 @@
     "description": "Dialog info when product is not found with barcode",
     "type": "text",
     "placeholders": {
-      "barcode": {}
+      "barcode": {
+        "type": "String"
+      }
     }
   },
   "alternativeNames": "Noms alternatius",
@@ -664,7 +646,9 @@
     "description": "A value in kcal, e.g. 500 kcal",
     "type": "text",
     "placeholders": {
-      "value": {}
+      "value": {
+        "type": "String"
+      }
     }
   },
   "gValue": "{value} g",
@@ -672,7 +656,9 @@
     "description": "A value in grams, e.g. 5 g",
     "type": "text",
     "placeholders": {
-      "value": {}
+      "value": {
+        "type": "String"
+      }
     }
   },
   "percentValue": "{value} %",
@@ -680,17 +666,13 @@
     "description": "A value in percent, e.g. 10 %",
     "type": "text",
     "placeholders": {
-      "value": {}
+      "value": {
+        "type": "String"
+      }
     }
   },
   "aboutMastodonTitle": "Mastodon",
-  "@aboutMastodonTitle": {
-    "description": "Title for mastodon section in the about dialog"
-  },
-  "aboutMastodonText": "Segueix-nos a Mastodon per a actualitzacions i notícies sobre el projecte",
-  "@aboutMastodonText": {
-    "description": "Text for the mastodon section in the about dialog"
-  },
+  "@aboutMastodonTitle": {},
   "selectEntry": "Si us plau, selecciona una entrada",
   "@selectEntry": {},
   "baseNameEnglish": "Tots els exercicis necessiten un nom base en anglès",
@@ -792,7 +774,9 @@
     "description": "Error message when the user hasn't entered the minimum amount characters in a form",
     "type": "text",
     "placeholders": {
-      "min": {}
+      "min": {
+        "type": "String"
+      }
     }
   },
   "variations": "Variacions",
@@ -802,14 +786,18 @@
   "alsoKnownAs": "També conegut com: {aliases}",
   "@alsoKnownAs": {
     "placeholders": {
-      "aliases": {}
+      "aliases": {
+        "type": "String"
+      }
     },
     "description": "List of alternative names for an exercise"
   },
   "verifiedEmailInfo": "S'ha enviat un correu electrònic de verificació a {email}",
   "@verifiedEmailInfo": {
     "placeholders": {
-      "email": {}
+      "email": {
+        "type": "String"
+      }
     }
   },
   "previous": "Anterior",
diff --git a/lib/l10n/app_cs.arb b/lib/l10n/app_cs.arb
index 8245baa0..0ec42751 100644
--- a/lib/l10n/app_cs.arb
+++ b/lib/l10n/app_cs.arb
@@ -21,10 +21,6 @@
   "@customServerUrl": {
     "description": "Label in the form where the users can enter their own wger instance"
   },
-  "labelWorkoutPlans": "Plány cvičení",
-  "@labelWorkoutPlans": {
-    "description": "Title for screen workout plans"
-  },
   "labelBottomNavWorkout": "Trénink",
   "@labelBottomNavWorkout": {
     "description": "Label used in bottom navigation, use a short word"
@@ -59,10 +55,6 @@
   "@category": {
     "description": "Category for an exercise, ingredient, etc."
   },
-  "noWorkoutPlans": "Nemáte žádné cvičební plány",
-  "@noWorkoutPlans": {
-    "description": "Message shown when the user has no workout plans"
-  },
   "rir": "OvR",
   "@rir": {
     "description": "Shorthand for Repetitions In Reserve"
@@ -233,16 +225,8 @@
   },
   "goToDetailPage": "Přejít na stránku s podrobnostmi",
   "@goToDetailPage": {},
-  "aboutSourceTitle": "Zdrojový kód",
-  "@aboutSourceTitle": {
-    "description": "Title for source code section in the about dialog"
-  },
   "calendar": "Kalendář",
   "@calendar": {},
-  "enterRepetitionsOrWeight": "Prosím, vyplňte buď počet opakování, nebo hmotnost u alespoň jedné sady",
-  "@enterRepetitionsOrWeight": {
-    "description": "Error message when the user hasn't filled in the forms for exercise sets"
-  },
   "enterValue": "Prosím zadejte hodnotu",
   "@enterValue": {
     "description": "Error message when the user hasn't entered a value on a required field"
@@ -258,8 +242,12 @@
     "description": "Error message when the user hasn't entered the correct number of characters in a form",
     "type": "text",
     "placeholders": {
-      "min": {},
-      "max": {}
+      "min": {
+        "type": "String"
+      },
+      "max": {
+        "type": "String"
+      }
     }
   },
   "enterMinCharacters": "Prosím, zadejte alespoň {min} znaků",
@@ -267,7 +255,9 @@
     "description": "Error message when the user hasn't entered the minimum amount characters in a form",
     "type": "text",
     "placeholders": {
-      "min": {}
+      "min": {
+        "type": "String"
+      }
     }
   },
   "baseNameEnglish": "Všechny cviky potřebují mít základní název v angličtině",
@@ -372,10 +362,6 @@
   "@searchExercise": {
     "description": "Label on set form. Selected exercises are added to the set"
   },
-  "supersetWith": "superset s",
-  "@supersetWith": {
-    "description": "Text used between exercise cards when adding a new set. Translate as something like 'in a superset with'"
-  },
   "logMeal": "Zaznamenat do nutričního diáře",
   "@logMeal": {},
   "muscles": "Svaly",
@@ -386,10 +372,6 @@
   "@musclesSecondary": {
     "description": "secondary muscles trained by an exercise"
   },
-  "newWorkout": "Nový plán cvičení",
-  "@newWorkout": {
-    "description": "Header when adding a new workout"
-  },
   "reps": "Opakování",
   "@reps": {
     "description": "Shorthand for repetitions, used when space constraints are tighter"
@@ -419,7 +401,9 @@
     "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.",
     "type": "text",
     "placeholders": {
-      "nr": {}
+      "nr": {
+        "type": "String"
+      }
     }
   },
   "newDay": "Nový den",
@@ -493,41 +477,15 @@
     "description": "Confirmation text before the user deletes an object",
     "type": "text",
     "placeholders": {
-      "toDelete": {}
+      "toDelete": {
+        "type": "String"
+      }
     }
   },
   "aboutDescription": "Děkujeme Vám za použití wger! wger je komunitní open source projekt, který je tvořen fitness nadšenci z celého světa.",
   "@aboutDescription": {
     "description": "Text in the about dialog"
   },
-  "aboutSourceText": "Získejte zdrojový kód této aplikace a jejího serveru na GitHubu",
-  "@aboutSourceText": {
-    "description": "Text for source code section in the about dialog"
-  },
-  "aboutBugsTitle": "Máte problém nebo nápad?",
-  "@aboutBugsTitle": {
-    "description": "Title for bugs section in the about dialog"
-  },
-  "aboutBugsText": "Kontaktujte nás, pokud se něco nechovalo podle očekávání nebo pokud existuje funkce, o které se domníváte, že chybí.",
-  "@aboutBugsText": {
-    "description": "Text for bugs section in the about dialog"
-  },
-  "aboutContactUsTitle": "Řekněte ahoj!",
-  "@aboutContactUsTitle": {
-    "description": "Title for contact us section in the about dialog"
-  },
-  "aboutContactUsText": "Pokud si s námi chcete popovídat, přejděte na Discord server a kontaktujte nás",
-  "@aboutContactUsText": {
-    "description": "Text for contact us section in the about dialog"
-  },
-  "aboutTranslationTitle": "Překlad",
-  "@aboutTranslationTitle": {
-    "description": "Title for translation section in the about dialog"
-  },
-  "aboutTranslationText": "Tato aplikace je přeložena na weblate. Chcete-li také pomoci, klikněte na odkaz a začněte překládat",
-  "@aboutTranslationText": {
-    "description": "Text for translation section in the about dialog"
-  },
   "goToToday": "Přejít na dnešek",
   "@goToToday": {
     "description": "Label on button to jump back to 'today' in the calendar widget"
@@ -537,7 +495,9 @@
     "description": "Label shown on the slider where the user selects the nr of sets",
     "type": "text",
     "placeholders": {
-      "nrOfSets": {}
+      "nrOfSets": {
+        "type": "String"
+      }
     }
   },
   "recentlyUsedIngredients": "Naposledy přidané přísady",
@@ -548,6 +508,26 @@
   "@takePicture": {},
   "gallery": "Galerie",
   "@gallery": {},
+  "imageFormatNotSupported": "{imageFormat} není podporován",
+  "@imageFormatNotSupported": {
+      "description": "Label shown on the error container when image format is not supported",
+      "type": "text",
+      "placeholders": {
+          "imageFormat": {
+              "type": "String"
+          }
+      }
+  },
+  "imageFormatNotSupportedDetail": "Obrazy {imageFormat} zatím nejsou podporovány.",
+  "@imageFormatNotSupportedDetail": {
+      "description": "Label shown on the image preview container when image format is not supported",
+      "type": "text",
+      "placeholders": {
+          "imageFormat": {
+              "type": "String"
+          }
+      }
+  },
   "productFound": "Produkt nalezen",
   "@productFound": {
     "description": "Header label for dialog when product is found with barcode"
@@ -581,7 +561,9 @@
     "description": "Dialog info when product is found with barcode",
     "type": "text",
     "placeholders": {
-      "productName": {}
+      "productName": {
+        "type": "String"
+      }
     }
   },
   "scanBarcode": "Naskenovat čárový kód",
@@ -614,7 +596,9 @@
     "description": "Dialog info when product is not found with barcode",
     "type": "text",
     "placeholders": {
-      "barcode": {}
+      "barcode": {
+        "type": "String"
+      }
     }
   },
   "useMetric": "Použít metrické jednotky pro tělesnou váhu",
@@ -634,19 +618,15 @@
     "description": "Message returned if no exercises match the searched string"
   },
   "aboutMastodonTitle": "Mastodon",
-  "@aboutMastodonTitle": {
-    "description": "Title for mastodon section in the about dialog"
-  },
-  "aboutMastodonText": "Sledujte nás na Mastodonu pro aktualizace a novinky o projektu",
-  "@aboutMastodonText": {
-    "description": "Text for the mastodon section in the about dialog"
-  },
+  "@aboutMastodonTitle": {},
   "unVerifiedEmail": "Neověřený e-mail",
   "@unVerifiedEmail": {},
   "alsoKnownAs": "Také známé jako: {aliases}",
   "@alsoKnownAs": {
     "placeholders": {
-      "aliases": {}
+      "aliases": {
+        "type": "String"
+      }
     },
     "description": "List of alternative names for an exercise"
   },
@@ -663,7 +643,9 @@
   "verifiedEmailInfo": "Ověřovací e-mail byl odeslán na adresu {email}",
   "@verifiedEmailInfo": {
     "placeholders": {
-      "email": {}
+      "email": {
+        "type": "String"
+      }
     }
   },
   "translateExercise": "Přeložte toto cvičení",
@@ -848,10 +830,6 @@
   "@onlyLogging": {},
   "onlyLoggingHelpText": "Zaškrtněte, pokud chcete pouze zaznamenávat své kalorie a nechcete nastavovat podrobný výživový plán s přesnými jídly",
   "@onlyLoggingHelpText": {},
-  "addGoalsToPlanHelpText": "Tato možnost vám umožňuje nastavit cíle pro energii, bílkoviny, karbohydráty a tuk ve vašem plánu. Upozornění: pokud si nastavíte podrobný jídelní plán, tyto hodnoty budou mít přednost.",
-  "@addGoalsToPlanHelpText": {},
-  "addGoalsToPlan": "Přidat cíle do tohoto plánu",
-  "@addGoalsToPlan": {},
   "goalEnergy": "Cíl energie",
   "@goalEnergy": {},
   "goalProtein": "Cíl bílkovin",
@@ -869,7 +847,9 @@
     "description": "A value in kcal, e.g. 500 kcal",
     "type": "text",
     "placeholders": {
-      "value": {}
+      "value": {
+        "type": "String"
+      }
     }
   },
   "gValue": "{value} g",
@@ -877,7 +857,9 @@
     "description": "A value in grams, e.g. 5 g",
     "type": "text",
     "placeholders": {
-      "value": {}
+      "value": {
+        "type": "String"
+      }
     }
   },
   "percentValue": "{value} %",
@@ -885,7 +867,9 @@
     "description": "A value in percent, e.g. 10 %",
     "type": "text",
     "placeholders": {
-      "value": {}
+      "value": {
+        "type": "String"
+      }
     }
   },
   "surplus": "přebytek",
diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb
index 56de99fb..cf4ff4e0 100644
--- a/lib/l10n/app_de.arb
+++ b/lib/l10n/app_de.arb
@@ -1,889 +1,1045 @@
 {
-  "@@last_modified": "2020-11-11T15:04:05.523531",
-  "labelWorkoutPlans": "Trainingspläne",
-  "@labelWorkoutPlans": {
-    "description": "Title for screen workout plans",
-    "type": "text",
-    "placeholders": {}
-  },
-  "labelWorkoutPlan": "Trainingsplan",
-  "@labelWorkoutPlan": {
-    "description": "Title for screen workout plan",
-    "type": "text",
-    "placeholders": {}
-  },
-  "labelDashboard": "Startseite",
-  "@labelDashboard": {
-    "description": "Title for screen dashboard"
-  },
-  "rir": "WidR",
-  "@rir": {
-    "description": "Shorthand for Repetitions In Reserve"
-  },
-  "repetitions": "Wiederholungen",
-  "@repetitions": {
-    "description": "Repetitions for an exercise set"
-  },
-  "exercise": "Übung",
-  "@exercise": {
-    "description": "An exercise for a workout"
-  },
-  "successfullyDeleted": "Gelöscht",
-  "@successfullyDeleted": {
-    "description": "Message when an item was successfully deleted"
-  },
-  "toggleDetails": "Details ein/ausblenden",
-  "@toggleDetails": {
-    "description": "Switch to toggle detail / overview"
-  },
-  "aboutText": "wger ist copylefted-Software, lizenziert unter der AGPLv3+ und verfügbar auf GitHub:",
-  "@aboutText": {
-    "description": "Text in the about dialog"
-  },
-  "newNutritionalPlan": "Neuer Ernährungsplan",
-  "@newNutritionalPlan": {},
-  "delete": "Löschen",
-  "@delete": {},
-  "loadingText": "Wird geladen …",
-  "@loadingText": {
-    "description": "Text to show when entries are being loaded in the background: Loading..."
-  },
-  "edit": "Bearbeiten",
-  "@edit": {},
-  "newEntry": "Neuer Eintrag",
-  "@newEntry": {
-    "description": "Title when adding a new entry such as a weight or log entry"
-  },
-  "amount": "Betrag",
-  "@amount": {
-    "description": "The amount (e.g. in grams) of an ingredient in a meal"
-  },
-  "sodium": "Natrium",
-  "@sodium": {},
-  "fiber": "Ballaststoff",
-  "@fiber": {},
-  "saturatedFat": "Gesättigte Fettsäuren",
-  "@saturatedFat": {},
-  "fat": "Fett",
-  "@fat": {},
-  "sugars": "Zucker",
-  "@sugars": {},
-  "carbohydrates": "Kohlenhydrate",
-  "@carbohydrates": {},
-  "protein": "Eiweiß",
-  "@protein": {},
-  "g": "g",
-  "@g": {
-    "description": "Abbreviation for gram"
-  },
-  "mealLogged": "Mahlzeit im Tagebuch protokolliert",
-  "@mealLogged": {},
-  "kJ": "kJ",
-  "@kJ": {
-    "description": "Energy in a meal in kilo joules, kJ"
-  },
-  "kcal": "kcal",
-  "@kcal": {
-    "description": "Energy in a meal in kilocalories, kcal"
-  },
-  "energy": "Energie",
-  "@energy": {
-    "description": "Energy in a meal, ingredient etc. e.g. in kJ"
-  },
-  "ingredient": "Zutat",
-  "@ingredient": {},
-  "timeEnd": "Endzeit",
-  "@timeEnd": {
-    "description": "The end time of a workout"
-  },
-  "timeStart": "Startzeit",
-  "@timeStart": {
-    "description": "The starting time of a workout"
-  },
-  "time": "Zeit",
-  "@time": {
-    "description": "The time of a meal or workout"
-  },
-  "date": "Datum",
-  "@date": {
-    "description": "The date of a workout log or body weight entry"
-  },
-  "weight": "Gewicht",
-  "@weight": {
-    "description": "The weight of a workout log or body weight entry"
-  },
-  "dismiss": "Verwerfen",
-  "@dismiss": {},
-  "anErrorOccurred": "Es ist ein Fehler aufgetreten!",
-  "@anErrorOccurred": {},
-  "nutritionalPlans": "Ernährungspläne",
-  "@nutritionalPlans": {},
-  "nutritionalDiary": "Ernährungstagebuch",
-  "@nutritionalDiary": {},
-  "nutritionalPlan": "Ernährungsplan",
-  "@nutritionalPlan": {},
-  "addIngredient": "Zutat hinzufügen",
-  "@addIngredient": {},
-  "newWorkout": "Neuer Trainingsplan",
-  "@newWorkout": {
-    "description": "Header when adding a new workout"
-  },
-  "gymMode": "Studiomodus",
-  "@gymMode": {
-    "description": "Label when starting the gym mode"
-  },
-  "addMeal": "Mahlzeit hinzufügen",
-  "@addMeal": {},
-  "add": "Hinzufügen",
-  "@add": {},
-  "cancel": "Abbrechen",
-  "@cancel": {},
-  "save": "Speichern",
-  "@save": {},
-  "description": "Beschreibung",
-  "@description": {},
-  "newSet": "Neuer Satz",
-  "@newSet": {
-    "description": "Header when adding a new set to a workout day"
-  },
-  "newDay": "Neuer Tag",
-  "@newDay": {},
-  "workoutSession": "Trainingseinheit",
-  "@workoutSession": {
-    "description": "A (logged) workout session"
-  },
-  "notes": "Notizen",
-  "@notes": {
-    "description": "Personal notes, e.g. for a workout session"
-  },
-  "impression": "Eindruck",
-  "@impression": {
-    "description": "General impression (e.g. for a workout session) such as good, bad, etc."
-  },
-  "comment": "Kommentar",
-  "@comment": {
-    "description": "Comment, additional information"
-  },
-  "goToToday": "Zu heute gehen",
-  "@goToToday": {
-    "description": "Label on button to jump back to 'today' in the calendar widget"
-  },
-  "selectIngredient": "Bitte wähle eine Zutat",
-  "@selectIngredient": {
-    "description": "Error message when the user hasn't selected an ingredient from the autocompleter"
-  },
-  "enterValidNumber": "Bitte gebe eine gültige Zahl ein",
-  "@enterValidNumber": {
-    "description": "Error message when the user has submitted an invalid number (e.g. '3,.,.,.')"
-  },
-  "enterValue": "Bitte gebe einen Wert ein",
-  "@enterValue": {
-    "description": "Error message when the user hasn't entered a value on a required field"
-  },
-  "calendar": "Kalender",
-  "@calendar": {},
-  "noWeightEntries": "Du hast keine Gewichtseinträge",
-  "@noWeightEntries": {
-    "description": "Message shown when the user has no logged weight entries"
-  },
-  "unit": "Einheit",
-  "@unit": {
-    "description": "The unit used for a repetition (kg, time, etc.)"
-  },
-  "logHelpEntriesUnits": "Beachte, dass nur Einträge mit einer Gewichtseinheit (kg oder lb) und Wiederholungen aufgezeichnet werden, andere Kombinationen wie Zeit oder „bis zum Versagen“ werden hier ignoriert.",
-  "@logHelpEntriesUnits": {},
-  "logHelpEntries": "Gibt es an einem Tag mehrere Einträge mit der gleichen Anzahl von Wiederholungen, aber unterschiedlichen Gewichten, wird nur der Eintrag mit dem höheren Gewicht im Diagramm angezeigt.",
-  "@logHelpEntries": {},
-  "loginInstead": "Du hast bereits einen Account? Stattdessen anmelden",
-  "@loginInstead": {},
-  "registerInstead": "Du hast keinen Account? Jetzt registrieren",
-  "@registerInstead": {},
-  "reset": "Zurücksetzen",
-  "@reset": {
-    "description": "Button text allowing the user to reset the entered values to the default"
-  },
-  "customServerHint": "Gebe die Adresse deines eigenen Servers ein, ansonsten wird die Standardadresse verwendet",
-  "@customServerHint": {
-    "description": "Hint text for the form where the users can enter their own wger instance"
-  },
-  "customServerUrl": "URL der wger-Instanz",
-  "@customServerUrl": {
-    "description": "Label in the form where the users can enter their own wger instance"
-  },
-  "invalidUsername": "Bitte gebe einen gültigen Benutzernamen ein",
-  "@invalidUsername": {
-    "description": "Error message when the user enters an invalid username"
-  },
-  "username": "Benutzername",
-  "@username": {},
-  "email": "E-Mail-Adresse",
-  "@email": {},
-  "invalidEmail": "Bitte gebe eine gültigen E-Mail-Adresse ein",
-  "@invalidEmail": {
-    "description": "Error message when the user enters an invalid email"
-  },
-  "confirmPassword": "Passwort bestätigen",
-  "@confirmPassword": {},
-  "password": "Passwort",
-  "@password": {},
-  "passwordTooShort": "Das Passwort ist zu kurz",
-  "@passwordTooShort": {
-    "description": "Error message when the user a password that is too short"
-  },
-  "passwordsDontMatch": "Die Passwörter stimmen nicht überein",
-  "@passwordsDontMatch": {
-    "description": "Error message when the user enters two different passwords during registration"
-  },
-  "invalidUrl": "Bitte gebe eine gültige URL ein",
-  "@invalidUrl": {
-    "description": "Error message when the user enters an invalid URL, e.g. in the login form"
-  },
-  "useCustomServer": "Benutzerdefinierten Server verwenden",
-  "@useCustomServer": {
-    "description": "Toggle button allowing users to switch between the default and a custom wger server"
-  },
-  "useDefaultServer": "Standard-Server verwenden",
-  "@useDefaultServer": {
-    "description": "Toggle button allowing users to switch between the default and a custom wger server"
-  },
-  "register": "Registrieren",
-  "@register": {
-    "description": "Text for registration button"
-  },
-  "login": "Anmelden",
-  "@login": {
-    "description": "Text for login button"
-  },
-  "addExercise": "Eine Übung hinzufügen",
-  "@addExercise": {},
-  "confirmDelete": "Bist du sicher, dass du '{toDelete}' löschen möchtest?",
-  "@confirmDelete": {
-    "description": "Confirmation text before the user deletes an object",
-    "type": "text",
-    "placeholders": {
-      "toDelete": {}
-    }
-  },
-  "noNutritionalPlans": "Du hast keine Ernährungspläne",
-  "@noNutritionalPlans": {
-    "description": "Message shown when the user has no nutritional plans"
-  },
-  "todaysWorkout": "Dein Training heute",
-  "@todaysWorkout": {},
-  "noWorkoutPlans": "Du hast keine Trainingspläne",
-  "@noWorkoutPlans": {
-    "description": "Message shown when the user has no workout plans"
-  },
-  "nrOfSets": "Sätze pro Übung: {nrOfSets}",
-  "@nrOfSets": {
-    "description": "Label shown on the slider where the user selects the nr of sets",
-    "type": "text",
-    "placeholders": {
-      "nrOfSets": {}
-    }
-  },
-  "enterCharacters": "Bitte gebe zwischen {min} und {max} Zeichen ein",
-  "@enterCharacters": {
-    "description": "Error message when the user hasn't entered the correct number of characters in a form",
-    "type": "text",
-    "placeholders": {
-      "min": {},
-      "max": {}
-    }
-  },
-  "selectExercise": "Bitte wähle eine Übung aus",
-  "@selectExercise": {
-    "description": "Error message when the user hasn't selected an exercise in the form"
-  },
-  "selectExercises": "Wenn du einen Supersatz machen willst, kannst du nach mehreren Übungen suchen, sie werden dann gruppiert",
-  "@selectExercises": {},
-  "sameRepetitions": "Wenn du für alle Sätze die gleichen Wiederholungen und das gleiche Gewicht verwendest, kannst du nur eine Zeile ausfüllen. Gebe z. B. für 4 Sätze einfach 10 für die Wiederholungen ein, daraus wird automatisch „4 × 10„.",
-  "@sameRepetitions": {},
-  "setNr": "Satz {nr}",
-  "@setNr": {
-    "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.",
-    "type": "text",
-    "placeholders": {
-      "nr": {}
-    }
-  },
-  "dayDescriptionHelp": "Eine Beschreibung was an diesem Tag gemacht wird (z. B. „Zugtag“) oder welche Körperteile trainiert werden (z. B. „Brust und Schultern“)",
-  "@dayDescriptionHelp": {},
-  "set": "Satz",
-  "@set": {
-    "description": "A set in a workout plan"
-  },
-  "repetitionUnit": "Wiederholungseinheit",
-  "@repetitionUnit": {},
-  "weightUnit": "Gewichtseinheit",
-  "@weightUnit": {},
-  "reps": "Wdh.",
-  "@reps": {
-    "description": "Shorthand for repetitions, used when space constraints are tighter"
-  },
-  "enterRepetitionsOrWeight": "Bitte gebe entweder die Wiederholungen oder das Gewicht für mindestens einen der Sätze an",
-  "@enterRepetitionsOrWeight": {
-    "description": "Error message when the user hasn't filled in the forms for exercise sets"
-  },
-  "start": "Starten",
-  "@start": {
-    "description": "Label on button to start the gym mode (i.e., an imperative)"
-  },
-  "addSet": "Satz hinzufügen",
-  "@addSet": {
-    "description": "Label for the button that adds a set (to a workout day)"
-  },
-  "successfullySaved": "Erfolgreich gespeichert",
-  "@successfullySaved": {
-    "description": "Message when an item was successfully saved"
-  },
-  "labelWorkoutLogs": "Trainingsprotokolle",
-  "@labelWorkoutLogs": {
-    "description": "(Workout) logs"
-  },
-  "logout": "Abmelden",
-  "@logout": {
-    "description": "Text for logout button"
-  },
-  "aboutTranslationText": "Diese Anwendung wird auf weblate übersetzt. Wenn du auch helfen möchtest, klicke auf den Link und beginne zu übersetzen",
-  "@aboutTranslationText": {
-    "description": "Text for translation section in the about dialog"
-  },
-  "aboutTranslationTitle": "Übersetzung",
-  "@aboutTranslationTitle": {
-    "description": "Title for translation section in the about dialog"
-  },
-  "aboutContactUsText": "Wenn du mit uns chatten möchtest, komm auf den Discord-Server und sag hallo",
-  "@aboutContactUsText": {
-    "description": "Text for contact us section in the about dialog"
-  },
-  "aboutContactUsTitle": "Sag Hallo!",
-  "@aboutContactUsTitle": {
-    "description": "Title for contact us section in the about dialog"
-  },
-  "aboutBugsText": "Setze dich mit uns in Verbindung, wenn sich etwas nicht wie erwartet verhalten hat oder wenn es eine Funktion gibt, die du vermisst.",
-  "@aboutBugsText": {
-    "description": "Text for bugs section in the about dialog"
-  },
-  "aboutBugsTitle": "Hast du ein Problem oder eine Idee?",
-  "@aboutBugsTitle": {
-    "description": "Title for bugs section in the about dialog"
-  },
-  "aboutSourceText": "Hole dir den Quellcode dieser Anwendung und des dazugehörigen Servers auf Github",
-  "@aboutSourceText": {
-    "description": "Text for source code section in the about dialog"
-  },
-  "aboutSourceTitle": "Quelltext",
-  "@aboutSourceTitle": {
-    "description": "Title for source code section in the about dialog"
-  },
-  "aboutDescription": "Danke, dass du wger verwendest! wger ist ein gemeinschaftliches quelloffenes Projekt, das von Fitness-Enthusiasten aus der ganzen Welt entwickelt wurde.",
-  "@aboutDescription": {
-    "description": "Text in the about dialog"
-  },
-  "logMeal": "Gericht im Ernährungstagebuch protokollieren",
-  "@logMeal": {},
-  "category": "Kategorie",
-  "@category": {
-    "description": "Category for an exercise, ingredient, etc."
-  },
-  "equipment": "Gerät",
-  "@equipment": {
-    "description": "Equipment needed to perform an exercise"
-  },
-  "musclesSecondary": "Sekundäre Muskeln",
-  "@musclesSecondary": {
-    "description": "secondary muscles trained by an exercise"
-  },
-  "muscles": "Muskeln",
-  "@muscles": {
-    "description": "(main) muscles trained by an exercise"
-  },
-  "addImage": "Bild hinzufügen",
-  "@addImage": {},
-  "gallery": "Galerie",
-  "@gallery": {},
-  "chooseFromLibrary": "Wähle aus der Bibliothek",
-  "@chooseFromLibrary": {},
-  "takePicture": "Bild aufnehmen",
-  "@takePicture": {},
-  "selectImage": "Bitte wähle ein Bild aus",
-  "@selectImage": {
-    "description": "Label and error message when the user hasn't selected an image to save"
-  },
-  "name": "Name",
-  "@name": {
-    "description": "Name for a workout or nutritional plan"
-  },
-  "goToDetailPage": "Weiter zur Detailseite",
-  "@goToDetailPage": {},
-  "labelBottomNavNutrition": "Ernährung",
-  "@labelBottomNavNutrition": {
-    "description": "Label used in bottom navigation, use a short word"
-  },
-  "labelBottomNavWorkout": "Training",
-  "@labelBottomNavWorkout": {
-    "description": "Label used in bottom navigation, use a short word"
-  },
-  "optionsLabel": "Optionen",
-  "@optionsLabel": {
-    "description": "Label for the popup with general app options"
-  },
-  "setUnitsAndRir": "Einheiten und RiR einstellen",
-  "@setUnitsAndRir": {
-    "description": "Label shown on the slider where the user can toggle showing units and RiR",
-    "type": "text"
-  },
-  "searchExercise": "Suche Übung zum Hinzufügen",
-  "@searchExercise": {
-    "description": "Label on set form. Selected exercises are added to the set"
-  },
-  "rirNotUsed": "RiR nicht verwendet",
-  "@rirNotUsed": {
-    "description": "Label used in RiR slider when the RiR value is not used/saved for the current setting or log"
-  },
-  "jumpTo": "Springen zu",
-  "@jumpTo": {
-    "description": "Imperative. Label used in popup allowing the user to jump to a specific exercise while in the gym mode"
-  },
-  "pause": "Pause",
-  "@pause": {
-    "description": "Noun, not an imperative! Label used for the pause when using the gym mode"
-  },
-  "usernameValidChars": "Ein Benutzername darf nur Buchstaben, Ziffern und die Zeichen @, +, ., - und _ enthalten",
-  "@usernameValidChars": {
-    "description": "Error message when the user tries to register a username with forbidden characters"
-  },
-  "plateCalculatorNotDivisible": "Mit den vorhandenen Platten kann das Gewicht nicht erreicht werden",
-  "@plateCalculatorNotDivisible": {
-    "description": "Error message when the current weight is not reachable with plates (e.g. 33.1 kg)"
-  },
-  "plateCalculator": "Platten",
-  "@plateCalculator": {
-    "description": "Label used for the plate calculator in the gym mode"
-  },
-  "timeStartAhead": "Die Startzeit kann nicht vor der Endzeit liegen",
-  "@timeStartAhead": {},
-  "supersetWith": "Supersatz mit",
-  "@supersetWith": {
-    "description": "Text used between exercise cards when adding a new set. Translate as something like 'in a superset with'"
-  },
-  "total": "Summe",
-  "@total": {
-    "description": "Label used for total sums of e.g. calories or similar"
-  },
-  "gPerBodyKg": "g pro Körper-kg",
-  "@gPerBodyKg": {
-    "description": "Label used for total sums of e.g. calories or similar in grams per Kg of body weight"
-  },
-  "percentEnergy": "Prozent der Energie",
-  "@percentEnergy": {},
-  "difference": "Differenz",
-  "@difference": {},
-  "logged": "Protokolliert",
-  "@logged": {
-    "description": "Header for the column of 'logged' nutritional values, i.e. what was eaten"
-  },
-  "planned": "Geplant",
-  "@planned": {
-    "description": "Header for the column of 'planned' nutritional values, i.e. what should be eaten"
-  },
-  "macronutrients": "Makronährstoffe",
-  "@macronutrients": {},
-  "value": "Wert",
-  "@value": {
-    "description": "The value of a measurement entry"
-  },
-  "measurementCategoriesHelpText": "Messkategorie, z. B. „Bizeps“ oder „Körperfett“",
-  "@measurementCategoriesHelpText": {},
-  "measurementEntriesHelpText": "Die Einheit, die verwendet wird, um die Kategorie zu messen, wie z.B. „cm“ oder „%“",
-  "@measurementEntriesHelpText": {},
-  "fatShort": "F",
-  "@fatShort": {
-    "description": "The first letter or short name of the word 'Fat', used in overviews"
-  },
-  "energyShort": "E",
-  "@energyShort": {
-    "description": "The first letter or short name of the word 'Energy', used in overviews"
-  },
-  "proteinShort": "P",
-  "@proteinShort": {
-    "description": "The first letter or short name of the word 'Protein', used in overviews"
-  },
-  "measurement": "Messung",
-  "@measurement": {},
-  "appUpdateContent": "Diese Version der Anwendung ist nicht mit dem Server kompatibel, bitte aktualisieren Sie Ihre Anwendung.",
-  "@appUpdateContent": {},
-  "appUpdateTitle": "Aktualisierung erforderlich",
-  "@appUpdateTitle": {},
-  "measurements": "Messungen",
-  "@measurements": {
-    "description": "Categories for the measurements such as biceps size, body fat, etc."
-  },
-  "dataCopied": "Daten in neuen Eintrag kopiert",
-  "@dataCopied": {
-    "description": "Snackbar message to show on copying data to a new log entry"
-  },
-  "carbohydratesShort": "K",
-  "@carbohydratesShort": {
-    "description": "The first letter or short name of the word 'Carbohydrates', used in overviews"
-  },
-  "recentlyUsedIngredients": "Kürzlich hinzugefügte Zutaten",
-  "@recentlyUsedIngredients": {
-    "description": "A message when a user adds a new ingredient to a meal."
-  },
-  "searchIngredient": "Zutat suchen",
-  "@searchIngredient": {
-    "description": "Label on ingredient search form"
-  },
-  "logIngredient": "Zutat im Ernährungstagebuch protokollieren",
-  "@logIngredient": {},
-  "close": "Schließen",
-  "@close": {
-    "description": "Translation for close"
-  },
-  "productNotFoundDescription": "Das Produkt mit dem gescannten Strichcode {barcode} wurde nicht in der wger-Datenbank gefunden",
-  "@productNotFoundDescription": {
-    "description": "Dialog info when product is not found with barcode",
-    "type": "text",
-    "placeholders": {
-      "barcode": {}
-    }
-  },
-  "productFound": "Produkt gefunden",
-  "@productFound": {
-    "description": "Header label for dialog when product is found with barcode"
-  },
-  "productFoundDescription": "Der Strichcode gehört zu diesem Produkt: {productName}. Möchten Sie fortfahren?",
-  "@productFoundDescription": {
-    "description": "Dialog info when product is found with barcode",
-    "type": "text",
-    "placeholders": {
-      "productName": {}
-    }
-  },
-  "productNotFound": "Produkt nicht gefunden",
-  "@productNotFound": {
-    "description": "Header label for dialog when product is not found with barcode"
-  },
-  "weekAverage": "7-Tage-Durchschnitt",
-  "@weekAverage": {
-    "description": "Header for the column of '7 day average' nutritional values, i.e. what was logged last week"
-  },
-  "scanBarcode": "Strichcode scannen",
-  "@scanBarcode": {
-    "description": "Label for scan barcode button"
-  },
-  "abs": "Bauch",
-  "@abs": {},
-  "arms": "Arme",
-  "@arms": {},
-  "back": "Rücken",
-  "@back": {},
-  "calves": "Waden",
-  "@calves": {},
-  "chest": "Brust",
-  "@chest": {},
-  "legs": "Beine",
-  "@legs": {},
-  "shoulders": "Schultern",
-  "@shoulders": {},
-  "barbell": "Langhantel",
-  "@barbell": {},
-  "noMeasurementEntries": "Du hast keine Messeingaben",
-  "@noMeasurementEntries": {},
-  "moreMeasurementEntries": "Neue Messung hinzufügen",
-  "@moreMeasurementEntries": {
-    "description": "Message shown when the user wants to add new measurement"
-  },
-  "selectEntry": "Bitte einen Eintrag auswählen",
-  "@selectEntry": {},
-  "exercises": "Übungen",
-  "@exercises": {
-    "description": "Multiple exercises for a workout"
-  },
-  "userProfile": "Dein Profil",
-  "@userProfile": {},
-  "exerciseList": "Liste der Übungen",
-  "@exerciseList": {},
-  "exerciseName": "Name der Übung",
-  "@exerciseName": {
-    "description": "Label for the name of a workout exercise"
-  },
-  "translation": "Übersetzung",
-  "@translation": {},
-  "translateExercise": "Diese Übung jetzt übersetzen",
-  "@translateExercise": {},
-  "baseData": "Grundlagen auf Englisch",
-  "@baseData": {
-    "description": "The base data for an exercise such as category, trained muscles, etc."
-  },
-  "images": "Bilder",
-  "@images": {},
-  "language": "Sprache",
-  "@language": {},
-  "add_exercise_image_license": "Bilder müssen mit der CC BY SA Lizenz vereinbar sein. Wenn du dir unsicher bist lade nur Bilder hoch, welche du selbst gemacht hast.",
-  "@add_exercise_image_license": {},
-  "variations": "Variationen",
-  "@variations": {
-    "description": "Variations of one exercise (e.g. benchpress and benchpress narrow)"
-  },
-  "contributeExercise": "Eine Übung beisteuern",
-  "@contributeExercise": {},
-  "hamstrings": "Oberschenkelmuskeln",
-  "@hamstrings": {},
-  "lower_back": "Unterer Rücken",
-  "@lower_back": {},
-  "aboutPageTitle": "Über Wger",
-  "@aboutPageTitle": {},
-  "alsoKnownAs": "Auch bekannt als:{aliases}",
-  "@alsoKnownAs": {
-    "placeholders": {
-      "aliases": {}
+    "@@last_modified": "2020-11-11T15:04:05.523531",
+    "labelWorkoutPlan": "Trainingsplan",
+    "@labelWorkoutPlan": {
+        "description": "Title for screen workout plan",
+        "type": "text",
+        "placeholders": {}
     },
-    "description": "List of alternative names for an exercise"
-  },
-  "biceps": "Bizeps",
-  "@biceps": {},
-  "dumbbell": "Kurzhantel",
-  "@dumbbell": {},
-  "gym_mat": "Gymnastikmatte",
-  "@gym_mat": {},
-  "incline_bench": "Schrägbank",
-  "@incline_bench": {},
-  "lats": "Latissimus",
-  "@lats": {},
-  "enterMinCharacters": "Bitte gebe mindestens {min} Zeichen ein",
-  "@enterMinCharacters": {
-    "description": "Error message when the user hasn't entered the minimum amount characters in a form",
-    "type": "text",
-    "placeholders": {
-      "min": {}
-    }
-  },
-  "baseNameEnglish": "Alle Übungen brauchen einen Basisnamen in Englisch",
-  "@baseNameEnglish": {},
-  "contributeExerciseWarning": "Sie können nur Übungen beitragen, wenn Ihr Konto älter als {days} Tage ist und Sie Ihre E-Mail verifiziert haben",
-  "@contributeExerciseWarning": {
-    "description": "Number of days before which a person can add exercise",
-    "placeholders": {
-      "days": {
-        "type": "String",
-        "example": "14"
-      }
-    }
-  },
-  "cacheWarning": "Aufgrund von Caching kann es einige Zeit dauern, bis die Änderungen in der gesamten Anwendung sichtbar sind.",
-  "@cacheWarning": {},
-  "bench": "Bank",
-  "@bench": {},
-  "glutes": "Gesäßmuskeln",
-  "@glutes": {},
-  "kilometers": "Kilometer",
-  "@kilometers": {},
-  "miles": "Meilen",
-  "@miles": {},
-  "quads": "Quadrizeps",
-  "@quads": {},
-  "sz_bar": "SZ-Stange",
-  "@sz_bar": {},
-  "seconds": "Sekunden",
-  "@seconds": {},
-  "triceps": "Trizeps",
-  "@triceps": {},
-  "until_failure": "Bis zum Versagen",
-  "@until_failure": {},
-  "cardio": "Kardio",
-  "@cardio": {},
-  "success": "Erfolgreich",
-  "@success": {
-    "description": "Message when an action completed successfully, usually used as a heading"
-  },
-  "pull_up_bar": "Klimmzugstange",
-  "@pull_up_bar": {},
-  "verifiedEmailReason": "Du musst deine E-Mail verifizieren, um Übungen hinzuzufügen",
-  "@verifiedEmailReason": {},
-  "kettlebell": "Kugelhantel",
-  "@kettlebell": {},
-  "verifiedEmail": "Verifizierte E-Mail",
-  "@verifiedEmail": {},
-  "unVerifiedEmail": "Unverifizierte E-Mail",
-  "@unVerifiedEmail": {},
-  "alternativeNames": "Alternative Namen",
-  "@alternativeNames": {},
-  "verifiedEmailInfo": "Eine Bestätigungs-E-Mail wurde an {email} gesendet",
-  "@verifiedEmailInfo": {
-    "placeholders": {
-      "email": {}
-    }
-  },
-  "minutes": "Minuten",
-  "@minutes": {},
-  "oneNamePerLine": "Ein Name pro Zeile",
-  "@oneNamePerLine": {},
-  "whatVariationsExist": "Welche Varianten dieser Übung gibt es eventuell?",
-  "@whatVariationsExist": {},
-  "previous": "Vorherige",
-  "@previous": {},
-  "next": "Weiter",
-  "@next": {},
-  "swiss_ball": "Gymnastikball",
-  "@swiss_ball": {},
-  "none__bodyweight_exercise_": "keine (Körpergewichtsübung)",
-  "@none__bodyweight_exercise_": {},
-  "body_weight": "Körpergewicht",
-  "@body_weight": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "kg": "kg",
-  "@kg": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "kilometers_per_hour": "Kilometer pro Stunde",
-  "@kilometers_per_hour": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "miles_per_hour": "Meilen pro Stunde",
-  "@miles_per_hour": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "verify": "Verifizieren",
-  "@verify": {},
-  "textPromptTitle": "Bereit zu starten?",
-  "@textPromptTitle": {},
-  "settingsTitle": "Einstellung",
-  "@settingsTitle": {},
-  "textPromptSubheading": "Drücken Sie die Aktionstaste, um zu beginnen",
-  "@textPromptSubheading": {},
-  "max_reps": "Max. Wiederholungen",
-  "@max_reps": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "noMatchingExerciseFound": "Diese Übung wurde nicht gefunden",
-  "@noMatchingExerciseFound": {
-    "description": "Message returned if no exercises match the searched string"
-  },
-  "aboutMastodonTitle": "Mastodon",
-  "@aboutMastodonTitle": {
-    "description": "Title for mastodon section in the about dialog"
-  },
-  "plates": "Platten",
-  "@plates": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "aboutMastodonText": "Folgen Sie uns auf Mastodon für Updates und Neuigkeiten zum Projekt",
-  "@aboutMastodonText": {
-    "description": "Text for the mastodon section in the about dialog"
-  },
-  "aboutDonateTitle": "Spende",
-  "@aboutDonateTitle": {},
-  "aboutDonateText": "Kaufen Sie uns einen Kaffee, um das Projekt zu unterstützen, Serverkosten zu decken und uns weiterhin zu versorgen",
-  "@aboutDonateText": {},
-  "settingsCacheTitle": "Zwischenspeicher",
-  "@settingsCacheTitle": {},
-  "settingsExerciseCacheDescription": "Übungs-Zwischenspeicher",
-  "@settingsExerciseCacheDescription": {},
-  "settingsCacheDeletedSnackbar": "Zwischenspeicher erfolgreich gelöscht",
-  "@settingsCacheDeletedSnackbar": {},
-  "lb": "lb",
-  "@lb": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "useMetric": "Metrische Einheiten für das Körpergewicht verwenden",
-  "@useMetric": {},
-  "done": "Fertig",
-  "@done": {},
-  "searchNamesInEnglish": "Namen auch auf English suchen",
-  "@searchNamesInEnglish": {},
-  "goalMacro": "Makroziele",
-  "@goalMacro": {
-    "description": "The goal for macronutrients"
-  },
-  "goalFiber": "Ballaststoffziel",
-  "@goalFiber": {},
-  "loggedToday": "Heute protokolliert",
-  "@loggedToday": {},
-  "onlyLogging": "Nur Kalorien eintragen",
-  "@onlyLogging": {},
-  "onlyLoggingHelpText": "Setze das Häkchen, wenn du nur deine Kalorien protokollieren möchtest und keinen detaillierten Ernährungsplan mit spezifischen Mahlzeiten einrichten willst",
-  "@onlyLoggingHelpText": {},
-  "goalEnergy": "Energieziel",
-  "@goalEnergy": {},
-  "goalProtein": "Eiweißziel",
-  "@goalProtein": {},
-  "goalCarbohydrates": "Kohlenhydratziel",
-  "@goalCarbohydrates": {},
-  "goalFat": "Fettziel",
-  "@goalFat": {},
-  "today": "Heute",
-  "@today": {},
-  "log": "Protokollieren",
-  "@log": {
-    "description": "Log a specific meal (imperative form)"
-  },
-  "noIngredientsDefined": "Noch keine Zutaten definiert",
-  "@noIngredientsDefined": {},
-  "ingredientLogged": "Zutat im Tagebuch protokolliert",
-  "@ingredientLogged": {},
-  "selectMealToLog": "Wähle eine Mahlzeit, um sie im Tagebuch zu protokollieren",
-  "@selectMealToLog": {},
-  "chartAllTimeTitle": "{name} aller Zeiten",
-  "@chartAllTimeTitle": {
-    "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-    "type": "text",
-    "placeholders": {
-      "name": {}
-    }
-  },
-  "chart30DaysTitle": "{name} der letzten 30 Tage",
-  "@chart30DaysTitle": {
-    "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
-    "type": "text",
-    "placeholders": {
-      "name": {}
-    }
-  },
-  "chartDuringPlanTitle": "{chartName} während des Ernährungsplans {planName}",
-  "@chartDuringPlanTitle": {
-    "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
-    "type": "text",
-    "placeholders": {
-      "chartName": {},
-      "planName": {}
-    }
-  },
-  "surplus": "Überschuss",
-  "@surplus": {
-    "description": "Caloric surplus (either planned or unplanned)"
-  },
-  "deficit": "Defizit",
-  "@deficit": {
-    "description": "Caloric deficit (either planned or unplanned)"
-  },
-  "kcalValue": "{value} kcal",
-  "@kcalValue": {
-    "description": "A value in kcal, e.g. 500 kcal",
-    "type": "text",
-    "placeholders": {
-      "value": {}
-    }
-  },
-  "gValue": "{value} g",
-  "@gValue": {
-    "description": "A value in grams, e.g. 5 g",
-    "type": "text",
-    "placeholders": {
-      "value": {}
-    }
-  },
-  "percentValue": "{value} %",
-  "@percentValue": {
-    "description": "A value in percent, e.g. 10 %",
-    "type": "text",
-    "placeholders": {
-      "value": {}
-    }
-  },
-  "settingsIngredientCacheDescription": "Zutaten-Cache",
-  "@settingsIngredientCacheDescription": {}
+    "labelDashboard": "Übersicht",
+    "@labelDashboard": {
+        "description": "Title for screen dashboard"
+    },
+    "rir": "RiR",
+    "@rir": {
+        "description": "Shorthand for Repetitions In Reserve"
+    },
+    "repetitions": "Wiederholungen",
+    "@repetitions": {
+        "description": "Repetitions for an exercise set"
+    },
+    "exercise": "Übung",
+    "@exercise": {
+        "description": "An exercise for a workout"
+    },
+    "successfullyDeleted": "Gelöscht",
+    "@successfullyDeleted": {
+        "description": "Message when an item was successfully deleted"
+    },
+    "toggleDetails": "Details ein/ausblenden",
+    "@toggleDetails": {
+        "description": "Switch to toggle detail / overview"
+    },
+    "newNutritionalPlan": "Neuer Ernährungsplan",
+    "@newNutritionalPlan": {},
+    "delete": "Löschen",
+    "@delete": {},
+    "loadingText": "Wird geladen …",
+    "@loadingText": {
+        "description": "Text to show when entries are being loaded in the background: Loading..."
+    },
+    "edit": "Bearbeiten",
+    "@edit": {},
+    "newEntry": "Neuer Eintrag",
+    "@newEntry": {
+        "description": "Title when adding a new entry such as a weight or log entry"
+    },
+    "amount": "Betrag",
+    "@amount": {
+        "description": "The amount (e.g. in grams) of an ingredient in a meal"
+    },
+    "sodium": "Natrium",
+    "@sodium": {},
+    "fiber": "Ballaststoff",
+    "@fiber": {},
+    "saturatedFat": "Gesättigte Fettsäuren",
+    "@saturatedFat": {},
+    "fat": "Fett",
+    "@fat": {},
+    "sugars": "Zucker",
+    "@sugars": {},
+    "carbohydrates": "Kohlenhydrate",
+    "@carbohydrates": {},
+    "protein": "Eiweiß",
+    "@protein": {},
+    "g": "g",
+    "@g": {
+        "description": "Abbreviation for gram"
+    },
+    "mealLogged": "Mahlzeit im Tagebuch protokolliert",
+    "@mealLogged": {},
+    "kJ": "kJ",
+    "@kJ": {
+        "description": "Energy in a meal in kilo joules, kJ"
+    },
+    "kcal": "kcal",
+    "@kcal": {
+        "description": "Energy in a meal in kilocalories, kcal"
+    },
+    "energy": "Energie",
+    "@energy": {
+        "description": "Energy in a meal, ingredient etc. e.g. in kJ"
+    },
+    "ingredient": "Zutat",
+    "@ingredient": {},
+    "timeEnd": "Endzeit",
+    "@timeEnd": {
+        "description": "The end time of a workout"
+    },
+    "timeStart": "Startzeit",
+    "@timeStart": {
+        "description": "The starting time of a workout"
+    },
+    "time": "Zeit",
+    "@time": {
+        "description": "The time of a meal or workout"
+    },
+    "date": "Datum",
+    "@date": {
+        "description": "The date of a workout log or body weight entry"
+    },
+    "weight": "Gewicht",
+    "@weight": {
+        "description": "The weight of a workout log or body weight entry"
+    },
+    "anErrorOccurred": "Es ist ein Fehler aufgetreten!",
+    "@anErrorOccurred": {},
+    "nutritionalPlans": "Ernährungspläne",
+    "@nutritionalPlans": {},
+    "nutritionalDiary": "Ernährungstagebuch",
+    "@nutritionalDiary": {},
+    "nutritionalPlan": "Ernährungsplan",
+    "@nutritionalPlan": {},
+    "addIngredient": "Zutat hinzufügen",
+    "@addIngredient": {},
+    "gymMode": "Studiomodus",
+    "@gymMode": {
+        "description": "Label when starting the gym mode"
+    },
+    "addMeal": "Mahlzeit hinzufügen",
+    "@addMeal": {},
+    "add": "Hinzufügen",
+    "@add": {},
+    "cancel": "Abbrechen",
+    "@cancel": {},
+    "save": "Speichern",
+    "@save": {},
+    "description": "Beschreibung",
+    "@description": {},
+    "newSet": "Neuer Satz",
+    "@newSet": {
+        "description": "Header when adding a new set to a workout day"
+    },
+    "newDay": "Neuer Tag",
+    "@newDay": {},
+    "workoutSession": "Trainingseinheit",
+    "@workoutSession": {
+        "description": "A (logged) workout session"
+    },
+    "notes": "Notizen",
+    "@notes": {
+        "description": "Personal notes, e.g. for a workout session"
+    },
+    "impression": "Eindruck",
+    "@impression": {
+        "description": "General impression (e.g. for a workout session) such as good, bad, etc."
+    },
+    "comment": "Kommentar",
+    "@comment": {
+        "description": "Comment, additional information"
+    },
+    "goToToday": "Zu heute gehen",
+    "@goToToday": {
+        "description": "Label on button to jump back to 'today' in the calendar widget"
+    },
+    "selectIngredient": "Bitte wähle eine Zutat",
+    "@selectIngredient": {
+        "description": "Error message when the user hasn't selected an ingredient from the autocompleter"
+    },
+    "enterValidNumber": "Bitte gebe eine gültige Zahl ein",
+    "@enterValidNumber": {
+        "description": "Error message when the user has submitted an invalid number (e.g. '3,.,.,.')"
+    },
+    "enterValue": "Bitte gebe einen Wert ein",
+    "@enterValue": {
+        "description": "Error message when the user hasn't entered a value on a required field"
+    },
+    "calendar": "Kalender",
+    "@calendar": {},
+    "noWeightEntries": "Du hast keine Gewichtseinträge",
+    "@noWeightEntries": {
+        "description": "Message shown when the user has no logged weight entries"
+    },
+    "unit": "Einheit",
+    "@unit": {
+        "description": "The unit used for a repetition (kg, time, etc.)"
+    },
+    "logHelpEntriesUnits": "Beachte, dass nur Einträge mit einer Gewichtseinheit (kg oder lb) und Wiederholungen aufgezeichnet werden, andere Kombinationen wie Zeit oder „bis zum Versagen“ werden hier ignoriert.",
+    "@logHelpEntriesUnits": {},
+    "logHelpEntries": "Gibt es an einem Tag mehrere Einträge mit der gleichen Anzahl von Wiederholungen, aber unterschiedlichen Gewichten, wird nur der Eintrag mit dem höheren Gewicht im Diagramm angezeigt.",
+    "@logHelpEntries": {},
+    "loginInstead": "Du hast bereits einen Account? Stattdessen anmelden",
+    "@loginInstead": {},
+    "registerInstead": "Du hast keinen Account? Jetzt registrieren",
+    "@registerInstead": {},
+    "reset": "Zurücksetzen",
+    "@reset": {
+        "description": "Button text allowing the user to reset the entered values to the default"
+    },
+    "customServerHint": "Geben Sie die Adresse deines eigenen Servers ein, ansonsten wird die Standardadresse verwendet",
+    "@customServerHint": {
+        "description": "Hint text for the form where the users can enter their own wger instance"
+    },
+    "customServerUrl": "URL der wger-Instanz",
+    "@customServerUrl": {
+        "description": "Label in the form where the users can enter their own wger instance"
+    },
+    "invalidUsername": "Bitte geben Sie einen gültigen Benutzernamen ein",
+    "@invalidUsername": {
+        "description": "Error message when the user enters an invalid username"
+    },
+    "username": "Benutzername",
+    "@username": {},
+    "email": "E-Mail Adresse",
+    "@email": {},
+    "invalidEmail": "Bitte geben Sie eine gültige E-Mail-Adresse ein",
+    "@invalidEmail": {
+        "description": "Error message when the user enters an invalid email"
+    },
+    "confirmPassword": "Passwort bestätigen",
+    "@confirmPassword": {},
+    "password": "Passwort",
+    "@password": {},
+    "passwordTooShort": "Das Passwort ist zu kurz",
+    "@passwordTooShort": {
+        "description": "Error message when the user a password that is too short"
+    },
+    "passwordsDontMatch": "Die Passwörter stimmen nicht überein",
+    "@passwordsDontMatch": {
+        "description": "Error message when the user enters two different passwords during registration"
+    },
+    "invalidUrl": "Bitte gebe eine gültige URL ein",
+    "@invalidUrl": {
+        "description": "Error message when the user enters an invalid URL, e.g. in the login form"
+    },
+    "useCustomServer": "Verwende Benutzerdefinierten Server",
+    "@useCustomServer": {
+        "description": "Toggle button allowing users to switch between the default and a custom wger server"
+    },
+    "useDefaultServer": "Verwende Standard-Server",
+    "@useDefaultServer": {
+        "description": "Toggle button allowing users to switch between the default and a custom wger server"
+    },
+    "register": "Registrieren",
+    "@register": {
+        "description": "Text for registration button"
+    },
+    "login": "Anmelden",
+    "@login": {
+        "description": "Text for login button"
+    },
+    "addExercise": "Eine Übung hinzufügen",
+    "@addExercise": {},
+    "confirmDelete": "Bist du sicher, dass du '{toDelete}' löschen möchtest?",
+    "@confirmDelete": {
+        "description": "Confirmation text before the user deletes an object",
+        "type": "text",
+        "placeholders": {
+            "toDelete": {
+                "type": "String"
+            }
+        }
+    },
+    "noNutritionalPlans": "Du hast keine Ernährungspläne",
+    "@noNutritionalPlans": {
+        "description": "Message shown when the user has no nutritional plans"
+    },
+    "todaysWorkout": "Dein Training heute",
+    "@todaysWorkout": {},
+    "nrOfSets": "Sätze pro Übung: {nrOfSets}",
+    "@nrOfSets": {
+        "description": "Label shown on the slider where the user selects the nr of sets",
+        "type": "text",
+        "placeholders": {
+            "nrOfSets": {
+                "type": "String"
+            }
+        }
+    },
+    "enterCharacters": "Bitte gebe zwischen {min} und {max} Zeichen ein",
+    "@enterCharacters": {
+        "description": "Error message when the user hasn't entered the correct number of characters in a form",
+        "type": "text",
+        "placeholders": {
+            "min": {
+                "type": "String"
+            },
+            "max": {
+                "type": "String"
+            }
+        }
+    },
+    "selectExercise": "Bitte wähle eine Übung aus",
+    "@selectExercise": {
+        "description": "Error message when the user hasn't selected an exercise in the form"
+    },
+    "selectExercises": "Wenn du einen Supersatz machen willst, kannst du nach mehreren Übungen suchen, sie werden dann gruppiert",
+    "@selectExercises": {},
+    "sameRepetitions": "Wenn du für alle Sätze die gleichen Wiederholungen und das gleiche Gewicht verwendest, kannst du nur eine Zeile ausfüllen. Gebe z. B. für 4 Sätze einfach 10 für die Wiederholungen ein, daraus wird automatisch „4 × 10“.",
+    "@sameRepetitions": {},
+    "setNr": "Satz {nr}",
+    "@setNr": {
+        "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.",
+        "type": "text",
+        "placeholders": {
+            "nr": {
+                "type": "String"
+            }
+        }
+    },
+    "dayDescriptionHelp": "Eine Beschreibung, was an diesem Tag gemacht wird (z. B. „Zugtag“) oder welche Körperteile trainiert werden (z. B. „Brust und Schultern“)",
+    "@dayDescriptionHelp": {},
+    "set": "Satz",
+    "@set": {
+        "description": "A set in a workout plan"
+    },
+    "repetitionUnit": "Wiederholungseinheit",
+    "@repetitionUnit": {},
+    "weightUnit": "Gewichtseinheit",
+    "@weightUnit": {},
+    "reps": "Wdh.",
+    "@reps": {
+        "description": "Shorthand for repetitions, used when space constraints are tighter"
+    },
+    "start": "Start",
+    "@start": {
+        "description": "Label on button to start the gym mode (i.e., an imperative)"
+    },
+    "addSet": "Satz hinzufügen",
+    "@addSet": {
+        "description": "Label for the button that adds a set (to a workout day)"
+    },
+    "successfullySaved": "Gespeichert",
+    "@successfullySaved": {
+        "description": "Message when an item was successfully saved"
+    },
+    "labelWorkoutLogs": "Trainingsprotokolle",
+    "@labelWorkoutLogs": {
+        "description": "(Workout) logs"
+    },
+    "logout": "Abmelden",
+    "@logout": {
+        "description": "Text for logout button"
+    },
+    "aboutDescription": "Danke, dass du wger verwendest! wger ist ein gemeinschaftliches quelloffenes Projekt, das von Fitness-Enthusiasten aus der ganzen Welt entwickelt wurde.",
+    "@aboutDescription": {
+        "description": "Text in the about dialog"
+    },
+    "logMeal": "Gericht im Ernährungstagebuch protokollieren",
+    "@logMeal": {},
+    "category": "Kategorie",
+    "@category": {
+        "description": "Category for an exercise, ingredient, etc."
+    },
+    "equipment": "Gerät",
+    "@equipment": {
+        "description": "Equipment needed to perform an exercise"
+    },
+    "musclesSecondary": "Sekundäre Muskeln",
+    "@musclesSecondary": {
+        "description": "secondary muscles trained by an exercise"
+    },
+    "muscles": "Muskeln",
+    "@muscles": {
+        "description": "(main) muscles trained by an exercise"
+    },
+    "addImage": "Bild hinzufügen",
+    "@addImage": {},
+    "gallery": "Galerie",
+    "@gallery": {},
+    "imageFormatNotSupported": "{imageFormat} wird nicht unterstützt",
+    "@imageFormatNotSupported": {
+        "description": "Label shown on the error container when image format is not supported",
+        "type": "text",
+        "placeholders": {
+            "imageFormat": {
+                "type": "String"
+            }
+        }
+    },
+    "imageFormatNotSupportedDetail": "{imageFormat}-Bilder werden noch nicht unterstützt.",
+    "@imageFormatNotSupportedDetail": {
+        "description": "Label shown on the image preview container when image format is not supported",
+        "type": "text",
+        "placeholders": {
+            "imageFormat": {
+                "type": "String"
+            }
+        }
+    },
+    "chooseFromLibrary": "Wähle aus der Bibliothek",
+    "@chooseFromLibrary": {},
+    "takePicture": "Bild aufnehmen",
+    "@takePicture": {},
+    "selectImage": "Bitte wähle ein Bild aus",
+    "@selectImage": {
+        "description": "Label and error message when the user hasn't selected an image to save"
+    },
+    "name": "Name",
+    "@name": {
+        "description": "Name for a workout or nutritional plan"
+    },
+    "goToDetailPage": "Weiter zur Detailseite",
+    "@goToDetailPage": {},
+    "labelBottomNavNutrition": "Ernährung",
+    "@labelBottomNavNutrition": {
+        "description": "Label used in bottom navigation, use a short word"
+    },
+    "labelBottomNavWorkout": "Training",
+    "@labelBottomNavWorkout": {
+        "description": "Label used in bottom navigation, use a short word"
+    },
+    "optionsLabel": "Optionen",
+    "@optionsLabel": {
+        "description": "Label for the popup with general app options"
+    },
+    "setUnitsAndRir": "Einheiten und RiR einstellen",
+    "@setUnitsAndRir": {
+        "description": "Label shown on the slider where the user can toggle showing units and RiR",
+        "type": "text"
+    },
+    "searchExercise": "Suche Übung zum Hinzufügen",
+    "@searchExercise": {
+        "description": "Label on set form. Selected exercises are added to the set"
+    },
+    "rirNotUsed": "RiR nicht verwendet",
+    "@rirNotUsed": {
+        "description": "Label used in RiR slider when the RiR value is not used/saved for the current setting or log"
+    },
+    "jumpTo": "Springen zu",
+    "@jumpTo": {
+        "description": "Imperative. Label used in popup allowing the user to jump to a specific exercise while in the gym mode"
+    },
+    "pause": "Pause",
+    "@pause": {
+        "description": "Noun, not an imperative! Label used for the pause when using the gym mode"
+    },
+    "usernameValidChars": "Ein Benutzername darf nur Buchstaben, Ziffern und die Zeichen @, +, ., - und _ enthalten",
+    "@usernameValidChars": {
+        "description": "Error message when the user tries to register a username with forbidden characters"
+    },
+    "plateCalculatorNotDivisible": "Mit den vorhandenen Platten kann das Gewicht nicht erreicht werden",
+    "@plateCalculatorNotDivisible": {
+        "description": "Error message when the current weight is not reachable with plates (e.g. 33.1 kg)"
+    },
+    "plateCalculator": "Platten",
+    "@plateCalculator": {
+        "description": "Label used for the plate calculator in the gym mode"
+    },
+    "timeStartAhead": "Die Startzeit kann nicht vor der Endzeit liegen",
+    "@timeStartAhead": {},
+    "total": "Gesamt",
+    "@total": {
+        "description": "Label used for total sums of e.g. calories or similar"
+    },
+    "gPerBodyKg": "g pro Körper-kg",
+    "@gPerBodyKg": {
+        "description": "Label used for total sums of e.g. calories or similar in grams per Kg of body weight"
+    },
+    "percentEnergy": "Prozent der Energie",
+    "@percentEnergy": {},
+    "difference": "Differenz",
+    "@difference": {},
+    "logged": "Protokolliert",
+    "@logged": {
+        "description": "Header for the column of 'logged' nutritional values, i.e. what was eaten"
+    },
+    "planned": "Geplant",
+    "@planned": {
+        "description": "Header for the column of 'planned' nutritional values, i.e. what should be eaten"
+    },
+    "macronutrients": "Makronährstoffe",
+    "@macronutrients": {},
+    "value": "Wert",
+    "@value": {
+        "description": "The value of a measurement entry"
+    },
+    "measurementCategoriesHelpText": "Messkategorie, z. B. „Bizeps“ oder „Körperfett“",
+    "@measurementCategoriesHelpText": {},
+    "measurementEntriesHelpText": "Die Einheit, die verwendet wird, um die Kategorie zu messen, wie z.B. „cm“ oder „%“",
+    "@measurementEntriesHelpText": {},
+    "fatShort": "F",
+    "@fatShort": {
+        "description": "The first letter or short name of the word 'Fat', used in overviews"
+    },
+    "energyShort": "E",
+    "@energyShort": {
+        "description": "The first letter or short name of the word 'Energy', used in overviews"
+    },
+    "proteinShort": "P",
+    "@proteinShort": {
+        "description": "The first letter or short name of the word 'Protein', used in overviews"
+    },
+    "measurement": "Messung",
+    "@measurement": {},
+    "appUpdateContent": "Diese Version der Anwendung ist nicht mit dem Server kompatibel, bitte aktualisieren Sie Ihre Anwendung.",
+    "@appUpdateContent": {},
+    "appUpdateTitle": "Aktualisierung erforderlich",
+    "@appUpdateTitle": {},
+    "measurements": "Messungen",
+    "@measurements": {
+        "description": "Categories for the measurements such as biceps size, body fat, etc."
+    },
+    "dataCopied": "Daten in neuen Eintrag kopiert",
+    "@dataCopied": {
+        "description": "Snackbar message to show on copying data to a new log entry"
+    },
+    "carbohydratesShort": "K",
+    "@carbohydratesShort": {
+        "description": "The first letter or short name of the word 'Carbohydrates', used in overviews"
+    },
+    "recentlyUsedIngredients": "Kürzlich hinzugefügte Zutaten",
+    "@recentlyUsedIngredients": {
+        "description": "A message when a user adds a new ingredient to a meal."
+    },
+    "searchIngredient": "Zutat suchen",
+    "@searchIngredient": {
+        "description": "Label on ingredient search form"
+    },
+    "logIngredient": "Zutat im Ernährungstagebuch protokollieren",
+    "@logIngredient": {},
+    "close": "Schließen",
+    "@close": {
+        "description": "Translation for close"
+    },
+    "productNotFoundDescription": "Das Produkt mit dem gescannten Strichcode {barcode} wurde nicht in der wger-Datenbank gefunden",
+    "@productNotFoundDescription": {
+        "description": "Dialog info when product is not found with barcode",
+        "type": "text",
+        "placeholders": {
+            "barcode": {
+                "type": "String"
+            }
+        }
+    },
+    "productFound": "Produkt gefunden",
+    "@productFound": {
+        "description": "Header label for dialog when product is found with barcode"
+    },
+    "productFoundDescription": "Der Strichcode gehört zu diesem Produkt: {productName}. Möchten Sie fortfahren?",
+    "@productFoundDescription": {
+        "description": "Dialog info when product is found with barcode",
+        "type": "text",
+        "placeholders": {
+            "productName": {
+                "type": "String"
+            }
+        }
+    },
+    "productNotFound": "Produkt nicht gefunden",
+    "@productNotFound": {
+        "description": "Header label for dialog when product is not found with barcode"
+    },
+    "weekAverage": "7-Tage-Durchschnitt",
+    "@weekAverage": {
+        "description": "Header for the column of '7 day average' nutritional values, i.e. what was logged last week"
+    },
+    "scanBarcode": "Strichcode scannen",
+    "@scanBarcode": {
+        "description": "Label for scan barcode button"
+    },
+    "abs": "Bauch",
+    "@abs": {},
+    "arms": "Arme",
+    "@arms": {},
+    "back": "Rücken",
+    "@back": {},
+    "calves": "Waden",
+    "@calves": {},
+    "chest": "Brust",
+    "@chest": {},
+    "legs": "Beine",
+    "@legs": {},
+    "shoulders": "Schultern",
+    "@shoulders": {},
+    "barbell": "Langhantel",
+    "@barbell": {},
+    "noMeasurementEntries": "Du hast keine Messeingaben",
+    "@noMeasurementEntries": {},
+    "moreMeasurementEntries": "Neue Messung hinzufügen",
+    "@moreMeasurementEntries": {
+        "description": "Message shown when the user wants to add new measurement"
+    },
+    "selectEntry": "Bitte einen Eintrag auswählen",
+    "@selectEntry": {},
+    "exercises": "Übungen",
+    "@exercises": {
+        "description": "Multiple exercises for a workout"
+    },
+    "userProfile": "Dein Profil",
+    "@userProfile": {},
+    "exerciseList": "Liste der Übungen",
+    "@exerciseList": {},
+    "exerciseName": "Name der Übung",
+    "@exerciseName": {
+        "description": "Label for the name of a workout exercise"
+    },
+    "translation": "Übersetzung",
+    "@translation": {},
+    "translateExercise": "Diese Übung jetzt übersetzen",
+    "@translateExercise": {},
+    "baseData": "Grundlagen auf Englisch",
+    "@baseData": {
+        "description": "The base data for an exercise such as category, trained muscles, etc."
+    },
+    "images": "Bilder",
+    "@images": {},
+    "language": "Sprache",
+    "@language": {},
+    "add_exercise_image_license": "Bilder müssen mit der CC BY SA Lizenz vereinbar sein. Wenn du dir unsicher bist lade nur Bilder hoch, welche du selbst gemacht hast.",
+    "@add_exercise_image_license": {},
+    "variations": "Variationen",
+    "@variations": {
+        "description": "Variations of one exercise (e.g. benchpress and benchpress narrow)"
+    },
+    "contributeExercise": "Eine Übung beisteuern",
+    "@contributeExercise": {},
+    "hamstrings": "Oberschenkelmuskeln",
+    "@hamstrings": {},
+    "lower_back": "Unterer Rücken",
+    "@lower_back": {},
+    "aboutPageTitle": "Über uns & Support",
+    "@aboutPageTitle": {},
+    "alsoKnownAs": "Auch bekannt als:{aliases}",
+    "@alsoKnownAs": {
+        "placeholders": {
+            "aliases": {
+                "type": "String"
+            }
+        },
+        "description": "List of alternative names for an exercise"
+    },
+    "biceps": "Bizeps",
+    "@biceps": {},
+    "dumbbell": "Kurzhantel",
+    "@dumbbell": {},
+    "gym_mat": "Gymnastikmatte",
+    "@gym_mat": {},
+    "incline_bench": "Schrägbank",
+    "@incline_bench": {},
+    "lats": "Latissimus",
+    "@lats": {},
+    "enterMinCharacters": "Bitte gebe mindestens {min} Zeichen ein",
+    "@enterMinCharacters": {
+        "description": "Error message when the user hasn't entered the minimum amount characters in a form",
+        "type": "text",
+        "placeholders": {
+            "min": {
+                "type": "String"
+            }
+        }
+    },
+    "baseNameEnglish": "Alle Übungen brauchen einen Basisnamen in Englisch",
+    "@baseNameEnglish": {},
+    "contributeExerciseWarning": "Sie können nur Übungen beitragen, wenn Ihr Konto älter als {days} Tage ist und Sie Ihre E-Mail verifiziert haben",
+    "@contributeExerciseWarning": {
+        "description": "Number of days before which a person can add exercise",
+        "placeholders": {
+            "days": {
+                "type": "String",
+                "example": "14"
+            }
+        }
+    },
+    "cacheWarning": "Aufgrund von Caching kann es einige Zeit dauern, bis die Änderungen in der gesamten Anwendung sichtbar sind.",
+    "@cacheWarning": {},
+    "bench": "Bank",
+    "@bench": {},
+    "glutes": "Gesäßmuskeln",
+    "@glutes": {},
+    "kilometers": "Kilometer",
+    "@kilometers": {},
+    "miles": "Meilen",
+    "@miles": {},
+    "quads": "Quadrizeps",
+    "@quads": {},
+    "sz_bar": "SZ-Stange",
+    "@sz_bar": {},
+    "seconds": "Sekunden",
+    "@seconds": {},
+    "triceps": "Trizeps",
+    "@triceps": {},
+    "until_failure": "Bis zum Versagen",
+    "@until_failure": {},
+    "cardio": "Kardio",
+    "@cardio": {},
+    "success": "Erfolgreich",
+    "@success": {
+        "description": "Message when an action completed successfully, usually used as a heading"
+    },
+    "pull_up_bar": "Klimmzugstange",
+    "@pull_up_bar": {},
+    "verifiedEmailReason": "Du musst deine E-Mail verifizieren, um Übungen hinzuzufügen",
+    "@verifiedEmailReason": {},
+    "kettlebell": "Kugelhantel",
+    "@kettlebell": {},
+    "verifiedEmail": "Verifizierte E-Mail",
+    "@verifiedEmail": {},
+    "unVerifiedEmail": "Unverifizierte E-Mail",
+    "@unVerifiedEmail": {},
+    "alternativeNames": "Alternative Namen",
+    "@alternativeNames": {},
+    "verifiedEmailInfo": "Eine Bestätigungs-E-Mail wurde an {email} gesendet",
+    "@verifiedEmailInfo": {
+        "placeholders": {
+            "email": {
+                "type": "String"
+            }
+        }
+    },
+    "minutes": "Minuten",
+    "@minutes": {},
+    "oneNamePerLine": "Ein Name pro Zeile",
+    "@oneNamePerLine": {},
+    "whatVariationsExist": "Welche Varianten dieser Übung gibt es eventuell?",
+    "@whatVariationsExist": {},
+    "previous": "Vorherige",
+    "@previous": {},
+    "next": "Nächste",
+    "@next": {},
+    "swiss_ball": "Gymnastikball",
+    "@swiss_ball": {},
+    "none__bodyweight_exercise_": "keine (Körpergewichtsübung)",
+    "@none__bodyweight_exercise_": {},
+    "body_weight": "Körpergewicht",
+    "@body_weight": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "kg": "kg",
+    "@kg": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "kilometers_per_hour": "Kilometer pro Stunde",
+    "@kilometers_per_hour": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "miles_per_hour": "Meilen pro Stunde",
+    "@miles_per_hour": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "verify": "Verifizieren",
+    "@verify": {},
+    "textPromptTitle": "Bereit zu starten?",
+    "@textPromptTitle": {},
+    "settingsTitle": "Einstellungen",
+    "@settingsTitle": {},
+    "textPromptSubheading": "Drücken Sie die Aktionstaste, um zu beginnen",
+    "@textPromptSubheading": {},
+    "max_reps": "Max. Wiederholungen",
+    "@max_reps": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "noMatchingExerciseFound": "Diese Übung wurde nicht gefunden",
+    "@noMatchingExerciseFound": {
+        "description": "Message returned if no exercises match the searched string"
+    },
+    "aboutMastodonTitle": "Mastodon",
+    "@aboutMastodonTitle": {},
+    "plates": "Platten",
+    "@plates": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "aboutDonateTitle": "Mach eine Spende",
+    "@aboutDonateTitle": {},
+    "aboutDonateText": "Das Projekt ist kostenlos und wird es auch bleiben, der Betrieb des Servers hingegen nicht! Die Entwicklung erfordert zudem viel Zeit und Mühe von Freiwilligen. Ihr Beitrag deckt diese Kosten direkt und trägt zur Zuverlässigkeit des Dienstes bei.",
+    "@aboutDonateText": {},
+    "settingsCacheTitle": "Zwischenspeicher",
+    "@settingsCacheTitle": {},
+    "settingsExerciseCacheDescription": "Übungs-Zwischenspeicher",
+    "@settingsExerciseCacheDescription": {},
+    "settingsCacheDeletedSnackbar": "Zwischenspeicher erfolgreich gelöscht",
+    "@settingsCacheDeletedSnackbar": {},
+    "lb": "lb",
+    "@lb": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "useMetric": "Metrische Einheiten für das Körpergewicht verwenden",
+    "@useMetric": {},
+    "done": "Fertig",
+    "@done": {},
+    "searchNamesInEnglish": "Namen auch auf Englisch suchen",
+    "@searchNamesInEnglish": {},
+    "goalMacro": "Makroziele",
+    "@goalMacro": {
+        "description": "The goal for macronutrients"
+    },
+    "goalFiber": "Ballaststoffziel",
+    "@goalFiber": {},
+    "loggedToday": "Heute protokolliert",
+    "@loggedToday": {},
+    "onlyLogging": "Nur Kalorien eintragen",
+    "@onlyLogging": {},
+    "onlyLoggingHelpText": "Setze das Häkchen, wenn du nur deine Kalorien protokollieren möchtest und keinen detaillierten Ernährungsplan mit spezifischen Mahlzeiten einrichten willst",
+    "@onlyLoggingHelpText": {},
+    "goalEnergy": "Energieziel",
+    "@goalEnergy": {},
+    "goalProtein": "Eiweißziel",
+    "@goalProtein": {},
+    "goalCarbohydrates": "Kohlenhydratziel",
+    "@goalCarbohydrates": {},
+    "goalFat": "Fettziel",
+    "@goalFat": {},
+    "today": "Heute",
+    "@today": {},
+    "log": "Protokollieren",
+    "@log": {
+        "description": "Log a specific meal (imperative form)"
+    },
+    "noIngredientsDefined": "Noch keine Zutaten definiert",
+    "@noIngredientsDefined": {},
+    "ingredientLogged": "Zutat im Tagebuch protokolliert",
+    "@ingredientLogged": {},
+    "selectMealToLog": "Wähle eine Mahlzeit, um sie im Tagebuch zu protokollieren",
+    "@selectMealToLog": {},
+    "chartAllTimeTitle": "{name} aller Zeiten",
+    "@chartAllTimeTitle": {
+        "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
+        "type": "text",
+        "placeholders": {
+            "name": {
+                "type": "String"
+            }
+        }
+    },
+    "chart30DaysTitle": "{name} der letzten 30 Tage",
+    "@chart30DaysTitle": {
+        "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
+        "type": "text",
+        "placeholders": {
+            "name": {
+                "type": "String"
+            }
+        }
+    },
+    "chartDuringPlanTitle": "{chartName} während des Ernährungsplans {planName}",
+    "@chartDuringPlanTitle": {
+        "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
+        "type": "text",
+        "placeholders": {
+            "chartName": {
+                "type": "String"
+            },
+            "planName": {
+                "type": "String"
+            }
+        }
+    },
+    "surplus": "Überschuss",
+    "@surplus": {
+        "description": "Caloric surplus (either planned or unplanned)"
+    },
+    "deficit": "Defizit",
+    "@deficit": {
+        "description": "Caloric deficit (either planned or unplanned)"
+    },
+    "kcalValue": "{value} kcal",
+    "@kcalValue": {
+        "description": "A value in kcal, e.g. 500 kcal",
+        "type": "text",
+        "placeholders": {
+            "value": {
+                "type": "String"
+            }
+        }
+    },
+    "gValue": "{value} g",
+    "@gValue": {
+        "description": "A value in grams, e.g. 5 g",
+        "type": "text",
+        "placeholders": {
+            "value": {
+                "type": "String"
+            }
+        }
+    },
+    "percentValue": "{value} %",
+    "@percentValue": {
+        "description": "A value in percent, e.g. 10 %",
+        "type": "text",
+        "placeholders": {
+            "value": {
+                "type": "String"
+            }
+        }
+    },
+    "settingsIngredientCacheDescription": "Zutaten-Cache",
+    "@settingsIngredientCacheDescription": {},
+    "routines": "Routinen",
+    "@routines": {},
+    "newRoutine": "Neue Routine",
+    "@newRoutine": {},
+    "noRoutines": "Du hast keine Routinen",
+    "@noRoutines": {},
+    "sets": "Sätze",
+    "@sets": {
+        "description": "The number of sets to be done for one exercise"
+    },
+    "restTime": "Pausenzeit",
+    "@restTime": {},
+    "restDay": "Ruhetag",
+    "@restDay": {},
+    "copyToClipboard": "In Zwischenablage kopieren",
+    "@copyToClipboard": {},
+    "min": "Min",
+    "@min": {},
+    "apiToken": "API Token",
+    "@apiToken": {},
+    "useApiToken": "API Token benutzen",
+    "@useApiToken": {},
+    "useUsernameAndPassword": "Nutzername und Passwort benutzen",
+    "@useUsernameAndPassword": {},
+    "invalidApiToken": "Bitte geben Sie einen gültigen API-Schlüssel ein",
+    "@invalidApiToken": {
+        "description": "Error message when the user enters an invalid API key"
+    },
+    "apiTokenValidChars": "Ein API-Schlüssel darf nur die Buchstaben a-f und die Zahlen 0-9 enthalten und genau 40 Zeichen lang sein",
+    "@apiTokenValidChars": {
+        "description": "Error message when the user tries to input a API key with forbidden characters"
+    },
+    "exerciseNr": "Übung {nr}",
+    "@exerciseNr": {
+        "description": "Header in form indicating the number of the current exercise. Can also be translated as something like 'Set Nr. xy'.",
+        "type": "text",
+        "placeholders": {
+            "nr": {
+                "type": "String"
+            }
+        }
+    },
+    "supersetNr": "Supersatz {nr}",
+    "@supersetNr": {
+        "description": "Header in form indicating the number of the current exercise. Can also be translated as something like 'Superset Nr. xy'.",
+        "type": "text",
+        "placeholders": {
+            "nr": {
+                "type": "String"
+            }
+        }
+    },
+    "isRestDay": "Ist Ruhetag",
+    "@isRestDay": {},
+    "goalTypeMeals": "Von Mahlzeiten",
+    "@goalTypeMeals": {
+        "description": "added for localization of Class GoalType's filed meals"
+    },
+    "goalTypeAdvanced": "Fortgeschritten",
+    "@goalTypeAdvanced": {
+        "description": "added for localization of Class GoalType's filed advanced"
+    },
+    "addSuperset": "Supersatz hinzufügen",
+    "@addSuperset": {},
+    "setHasNoExercises": "Dieser Satz enthält noch keine Übungen!",
+    "@setHasNoExercises": {},
+    "simpleMode": "Einfacher Modus",
+    "@simpleMode": {},
+    "darkMode": "Immer Dunkelmodus",
+    "@darkMode": {},
+    "errorViewDetails": "Technische Details",
+    "@errorViewDetails": {},
+    "simpleModeHelp": "Blenden Sie einige der erweiterten Einstellungen beim Bearbeiten von Übungen aus",
+    "@simpleModeHelp": {},
+    "isRestDayHelp": "Bitte beachten Sie, dass alle Sätze und Übungen entfernt werden, wenn Sie einen Tag als Ruhetag markieren.",
+    "@isRestDayHelp": {},
+    "needsLogsToAdvance": "Benötigt Eintrag, um fortzufahren",
+    "@needsLogsToAdvance": {},
+    "needsLogsToAdvanceHelp": "Wählen Sie aus, ob die Routine nur dann zum nächsten geplanten Tag fortgesetzt werden soll, wenn Sie für diesen Tag ein Training protokolliert haben",
+    "@needsLogsToAdvanceHelp": {},
+    "routineDays": "Tage in der Routine",
+    "@routineDays": {},
+    "resultingRoutine": "Resultierende Routine",
+    "@resultingRoutine": {},
+    "errorInfoDescription": "Es tut uns leid, aber etwas ist schiefgelaufen. Sie können uns helfen, das Problem zu beheben, indem Sie es auf GitHub melden.",
+    "@errorInfoDescription": {},
+    "errorInfoDescription2": "Sie können die App weiterhin verwenden, einige Funktionen funktionieren jedoch möglicherweise nicht.",
+    "@errorInfoDescription2": {},
+    "errorCouldNotConnectToServer": "Verbindung zum Server konnte nicht hergestellt werden",
+    "@errorCouldNotConnectToServer": {},
+    "max": "Max",
+    "@max": {},
+    "aboutWhySupportTitle": "Open Source und kostenlos nutzbar ❤️",
+    "@aboutWhySupportTitle": {},
+    "aboutBugsListTitle": "Ein Problem melden oder eine Funktion vorschlagen",
+    "@aboutBugsListTitle": {},
+    "aboutTranslationListTitle": "Übersetzen Sie die Anwendung",
+    "@aboutTranslationListTitle": {},
+    "aboutSourceListTitle": "Quellcode anzeigen",
+    "@aboutSourceListTitle": {},
+    "aboutJoinCommunityTitle": "Treten Sie der Community bei",
+    "@aboutJoinCommunityTitle": {},
+    "aboutDiscordTitle": "Discord",
+    "@aboutDiscordTitle": {},
+    "others": "Sonstiges",
+    "@others": {},
+    "setHasProgression": "Set hat Fortschritt",
+    "@setHasProgression": {},
+    "progressionRules": "Diese Übung unterliegt Fortschrittsregeln und kann in der mobilen App nicht bearbeitet werden. Bitte verwenden Sie die Webanwendung, um diese Übung zu bearbeiten.",
+    "@progressionRules": {},
+    "goalTypeBasic": "Normal",
+    "@goalTypeBasic": {
+        "description": "added for localization of Class GoalType's filed basic"
+    },
+    "indicatorRaw": "raw",
+    "@indicatorRaw": {
+        "description": "added for localization of Class Indicator's field text"
+    },
+    "overallChangeWeight": "Allgemeine Veränderung",
+    "@overallChangeWeight": {
+        "description": "Overall change in weight, added for localization"
+    },
+    "indicatorAvg": "Durchschn.",
+    "@indicatorAvg": {
+        "description": "added for localization of Class Indicator's field text"
+    },
+    "themeMode": "Theme Modus",
+    "@themeMode": {},
+    "lightMode": "Immer Hellmodus",
+    "@lightMode": {},
+    "systemMode": "Systemeinstellungen",
+    "@systemMode": {},
+    "errorCouldNotConnectToServerDetails": "Die Anwendung konnte keine Verbindung zum Server herstellen. Bitte überprüfen Sie Ihre Internetverbindung oder die Server-URL und versuchen Sie es erneut. Sollte das Problem weiterhin bestehen, wenden Sie sich an den Serveradministrator.",
+    "@errorCouldNotConnectToServerDetails": {},
+    "fitInWeek": "Tage in die Woche einpassen",
+    "@fitInWeek": {},
+    "fitInWeekHelp": "Wenn diese Option aktiviert ist, wiederholen sich die Tage in einem wöchentlichen Zyklus, andernfalls folgen die Tage der Reihe nach, ohne Rücksicht auf den Beginn einer neuen Woche.",
+    "@fitInWeekHelp": {},
+    "aboutContributeText": "Beiträge aller Art sind willkommen. Egal, ob Sie Entwickler, Übersetzer oder einfach nur Fitnessbegeisterter sind – jede Unterstützung ist willkommen!",
+    "@aboutContributeText": {},
+    "aboutContributeTitle": "Beitragen",
+    "@aboutContributeTitle": {},
+    "resistance_band": "Widerstandsband",
+    "@resistance_band": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "setHasProgressionWarning": "Bitte beachten Sie, dass es derzeit nicht möglich ist, alle Einstellungen für ein Set in der mobilen Anwendung zu bearbeiten oder den automatischen Fortschritt zu konfigurieren. Nutzen Sie vorerst bitte die Webanwendung.",
+    "@setHasProgressionWarning": {},
+    "useColors": "farbig",
+    "@useColors": {},
+    "barWeight": "Gewicht der Stange",
+    "@barWeight": {},
+    "selectAvailablePlates": "Verfügbare Platten auswählen",
+    "@selectAvailablePlates": {},
+    "yourCurrentNutritionPlanHasNoMealsDefinedYet": "Dein aktueller Ernährungsplan enthält keine Gerichte",
+    "@yourCurrentNutritionPlanHasNoMealsDefinedYet": {
+        "description": "Message shown when a nutrition plan doesn't have any meals"
+    },
+    "toAddMealsToThePlanGoToNutritionalPlanDetails": "Gehe zum Ernährungsplaner um Gerichte hinzuzufügen",
+    "@toAddMealsToThePlanGoToNutritionalPlanDetails": {
+        "description": "Message shown to guide users to the nutritional plan details page to add meals"
+    },
+    "endDate": "Enddatum",
+    "@endDate": {},
+    "startDate": "Anfangsdatum",
+    "@startDate": {},
+    "applicationLogs": "Anwendungsprotokolle",
+    "@applicationLogs": {}
 }
diff --git a/lib/l10n/app_el.arb b/lib/l10n/app_el.arb
index 539298c6..5f238b89 100644
--- a/lib/l10n/app_el.arb
+++ b/lib/l10n/app_el.arb
@@ -71,10 +71,6 @@
   "@usernameValidChars": {
     "description": "Error message when the user tries to register a username with forbidden characters"
   },
-  "labelWorkoutPlans": "Προγράμματα προπόνησης",
-  "@labelWorkoutPlans": {
-    "description": "Title for screen workout plans"
-  },
   "previous": "Προηγούμενο",
   "@previous": {},
   "userProfile": "Το προφίλ σας",
@@ -208,7 +204,9 @@
     "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.",
     "type": "text",
     "placeholders": {
-      "nr": {}
+      "nr": {
+        "type": "String"
+      }
     }
   },
   "newDay": "Νέα ημέρα",
@@ -259,20 +257,12 @@
   "@successfullyDeleted": {
     "description": "Message when an item was successfully deleted"
   },
-  "noWorkoutPlans": "Δεν έχετε πλάνα προπόνησης",
-  "@noWorkoutPlans": {
-    "description": "Message shown when the user has no workout plans"
-  },
   "searchNamesInEnglish": "Επίσης, αναζητήστε ονόματα στα Αγγλικά",
   "@searchNamesInEnglish": {},
   "noMatchingExerciseFound": "Δεν βρέθηκαν αντίστοιχες ασκήσεις",
   "@noMatchingExerciseFound": {
     "description": "Message returned if no exercises match the searched string"
   },
-  "supersetWith": "υπερσύνολο με",
-  "@supersetWith": {
-    "description": "Text used between exercise cards when adding a new set. Translate as something like 'in a superset with'"
-  },
   "equipment": "Εξοπλισμός",
   "@equipment": {
     "description": "Equipment needed to perform an exercise"
@@ -281,10 +271,6 @@
   "@muscles": {
     "description": "(main) muscles trained by an exercise"
   },
-  "newWorkout": "Νέο πλάνο προπόνησης",
-  "@newWorkout": {
-    "description": "Header when adding a new workout"
-  },
   "reps": "Επαναλήψεις",
   "@reps": {
     "description": "Shorthand for repetitions, used when space constraints are tighter"
@@ -305,4 +291,4 @@
   "@gymMode": {
     "description": "Label when starting the gym mode"
   }
-}
+}
\ No newline at end of file
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index 9b093c9b..b4f2f372 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -37,6 +37,9 @@
   "@passwordTooShort": {
     "description": "Error message when the user a password that is too short"
   },
+  "selectAvailablePlates": "Select available plates",
+  "barWeight": "Bar weight",
+  "useColors": "Use colors",
   "password": "Password",
   "@password": {},
   "confirmPassword": "Confirm password",
@@ -53,6 +56,18 @@
   "@invalidUsername": {
     "description": "Error message when the user enters an invalid username"
   },
+  "useApiToken": "Use API Token",
+  "useUsernameAndPassword": "Use username and password",
+  "apiToken": "API Token",
+  "@apiToken": {},
+  "invalidApiToken": "Please enter a valid API key",
+  "@invalidApiToken": {
+    "description": "Error message when the user enters an invalid API key"
+  },
+  "apiTokenValidChars": "An API key may only contain the letters a-f, numbers 0-9 and be exactly 40 characters long",
+  "@apiTokenValidChars": {
+    "description": "Error message when the user tries to input a API key with forbidden characters"
+  },
   "customServerUrl": "URL of the wger instance",
   "@customServerUrl": {
     "description": "Label in the form where the users can enter their own wger instance"
@@ -69,10 +84,6 @@
   "@registerInstead": {},
   "loginInstead": "Already have an account? Login",
   "@loginInstead": {},
-  "labelWorkoutPlans": "Workout plans",
-  "@labelWorkoutPlans": {
-    "description": "Title for screen workout plans"
-  },
   "labelBottomNavWorkout": "Workout",
   "@labelBottomNavWorkout": {
     "description": "Label used in bottom navigation, use a short word"
@@ -128,10 +139,6 @@
     "description": "Message returned if no exercises match the searched string"
   },
   "searchNamesInEnglish": "Also search for names in English",
-  "supersetWith": "superset with",
-  "@supersetWith": {
-    "description": "Text used between exercise cards when adding a new set. Translate as something like 'in a superset with'"
-  },
   "equipment": "Equipment",
   "@equipment": {
     "description": "Equipment needed to perform an exercise"
@@ -148,18 +155,38 @@
   "@category": {
     "description": "Category for an exercise, ingredient, etc."
   },
-  "newWorkout": "New workout plan",
-  "@newWorkout": {
-    "description": "Header when adding a new workout"
-  },
-  "noWorkoutPlans": "You have no workout plans",
-  "@noWorkoutPlans": {
-    "description": "Message shown when the user has no workout plans"
+  "startDate": "Start date",
+  "@startDate": {
+    "description": "The start date of a nutritional plan or routine"
   },
+  "dayTypeCustom": "Custom",
+  "dayTypeEnom": "Every minute on the minute",
+  "dayTypeAmrap": "As many rounds as possible",
+  "dayTypeHiit": "High intensity interval training",
+  "dayTypeTabata": "Tabata",
+  "dayTypeEdt": "Escalating density training",
+  "dayTypeRft": "Rounds for time",
+  "dayTypeAfap": "As fast as possible",
+  "slotEntryTypeNormal": "Normal",
+  "slotEntryTypeDropset": "Dropset",
+  "slotEntryTypeMyo": "Myo",
+  "slotEntryTypePartial": "Partial",
+  "slotEntryTypeForced": "Forced",
+  "slotEntryTypeTut": "Time under Tension",
+  "slotEntryTypeIso": "Isometric hold",
+  "slotEntryTypeJump": "Jump",
+  "routines": "Routines",
+  "newRoutine": "New routine",
+  "noRoutines": "You have no routines",
   "reps": "Reps",
   "@reps": {
     "description": "Shorthand for repetitions, used when space constraints are tighter"
   },
+  "restTime": "Rest time",
+  "sets": "Sets",
+  "@sets": {
+    "description": "The number of sets to be done for one exercise"
+  },
   "rir": "RiR",
   "@rir": {
     "description": "Shorthand for Repetitions In Reserve"
@@ -179,12 +206,24 @@
   },
   "dayDescriptionHelp": "A description of what is done on this day (e.g. 'pull day') or what body parts are trained (e.g. 'chest and shoulders')",
   "@dayDescriptionHelp": {},
-  "setNr": "Set {nr}",
-  "@setNr": {
-    "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.",
+  "exerciseNr": "Exercise {nr}",
+  "@exerciseNr": {
+    "description": "Header in form indicating the number of the current exercise. Can also be translated as something like 'Set Nr. xy'.",
     "type": "text",
     "placeholders": {
-      "nr": {}
+      "nr": {
+        "type": "String"
+      }
+    }
+  },
+  "supersetNr": "Superset {nr}",
+  "@supersetNr": {
+    "description": "Header in form indicating the number of the current exercise. Can also be translated as something like 'Superset Nr. xy'.",
+    "type": "text",
+    "placeholders": {
+      "nr": {
+        "type": "String"
+      }
     }
   },
   "sameRepetitions": "If you do the same repetitions and weight for all sets you can just fill in one row. For example for 4 sets just enter 10 for the repetitions, this automatically becomes \"4 x 10\".",
@@ -205,6 +244,13 @@
   "@workoutSession": {
     "description": "A (logged) workout session"
   },
+  "restDay": "Rest day",
+  "isRestDay": "Is rest day",
+  "isRestDayHelp": "Please note that all sets and exercises will be removed when you mark a day as a rest day.",
+  "needsLogsToAdvance": "Needs logs to advance",
+  "needsLogsToAdvanceHelp": "Select if you want the routine to progress to the next scheduled day only if you've logged a workout for the day",
+  "routineDays": "Days in routine",
+  "resultingRoutine": "Resulting routine",
   "newDay": "New day",
   "@newDay": {},
   "newSet": "New set",
@@ -285,14 +331,30 @@
     "description": "The goal for macronutrients"
   },
   "selectMealToLog": "Select a meal to log to diary",
+  "yourCurrentNutritionPlanHasNoMealsDefinedYet": "Your current nutrition plan has no meals defined",
+  "@yourCurrentNutritionPlanHasNoMealsDefinedYet": {
+    "description": "Message shown when a nutrition plan doesn't have any meals"
+  },
+  "toAddMealsToThePlanGoToNutritionalPlanDetails": "To add meals to the plan, go to the nutritional plan details",
+  "@toAddMealsToThePlanGoToNutritionalPlanDetails": {
+    "description": "Message shown to guide users to the nutritional plan details page to add meals"
+  },
   "goalEnergy": "Energy goal",
   "goalProtein": "Protein goal",
   "goalCarbohydrates": "Carbohydrates goal",
   "goalFat": "Fat goal",
   "goalFiber": "Fiber goal",
   "anErrorOccurred": "An Error Occurred!",
-  "@anErrorOccurred": {},
+  "errorInfoDescription": "We're sorry, but something went wrong. You can help us fix this by reporting the issue on GitHub.",
+  "errorInfoDescription2": "You can continue using the app, but some features may not work.",
+  "errorViewDetails": "Technical details",
+  "applicationLogs": "Application logs",
+  "errorCouldNotConnectToServer": "Couldn't connect to server",
+  "errorCouldNotConnectToServerDetails": "The application could not connect to the server. Please check your internet connection or the server URL and try again. If the problem persists, contact the server administrator.",
+  "copyToClipboard": "Copy to clipboard",
   "weight": "Weight",
+  "min": "Min",
+  "max": "Max",
   "@weight": {
     "description": "The weight of a workout log or body weight entry"
   },
@@ -301,7 +363,9 @@
     "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
     "type": "text",
     "placeholders": {
-      "name": {}
+      "name": {
+        "type": "String"
+      }
     }
   },
   "chart30DaysTitle": "{name} last 30 days",
@@ -309,7 +373,9 @@
     "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
     "type": "text",
     "placeholders": {
-      "name": {}
+      "name": {
+        "type": "String"
+      }
     }
   },
   "chartDuringPlanTitle": "{chartName} during nutritional plan {planName}",
@@ -317,8 +383,12 @@
     "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
     "type": "text",
     "placeholders": {
-      "chartName": {},
-      "planName": {}
+      "chartName": {
+        "type": "String"
+      },
+      "planName": {
+        "type": "String"
+      }
     }
   },
   "measurement": "Measurement",
@@ -335,6 +405,14 @@
   "@date": {
     "description": "The date of a workout log or body weight entry"
   },
+  "endDate": "End date",
+  "@endDate": {
+    "description": "The End date of a nutritional plan or routine"
+  },
+  "openEnded": "Open ended",
+  "@openEnded": {
+    "description": "When a nutrition plan has no pre-defined end date"
+  },
   "value": "Value",
   "@value": {
     "description": "The value of a measurement entry"
@@ -412,7 +490,9 @@
     "description": "A value in kcal, e.g. 500 kcal",
     "type": "text",
     "placeholders": {
-      "value": {}
+      "value": {
+        "type": "String"
+      }
     }
   },
   "kJ": "kJ",
@@ -428,7 +508,9 @@
     "description": "A value in grams, e.g. 5 g",
     "type": "text",
     "placeholders": {
-      "value": {}
+      "value": {
+        "type": "String"
+      }
     }
   },
   "percentValue": "{value} %",
@@ -436,7 +518,9 @@
     "description": "A value in percent, e.g. 10 %",
     "type": "text",
     "placeholders": {
-      "value": {}
+      "value": {
+        "type": "String"
+      }
     }
   },
   "protein": "Protein",
@@ -462,7 +546,6 @@
   "saturatedFat": "Saturated fat",
   "@saturatedFat": {},
   "fiber": "Fibers",
-  "@fibres": {},
   "sodium": "Sodium",
   "@sodium": {},
   "amount": "Amount",
@@ -502,73 +585,42 @@
     "description": "Confirmation text before the user deletes an object",
     "type": "text",
     "placeholders": {
-      "toDelete": {}
+      "toDelete": {
+        "type": "String"
+      }
     }
   },
   "newNutritionalPlan": "New nutritional plan",
   "@newNutritionalPlan": {},
+  "overview": "Overview",
   "toggleDetails": "Toggle details",
   "@toggleDetails": {
     "description": "Switch to toggle detail / overview"
   },
   "goToDetailPage": "Go to detail page",
   "@goToDetailPage": {},
+  "aboutWhySupportTitle": "Open Source & free to use ❤️",
   "aboutDescription": "Thank you for using wger! wger is a collaborative open source project, made by fitness enthusiasts from around the world.",
   "@aboutDescription": {
     "description": "Text in the about dialog"
   },
-  "aboutSourceTitle": "Source code",
-  "@aboutSourceTitle": {
-    "description": "Title for source code section in the about dialog"
-  },
-  "aboutSourceText": "Get the source code of this application and its server on github",
-  "@aboutSourceText": {
-    "description": "Text for source code section in the about dialog"
-  },
-  "aboutBugsTitle": "Have a problem or idea?",
-  "@aboutBugsTitle": {
-    "description": "Title for bugs section in the about dialog"
-  },
-  "aboutBugsText": "Get in touch if something didn't behave as expected or if there is a feature that you feel is missing.",
-  "@aboutBugsText": {
-    "description": "Text for bugs section in the about dialog"
-  },
-  "aboutContactUsTitle": "Say hi!",
-  "@aboutContactUsTitle": {
-    "description": "Title for contact us section in the about dialog"
-  },
-  "aboutContactUsText": "If you want to chat with us, hop on the Discord server and get in touch",
-  "@aboutContactUsText": {
-    "description": "Text for contact us section in the about dialog"
-  },
+  "aboutDonateTitle": "Make a donation",
+  "aboutDonateText": "While the project is free and will always remain it, running the server isn’t! Development also takes significant time and effort from volunteers. Your contribution directly supports these costs, helping to keep the service reliable.",
+  "aboutContributeTitle": "Contribute",
+  "aboutContributeText": "All types of contributions are encouraged. Whether you're a developer, a translator, or just passionate about fitness, every bit of support is appreciated!",
+  "aboutBugsListTitle": "Report a problem or suggest a feature",
+  "aboutTranslationListTitle": "Translate the application",
+  "aboutSourceListTitle": "View source code",
+  "aboutJoinCommunityTitle": "Join the community",
   "aboutMastodonTitle": "Mastodon",
-  "@aboutMastodonTitle": {
-    "description": "Title for mastodon section in the about dialog"
-  },
-  "aboutMastodonText": "Follow us on mastodon for updates and news about the project",
-  "@aboutMastodonText": {
-    "description": "Text for the mastodon section in the about dialog"
-  },
-  "aboutTranslationTitle": "Translation",
-  "@aboutTranslationTitle": {
-    "description": "Title for translation section in the about dialog"
-  },
-  "aboutTranslationText": "This application is translated on weblate. If you also want to help, click the link and start translating",
-  "@aboutTranslationText": {
-    "description": "Text for translation section in the about dialog"
-  },
-  "aboutDonateTitle": "Donate",
-  "aboutDonateText": "Buy us a coffee to help the project, pay for server costs, and keep us fueled",
+  "aboutDiscordTitle": "Discord",
+  "others": "Others",
   "calendar": "Calendar",
   "@calendar": {},
   "goToToday": "Go to today",
   "@goToToday": {
     "description": "Label on button to jump back to 'today' in the calendar widget"
   },
-  "enterRepetitionsOrWeight": "Please fill in either the repetitions or the weight for at least one of the sets",
-  "@enterRepetitionsOrWeight": {
-    "description": "Error message when the user hasn't filled in the forms for exercise sets"
-  },
   "enterValue": "Please enter a value",
   "@enterValue": {
     "description": "Error message when the user hasn't entered a value on a required field"
@@ -583,8 +635,12 @@
     "description": "Error message when the user hasn't entered the correct number of characters in a form",
     "type": "text",
     "placeholders": {
-      "min": {},
-      "max": {}
+      "min": {
+        "type": "String"
+      },
+      "max": {
+        "type": "String"
+      }
     }
   },
   "enterMinCharacters": "Please enter at least {min} characters",
@@ -592,7 +648,9 @@
     "description": "Error message when the user hasn't entered the minimum amount characters in a form",
     "type": "text",
     "placeholders": {
-      "min": {}
+      "min": {
+        "type": "String"
+      }
     }
   },
   "baseNameEnglish": "All exercises need a base name in English",
@@ -601,7 +659,9 @@
     "description": "Label shown on the slider where the user selects the nr of sets",
     "type": "text",
     "placeholders": {
-      "nrOfSets": {}
+      "nrOfSets": {
+        "type": "String"
+      }
     }
   },
   "setUnitsAndRir": "Set units and RiR",
@@ -654,7 +714,9 @@
     "description": "Dialog info when product is found with barcode",
     "type": "text",
     "placeholders": {
-      "productName": {}
+      "productName": {
+        "type": "String"
+      }
     }
   },
   "productNotFound": "Product not found",
@@ -666,7 +728,9 @@
     "description": "Dialog info when product is not found with barcode",
     "type": "text",
     "placeholders": {
-      "barcode": {}
+      "barcode": {
+        "type": "String"
+      }
     }
   },
   "scanBarcode": "Scan barcode",
@@ -677,7 +741,75 @@
   "@close": {
     "description": "Translation for close"
   },
+  "identicalExercisePleaseDiscard": "If you notice an exercise that is identical to the one you're adding, please discard your draft and edit that exercise instead.",
+  "checkInformationBeforeSubmitting": "Please check that the information you entered is correct before submitting the exercise",
   "add_exercise_image_license": "Images must be compatible with the CC BY SA license. If in doubt, upload only photos you've taken yourself.",
+  "imageDetailsTitle": "Image details",
+  "@imageDetailsTitle": {
+    "description": "Title for image details form"
+  },
+  "imageDetailsLicenseTitle": "Title",
+  "@imageDetailsLicenseTitle": {
+    "description": "Label for image title field"
+  },
+  "imageDetailsLicenseTitleHint": "Enter image title",
+  "@imageDetailsLicenseTitleHint": {
+    "description": "Hint text for image title field"
+  },
+  "imageDetailsSourceLink": "Link to the source website",
+  "@imageDetailsSourceLink": {
+    "description": "Label for source link field"
+  },
+  "author": "Author(s)",
+  "@Author": {
+    "description": "Label for author field"
+  },
+  "authorHint": "Enter author name",
+  "@authorHint": {
+    "description": "Hint text for author field"
+  },
+  "imageDetailsAuthorLink": "Link to author website or profile",
+  "@imageDetailsAuthorLink": {
+    "description": "Label for author link field"
+  },
+  "imageDetailsDerivativeSource": "Link to the original source, if this is a derivative work",
+  "@imageDetailsDerivativeSource": {
+    "description": "Label for derivative source field"
+  },
+  "imageDetailsDerivativeHelp": "A derivative work is based on a previous work but contains sufficient new, creative content to entitle it to its own copyright.",
+  "@imageDetailsDerivativeHelp": {
+    "description": "Helper text explaining derivative works"
+  },
+  "imageDetailsImageType": "Image Type",
+  "@imageDetailsImageType": {
+    "description": "Label for image type selector"
+  },
+  "imageDetailsLicenseNotice": "By submitting this image, you agree to release it under the CC-BY-SA-4. The image must be either your own work or the author must have released it under a license compatible with it.",
+  "imageDetailsLicenseNoticeLinkToLicense": "See license text.",
+  "imageFormatNotSupported": "{imageFormat} not supported",
+  "@imageFormatNotSupported": {
+      "description": "Label shown on the error container when image format is not supported",
+      "type": "text",
+      "placeholders": {
+          "imageFormat": {
+              "type": "String"
+          }
+      }
+  },
+  "imageFormatNotSupportedDetail": "{imageFormat} images are not supported yet.",
+  "@imageFormatNotSupportedDetail": {
+      "description": "Label shown on the image preview container when image format is not supported",
+      "type": "text",
+      "placeholders": {
+          "imageFormat": {
+              "type": "String"
+          }
+      }
+  },
+  "add": "add",
+  "@add": {
+    "description": "Add button text"
+  },
   "variations": "Variations",
   "@variations": {
     "description": "Variations of one exercise (e.g. benchpress and benchpress narrow)"
@@ -685,7 +817,9 @@
   "alsoKnownAs": "Also known as: {aliases}",
   "@alsoKnownAs": {
     "placeholders": {
-      "aliases": {}
+      "aliases": {
+        "type": "String"
+      }
     },
     "description": "List of alternative names for an exercise"
   },
@@ -695,7 +829,9 @@
   "verifiedEmailInfo": "A verification email was sent to {email}",
   "@verifiedEmailInfo": {
     "placeholders": {
-      "email": {}
+      "email": {
+        "type": "String"
+      }
     }
   },
   "alternativeNames": "Alternative names",
@@ -706,6 +842,12 @@
   "images": "Images",
   "language": "Language",
   "addExercise": "Add exercise",
+  "fitInWeek": "Fit in week",
+  "fitInWeekHelp": "If enabled, the days will repeat in a weekly cycle, otherwise the days will follow sequentially without regards to the start of a new week.",
+  "addSuperset": "Add superset",
+  "setHasProgression": "Set has progression",
+  "setHasProgressionWarning": "Please note that at the moment it is not possible to edit all settings for a set on the mobile application or configure automatic progression. For now, please use the web application.",
+  "setHasNoExercises": "This set has no exercises yet!",
   "contributeExercise": "Contribute an exercise",
   "translation": "Translation",
   "translateExercise": "Translate this exercise now",
@@ -713,12 +855,13 @@
   "@baseData": {
     "description": "The base data for an exercise such as category, trained muscles, etc."
   },
+  "enterTextInLanguage": "Please enter the text in the correct language!",
   "settingsTitle": "Settings",
   "settingsCacheTitle": "Cache",
   "settingsExerciseCacheDescription": "Exercise cache",
   "settingsIngredientCacheDescription": "Ingredient cache",
   "settingsCacheDeletedSnackbar": "Cache successfully cleared",
-  "aboutPageTitle": "About Wger",
+  "aboutPageTitle": "About us & Support",
   "contributeExerciseWarning": "You can only contribute exercises if your account is older than {days} days and have verified your email",
   "@contributeExerciseWarning": {
     "description": "Number of days before which a person can add exercise",
@@ -729,6 +872,9 @@
       }
     }
   },
+  "simpleMode": "Simple mode",
+  "simpleModeHelp": "Hide some of the more advanced settings when editing exercises",
+  "progressionRules": "This exercise has progression rules and can't be edited on the mobile app. Please use the web application to edit this exercise.",
   "cacheWarning": "Due to caching it might take some time till the changes are visible throughout the application.",
   "textPromptTitle": "Ready to start?",
   "textPromptSubheading": "Press the action button to begin",
@@ -848,6 +994,10 @@
   "@repetitions": {
     "description": "Generated entry for translation for server strings"
   },
+  "resistance_band": "Resistance band",
+  "@resistance_band": {
+    "description": "Generated entry for translation for server strings"
+  },
   "sz_bar": "SZ-Bar",
   "@sz_bar": {
     "description": "Generated entry for translation for server strings"
@@ -888,5 +1038,34 @@
   "@log": {
     "description": "Log a specific meal (imperative form)"
   },
-  "done": "Done"
+  "done": "Done",
+  "overallChangeWeight": "Overall change",
+  "@overallChangeWeight": {
+    "description": "Overall change in weight, added for localization"
+  },
+  "goalTypeMeals": "From meals",
+  "@goalTypeMeals": {
+    "description": "added for localization of Class GoalType's filed meals"
+  },
+  "goalTypeBasic": "Basic",
+  "@goalTypeBasic": {
+    "description": "added for localization of Class GoalType's filed basic"
+  },
+  "goalTypeAdvanced": "Advanced",
+  "@goalTypeAdvanced": {
+    "description": "added for localization of Class GoalType's filed advanced"
+  },
+  "indicatorRaw": "raw",
+  "@indicatorRaw": {
+    "description": "added for localization of Class Indicator's field text"
+  },
+  "indicatorAvg": "avg",
+  "@indicatorAvg": {
+    "description": "added for localization of Class Indicator's field text"
+  },
+  "endWorkout": "End Workout",
+  "themeMode": "Theme mode",
+  "darkMode": "Always dark mode",
+  "lightMode": "Always light mode",
+  "systemMode": "System settings"
 }
diff --git a/lib/l10n/app_es.arb b/lib/l10n/app_es.arb
index b3c067f3..312bb16a 100644
--- a/lib/l10n/app_es.arb
+++ b/lib/l10n/app_es.arb
@@ -1,791 +1,1040 @@
 {
-  "exercise": "Ejercicio",
-  "@exercise": {
-    "description": "An exercise for a workout"
-  },
-  "kcal": "kcal",
-  "@kcal": {
-    "description": "Energy in a meal in kilocalories, kcal"
-  },
-  "reps": "Repeticiones",
-  "@reps": {
-    "description": "Shorthand for repetitions, used when space constraints are tighter"
-  },
-  "selectIngredient": "Por favor selecciona un ingrediente",
-  "@selectIngredient": {
-    "description": "Error message when the user hasn't selected an ingredient from the autocompleter"
-  },
-  "enterValidNumber": "Por favor ingresa un número válido",
-  "@enterValidNumber": {
-    "description": "Error message when the user has submitted an invalid number (e.g. '3,.,.,.')"
-  },
-  "nrOfSets": "Series por ejercicio: {nrOfSets}",
-  "@nrOfSets": {
-    "description": "Label shown on the slider where the user selects the nr of sets",
-    "type": "text",
-    "placeholders": {
-      "nrOfSets": {}
-    }
-  },
-  "enterCharacters": "Por favor ingresa entre {min} y {max} caracteres",
-  "@enterCharacters": {
-    "description": "Error message when the user hasn't entered the correct number of characters in a form",
-    "type": "text",
-    "placeholders": {
-      "min": {},
-      "max": {}
-    }
-  },
-  "selectExercise": "Por favor selecciona un ejercicio",
-  "@selectExercise": {
-    "description": "Error message when the user hasn't selected an exercise in the form"
-  },
-  "enterValue": "Por favor ingresa un valor",
-  "@enterValue": {
-    "description": "Error message when the user hasn't entered a value on a required field"
-  },
-  "enterRepetitionsOrWeight": "Por favor completa las repeticiones o pesos para al menos una de las series",
-  "@enterRepetitionsOrWeight": {
-    "description": "Error message when the user hasn't filled in the forms for exercise sets"
-  },
-  "goToToday": "Ir a \"hoy\"",
-  "@goToToday": {
-    "description": "Label on button to jump back to 'today' in the calendar widget"
-  },
-  "calendar": "Calendario",
-  "@calendar": {},
-  "aboutTranslationText": "Esta aplicación fue traducida en weblste. Si tú también quieres ayudar, haz click en el link y comienza a traducir",
-  "@aboutTranslationText": {
-    "description": "Text for translation section in the about dialog"
-  },
-  "aboutTranslationTitle": "Traducción",
-  "@aboutTranslationTitle": {
-    "description": "Title for translation section in the about dialog"
-  },
-  "aboutContactUsText": "Si quieres chatear con nosotros, ingresa a nuestro servidor de Discord y ponte en contacto",
-  "@aboutContactUsText": {
-    "description": "Text for contact us section in the about dialog"
-  },
-  "aboutContactUsTitle": "¡Saluda!",
-  "@aboutContactUsTitle": {
-    "description": "Title for contact us section in the about dialog"
-  },
-  "aboutBugsText": "Ponte en contacto si algo no funciona como se esperaba o si hay alguna función que sientes que está faltando.",
-  "@aboutBugsText": {
-    "description": "Text for bugs section in the about dialog"
-  },
-  "aboutBugsTitle": "¿Tienes algún problema o idea?",
-  "@aboutBugsTitle": {
-    "description": "Title for bugs section in the about dialog"
-  },
-  "aboutSourceText": "Obtener el código fuente de esta aplicación y su servidor en GitHub",
-  "@aboutSourceText": {
-    "description": "Text for source code section in the about dialog"
-  },
-  "aboutSourceTitle": "Código fuente",
-  "@aboutSourceTitle": {
-    "description": "Title for source code section in the about dialog"
-  },
-  "aboutDescription": "¡Gracias por usar wger! wger es un proyecto colaborativo de código abierto, realizado por entusiastas del fitness de todo el planeta.",
-  "@aboutDescription": {
-    "description": "Text in the about dialog"
-  },
-  "toggleDetails": "Alternar detalles",
-  "@toggleDetails": {
-    "description": "Switch to toggle detail / overview"
-  },
-  "newNutritionalPlan": "Nuevo plan nutricional",
-  "@newNutritionalPlan": {},
-  "confirmDelete": "¿Estás seguro de que deseas borrar '{toDelete}'?",
-  "@confirmDelete": {
-    "description": "Confirmation text before the user deletes an object",
-    "type": "text",
-    "placeholders": {
-      "toDelete": {}
-    }
-  },
-  "delete": "Borrar",
-  "@delete": {},
-  "loadingText": "Cargando...",
-  "@loadingText": {
-    "description": "Text to show when entries are being loaded in the background: Loading..."
-  },
-  "edit": "Editar",
-  "@edit": {},
-  "noWeightEntries": "No tienes entradas de peso registradas",
-  "@noWeightEntries": {
-    "description": "Message shown when the user has no logged weight entries"
-  },
-  "newEntry": "Nueva entrada",
-  "@newEntry": {
-    "description": "Title when adding a new entry such as a weight or log entry"
-  },
-  "unit": "Unidad",
-  "@unit": {
-    "description": "The unit used for a repetition (kg, time, etc.)"
-  },
-  "amount": "Cantidad",
-  "@amount": {
-    "description": "The amount (e.g. in grams) of an ingredient in a meal"
-  },
-  "sodium": "Sodio",
-  "@sodium": {},
-  "fiber": "Fibra",
-  "@fiber": {},
-  "saturatedFat": "Grasas saturadas",
-  "@saturatedFat": {},
-  "fat": "Grasas",
-  "@fat": {},
-  "sugars": "Azúcares",
-  "@sugars": {},
-  "carbohydrates": "Carbohidratos",
-  "@carbohydrates": {},
-  "protein": "Proteína",
-  "@protein": {},
-  "g": "g",
-  "@g": {
-    "description": "Abbreviation for gram"
-  },
-  "kJ": "kJ",
-  "@kJ": {
-    "description": "Energy in a meal in kilo joules, kJ"
-  },
-  "energy": "Energía",
-  "@energy": {
-    "description": "Energy in a meal, ingredient etc. e.g. in kJ"
-  },
-  "ingredient": "Ingrediente",
-  "@ingredient": {},
-  "timeEnd": "Tiempo de fin",
-  "@timeEnd": {
-    "description": "The end time of a workout"
-  },
-  "timeStart": "Tiempo de inicio",
-  "@timeStart": {
-    "description": "The starting time of a workout"
-  },
-  "time": "Tiempo",
-  "@time": {
-    "description": "The time of a meal or workout"
-  },
-  "start": "Iniciar",
-  "@start": {
-    "description": "Label on button to start the gym mode (i.e., an imperative)"
-  },
-  "date": "Fecha",
-  "@date": {
-    "description": "The date of a workout log or body weight entry"
-  },
-  "weight": "Peso",
-  "@weight": {
-    "description": "The weight of a workout log or body weight entry"
-  },
-  "dismiss": "Cerrar",
-  "@dismiss": {},
-  "anErrorOccurred": "¡Un error ha ocurrido!",
-  "@anErrorOccurred": {},
-  "noNutritionalPlans": "No tienes planes nutricionales",
-  "@noNutritionalPlans": {
-    "description": "Message shown when the user has no nutritional plans"
-  },
-  "nutritionalPlans": "Planes nutricionales",
-  "@nutritionalPlans": {},
-  "nutritionalDiary": "Diario nutricional",
-  "@nutritionalDiary": {},
-  "nutritionalPlan": "Plan nutricional",
-  "@nutritionalPlan": {},
-  "addIngredient": "Agregar ingrediente",
-  "@addIngredient": {},
-  "logMeal": "Registar esta comida",
-  "@logMeal": {},
-  "mealLogged": "Comida registrada en el diario",
-  "@mealLogged": {},
-  "addMeal": "Agregar comida",
-  "@addMeal": {},
-  "addSet": "Agregar serie",
-  "@addSet": {
-    "description": "Label for the button that adds a set (to a workout day)"
-  },
-  "cancel": "Cancelar",
-  "@cancel": {},
-  "save": "Guardar",
-  "@save": {},
-  "description": "Descripción",
-  "@description": {},
-  "logHelpEntriesUnits": "Tenga en cuenta que solo se registran las entradas con una unidad de peso (kg o lb) y las repeticiones; aquí se ignoran otras combinaciones, como el tiempo o hasta el fallo.",
-  "@logHelpEntriesUnits": {},
-  "logHelpEntries": "Si en un solo día hay más de una entrada con el mismo número de repeticiones, pero diferentes pesos, solo la entrada con mayor peso se mostrará en el diagrama.",
-  "@logHelpEntries": {},
-  "todaysWorkout": "Tu rutina de hoy",
-  "@todaysWorkout": {},
-  "gymMode": "Modo gimansio",
-  "@gymMode": {
-    "description": "Label when starting the gym mode"
-  },
-  "selectExercises": "Si quieres hacer una superserie puedes buscar varios ejercicios, se agruparán juntos",
-  "@selectExercises": {},
-  "newSet": "Nueva serie",
-  "@newSet": {
-    "description": "Header when adding a new set to a workout day"
-  },
-  "newDay": "Nuevo día",
-  "@newDay": {},
-  "workoutSession": "Sesión de entrenamiento",
-  "@workoutSession": {
-    "description": "A (logged) workout session"
-  },
-  "notes": "Notas personales",
-  "@notes": {
-    "description": "Personal notes, e.g. for a workout session"
-  },
-  "impression": "Impresión general",
-  "@impression": {
-    "description": "General impression (e.g. for a workout session) such as good, bad, etc."
-  },
-  "sameRepetitions": "Si haces las mismas repeticiones y el mismo peso para todas las series, solo puedes completar una fila. Por ejemplo, para 4 series solo ingrese 10 para las repeticiones, esto automáticamente se convierte en \"4 x 10\".",
-  "@sameRepetitions": {},
-  "comment": "Comentario",
-  "@comment": {
-    "description": "Comment, additional information"
-  },
-  "setNr": "Serie {nr}",
-  "@setNr": {
-    "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.",
-    "type": "text",
-    "placeholders": {
-      "nr": {}
-    }
-  },
-  "dayDescriptionHelp": "Una descripción de lo que se hace este día (ej. 'día de levantamientos') o qué partes del cuerpo se entrenan (ej. 'pecho y hombros')",
-  "@dayDescriptionHelp": {},
-  "set": "Serie",
-  "@set": {
-    "description": "A set in a workout plan"
-  },
-  "repetitionUnit": "Unidad de repetición",
-  "@repetitionUnit": {},
-  "weightUnit": "Unidad de peso",
-  "@weightUnit": {},
-  "rir": "ReR",
-  "@rir": {
-    "description": "Shorthand for Repetitions In Reserve"
-  },
-  "repetitions": "Repeticiones",
-  "@repetitions": {
-    "description": "Repetitions for an exercise set"
-  },
-  "addExercise": "Añadir ejercicio",
-  "@addExercise": {},
-  "noWorkoutPlans": "No posees ningún plan de entrenamiento",
-  "@noWorkoutPlans": {
-    "description": "Message shown when the user has no workout plans"
-  },
-  "newWorkout": "Nuevo plan de entrenamiento",
-  "@newWorkout": {
-    "description": "Header when adding a new workout"
-  },
-  "category": "Categoría",
-  "@category": {
-    "description": "Category for an exercise, ingredient, etc."
-  },
-  "equipment": "Equipamiento",
-  "@equipment": {
-    "description": "Equipment needed to perform an exercise"
-  },
-  "successfullySaved": "Guardado correctamente",
-  "@successfullySaved": {
-    "description": "Message when an item was successfully saved"
-  },
-  "successfullyDeleted": "Borrado correctamente",
-  "@successfullyDeleted": {
-    "description": "Message when an item was successfully deleted"
-  },
-  "labelDashboard": "Tablero",
-  "@labelDashboard": {
-    "description": "Title for screen dashboard"
-  },
-  "labelWorkoutPlan": "Plan de ejercicios",
-  "@labelWorkoutPlan": {
-    "description": "Title for screen workout plan"
-  },
-  "labelWorkoutLogs": "Registros de entrenamientos",
-  "@labelWorkoutLogs": {
-    "description": "(Workout) logs"
-  },
-  "labelWorkoutPlans": "Planes de ejercicios",
-  "@labelWorkoutPlans": {
-    "description": "Title for screen workout plans"
-  },
-  "loginInstead": "¿Ya tiene una cuenta? Inicia sesión",
-  "@loginInstead": {},
-  "registerInstead": "¿No tienes una cuenta? Regístrate ahora",
-  "@registerInstead": {},
-  "reset": "Reiniciar",
-  "@reset": {
-    "description": "Button text allowing the user to reset the entered values to the default"
-  },
-  "customServerHint": "Ingresa la dirección de tu propio servidor, de lo contrario se utilizará la dirección por default",
-  "@customServerHint": {
-    "description": "Hint text for the form where the users can enter their own wger instance"
-  },
-  "customServerUrl": "URL de la instancia de wger",
-  "@customServerUrl": {
-    "description": "Label in the form where the users can enter their own wger instance"
-  },
-  "invalidUsername": "Por favor ingrese un nombre de usuario válido",
-  "@invalidUsername": {
-    "description": "Error message when the user enters an invalid username"
-  },
-  "username": "Nombre de usuario",
-  "@username": {},
-  "email": "Dirección de correo electrónico",
-  "@email": {},
-  "invalidEmail": "Por favor ingrese una dirección de correo electrónico válida",
-  "@invalidEmail": {
-    "description": "Error message when the user enters an invalid email"
-  },
-  "confirmPassword": "Confirmar contraseña",
-  "@confirmPassword": {},
-  "password": "Contraseña",
-  "@password": {},
-  "passwordTooShort": "La contraseña es demasiado corta",
-  "@passwordTooShort": {
-    "description": "Error message when the user a password that is too short"
-  },
-  "passwordsDontMatch": "Las contraseñas no coinciden",
-  "@passwordsDontMatch": {
-    "description": "Error message when the user enters two different passwords during registration"
-  },
-  "invalidUrl": "Por favor ingrese una URL válida",
-  "@invalidUrl": {
-    "description": "Error message when the user enters an invalid URL, e.g. in the login form"
-  },
-  "useCustomServer": "Usar servidor personalizado",
-  "@useCustomServer": {
-    "description": "Toggle button allowing users to switch between the default and a custom wger server"
-  },
-  "useDefaultServer": "Usar servidor por defecto",
-  "@useDefaultServer": {
-    "description": "Toggle button allowing users to switch between the default and a custom wger server"
-  },
-  "register": "Registrarse",
-  "@register": {
-    "description": "Text for registration button"
-  },
-  "logout": "Cerrar sesión",
-  "@logout": {
-    "description": "Text for logout button"
-  },
-  "login": "Iniciar sesión",
-  "@login": {
-    "description": "Text for login button"
-  },
-  "addImage": "Añadir imagen",
-  "@addImage": {},
-  "gallery": "Galería",
-  "@gallery": {},
-  "chooseFromLibrary": "Elije de la biblioteca de fotos",
-  "@chooseFromLibrary": {},
-  "takePicture": "Toma una foto",
-  "@takePicture": {},
-  "optionsLabel": "Opciones",
-  "@optionsLabel": {
-    "description": "Label for the popup with general app options"
-  },
-  "selectImage": "Por favor selecciona una imagen",
-  "@selectImage": {
-    "description": "Label and error message when the user hasn't selected an image to save"
-  },
-  "goToDetailPage": "Ir a la página de detalles",
-  "@goToDetailPage": {},
-  "name": "Nombre",
-  "@name": {
-    "description": "Name for a workout or nutritional plan"
-  },
-  "jumpTo": "Saltar a",
-  "@jumpTo": {
-    "description": "Imperative. Label used in popup allowing the user to jump to a specific exercise while in the gym mode"
-  },
-  "pause": "Pausa",
-  "@pause": {
-    "description": "Noun, not an imperative! Label used for the pause when using the gym mode"
-  },
-  "musclesSecondary": "Músculos secundarios",
-  "@musclesSecondary": {
-    "description": "secondary muscles trained by an exercise"
-  },
-  "muscles": "Músculos",
-  "@muscles": {
-    "description": "(main) muscles trained by an exercise"
-  },
-  "labelBottomNavNutrition": "Nutrición",
-  "@labelBottomNavNutrition": {
-    "description": "Label used in bottom navigation, use a short word"
-  },
-  "labelBottomNavWorkout": "Rutina",
-  "@labelBottomNavWorkout": {
-    "description": "Label used in bottom navigation, use a short word"
-  },
-  "usernameValidChars": "El nombre de usuario sólo puede contener letras, dígitos y los caracteres @, +, ., - y _",
-  "@usernameValidChars": {
-    "description": "Error message when the user tries to register a username with forbidden characters"
-  },
-  "total": "Total",
-  "@total": {
-    "description": "Label used for total sums of e.g. calories or similar"
-  },
-  "percentEnergy": "Porcentaje de energía",
-  "@percentEnergy": {},
-  "difference": "Diferencia",
-  "@difference": {},
-  "macronutrients": "Macronutrientes",
-  "@macronutrients": {},
-  "timeStartAhead": "La hora de inicio no puede adelantarse a la hora de finalización",
-  "@timeStartAhead": {},
-  "measurements": "Medidas",
-  "@measurements": {
-    "description": "Categories for the measurements such as biceps size, body fat, etc."
-  },
-  "measurement": "Medida",
-  "@measurement": {},
-  "measurementCategoriesHelpText": "Categoría de medición, como \"bíceps\" o \"grasa corporal",
-  "@measurementCategoriesHelpText": {},
-  "measurementEntriesHelpText": "La unidad utilizada para medir la categoría, como \"cm\" o \"%\"",
-  "@measurementEntriesHelpText": {},
-  "value": "Valor",
-  "@value": {
-    "description": "The value of a measurement entry"
-  },
-  "dataCopied": "Datos copiados a la nueva entrada",
-  "@dataCopied": {
-    "description": "Snackbar message to show on copying data to a new log entry"
-  },
-  "energyShort": "E",
-  "@energyShort": {
-    "description": "The first letter or short name of the word 'Energy', used in overviews"
-  },
-  "searchExercise": "Busca el ejercicio para añadirlo",
-  "@searchExercise": {
-    "description": "Label on set form. Selected exercises are added to the set"
-  },
-  "proteinShort": "P",
-  "@proteinShort": {
-    "description": "The first letter or short name of the word 'Protein', used in overviews"
-  },
-  "carbohydratesShort": "C",
-  "@carbohydratesShort": {
-    "description": "The first letter or short name of the word 'Carbohydrates', used in overviews"
-  },
-  "fatShort": "G",
-  "@fatShort": {
-    "description": "The first letter or short name of the word 'Fat', used in overviews"
-  },
-  "logIngredient": "Guardar en el diario nutricional",
-  "@logIngredient": {},
-  "plateCalculatorNotDivisible": "No se puede obtener el peso con las placas disponbles",
-  "@plateCalculatorNotDivisible": {
-    "description": "Error message when the current weight is not reachable with plates (e.g. 33.1 kg)"
-  },
-  "plateCalculator": "Placas",
-  "@plateCalculator": {
-    "description": "Label used for the plate calculator in the gym mode"
-  },
-  "searchIngredient": "Buscar ingrediente",
-  "@searchIngredient": {
-    "description": "Label on ingredient search form"
-  },
-  "supersetWith": "en conjunto con",
-  "@supersetWith": {
-    "description": "Text used between exercise cards when adding a new set. Translate as something like 'in a superset with'"
-  },
-  "rirNotUsed": "Valor ReR sin usar",
-  "@rirNotUsed": {
-    "description": "Label used in RiR slider when the RiR value is not used/saved for the current setting or log"
-  },
-  "planned": "Previsto",
-  "@planned": {
-    "description": "Header for the column of 'planned' nutritional values, i.e. what should be eaten"
-  },
-  "logged": "Registrado",
-  "@logged": {
-    "description": "Header for the column of 'logged' nutritional values, i.e. what was eaten"
-  },
-  "gPerBodyKg": "g por kg de peso corporal",
-  "@gPerBodyKg": {
-    "description": "Label used for total sums of e.g. calories or similar in grams per Kg of body weight"
-  },
-  "setUnitsAndRir": "Unidades de serie y ReR",
-  "@setUnitsAndRir": {
-    "description": "Label shown on the slider where the user can toggle showing units and RiR",
-    "type": "text"
-  },
-  "recentlyUsedIngredients": "Ingredientes añadidos recientemente",
-  "@recentlyUsedIngredients": {
-    "description": "A message when a user adds a new ingredient to a meal."
-  },
-  "appUpdateTitle": "Es necesario actualizar",
-  "@appUpdateTitle": {},
-  "appUpdateContent": "Esta versión de la aplicación no es compatible con el servidor. Por favor, actualízala.",
-  "@appUpdateContent": {},
-  "productFoundDescription": "El código de barras corresponde a este producto: {productName}. ¿Deseas continuar?",
-  "@productFoundDescription": {
-    "description": "Dialog info when product is found with barcode",
-    "type": "text",
-    "placeholders": {
-      "productName": {}
-    }
-  },
-  "weekAverage": "Promedio de 7 días",
-  "@weekAverage": {
-    "description": "Header for the column of '7 day average' nutritional values, i.e. what was logged last week"
-  },
-  "productFound": "Producto encontrado",
-  "@productFound": {
-    "description": "Header label for dialog when product is found with barcode"
-  },
-  "productNotFound": "Producto no encontrado",
-  "@productNotFound": {
-    "description": "Header label for dialog when product is not found with barcode"
-  },
-  "productNotFoundDescription": "El producto con el código de barras escaneado {barcode} no se ha encontrado en la base de datos de wger",
-  "@productNotFoundDescription": {
-    "description": "Dialog info when product is not found with barcode",
-    "type": "text",
-    "placeholders": {
-      "barcode": {}
-    }
-  },
-  "scanBarcode": "Escanear código de barras",
-  "@scanBarcode": {
-    "description": "Label for scan barcode button"
-  },
-  "close": "Cerrar",
-  "@close": {
-    "description": "Translation for close"
-  },
-  "noMeasurementEntries": "No has ingresado medidas",
-  "@noMeasurementEntries": {},
-  "moreMeasurementEntries": "Agrega una nueva medida",
-  "@moreMeasurementEntries": {
-    "description": "Message shown when the user wants to add new measurement"
-  },
-  "variations": "Variantes",
-  "@variations": {
-    "description": "Variations of one exercise (e.g. benchpress and benchpress narrow)"
-  },
-  "alsoKnownAs": "También conocido como: {aliases}",
-  "@alsoKnownAs": {
-    "placeholders": {
-      "aliases": {}
+    "exercise": "Ejercicio",
+    "@exercise": {
+        "description": "An exercise for a workout"
     },
-    "description": "List of alternative names for an exercise"
-  },
-  "verifiedEmail": "Correo electrónico verificado",
-  "@verifiedEmail": {},
-  "alternativeNames": "Nombres alternativos",
-  "@alternativeNames": {},
-  "unVerifiedEmail": "Correo electrónico no verificado",
-  "@unVerifiedEmail": {},
-  "verifiedEmailInfo": "Se envió un correo electrónico de verificación a {email}",
-  "@verifiedEmailInfo": {
-    "placeholders": {
-      "email": {}
-    }
-  },
-  "oneNamePerLine": "Un nombre por línea",
-  "@oneNamePerLine": {},
-  "whatVariationsExist": "¿Qué variantes de este ejercicio existen, si las hay?",
-  "@whatVariationsExist": {},
-  "previous": "Anterior",
-  "@previous": {},
-  "next": "Siguiente",
-  "@next": {},
-  "images": "Imágenes",
-  "@images": {},
-  "language": "Lenguaje",
-  "@language": {},
-  "contributeExercise": "Aporta un ejercicio",
-  "@contributeExercise": {},
-  "translation": "Traducción",
-  "@translation": {},
-  "translateExercise": "Traduce este ejercicio ahora",
-  "@translateExercise": {},
-  "baseData": "Conceptos básicos en Inglés",
-  "@baseData": {
-    "description": "The base data for an exercise such as category, trained muscles, etc."
-  },
-  "minutes": "Minutos",
-  "@minutes": {},
-  "glutes": "Glúteos",
-  "@glutes": {},
-  "kilometers": "Kilómetros",
-  "@kilometers": {},
-  "until_failure": "Hasta el fallo",
-  "@until_failure": {},
-  "seconds": "Segundos",
-  "@seconds": {},
-  "bench": "Banco",
-  "@bench": {},
-  "barbell": "Barra con pesas",
-  "@barbell": {},
-  "triceps": "Tríceps",
-  "@triceps": {},
-  "swiss_ball": "Pelota Suiza",
-  "@swiss_ball": {},
-  "none__bodyweight_exercise_": "Ninguno (ejercicio de peso corporal)",
-  "@none__bodyweight_exercise_": {},
-  "lower_back": "Espalda baja",
-  "@lower_back": {},
-  "hamstrings": "Isquiotibiales",
-  "@hamstrings": {},
-  "calves": "Pantorrillas",
-  "@calves": {},
-  "chest": "Pecho",
-  "@chest": {},
-  "kettlebell": "Pesa rusa",
-  "@kettlebell": {},
-  "dumbbell": "Mancuerna",
-  "@dumbbell": {},
-  "gym_mat": "Colchoneta",
-  "@gym_mat": {},
-  "abs": "Abdominales",
-  "@abs": {},
-  "incline_bench": "Banco inclinado",
-  "@incline_bench": {},
-  "miles": "Millas",
-  "@miles": {},
-  "legs": "Piernas",
-  "@legs": {},
-  "back": "Espalda",
-  "@back": {},
-  "quads": "Cuádriceps",
-  "@quads": {},
-  "arms": "Brazos",
-  "@arms": {},
-  "aboutPageTitle": "Acerca de Wger",
-  "@aboutPageTitle": {},
-  "userProfile": "Tu perfil",
-  "@userProfile": {},
-  "exerciseList": "Lista de ejercicios",
-  "@exerciseList": {},
-  "exercises": "Ejercicios",
-  "@exercises": {
-    "description": "Multiple exercises for a workout"
-  },
-  "exerciseName": "Nombre del Ejercicio",
-  "@exerciseName": {
-    "description": "Label for the name of a workout exercise"
-  },
-  "selectEntry": "Por favor selecciona una entrada",
-  "@selectEntry": {},
-  "baseNameEnglish": "Todos los ejercicios necesitan un nombre base en Inglés",
-  "@baseNameEnglish": {},
-  "lats": "Laterales",
-  "@lats": {},
-  "enterMinCharacters": "Por favor ingresa al menos {min} caracteres",
-  "@enterMinCharacters": {
-    "description": "Error message when the user hasn't entered the minimum amount characters in a form",
-    "type": "text",
-    "placeholders": {
-      "min": {}
-    }
-  },
-  "add_exercise_image_license": "Las imágenes deben ser compatibles con la licencia CC BY SA. Si tienes dudas, sube solamente fotos que hayas tomado tú mismo.",
-  "@add_exercise_image_license": {},
-  "biceps": "Bíceps",
-  "@biceps": {},
-  "verifiedEmailReason": "Necesitas verificar tu correo electrónico para contribuir con ejercicios",
-  "@verifiedEmailReason": {},
-  "pull_up_bar": "Barra de dominadas",
-  "@pull_up_bar": {},
-  "shoulders": "Hombros",
-  "@shoulders": {},
-  "sz_bar": "Barra SZ",
-  "@sz_bar": {},
-  "searchNamesInEnglish": "También busque nombres en Ingles",
-  "@searchNamesInEnglish": {},
-  "cacheWarning": "Debido al cache, puede tomar un tiempo hasta que los cambios sean visibles en toda la aplicación.",
-  "@cacheWarning": {},
-  "cardio": "Aerobico",
-  "@cardio": {},
-  "contributeExerciseWarning": "Podes contribuir ejercicios únicamente si tu cuenta tiene más de {days} días y tu email fue verificado",
-  "@contributeExerciseWarning": {
-    "description": "Number of days before which a person can add exercise",
-    "placeholders": {
-      "days": {
-        "type": "String",
-        "example": "14"
-      }
-    }
-  },
-  "success": "Éxito",
-  "@success": {
-    "description": "Message when an action completed successfully, usually used as a heading"
-  },
-  "verify": "Verificar",
-  "@verify": {},
-  "textPromptTitle": "¿Listo para comenzar?",
-  "@textPromptTitle": {},
-  "textPromptSubheading": "Presione el botón para continuar",
-  "@textPromptSubheading": {},
-  "lb": "lb",
-  "@lb": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "max_reps": "Reps Max",
-  "@max_reps": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "body_weight": "Peso Corporal",
-  "@body_weight": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "kilometers_per_hour": "Kilómetros por Hora",
-  "@kilometers_per_hour": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "miles_per_hour": "Millas por Hora",
-  "@miles_per_hour": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "plates": "Platos",
-  "@plates": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "kg": "Kg",
-  "@kg": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "useMetric": "Utilizar unidades metricas para el peso corporal",
-  "@useMetric": {},
-  "settingsTitle": "Configuraciones",
-  "@settingsTitle": {},
-  "settingsCacheTitle": "Cache",
-  "@settingsCacheTitle": {},
-  "settingsCacheDeletedSnackbar": "Cache borrado exitosamente",
-  "@settingsCacheDeletedSnackbar": {},
-  "log": "Registro",
-  "@log": {
-    "description": "Log a specific meal (imperative form)"
-  },
-  "done": "Listo",
-  "@done": {},
-  "noMatchingExerciseFound": "No se encontraron ejercicios que coincidan",
-  "@noMatchingExerciseFound": {
-    "description": "Message returned if no exercises match the searched string"
-  },
-  "aboutMastodonTitle": "Mastodon",
-  "@aboutMastodonTitle": {
-    "description": "Title for mastodon section in the about dialog"
-  },
-  "aboutMastodonText": "Siguenos en mastodon para recibir actualizaciones y noticias sobre el proyecto",
-  "@aboutMastodonText": {
-    "description": "Text for the mastodon section in the about dialog"
-  },
-  "settingsExerciseCacheDescription": "Cache de ejercicios",
-  "@settingsExerciseCacheDescription": {},
-  "aboutDonateTitle": "Donar",
-  "@aboutDonateTitle": {},
-  "aboutDonateText": "Invítanos un café para ayudar al proyecto, cubrir los costos del servidor y mantenernos activos",
-  "@aboutDonateText": {}
+    "kcal": "kcal",
+    "@kcal": {
+        "description": "Energy in a meal in kilocalories, kcal"
+    },
+    "reps": "Repeticiones",
+    "@reps": {
+        "description": "Shorthand for repetitions, used when space constraints are tighter"
+    },
+    "selectIngredient": "Por favor selecciona un ingrediente",
+    "@selectIngredient": {
+        "description": "Error message when the user hasn't selected an ingredient from the autocompleter"
+    },
+    "enterValidNumber": "Por favor ingresa un número válido",
+    "@enterValidNumber": {
+        "description": "Error message when the user has submitted an invalid number (e.g. '3,.,.,.')"
+    },
+    "nrOfSets": "Series por ejercicio: {nrOfSets}",
+    "@nrOfSets": {
+        "description": "Label shown on the slider where the user selects the nr of sets",
+        "type": "text",
+        "placeholders": {
+            "nrOfSets": {
+                "type": "String"
+            }
+        }
+    },
+    "enterCharacters": "Por favor ingresa entre {min} y {max} caracteres",
+    "@enterCharacters": {
+        "description": "Error message when the user hasn't entered the correct number of characters in a form",
+        "type": "text",
+        "placeholders": {
+            "min": {
+                "type": "String"
+            },
+            "max": {
+                "type": "String"
+            }
+        }
+    },
+    "selectExercise": "Por favor selecciona un ejercicio",
+    "@selectExercise": {
+        "description": "Error message when the user hasn't selected an exercise in the form"
+    },
+    "enterValue": "Por favor ingresa un valor",
+    "@enterValue": {
+        "description": "Error message when the user hasn't entered a value on a required field"
+    },
+    "goToToday": "Ir a \"hoy\"",
+    "@goToToday": {
+        "description": "Label on button to jump back to 'today' in the calendar widget"
+    },
+    "calendar": "Calendario",
+    "@calendar": {},
+    "aboutDescription": "¡Gracias por usar wger! wger es un proyecto colaborativo de código abierto, realizado por entusiastas del fitness de todo el planeta.",
+    "@aboutDescription": {
+        "description": "Text in the about dialog"
+    },
+    "toggleDetails": "Alternar detalles",
+    "@toggleDetails": {
+        "description": "Switch to toggle detail / overview"
+    },
+    "newNutritionalPlan": "Nuevo plan nutricional",
+    "@newNutritionalPlan": {},
+    "confirmDelete": "¿Estás seguro de que deseas borrar '{toDelete}'?",
+    "@confirmDelete": {
+        "description": "Confirmation text before the user deletes an object",
+        "type": "text",
+        "placeholders": {
+            "toDelete": {
+                "type": "String"
+            }
+        }
+    },
+    "delete": "Borrar",
+    "@delete": {},
+    "loadingText": "Cargando...",
+    "@loadingText": {
+        "description": "Text to show when entries are being loaded in the background: Loading..."
+    },
+    "edit": "Editar",
+    "@edit": {},
+    "noWeightEntries": "No tienes entradas de peso registradas",
+    "@noWeightEntries": {
+        "description": "Message shown when the user has no logged weight entries"
+    },
+    "newEntry": "Nueva entrada",
+    "@newEntry": {
+        "description": "Title when adding a new entry such as a weight or log entry"
+    },
+    "unit": "Unidad",
+    "@unit": {
+        "description": "The unit used for a repetition (kg, time, etc.)"
+    },
+    "amount": "Cantidad",
+    "@amount": {
+        "description": "The amount (e.g. in grams) of an ingredient in a meal"
+    },
+    "sodium": "Sodio",
+    "@sodium": {},
+    "fiber": "Fibra",
+    "@fiber": {},
+    "saturatedFat": "Grasas saturadas",
+    "@saturatedFat": {},
+    "fat": "Grasas",
+    "@fat": {},
+    "sugars": "Azúcares",
+    "@sugars": {},
+    "carbohydrates": "Carbohidratos",
+    "@carbohydrates": {},
+    "protein": "Proteína",
+    "@protein": {},
+    "g": "g",
+    "@g": {
+        "description": "Abbreviation for gram"
+    },
+    "kJ": "kJ",
+    "@kJ": {
+        "description": "Energy in a meal in kilo joules, kJ"
+    },
+    "energy": "Energía",
+    "@energy": {
+        "description": "Energy in a meal, ingredient etc. e.g. in kJ"
+    },
+    "ingredient": "Ingrediente",
+    "@ingredient": {},
+    "timeEnd": "Tiempo de fin",
+    "@timeEnd": {
+        "description": "The end time of a workout"
+    },
+    "timeStart": "Tiempo de inicio",
+    "@timeStart": {
+        "description": "The starting time of a workout"
+    },
+    "time": "Tiempo",
+    "@time": {
+        "description": "The time of a meal or workout"
+    },
+    "start": "Comenzar",
+    "@start": {
+        "description": "Label on button to start the gym mode (i.e., an imperative)"
+    },
+    "date": "Fecha",
+    "@date": {
+        "description": "The date of a workout log or body weight entry"
+    },
+    "weight": "Peso",
+    "@weight": {
+        "description": "The weight of a workout log or body weight entry"
+    },
+    "anErrorOccurred": "¡Un error ha ocurrido!",
+    "@anErrorOccurred": {},
+    "noNutritionalPlans": "No tienes planes nutricionales",
+    "@noNutritionalPlans": {
+        "description": "Message shown when the user has no nutritional plans"
+    },
+    "nutritionalPlans": "Planes nutricionales",
+    "@nutritionalPlans": {},
+    "nutritionalDiary": "Diario nutricional",
+    "@nutritionalDiary": {},
+    "nutritionalPlan": "Plan nutricional",
+    "@nutritionalPlan": {},
+    "addIngredient": "Agregar ingrediente",
+    "@addIngredient": {},
+    "logMeal": "Registrar esta comida",
+    "@logMeal": {},
+    "mealLogged": "Comida registrada en el diario",
+    "@mealLogged": {},
+    "addMeal": "Agregar comida",
+    "@addMeal": {},
+    "addSet": "Agregar serie",
+    "@addSet": {
+        "description": "Label for the button that adds a set (to a workout day)"
+    },
+    "cancel": "Cancelar",
+    "@cancel": {},
+    "save": "Guardar",
+    "@save": {},
+    "description": "Descripción",
+    "@description": {},
+    "logHelpEntriesUnits": "Tenga en cuenta que solo se registran las entradas con una unidad de peso (kg o lb) y las repeticiones; aquí se ignoran otras combinaciones, como el tiempo o hasta el fallo.",
+    "@logHelpEntriesUnits": {},
+    "logHelpEntries": "Si en un solo día hay más de una entrada con el mismo número de repeticiones, pero diferentes pesos, solo la entrada con mayor peso se mostrará en el diagrama.",
+    "@logHelpEntries": {},
+    "todaysWorkout": "Tu rutina de hoy",
+    "@todaysWorkout": {},
+    "gymMode": "Modo gimansio",
+    "@gymMode": {
+        "description": "Label when starting the gym mode"
+    },
+    "selectExercises": "Si quieres hacer una superserie puedes buscar varios ejercicios, se agruparán juntos",
+    "@selectExercises": {},
+    "newSet": "Nueva serie",
+    "@newSet": {
+        "description": "Header when adding a new set to a workout day"
+    },
+    "newDay": "Nuevo día",
+    "@newDay": {},
+    "workoutSession": "Sesión de entrenamiento",
+    "@workoutSession": {
+        "description": "A (logged) workout session"
+    },
+    "notes": "Notas personales",
+    "@notes": {
+        "description": "Personal notes, e.g. for a workout session"
+    },
+    "impression": "Impresión general",
+    "@impression": {
+        "description": "General impression (e.g. for a workout session) such as good, bad, etc."
+    },
+    "sameRepetitions": "Si haces las mismas repeticiones y el mismo peso para todas las series, solo puedes completar una fila. Por ejemplo, para 4 series solo ingrese 10 para las repeticiones, esto automáticamente se convierte en \"4 x 10\".",
+    "@sameRepetitions": {},
+    "comment": "Comentar",
+    "@comment": {
+        "description": "Comment, additional information"
+    },
+    "setNr": "Serie {nr}",
+    "@setNr": {
+        "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.",
+        "type": "text",
+        "placeholders": {
+            "nr": {
+                "type": "String"
+            }
+        }
+    },
+    "dayDescriptionHelp": "Una descripción de lo que se hace este día (ej. 'día de levantamientos') o qué partes del cuerpo se entrenan (ej. 'pecho y hombros')",
+    "@dayDescriptionHelp": {},
+    "set": "Serie",
+    "@set": {
+        "description": "A set in a workout plan"
+    },
+    "repetitionUnit": "Unidad de repetición",
+    "@repetitionUnit": {},
+    "weightUnit": "Unidad de peso",
+    "@weightUnit": {},
+    "rir": "ReR",
+    "@rir": {
+        "description": "Shorthand for Repetitions In Reserve"
+    },
+    "repetitions": "Repeticiones",
+    "@repetitions": {
+        "description": "Repetitions for an exercise set"
+    },
+    "addExercise": "Añadir ejercicio",
+    "@addExercise": {},
+    "category": "Categoría",
+    "@category": {
+        "description": "Category for an exercise, ingredient, etc."
+    },
+    "equipment": "Equipamiento",
+    "@equipment": {
+        "description": "Equipment needed to perform an exercise"
+    },
+    "successfullySaved": "Guardado correctamente",
+    "@successfullySaved": {
+        "description": "Message when an item was successfully saved"
+    },
+    "successfullyDeleted": "Borrado",
+    "@successfullyDeleted": {
+        "description": "Message when an item was successfully deleted"
+    },
+    "labelDashboard": "Tablero",
+    "@labelDashboard": {
+        "description": "Title for screen dashboard"
+    },
+    "labelWorkoutPlan": "Plan de ejercicios",
+    "@labelWorkoutPlan": {
+        "description": "Title for screen workout plan"
+    },
+    "labelWorkoutLogs": "Registros de entrenamientos",
+    "@labelWorkoutLogs": {
+        "description": "(Workout) logs"
+    },
+    "loginInstead": "¿Ya tiene una cuenta? Inicia sesión",
+    "@loginInstead": {},
+    "registerInstead": "¿No tienes una cuenta? Regístrate ahora",
+    "@registerInstead": {},
+    "reset": "Reiniciar",
+    "@reset": {
+        "description": "Button text allowing the user to reset the entered values to the default"
+    },
+    "customServerHint": "Ingresa la dirección de tu propio servidor, de lo contrario se utilizará la dirección por default",
+    "@customServerHint": {
+        "description": "Hint text for the form where the users can enter their own wger instance"
+    },
+    "customServerUrl": "URL de la instancia de wger",
+    "@customServerUrl": {
+        "description": "Label in the form where the users can enter their own wger instance"
+    },
+    "invalidUsername": "Por favor, ingrese un nombre de usuario válido",
+    "@invalidUsername": {
+        "description": "Error message when the user enters an invalid username"
+    },
+    "username": "Nombre de usuario",
+    "@username": {},
+    "email": "Dirección de correo electrónico",
+    "@email": {},
+    "invalidEmail": "Por favor, introduce una dirección de correo electrónico válida",
+    "@invalidEmail": {
+        "description": "Error message when the user enters an invalid email"
+    },
+    "confirmPassword": "Confirmar contraseña",
+    "@confirmPassword": {},
+    "password": "Contraseña",
+    "@password": {},
+    "passwordTooShort": "La contraseña es demasiado corta",
+    "@passwordTooShort": {
+        "description": "Error message when the user a password that is too short"
+    },
+    "passwordsDontMatch": "Las contraseñas no coinciden",
+    "@passwordsDontMatch": {
+        "description": "Error message when the user enters two different passwords during registration"
+    },
+    "invalidUrl": "Por favor, introduzca una URL válida",
+    "@invalidUrl": {
+        "description": "Error message when the user enters an invalid URL, e.g. in the login form"
+    },
+    "useCustomServer": "Utilizar un servidor personalizado",
+    "@useCustomServer": {
+        "description": "Toggle button allowing users to switch between the default and a custom wger server"
+    },
+    "useDefaultServer": "Usar el servidor predeterminado",
+    "@useDefaultServer": {
+        "description": "Toggle button allowing users to switch between the default and a custom wger server"
+    },
+    "register": "Registrarse",
+    "@register": {
+        "description": "Text for registration button"
+    },
+    "logout": "Cerrar sesión",
+    "@logout": {
+        "description": "Text for logout button"
+    },
+    "login": "Iniciar sesión",
+    "@login": {
+        "description": "Text for login button"
+    },
+    "addImage": "Añadir imagen",
+    "@addImage": {},
+    "gallery": "Galería",
+    "@gallery": {},
+    "imageFormatNotSupported": "{imageFormat} no compatible",
+    "@imageFormatNotSupported": {
+        "description": "Label shown on the error container when image format is not supported",
+        "type": "text",
+        "placeholders": {
+            "imageFormat": {
+                "type": "String"
+            }
+        }
+    },
+    "imageFormatNotSupportedDetail": "Las imágenes {imageFormat} aún no son compatibles.",
+    "@imageFormatNotSupportedDetail": {
+        "description": "Label shown on the image preview container when image format is not supported",
+        "type": "text",
+        "placeholders": {
+            "imageFormat": {
+                "type": "String"
+            }
+        }
+    },
+    "chooseFromLibrary": "Elije de la biblioteca de fotos",
+    "@chooseFromLibrary": {},
+    "takePicture": "Toma una foto",
+    "@takePicture": {},
+    "optionsLabel": "Opciones",
+    "@optionsLabel": {
+        "description": "Label for the popup with general app options"
+    },
+    "selectImage": "Por favor selecciona una imagen",
+    "@selectImage": {
+        "description": "Label and error message when the user hasn't selected an image to save"
+    },
+    "goToDetailPage": "Ir a la página de detalles",
+    "@goToDetailPage": {},
+    "name": "Nombre",
+    "@name": {
+        "description": "Name for a workout or nutritional plan"
+    },
+    "jumpTo": "Saltar a",
+    "@jumpTo": {
+        "description": "Imperative. Label used in popup allowing the user to jump to a specific exercise while in the gym mode"
+    },
+    "pause": "Pausa",
+    "@pause": {
+        "description": "Noun, not an imperative! Label used for the pause when using the gym mode"
+    },
+    "musclesSecondary": "Músculos secundarios",
+    "@musclesSecondary": {
+        "description": "secondary muscles trained by an exercise"
+    },
+    "muscles": "Músculos",
+    "@muscles": {
+        "description": "(main) muscles trained by an exercise"
+    },
+    "labelBottomNavNutrition": "Nutrición",
+    "@labelBottomNavNutrition": {
+        "description": "Label used in bottom navigation, use a short word"
+    },
+    "labelBottomNavWorkout": "Rutina",
+    "@labelBottomNavWorkout": {
+        "description": "Label used in bottom navigation, use a short word"
+    },
+    "usernameValidChars": "Un nombre de usuario solo puede contener letras, dígitos y los caracteres @, +, ., - y _",
+    "@usernameValidChars": {
+        "description": "Error message when the user tries to register a username with forbidden characters"
+    },
+    "total": "Total",
+    "@total": {
+        "description": "Label used for total sums of e.g. calories or similar"
+    },
+    "percentEnergy": "Porcentaje de energía",
+    "@percentEnergy": {},
+    "difference": "Diferencia",
+    "@difference": {},
+    "macronutrients": "Macronutrientes",
+    "@macronutrients": {},
+    "timeStartAhead": "La hora de inicio no puede adelantarse a la hora de finalización",
+    "@timeStartAhead": {},
+    "measurements": "Medidas",
+    "@measurements": {
+        "description": "Categories for the measurements such as biceps size, body fat, etc."
+    },
+    "measurement": "Medida",
+    "@measurement": {},
+    "measurementCategoriesHelpText": "Categoría de medición, como \"bíceps\" o \"grasa corporal\"",
+    "@measurementCategoriesHelpText": {},
+    "measurementEntriesHelpText": "La unidad utilizada para medir la categoría, como \"cm\" o \"%\"",
+    "@measurementEntriesHelpText": {},
+    "value": "Valor",
+    "@value": {
+        "description": "The value of a measurement entry"
+    },
+    "dataCopied": "Datos copiados a la nueva entrada",
+    "@dataCopied": {
+        "description": "Snackbar message to show on copying data to a new log entry"
+    },
+    "energyShort": "E",
+    "@energyShort": {
+        "description": "The first letter or short name of the word 'Energy', used in overviews"
+    },
+    "searchExercise": "Busca el ejercicio para añadirlo",
+    "@searchExercise": {
+        "description": "Label on set form. Selected exercises are added to the set"
+    },
+    "proteinShort": "P",
+    "@proteinShort": {
+        "description": "The first letter or short name of the word 'Protein', used in overviews"
+    },
+    "carbohydratesShort": "C",
+    "@carbohydratesShort": {
+        "description": "The first letter or short name of the word 'Carbohydrates', used in overviews"
+    },
+    "fatShort": "G",
+    "@fatShort": {
+        "description": "The first letter or short name of the word 'Fat', used in overviews"
+    },
+    "logIngredient": "Registrar en el diario nutricional",
+    "@logIngredient": {},
+    "plateCalculatorNotDivisible": "No se puede obtener el peso con las placas disponbles",
+    "@plateCalculatorNotDivisible": {
+        "description": "Error message when the current weight is not reachable with plates (e.g. 33.1 kg)"
+    },
+    "plateCalculator": "Placas",
+    "@plateCalculator": {
+        "description": "Label used for the plate calculator in the gym mode"
+    },
+    "searchIngredient": "Buscar ingrediente",
+    "@searchIngredient": {
+        "description": "Label on ingredient search form"
+    },
+    "rirNotUsed": "Valor ReR sin usar",
+    "@rirNotUsed": {
+        "description": "Label used in RiR slider when the RiR value is not used/saved for the current setting or log"
+    },
+    "planned": "Previsto",
+    "@planned": {
+        "description": "Header for the column of 'planned' nutritional values, i.e. what should be eaten"
+    },
+    "logged": "Registrado",
+    "@logged": {
+        "description": "Header for the column of 'logged' nutritional values, i.e. what was eaten"
+    },
+    "gPerBodyKg": "g por kg de peso corporal",
+    "@gPerBodyKg": {
+        "description": "Label used for total sums of e.g. calories or similar in grams per Kg of body weight"
+    },
+    "setUnitsAndRir": "Unidades de serie y ReR",
+    "@setUnitsAndRir": {
+        "description": "Label shown on the slider where the user can toggle showing units and RiR",
+        "type": "text"
+    },
+    "recentlyUsedIngredients": "Ingredientes añadidos recientemente",
+    "@recentlyUsedIngredients": {
+        "description": "A message when a user adds a new ingredient to a meal."
+    },
+    "appUpdateTitle": "Es necesario actualizar",
+    "@appUpdateTitle": {},
+    "appUpdateContent": "Esta versión de la aplicación no es compatible con el servidor. Por favor, actualízala.",
+    "@appUpdateContent": {},
+    "productFoundDescription": "El código de barras corresponde a este producto: {productName}. ¿Deseas continuar?",
+    "@productFoundDescription": {
+        "description": "Dialog info when product is found with barcode",
+        "type": "text",
+        "placeholders": {
+            "productName": {
+                "type": "String"
+            }
+        }
+    },
+    "weekAverage": "Promedio de 7 días",
+    "@weekAverage": {
+        "description": "Header for the column of '7 day average' nutritional values, i.e. what was logged last week"
+    },
+    "productFound": "Producto encontrado",
+    "@productFound": {
+        "description": "Header label for dialog when product is found with barcode"
+    },
+    "productNotFound": "Producto no encontrado",
+    "@productNotFound": {
+        "description": "Header label for dialog when product is not found with barcode"
+    },
+    "productNotFoundDescription": "El producto con el código de barras escaneado {barcode} no se ha encontrado en la base de datos de wger",
+    "@productNotFoundDescription": {
+        "description": "Dialog info when product is not found with barcode",
+        "type": "text",
+        "placeholders": {
+            "barcode": {
+                "type": "String"
+            }
+        }
+    },
+    "scanBarcode": "Escanear código de barras",
+    "@scanBarcode": {
+        "description": "Label for scan barcode button"
+    },
+    "close": "Cerrar",
+    "@close": {
+        "description": "Translation for close"
+    },
+    "noMeasurementEntries": "No has ingresado medidas",
+    "@noMeasurementEntries": {},
+    "moreMeasurementEntries": "Agrega una nueva medida",
+    "@moreMeasurementEntries": {
+        "description": "Message shown when the user wants to add new measurement"
+    },
+    "variations": "Variantes",
+    "@variations": {
+        "description": "Variations of one exercise (e.g. benchpress and benchpress narrow)"
+    },
+    "alsoKnownAs": "También conocido como: {aliases}",
+    "@alsoKnownAs": {
+        "placeholders": {
+            "aliases": {
+                "type": "String"
+            }
+        },
+        "description": "List of alternative names for an exercise"
+    },
+    "verifiedEmail": "Correo electrónico verificado",
+    "@verifiedEmail": {},
+    "alternativeNames": "Nombres alternativos",
+    "@alternativeNames": {},
+    "unVerifiedEmail": "Correo electrónico no verificado",
+    "@unVerifiedEmail": {},
+    "verifiedEmailInfo": "Se envió un correo electrónico de verificación a {email}",
+    "@verifiedEmailInfo": {
+        "placeholders": {
+            "email": {
+                "type": "String"
+            }
+        }
+    },
+    "oneNamePerLine": "Un nombre por línea",
+    "@oneNamePerLine": {},
+    "whatVariationsExist": "¿Qué variantes de este ejercicio existen, si las hay?",
+    "@whatVariationsExist": {},
+    "previous": "Anterior",
+    "@previous": {},
+    "next": "Siguiente",
+    "@next": {},
+    "images": "Imágenes",
+    "@images": {},
+    "language": "Lenguaje",
+    "@language": {},
+    "contributeExercise": "Aporta un ejercicio",
+    "@contributeExercise": {},
+    "translation": "Traducción",
+    "@translation": {},
+    "translateExercise": "Traduce este ejercicio ahora",
+    "@translateExercise": {},
+    "baseData": "Conceptos básicos en Inglés",
+    "@baseData": {
+        "description": "The base data for an exercise such as category, trained muscles, etc."
+    },
+    "minutes": "Minutos",
+    "@minutes": {},
+    "glutes": "Glúteos",
+    "@glutes": {},
+    "kilometers": "Kilómetros",
+    "@kilometers": {},
+    "until_failure": "Hasta el fallo",
+    "@until_failure": {},
+    "seconds": "Segundos",
+    "@seconds": {},
+    "bench": "Banco",
+    "@bench": {},
+    "barbell": "Barra con pesas",
+    "@barbell": {},
+    "triceps": "Tríceps",
+    "@triceps": {},
+    "swiss_ball": "Pelota Suiza",
+    "@swiss_ball": {},
+    "none__bodyweight_exercise_": "Ninguno (ejercicio de peso corporal)",
+    "@none__bodyweight_exercise_": {},
+    "lower_back": "Espalda baja",
+    "@lower_back": {},
+    "hamstrings": "Isquiotibiales",
+    "@hamstrings": {},
+    "calves": "Pantorrillas",
+    "@calves": {},
+    "chest": "Pecho",
+    "@chest": {},
+    "kettlebell": "Pesa rusa",
+    "@kettlebell": {},
+    "dumbbell": "Mancuerna",
+    "@dumbbell": {},
+    "gym_mat": "Colchoneta",
+    "@gym_mat": {},
+    "abs": "Abdominales",
+    "@abs": {},
+    "incline_bench": "Banco inclinado",
+    "@incline_bench": {},
+    "miles": "Millas",
+    "@miles": {},
+    "legs": "Piernas",
+    "@legs": {},
+    "back": "Espalda",
+    "@back": {},
+    "quads": "Cuádriceps",
+    "@quads": {},
+    "arms": "Brazos",
+    "@arms": {},
+    "aboutPageTitle": "Acerca de Wger y soporte",
+    "@aboutPageTitle": {},
+    "userProfile": "Tu perfil",
+    "@userProfile": {},
+    "exerciseList": "Lista de ejercicios",
+    "@exerciseList": {},
+    "exercises": "Ejercicios",
+    "@exercises": {
+        "description": "Multiple exercises for a workout"
+    },
+    "exerciseName": "Nombre del Ejercicio",
+    "@exerciseName": {
+        "description": "Label for the name of a workout exercise"
+    },
+    "selectEntry": "Por favor selecciona una entrada",
+    "@selectEntry": {},
+    "baseNameEnglish": "Todos los ejercicios necesitan un nombre base en Inglés",
+    "@baseNameEnglish": {},
+    "lats": "Laterales",
+    "@lats": {},
+    "enterMinCharacters": "Por favor ingresa al menos {min} caracteres",
+    "@enterMinCharacters": {
+        "description": "Error message when the user hasn't entered the minimum amount characters in a form",
+        "type": "text",
+        "placeholders": {
+            "min": {
+                "type": "String"
+            }
+        }
+    },
+    "add_exercise_image_license": "Las imágenes deben ser compatibles con la licencia CC BY SA. Si tienes dudas, sube solamente fotos que hayas tomado tú mismo.",
+    "@add_exercise_image_license": {},
+    "biceps": "Bíceps",
+    "@biceps": {},
+    "verifiedEmailReason": "Necesitas verificar tu correo electrónico para contribuir con ejercicios",
+    "@verifiedEmailReason": {},
+    "pull_up_bar": "Barra de dominadas",
+    "@pull_up_bar": {},
+    "shoulders": "Hombros",
+    "@shoulders": {},
+    "sz_bar": "Barra SZ",
+    "@sz_bar": {},
+    "searchNamesInEnglish": "También busque nombres en Ingles",
+    "@searchNamesInEnglish": {},
+    "cacheWarning": "Debido al cache, puede tomar un tiempo hasta que los cambios sean visibles en toda la aplicación.",
+    "@cacheWarning": {},
+    "cardio": "Aerobico",
+    "@cardio": {},
+    "contributeExerciseWarning": "Podes contribuir ejercicios únicamente si tu cuenta tiene más de {days} días y tu email fue verificado",
+    "@contributeExerciseWarning": {
+        "description": "Number of days before which a person can add exercise",
+        "placeholders": {
+            "days": {
+                "type": "String",
+                "example": "14"
+            }
+        }
+    },
+    "success": "Éxito",
+    "@success": {
+        "description": "Message when an action completed successfully, usually used as a heading"
+    },
+    "verify": "Verificar",
+    "@verify": {},
+    "textPromptTitle": "¿Listo para comenzar?",
+    "@textPromptTitle": {},
+    "textPromptSubheading": "Presione el botón para continuar",
+    "@textPromptSubheading": {},
+    "lb": "lb",
+    "@lb": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "max_reps": "Reps Max",
+    "@max_reps": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "body_weight": "Peso Corporal",
+    "@body_weight": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "kilometers_per_hour": "Kilómetros por Hora",
+    "@kilometers_per_hour": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "miles_per_hour": "Millas por Hora",
+    "@miles_per_hour": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "plates": "Platos",
+    "@plates": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "kg": "Kg",
+    "@kg": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "useMetric": "Utilizar unidades metricas para el peso corporal",
+    "@useMetric": {},
+    "settingsTitle": "Configuraciones",
+    "@settingsTitle": {},
+    "settingsCacheTitle": "Cache",
+    "@settingsCacheTitle": {},
+    "settingsCacheDeletedSnackbar": "Cache borrado exitosamente",
+    "@settingsCacheDeletedSnackbar": {},
+    "log": "Registro",
+    "@log": {
+        "description": "Log a specific meal (imperative form)"
+    },
+    "done": "Listo",
+    "@done": {},
+    "noMatchingExerciseFound": "No se encontraron ejercicios que coincidan",
+    "@noMatchingExerciseFound": {
+        "description": "Message returned if no exercises match the searched string"
+    },
+    "aboutMastodonTitle": "Mastodon",
+    "@aboutMastodonTitle": {},
+    "settingsExerciseCacheDescription": "Cache de ejercicios",
+    "@settingsExerciseCacheDescription": {},
+    "aboutDonateTitle": "Realizar una donación",
+    "@aboutDonateTitle": {},
+    "aboutDonateText": "Si bien el proyecto es gratuito y siempre lo seguirá siendo, ¡ejecutar el servidor no lo es! El desarrollo también requiere mucho tiempo y esfuerzo por parte de los voluntarios. Su contribución respalda directamente estos costos, lo que ayuda a mantener el servicio confiable.",
+    "@aboutDonateText": {},
+    "selectAvailablePlates": "Elige los discos disponibles",
+    "@selectAvailablePlates": {},
+    "barWeight": "Peso de la barra",
+    "@barWeight": {},
+    "useColors": "Usar colores",
+    "@useColors": {},
+    "useApiToken": "Usar tokens API",
+    "@useApiToken": {},
+    "useUsernameAndPassword": "Utilizar usuario y contraseña",
+    "@useUsernameAndPassword": {},
+    "apiToken": "Token API",
+    "@apiToken": {},
+    "invalidApiToken": "Por favor, Introduzca una clave API válida",
+    "@invalidApiToken": {
+        "description": "Error message when the user enters an invalid API key"
+    },
+    "apiTokenValidChars": "Una clave API solo puede contener las letras a-f, números 0-9 y tener exactamente 40 caracteres de longitud",
+    "@apiTokenValidChars": {
+        "description": "Error message when the user tries to input a API key with forbidden characters"
+    },
+    "noIngredientsDefined": "Aún no se definen ingredientes",
+    "@noIngredientsDefined": {},
+    "routines": "Rutinas",
+    "@routines": {},
+    "newRoutine": "Nueva rutina",
+    "@newRoutine": {},
+    "noRoutines": "No hay rutinas",
+    "@noRoutines": {},
+    "restTime": "Tiempo de descanso",
+    "@restTime": {},
+    "sets": "El número de rondas para cada ejercicio",
+    "@sets": {
+        "description": "The number of sets to be done for one exercise"
+    },
+    "exerciseNr": "Ejercicio {nr}",
+    "@exerciseNr": {
+        "description": "Header in form indicating the number of the current exercise. Can also be translated as something like 'Set Nr. xy'.",
+        "type": "text",
+        "placeholders": {
+            "nr": {
+                "type": "String"
+            }
+        }
+    },
+    "supersetNr": "Superset {nr}",
+    "@supersetNr": {
+        "description": "Header in form indicating the number of the current exercise. Can also be translated as something like 'Superset Nr. xy'.",
+        "type": "text",
+        "placeholders": {
+            "nr": {
+                "type": "String"
+            }
+        }
+    },
+    "restDay": "Día de descanso",
+    "@restDay": {},
+    "isRestDay": "Descanso",
+    "@isRestDay": {},
+    "isRestDayHelp": "Favor de considerar que todos los sets y ejercicios se eliminarán al marcar el día como descanso.",
+    "@isRestDayHelp": {},
+    "needsLogsToAdvance": "Necesita registros para avanzar",
+    "@needsLogsToAdvance": {},
+    "needsLogsToAdvanceHelp": "Seleccione esta opción si desea que la rutina avance al siguiente día programado solo si ha registrado un entrenamiento para ese día",
+    "@needsLogsToAdvanceHelp": {},
+    "routineDays": "Días en rutina",
+    "@routineDays": {},
+    "resultingRoutine": "Rutina resultante",
+    "@resultingRoutine": {},
+    "ingredientLogged": "Ingrediente registrado en el diario",
+    "@ingredientLogged": {},
+    "onlyLogging": "Solo registrar las calorías",
+    "@onlyLogging": {},
+    "onlyLoggingHelpText": "Marque la casilla si solo desea registrar sus calorías y no desea configurar un plan nutricional detallado con comidas específicas",
+    "@onlyLoggingHelpText": {},
+    "goalMacro": "Meta de Macros",
+    "@goalMacro": {
+        "description": "The goal for macronutrients"
+    },
+    "selectMealToLog": "Selecciona una comida para registrar en el diario",
+    "@selectMealToLog": {},
+    "yourCurrentNutritionPlanHasNoMealsDefinedYet": "Tu plan de nutrición no tiene comidas definidas",
+    "@yourCurrentNutritionPlanHasNoMealsDefinedYet": {
+        "description": "Message shown when a nutrition plan doesn't have any meals"
+    },
+    "toAddMealsToThePlanGoToNutritionalPlanDetails": "Para agregar comidas al plan, vaya a los detalles del plan nutricional",
+    "@toAddMealsToThePlanGoToNutritionalPlanDetails": {
+        "description": "Message shown to guide users to the nutritional plan details page to add meals"
+    },
+    "goalEnergy": "Objetivo energético",
+    "@goalEnergy": {},
+    "goalProtein": "Objetivo de proteina",
+    "@goalProtein": {},
+    "goalCarbohydrates": "Objetivo de carbohidratos",
+    "@goalCarbohydrates": {},
+    "goalFat": "Objetivo de grasas",
+    "@goalFat": {},
+    "goalFiber": "Objetivo de fibra",
+    "@goalFiber": {},
+    "errorInfoDescription": "Lo sentimos pero algo no ha funcionado como esperábamos. Puedes ayudarnos a arreglarlo reportando el problema en GitHub.",
+    "@errorInfoDescription": {},
+    "errorInfoDescription2": "Puedes seguir utilizando la aplicación pero algunas características pueden no funcionar.",
+    "@errorInfoDescription2": {},
+    "errorViewDetails": "Detalles técnicos",
+    "@errorViewDetails": {},
+    "errorCouldNotConnectToServer": "No se pudo conectar con el servidor",
+    "@errorCouldNotConnectToServer": {},
+    "errorCouldNotConnectToServerDetails": "La aplicación no se pudo conectar con el servidor. Por favor, comprueba to conexión a internet o la URL del servidor y prueba de nuevo. Si el problema persiste, contacta con el administrador del servidor.",
+    "@errorCouldNotConnectToServerDetails": {},
+    "copyToClipboard": "Copiar al portapapeles",
+    "@copyToClipboard": {},
+    "max": "Máximo",
+    "@max": {},
+    "aboutContributeTitle": "Contribuir",
+    "@aboutContributeTitle": {},
+    "aboutContributeText": "Todos los tipos de contribuciones son bien recibidas. Ya seas desarrollador, traductor o un apasionado por el deporte, toda ayuda es bien recibida.",
+    "@aboutContributeText": {},
+    "endDate": "Fecha de finalización",
+    "@endDate": {},
+    "startDate": "Fecha de inicio",
+    "@startDate": {},
+    "min": "Mínimo",
+    "@min": {},
+    "chart30DaysTitle": "{name} ultimos 30 días",
+    "@chart30DaysTitle": {
+        "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
+        "type": "text",
+        "placeholders": {
+            "name": {
+                "type": "String"
+            }
+        }
+    },
+    "chartDuringPlanTitle": "{chartName} durante el plan nutricional {planName}",
+    "@chartDuringPlanTitle": {
+        "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
+        "type": "text",
+        "placeholders": {
+            "chartName": {
+                "type": "String"
+            },
+            "planName": {
+                "type": "String"
+            }
+        }
+    },
+    "today": "Hoy",
+    "@today": {},
+    "loggedToday": "Registrado hoy",
+    "@loggedToday": {},
+    "surplus": "exceso calórico",
+    "@surplus": {
+        "description": "Caloric surplus (either planned or unplanned)"
+    },
+    "deficit": "déficit calórico",
+    "@deficit": {
+        "description": "Caloric deficit (either planned or unplanned)"
+    },
+    "kcalValue": "{value} kcal",
+    "@kcalValue": {
+        "description": "A value in kcal, e.g. 500 kcal",
+        "type": "text",
+        "placeholders": {
+            "value": {
+                "type": "String"
+            }
+        }
+    },
+    "gValue": "{value} g",
+    "@gValue": {
+        "description": "A value in grams, e.g. 5 g",
+        "type": "text",
+        "placeholders": {
+            "value": {
+                "type": "String"
+            }
+        }
+    },
+    "percentValue": "{value} %",
+    "@percentValue": {
+        "description": "A value in percent, e.g. 10 %",
+        "type": "text",
+        "placeholders": {
+            "value": {
+                "type": "String"
+            }
+        }
+    },
+    "aboutWhySupportTitle": "Código abierto y de uso gratuito ❤️",
+    "@aboutWhySupportTitle": {},
+    "aboutBugsListTitle": "Informar un problema o sugerir una característica",
+    "@aboutBugsListTitle": {},
+    "aboutTranslationListTitle": "Traducir la aplicación",
+    "@aboutTranslationListTitle": {},
+    "aboutSourceListTitle": "Ver código fuente",
+    "@aboutSourceListTitle": {},
+    "aboutJoinCommunityTitle": "Unirse a la comunidad",
+    "@aboutJoinCommunityTitle": {},
+    "aboutDiscordTitle": "Discord",
+    "@aboutDiscordTitle": {},
+    "others": "Otros",
+    "@others": {},
+    "fitInWeek": "En forma en una semana",
+    "@fitInWeek": {},
+    "fitInWeekHelp": "Si está activado, los días se repetirán en un ciclo semanal, de la otra manera, los días serán secuenciales sin importar el inicio de una nueva semana.",
+    "@fitInWeekHelp": {},
+    "addSuperset": "Añadir superserie",
+    "@addSuperset": {},
+    "setHasNoExercises": "¡Esta rutina no tiene ejercicios!",
+    "@setHasNoExercises": {},
+    "settingsIngredientCacheDescription": "Cache de ingredientes",
+    "@settingsIngredientCacheDescription": {},
+    "simpleMode": "Modo simple",
+    "@simpleMode": {},
+    "simpleModeHelp": "Ocultar ajustes avanzados cuando se editan los ejercicios",
+    "@simpleModeHelp": {},
+    "progressionRules": "Este ejercicio tiene reglas de progresión y no puede ser editado en la aplicación móvil. Por favor, usa la aplicación web para editarlo.",
+    "@progressionRules": {},
+    "resistance_band": "Banda de resistencia",
+    "@resistance_band": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "overallChangeWeight": "Cambio general",
+    "@overallChangeWeight": {
+        "description": "Overall change in weight, added for localization"
+    },
+    "goalTypeMeals": "De las comidas",
+    "@goalTypeMeals": {
+        "description": "added for localization of Class GoalType's filed meals"
+    },
+    "goalTypeBasic": "Básico",
+    "@goalTypeBasic": {
+        "description": "added for localization of Class GoalType's filed basic"
+    },
+    "goalTypeAdvanced": "Avanzado",
+    "@goalTypeAdvanced": {
+        "description": "added for localization of Class GoalType's filed advanced"
+    },
+    "indicatorRaw": "raw",
+    "@indicatorRaw": {
+        "description": "added for localization of Class Indicator's field text"
+    },
+    "indicatorAvg": "medio",
+    "@indicatorAvg": {
+        "description": "added for localization of Class Indicator's field text"
+    },
+    "themeMode": "Modo del tema",
+    "@themeMode": {},
+    "darkMode": "Siempre en modo oscuro",
+    "@darkMode": {},
+    "lightMode": "Siempre en modo claro",
+    "@lightMode": {},
+    "systemMode": "Configuracion del sistema",
+    "@systemMode": {},
+    "chartAllTimeTitle": "Histórico {name}",
+    "@chartAllTimeTitle": {
+        "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
+        "type": "text",
+        "placeholders": {
+            "name": {
+                "type": "String"
+            }
+        }
+    },
+    "setHasProgression": "Set con progresión",
+    "@setHasProgression": {},
+    "setHasProgressionWarning": "Tenga en cuenta que, por el momento, no es posible editar todos los ajustes de un set en la aplicación móvil ni configurar la progresión automática. Por ahora, utilice la aplicación web.",
+    "@setHasProgressionWarning": {},
+    "applicationLogs": "Registro de la aplicación",
+    "@applicationLogs": {}
 }
diff --git a/lib/l10n/app_fa.arb b/lib/l10n/app_fa.arb
new file mode 100644
index 00000000..0967ef42
--- /dev/null
+++ b/lib/l10n/app_fa.arb
@@ -0,0 +1 @@
+{}
diff --git a/lib/l10n/app_fr.arb b/lib/l10n/app_fr.arb
index ed6483c8..eb6637b6 100644
--- a/lib/l10n/app_fr.arb
+++ b/lib/l10n/app_fr.arb
@@ -1,857 +1,1040 @@
 {
-  "logHelpEntries": "Si durant une journée il y a plusieurs entrées avec le même nombre de répétitions, mais avec un poids différent, seule l’entrée avec le poids le plus haut sera affichée.",
-  "@logHelpEntries": {},
-  "logHelpEntriesUnits": "Notez que seules les entrées comportant une unité de poids (kg ou lb) et des répétitions sont représentées dans le graphique. Les autres combinaisons, telles que le temps ou le niveau d’échec, sont ignorées ici.",
-  "@logHelpEntriesUnits": {},
-  "weight": "Poids",
-  "@weight": {
-    "description": "The weight of a workout log or body weight entry"
-  },
-  "confirmDelete": "Êtes-vous sûre de vouloir supprimer « {toDelete} » ?",
-  "@confirmDelete": {
-    "description": "Confirmation text before the user deletes an object",
-    "type": "text",
-    "placeholders": {
-      "toDelete": {}
-    }
-  },
-  "selectIngredient": "Veuillez sélectionner un ingrédient",
-  "@selectIngredient": {
-    "description": "Error message when the user hasn't selected an ingredient from the autocompleter"
-  },
-  "enterValidNumber": "Veuillez entrer un nombre valide",
-  "@enterValidNumber": {
-    "description": "Error message when the user has submitted an invalid number (e.g. '3,.,.,.')"
-  },
-  "enterValue": "Insérer un valeur",
-  "@enterValue": {
-    "description": "Error message when the user hasn't entered a value on a required field"
-  },
-  "goToToday": "Aller à aujourd’hui",
-  "@goToToday": {
-    "description": "Label on button to jump back to 'today' in the calendar widget"
-  },
-  "calendar": "Calendrier",
-  "@calendar": {},
-  "aboutText": "wger est un logiciel libre, sous licence AFPLv3+ et disponible sur GitHub:",
-  "@aboutText": {
-    "description": "Text in the about dialog"
-  },
-  "toggleDetails": "Afficher les détails",
-  "@toggleDetails": {
-    "description": "Switch to toggle detail / overview"
-  },
-  "newNutritionalPlan": "Nouveau programme nutritionnel",
-  "@newNutritionalPlan": {},
-  "delete": "Supprimer",
-  "@delete": {},
-  "loadingText": "Chargement…",
-  "@loadingText": {
-    "description": "Text to show when entries are being loaded in the background: Loading..."
-  },
-  "edit": "Modifier",
-  "@edit": {},
-  "noWeightEntries": "Aucune entrée de poids",
-  "@noWeightEntries": {
-    "description": "Message shown when the user has no logged weight entries"
-  },
-  "newEntry": "Nouvelle entrée",
-  "@newEntry": {
-    "description": "Title when adding a new entry such as a weight or log entry"
-  },
-  "unit": "Unité",
-  "@unit": {
-    "description": "The unit used for a repetition (kg, time, etc.)"
-  },
-  "amount": "Quantité",
-  "@amount": {
-    "description": "The amount (e.g. in grams) of an ingredient in a meal"
-  },
-  "sodium": "Sodium",
-  "@sodium": {},
-  "fiber": "fiber",
-  "@fiber": {},
-  "saturatedFat": "Graisses saturées",
-  "@saturatedFat": {},
-  "fat": "Graisses",
-  "@fat": {},
-  "sugars": "Sucres",
-  "@sugars": {},
-  "carbohydrates": "Glucides",
-  "@carbohydrates": {},
-  "protein": "Protéines",
-  "@protein": {},
-  "g": "g",
-  "@g": {
-    "description": "Abbreviation for gram"
-  },
-  "kJ": "kJ",
-  "@kJ": {
-    "description": "Energy in a meal in kilo joules, kJ"
-  },
-  "kcal": "kcal",
-  "@kcal": {
-    "description": "Energy in a meal in kilocalories, kcal"
-  },
-  "energy": "Énergie",
-  "@energy": {
-    "description": "Energy in a meal, ingredient etc. e.g. in kJ"
-  },
-  "ingredient": "Ingrédient",
-  "@ingredient": {},
-  "timeEnd": "Horaire de fin",
-  "@timeEnd": {
-    "description": "The end time of a workout"
-  },
-  "timeStart": "Horaire de départ",
-  "@timeStart": {
-    "description": "The starting time of a workout"
-  },
-  "time": "Horaire",
-  "@time": {
-    "description": "The time of a meal or workout"
-  },
-  "date": "Date",
-  "@date": {
-    "description": "The date of a workout log or body weight entry"
-  },
-  "dismiss": "Rejeter",
-  "@dismiss": {},
-  "anErrorOccurred": "Une erreur s’est produite !",
-  "@anErrorOccurred": {},
-  "noNutritionalPlans": "Aucun programme nutritionnel",
-  "@noNutritionalPlans": {
-    "description": "Message shown when the user has no nutritional plans"
-  },
-  "nutritionalPlans": "Programmes nutritionnels",
-  "@nutritionalPlans": {},
-  "nutritionalDiary": "Journal nutritionnel",
-  "@nutritionalDiary": {},
-  "nutritionalPlan": "Programme nutritionnel",
-  "@nutritionalPlan": {},
-  "addIngredient": "Ajouter ingrédients",
-  "@addIngredient": {},
-  "mealLogged": "Repas journalisé",
-  "@mealLogged": {},
-  "addMeal": "Ajouter un repas",
-  "@addMeal": {},
-  "add": "Ajouter",
-  "@add": {},
-  "cancel": "Supprimer",
-  "@cancel": {},
-  "save": "Sauvegarder",
-  "@save": {},
-  "description": "Description",
-  "@description": {},
-  "gymMode": "Mode entraînement",
-  "@gymMode": {
-    "description": "Label when starting the gym mode"
-  },
-  "newSet": "Nouvelle série",
-  "@newSet": {
-    "description": "Header when adding a new set to a workout day"
-  },
-  "newDay": "Nouvelle journée",
-  "@newDay": {},
-  "workoutSession": "Session d’entraînement",
-  "@workoutSession": {
-    "description": "A (logged) workout session"
-  },
-  "notes": "Notes",
-  "@notes": {
-    "description": "Personal notes, e.g. for a workout session"
-  },
-  "impression": "Impression",
-  "@impression": {
-    "description": "General impression (e.g. for a workout session) such as good, bad, etc."
-  },
-  "comment": "Commentaire",
-  "@comment": {
-    "description": "Comment, additional information"
-  },
-  "rir": "RsR",
-  "@rir": {
-    "description": "Shorthand for Repetitions In Reserve"
-  },
-  "repetitions": "Répetitions",
-  "@repetitions": {
-    "description": "Repetitions for an exercise set"
-  },
-  "addExercise": "Ajouter un exercice",
-  "@addExercise": {},
-  "noWorkoutPlans": "Aucun plan d’entraînement",
-  "@noWorkoutPlans": {
-    "description": "Message shown when the user has no workout plans"
-  },
-  "newWorkout": "Nouveau plan d’entraînement",
-  "@newWorkout": {
-    "description": "Header when adding a new workout"
-  },
-  "exercise": "Exercice",
-  "@exercise": {
-    "description": "An exercise for a workout"
-  },
-  "successfullyDeleted": "Supprimé",
-  "@successfullyDeleted": {
-    "description": "Message when an item was successfully deleted"
-  },
-  "labelDashboard": "Accueil",
-  "@labelDashboard": {
-    "description": "Title for screen dashboard"
-  },
-  "labelWorkoutPlan": "Plan d’entraînement",
-  "@labelWorkoutPlan": {
-    "description": "Title for screen workout plan"
-  },
-  "labelWorkoutPlans": "Plans d’entraînement",
-  "@labelWorkoutPlans": {
-    "description": "Title for screen workout plans"
-  },
-  "registerInstead": "Vous n'avez pas de compte ? Inscrivez-vous maintenant",
-  "@registerInstead": {},
-  "loginInstead": "Déjà un compte ? Connectez-vous",
-  "@loginInstead": {},
-  "reset": "Réinitialiser",
-  "@reset": {
-    "description": "Button text allowing the user to reset the entered values to the default"
-  },
-  "useCustomServer": "Utiliser le serveur personnalisé",
-  "@useCustomServer": {
-    "description": "Toggle button allowing users to switch between the default and a custom wger server"
-  },
-  "customServerHint": "Entrez l’adresse de votre propre serveur, sinon le serveur par défaut sera utilisé",
-  "@customServerHint": {
-    "description": "Hint text for the form where the users can enter their own wger instance"
-  },
-  "customServerUrl": "URL de l’instance wger",
-  "@customServerUrl": {
-    "description": "Label in the form where the users can enter their own wger instance"
-  },
-  "invalidUsername": "Veuillez entrer un nom d’utilisateur valide",
-  "@invalidUsername": {
-    "description": "Error message when the user enters an invalid username"
-  },
-  "username": "Nom d’utilisateur",
-  "@username": {},
-  "email": "Adresse courriel",
-  "@email": {},
-  "invalidEmail": "Veuillez entrer une adresse courriel valide",
-  "@invalidEmail": {
-    "description": "Error message when the user enters an invalid email"
-  },
-  "confirmPassword": "Confirmer le mot de passe",
-  "@confirmPassword": {},
-  "password": "Mot de passe",
-  "@password": {},
-  "passwordTooShort": "Le mot de passe est trop court",
-  "@passwordTooShort": {
-    "description": "Error message when the user a password that is too short"
-  },
-  "passwordsDontMatch": "Les mots de passe sont différents",
-  "@passwordsDontMatch": {
-    "description": "Error message when the user enters two different passwords during registration"
-  },
-  "invalidUrl": "Veuillez entrer une URL valide",
-  "@invalidUrl": {
-    "description": "Error message when the user enters an invalid URL, e.g. in the login form"
-  },
-  "useDefaultServer": "Utiliser le serveur par défaut",
-  "@useDefaultServer": {
-    "description": "Toggle button allowing users to switch between the default and a custom wger server"
-  },
-  "register": "S’inscrire",
-  "@register": {
-    "description": "Text for registration button"
-  },
-  "login": "Se connecter",
-  "@login": {
-    "description": "Text for login button"
-  },
-  "set": "Série",
-  "@set": {
-    "description": "A set in a workout plan"
-  },
-  "repetitionUnit": "Unité des répétitions",
-  "@repetitionUnit": {},
-  "weightUnit": "Unité de poids",
-  "@weightUnit": {},
-  "reps": "Réps",
-  "@reps": {
-    "description": "Shorthand for repetitions, used when space constraints are tighter"
-  },
-  "nrOfSets": "Séries par exercice : {nrOfSets}",
-  "@nrOfSets": {
-    "description": "Label shown on the slider where the user selects the nr of sets",
-    "type": "text",
-    "placeholders": {
-      "nrOfSets": {}
-    }
-  },
-  "enterCharacters": "Veuillez saisir un nombre de caractères compris entre {min} et {max}",
-  "@enterCharacters": {
-    "description": "Error message when the user hasn't entered the correct number of characters in a form",
-    "type": "text",
-    "placeholders": {
-      "min": {},
-      "max": {}
-    }
-  },
-  "selectExercise": "Veuillez sélectionner un exercice",
-  "@selectExercise": {
-    "description": "Error message when the user hasn't selected an exercise in the form"
-  },
-  "enterRepetitionsOrWeight": "Veuillez indiquer les répétitions ou le poids pour au moins une des séries",
-  "@enterRepetitionsOrWeight": {
-    "description": "Error message when the user hasn't filled in the forms for exercise sets"
-  },
-  "aboutTranslationText": "Cette application est traduite sur Weblate. Si vous voulez aussi aider, cliquez sur le lien et commencez à traduire",
-  "@aboutTranslationText": {
-    "description": "Text for translation section in the about dialog"
-  },
-  "aboutTranslationTitle": "Traduction",
-  "@aboutTranslationTitle": {
-    "description": "Title for translation section in the about dialog"
-  },
-  "aboutContactUsText": "Si vous souhaitez discuter avec nous, rendez-vous sur le serveur Discord et contactez-nous",
-  "@aboutContactUsText": {
-    "description": "Text for contact us section in the about dialog"
-  },
-  "aboutContactUsTitle": "Dites-nous bonjour !",
-  "@aboutContactUsTitle": {
-    "description": "Title for contact us section in the about dialog"
-  },
-  "aboutBugsText": "Contactez-nous si un élément ne s’est pas comporté comme prévu ou si une fonctionnalité vous semble manquer.",
-  "@aboutBugsText": {
-    "description": "Text for bugs section in the about dialog"
-  },
-  "aboutBugsTitle": "Vous avez un problème ou une idée ?",
-  "@aboutBugsTitle": {
-    "description": "Title for bugs section in the about dialog"
-  },
-  "aboutSourceText": "Récupérez le code source de cette application et de son serveur sur Github",
-  "@aboutSourceText": {
-    "description": "Text for source code section in the about dialog"
-  },
-  "aboutSourceTitle": "Code source",
-  "@aboutSourceTitle": {
-    "description": "Title for source code section in the about dialog"
-  },
-  "aboutDescription": "Merci d’utiliser wger ! wger est un projet collaboratif à code source ouvert, réalisé par des passionnés de fitness du monde entier.",
-  "@aboutDescription": {
-    "description": "Text in the about dialog"
-  },
-  "start": "Démarrer",
-  "@start": {
-    "description": "Label on button to start the gym mode (i.e., an imperative)"
-  },
-  "logMeal": "Journaliser ce repas dans l'agenda",
-  "@logMeal": {},
-  "addSet": "Ajouter une série",
-  "@addSet": {
-    "description": "Label for the button that adds a set (to a workout day)"
-  },
-  "todaysWorkout": "Entraînement d’aujourd’hui",
-  "@todaysWorkout": {},
-  "selectExercises": "Si vous voulez faire une supersérie, vous pouvez rechercher plusieurs exercices, ils seront regroupés",
-  "@selectExercises": {},
-  "sameRepetitions": "Si vous faites les mêmes répétitions et le même poids pour toutes les séries, vous pouvez simplement remplir une ligne. Par exemple, pour 4 séries, il suffit d’entrer 10 pour les répétitions, ce qui devient automatiquement « 4 × 10 ».",
-  "@sameRepetitions": {},
-  "setNr": "Série {nr}",
-  "@setNr": {
-    "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.",
-    "type": "text",
-    "placeholders": {
-      "nr": {}
-    }
-  },
-  "dayDescriptionHelp": "Une description de ce qui est fait ce jour-ci (par exemple : « journée de tractions ») ou des parties du corps qui sont entraînées (par exemple : « poitrine et épaules »)",
-  "@dayDescriptionHelp": {},
-  "category": "Catégorie",
-  "@category": {
-    "description": "Category for an exercise, ingredient, etc."
-  },
-  "musclesSecondary": "Muscles secondaires",
-  "@musclesSecondary": {
-    "description": "secondary muscles trained by an exercise"
-  },
-  "muscles": "Muscles",
-  "@muscles": {
-    "description": "(main) muscles trained by an exercise"
-  },
-  "equipment": "Équippement",
-  "@equipment": {
-    "description": "Equipment needed to perform an exercise"
-  },
-  "successfullySaved": "Enregistré",
-  "@successfullySaved": {
-    "description": "Message when an item was successfully saved"
-  },
-  "labelWorkoutLogs": "Journaux d’entraînement",
-  "@labelWorkoutLogs": {
-    "description": "(Workout) logs"
-  },
-  "logout": "Se déconnecter",
-  "@logout": {
-    "description": "Text for logout button"
-  },
-  "addImage": "Ajouter une image",
-  "@addImage": {},
-  "gallery": "Galerie",
-  "@gallery": {},
-  "chooseFromLibrary": "Choisir depuis la bibliothèque",
-  "@chooseFromLibrary": {},
-  "takePicture": "Prendre une photo",
-  "@takePicture": {},
-  "selectImage": "Veuillez sélectionner une image",
-  "@selectImage": {
-    "description": "Label and error message when the user hasn't selected an image to save"
-  },
-  "name": "Nom",
-  "@name": {
-    "description": "Name for a workout or nutritional plan"
-  },
-  "optionsLabel": "Options",
-  "@optionsLabel": {
-    "description": "Label for the popup with general app options"
-  },
-  "setUnitsAndRir": "Définir les unités et RiR",
-  "@setUnitsAndRir": {
-    "description": "Label shown on the slider where the user can toggle showing units and RiR",
-    "type": "text"
-  },
-  "goToDetailPage": "Aller à la page de détails",
-  "@goToDetailPage": {},
-  "jumpTo": "Aller à",
-  "@jumpTo": {
-    "description": "Imperative. Label used in popup allowing the user to jump to a specific exercise while in the gym mode"
-  },
-  "pause": "Pause",
-  "@pause": {
-    "description": "Noun, not an imperative! Label used for the pause when using the gym mode"
-  },
-  "rirNotUsed": "RiR non utilisé",
-  "@rirNotUsed": {
-    "description": "Label used in RiR slider when the RiR value is not used/saved for the current setting or log"
-  },
-  "searchExercise": "Chercher des exos à ajouter",
-  "@searchExercise": {
-    "description": "Label on set form. Selected exercises are added to the set"
-  },
-  "labelBottomNavNutrition": "Nutrition",
-  "@labelBottomNavNutrition": {
-    "description": "Label used in bottom navigation, use a short word"
-  },
-  "labelBottomNavWorkout": "Entraînement",
-  "@labelBottomNavWorkout": {
-    "description": "Label used in bottom navigation, use a short word"
-  },
-  "usernameValidChars": "Un nom d'utilisateur ne peut contenir que des lettres, des chiffres et les caractères @, +, ., - et _",
-  "@usernameValidChars": {
-    "description": "Error message when the user tries to register a username with forbidden characters"
-  },
-  "timeStartAhead": "L'heure de début ne peut pas être après à l'heure de fin",
-  "@timeStartAhead": {},
-  "supersetWith": "supersérie avec",
-  "@supersetWith": {
-    "description": "Text used between exercise cards when adding a new set. Translate as something like 'in a superset with'"
-  },
-  "plateCalculatorNotDivisible": "Impossible d'atteindre le poids avec les disques disponibles",
-  "@plateCalculatorNotDivisible": {
-    "description": "Error message when the current weight is not reachable with plates (e.g. 33.1 kg)"
-  },
-  "plateCalculator": "Disques",
-  "@plateCalculator": {
-    "description": "Label used for the plate calculator in the gym mode"
-  },
-  "total": "Total",
-  "@total": {
-    "description": "Label used for total sums of e.g. calories or similar"
-  },
-  "gPerBodyKg": "g par kg corporel",
-  "@gPerBodyKg": {
-    "description": "Label used for total sums of e.g. calories or similar in grams per Kg of body weight"
-  },
-  "percentEnergy": "Pourcentage de l'énergie",
-  "@percentEnergy": {},
-  "difference": "Différence",
-  "@difference": {},
-  "logged": "Mangé",
-  "@logged": {
-    "description": "Header for the column of 'logged' nutritional values, i.e. what was eaten"
-  },
-  "planned": "Prévu",
-  "@planned": {
-    "description": "Header for the column of 'planned' nutritional values, i.e. what should be eaten"
-  },
-  "macronutrients": "Macronutriments",
-  "@macronutrients": {},
-  "value": "Valeur",
-  "@value": {
-    "description": "The value of a measurement entry"
-  },
-  "measurementEntriesHelpText": "L'unité utilisée pour mesurer la catégorie, comme cm ou %",
-  "@measurementEntriesHelpText": {},
-  "measurementCategoriesHelpText": "Catégorie de mesure, comme « biceps » ou « graisse corporelle »",
-  "@measurementCategoriesHelpText": {},
-  "measurements": "Mesures",
-  "@measurements": {
-    "description": "Categories for the measurements such as biceps size, body fat, etc."
-  },
-  "measurement": "Mesure",
-  "@measurement": {},
-  "dataCopied": "Données copiées dans la nouvelle entrée",
-  "@dataCopied": {
-    "description": "Snackbar message to show on copying data to a new log entry"
-  },
-  "carbohydratesShort": "Gl",
-  "@carbohydratesShort": {
-    "description": "The first letter or short name of the word 'Carbohydrates', used in overviews"
-  },
-  "fatShort": "Gr",
-  "@fatShort": {
-    "description": "The first letter or short name of the word 'Fat', used in overviews"
-  },
-  "energyShort": "E",
-  "@energyShort": {
-    "description": "The first letter or short name of the word 'Energy', used in overviews"
-  },
-  "proteinShort": "P",
-  "@proteinShort": {
-    "description": "The first letter or short name of the word 'Protein', used in overviews"
-  },
-  "appUpdateTitle": "Mise à jour nécessaire",
-  "@appUpdateTitle": {},
-  "appUpdateContent": "Cette version de l'application n'est pas compatible avec le serveur, veuillez mettre à jour votre application.",
-  "@appUpdateContent": {},
-  "recentlyUsedIngredients": "Ingrédients récemment ajoutés",
-  "@recentlyUsedIngredients": {
-    "description": "A message when a user adds a new ingredient to a meal."
-  },
-  "searchIngredient": "Rechercher un ingrédient",
-  "@searchIngredient": {
-    "description": "Label on ingredient search form"
-  },
-  "logIngredient": "Journaliser l'ingrédient dans l'agenda nutritionnel",
-  "@logIngredient": {},
-  "close": "Fermer",
-  "@close": {
-    "description": "Translation for close"
-  },
-  "productFound": "Produit trouvé",
-  "@productFound": {
-    "description": "Header label for dialog when product is found with barcode"
-  },
-  "weekAverage": "Moyenne sur 7 jours",
-  "@weekAverage": {
-    "description": "Header for the column of '7 day average' nutritional values, i.e. what was logged last week"
-  },
-  "success": "Succès",
-  "@success": {
-    "description": "Message when an action completed successfully, usually used as a heading"
-  },
-  "alternativeNames": "Noms alternatifs",
-  "@alternativeNames": {},
-  "oneNamePerLine": "Un nom par ligne",
-  "@oneNamePerLine": {},
-  "selectEntry": "Veuillez sélectionner une entrée",
-  "@selectEntry": {},
-  "variations": "Variantes",
-  "@variations": {
-    "description": "Variations of one exercise (e.g. benchpress and benchpress narrow)"
-  },
-  "productFoundDescription": "Le code-barres correspond à ce produit : {productName}. Voulez-vous continuer ?",
-  "@productFoundDescription": {
-    "description": "Dialog info when product is found with barcode",
-    "type": "text",
-    "placeholders": {
-      "productName": {}
-    }
-  },
-  "productNotFoundDescription": "Le produit dont le code-barres a été scanné {barcode} n'a pas été trouvé dans la base de données wger",
-  "@productNotFoundDescription": {
-    "description": "Dialog info when product is not found with barcode",
-    "type": "text",
-    "placeholders": {
-      "barcode": {}
-    }
-  },
-  "contributeExerciseWarning": "Vous ne pouvez contribuer aux exercices que si votre compte a plus de {days} jours et si vous avez vérifié votre adresse email",
-  "@contributeExerciseWarning": {
-    "description": "Number of days before which a person can add exercise",
-    "placeholders": {
-      "days": {
-        "type": "String",
-        "example": "14"
-      }
-    }
-  },
-  "back": "Dos",
-  "@back": {},
-  "enterMinCharacters": "Veuillez entrer au moins {min} caractères",
-  "@enterMinCharacters": {
-    "description": "Error message when the user hasn't entered the minimum amount characters in a form",
-    "type": "text",
-    "placeholders": {
-      "min": {}
-    }
-  },
-  "baseNameEnglish": "Tous les exercices doivent avoir un nom de base en anglais",
-  "@baseNameEnglish": {},
-  "productNotFound": "Produit non trouvé",
-  "@productNotFound": {
-    "description": "Header label for dialog when product is not found with barcode"
-  },
-  "scanBarcode": "Scanner le code barre",
-  "@scanBarcode": {
-    "description": "Label for scan barcode button"
-  },
-  "add_exercise_image_license": "Les images doivent être compatibles avec la licence CC BY SA. En cas de doute, ne téléchargez que des photos que vous avez prises vous-même.",
-  "@add_exercise_image_license": {},
-  "alsoKnownAs": "Aussi connu sous le nom de : {aliases}",
-  "@alsoKnownAs": {
-    "placeholders": {
-      "aliases": {}
+    "logHelpEntries": "Si durant une journée il y a plusieurs entrées avec le même nombre de répétitions, mais avec un poids différent, seule l’entrée avec le poids le plus haut sera affichée.",
+    "@logHelpEntries": {},
+    "logHelpEntriesUnits": "Notez que seules les entrées comportant une unité de poids (kg ou lb) et des répétitions sont représentées dans le graphique. Les autres combinaisons, telles que le temps ou le niveau d’échec, sont ignorées ici.",
+    "@logHelpEntriesUnits": {},
+    "weight": "Poids",
+    "@weight": {
+        "description": "The weight of a workout log or body weight entry"
     },
-    "description": "List of alternative names for an exercise"
-  },
-  "verifiedEmailReason": "Vous devez vérifier votre adresse e-mail pour contribuer aux exercices",
-  "@verifiedEmailReason": {},
-  "verifiedEmailInfo": "Un email de vérification a été envoyé à {email}",
-  "@verifiedEmailInfo": {
-    "placeholders": {
-      "email": {}
-    }
-  },
-  "whatVariationsExist": "Quelles sont les variantes de cet exercice, s'il en existe ?",
-  "@whatVariationsExist": {},
-  "previous": "Précédent",
-  "@previous": {},
-  "next": "Suivant",
-  "@next": {},
-  "images": "Photos",
-  "@images": {},
-  "language": "Langues",
-  "@language": {},
-  "contributeExercise": "Contribuer à un exercice",
-  "@contributeExercise": {},
-  "translation": "Traduction",
-  "@translation": {},
-  "translateExercise": "Traduire cet exercice maintenant",
-  "@translateExercise": {},
-  "baseData": "Les bases en anglais",
-  "@baseData": {
-    "description": "The base data for an exercise such as category, trained muscles, etc."
-  },
-  "bench": "Banc",
-  "@bench": {},
-  "glutes": "Fessiers",
-  "@glutes": {},
-  "kilometers": "Kilomètres",
-  "@kilometers": {},
-  "barbell": "Barre",
-  "@barbell": {},
-  "lower_back": "Bas du dos",
-  "@lower_back": {},
-  "swiss_ball": "Ballon de gymnastique",
-  "@swiss_ball": {},
-  "triceps": "Triceps",
-  "@triceps": {},
-  "none__bodyweight_exercise_": "aucun (exercice au poids du corps)",
-  "@none__bodyweight_exercise_": {},
-  "biceps": "Biceps",
-  "@biceps": {},
-  "chest": "Poitrine",
-  "@chest": {},
-  "kettlebell": "Kettlebell",
-  "@kettlebell": {},
-  "abs": "Abdos",
-  "@abs": {},
-  "dumbbell": "Haltères",
-  "@dumbbell": {},
-  "gym_mat": "Tapis de gymnastique",
-  "@gym_mat": {},
-  "incline_bench": "Banc incliné",
-  "@incline_bench": {},
-  "lats": "Grand dorsal",
-  "@lats": {},
-  "miles": "Miles",
-  "@miles": {},
-  "legs": "Jambes",
-  "@legs": {},
-  "quads": "Quadriceps",
-  "@quads": {},
-  "noMeasurementEntries": "Vous n'avez pas d'entrées de mesure",
-  "@noMeasurementEntries": {},
-  "aboutPageTitle": "A propos de Wger",
-  "@aboutPageTitle": {},
-  "userProfile": "Votre profil",
-  "@userProfile": {},
-  "exerciseList": "Liste d'exercices",
-  "@exerciseList": {},
-  "exercises": "Exercices",
-  "@exercises": {
-    "description": "Multiple exercises for a workout"
-  },
-  "exerciseName": "Nom de l'exercice",
-  "@exerciseName": {
-    "description": "Label for the name of a workout exercise"
-  },
-  "arms": "Bras",
-  "@arms": {},
-  "sz_bar": "Barre EZ",
-  "@sz_bar": {},
-  "moreMeasurementEntries": "Ajouter une mesure",
-  "@moreMeasurementEntries": {
-    "description": "Message shown when the user wants to add new measurement"
-  },
-  "hamstrings": "Ischio-jambiers",
-  "@hamstrings": {},
-  "pull_up_bar": "Barre de traction",
-  "@pull_up_bar": {},
-  "shoulders": "Epaules",
-  "@shoulders": {},
-  "calves": "Mollets",
-  "@calves": {},
-  "verifiedEmail": "Email vérifié",
-  "@verifiedEmail": {},
-  "unVerifiedEmail": "Email non vérifié",
-  "@unVerifiedEmail": {},
-  "cacheWarning": "En raison de la mise en cache, il peut s'écouler un certain temps avant que les changements soient visibles dans toute l'application.",
-  "@cacheWarning": {},
-  "cardio": "Cardio",
-  "@cardio": {},
-  "minutes": "Minutes",
-  "@minutes": {},
-  "seconds": "Secondes",
-  "@seconds": {},
-  "until_failure": "Jusqu'à l'échec",
-  "@until_failure": {},
-  "textPromptTitle": "Prêt à commencer ?",
-  "@textPromptTitle": {},
-  "textPromptSubheading": "Cliquez sur le bouton pour commencer",
-  "@textPromptSubheading": {},
-  "body_weight": "Poids corporel",
-  "@body_weight": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "kilometers_per_hour": "Kilomètres Par Heure",
-  "@kilometers_per_hour": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "miles_per_hour": "Miles Par Heure",
-  "@miles_per_hour": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "plates": "Disques de poids",
-  "@plates": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "kg": "kg",
-  "@kg": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "lb": "lb",
-  "@lb": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "searchNamesInEnglish": "Recherchez également des noms en anglais",
-  "@searchNamesInEnglish": {},
-  "max_reps": "Reps Maxi",
-  "@max_reps": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "verify": "Vérifier",
-  "@verify": {},
-  "aboutMastodonText": "Suivez-nous sur mastodon pour des mises à jour et des informations sur le projet",
-  "@aboutMastodonText": {
-    "description": "Text for the mastodon section in the about dialog"
-  },
-  "noMatchingExerciseFound": "Aucun exercice correspondant n'a été trouvé",
-  "@noMatchingExerciseFound": {
-    "description": "Message returned if no exercises match the searched string"
-  },
-  "today": "Aujourd'hui",
-  "@today": {},
-  "useMetric": "Utiliser le système métrique pour le poids du corps",
-  "@useMetric": {},
-  "onlyLogging": "Suivre uniquement les calories",
-  "@onlyLogging": {},
-  "onlyLoggingHelpText": "Cochez la case si vous souhaitez uniquement enregistrer vos calories et ne souhaitez pas établir un plan nutritionnel détaillé avec des repas spécifiques",
-  "@onlyLoggingHelpText": {},
-  "aboutMastodonTitle": "Mastodon",
-  "@aboutMastodonTitle": {
-    "description": "Title for mastodon section in the about dialog"
-  },
-  "aboutDonateTitle": "Faire un don",
-  "@aboutDonateTitle": {},
-  "goalEnergy": "Objectif énergétique",
-  "@goalEnergy": {},
-  "loggedToday": "Journalisé aujourd'hui",
-  "@loggedToday": {},
-  "kcalValue": "{value} kcal",
-  "@kcalValue": {
-    "description": "A value in kcal, e.g. 500 kcal",
-    "type": "text",
-    "placeholders": {
-      "value": {}
-    }
-  },
-  "gValue": "{value} g",
-  "@gValue": {
-    "description": "A value in grams, e.g. 5 g",
-    "type": "text",
-    "placeholders": {
-      "value": {}
-    }
-  },
-  "percentValue": "{value} %",
-  "@percentValue": {
-    "description": "A value in percent, e.g. 10 %",
-    "type": "text",
-    "placeholders": {
-      "value": {}
-    }
-  },
-  "noIngredientsDefined": "Aucun ingrédient défini pour le moment",
-  "@noIngredientsDefined": {},
-  "ingredientLogged": "Ingrédient journalisé dans l'agenda",
-  "@ingredientLogged": {},
-  "goalMacro": "Objectif de macronutriments",
-  "@goalMacro": {
-    "description": "The goal for macronutrients"
-  },
-  "selectMealToLog": "Sélectionner un repas à journaliser dans l'agenda",
-  "@selectMealToLog": {},
-  "goalCarbohydrates": "Objectif glucides",
-  "@goalCarbohydrates": {},
-  "goalProtein": "Objectif protéines",
-  "@goalProtein": {},
-  "goalFat": "Objectif gras",
-  "@goalFat": {},
-  "goalFiber": "Objectif fibre",
-  "@goalFiber": {},
-  "surplus": "surplus",
-  "@surplus": {
-    "description": "Caloric surplus (either planned or unplanned)"
-  },
-  "deficit": "déficit",
-  "@deficit": {
-    "description": "Caloric deficit (either planned or unplanned)"
-  },
-  "aboutDonateText": "Achetez-nous un café pour aider le projet, payez les coûts du serveur et faites-nous le plein d'énergie",
-  "@aboutDonateText": {},
-  "settingsTitle": "Paramètres",
-  "@settingsTitle": {},
-  "settingsCacheTitle": "Cache",
-  "@settingsCacheTitle": {},
-  "settingsExerciseCacheDescription": "Cache d'exercices",
-  "@settingsExerciseCacheDescription": {},
-  "settingsCacheDeletedSnackbar": "Cache nettoyé avec succès",
-  "@settingsCacheDeletedSnackbar": {},
-  "log": "Journaliser",
-  "@log": {
-    "description": "Log a specific meal (imperative form)"
-  },
-  "done": "Fait",
-  "@done": {}
+    "confirmDelete": "Êtes-vous sûre de vouloir supprimer « {toDelete} » ?",
+    "@confirmDelete": {
+        "description": "Confirmation text before the user deletes an object",
+        "type": "text",
+        "placeholders": {
+            "toDelete": {
+                "type": "String"
+            }
+        }
+    },
+    "selectIngredient": "Veuillez sélectionner un ingrédient",
+    "@selectIngredient": {
+        "description": "Error message when the user hasn't selected an ingredient from the autocompleter"
+    },
+    "enterValidNumber": "Veuillez entrer un nombre valide",
+    "@enterValidNumber": {
+        "description": "Error message when the user has submitted an invalid number (e.g. '3,.,.,.')"
+    },
+    "enterValue": "Insérer un valeur",
+    "@enterValue": {
+        "description": "Error message when the user hasn't entered a value on a required field"
+    },
+    "goToToday": "Aller à aujourd’hui",
+    "@goToToday": {
+        "description": "Label on button to jump back to 'today' in the calendar widget"
+    },
+    "calendar": "Calendrier",
+    "@calendar": {},
+    "toggleDetails": "Afficher les détails",
+    "@toggleDetails": {
+        "description": "Switch to toggle detail / overview"
+    },
+    "newNutritionalPlan": "Nouveau programme nutritionnel",
+    "@newNutritionalPlan": {},
+    "delete": "Supprimer",
+    "@delete": {},
+    "loadingText": "Chargement…",
+    "@loadingText": {
+        "description": "Text to show when entries are being loaded in the background: Loading..."
+    },
+    "edit": "Modifier",
+    "@edit": {},
+    "noWeightEntries": "Aucune entrée de poids",
+    "@noWeightEntries": {
+        "description": "Message shown when the user has no logged weight entries"
+    },
+    "newEntry": "Nouvelle entrée",
+    "@newEntry": {
+        "description": "Title when adding a new entry such as a weight or log entry"
+    },
+    "unit": "Unité",
+    "@unit": {
+        "description": "The unit used for a repetition (kg, time, etc.)"
+    },
+    "amount": "Quantité",
+    "@amount": {
+        "description": "The amount (e.g. in grams) of an ingredient in a meal"
+    },
+    "sodium": "Sodium",
+    "@sodium": {},
+    "fiber": "fiber",
+    "@fiber": {},
+    "saturatedFat": "Graisses saturées",
+    "@saturatedFat": {},
+    "fat": "Graisses",
+    "@fat": {},
+    "sugars": "Sucres",
+    "@sugars": {},
+    "carbohydrates": "Glucides",
+    "@carbohydrates": {},
+    "protein": "Protéines",
+    "@protein": {},
+    "g": "g",
+    "@g": {
+        "description": "Abbreviation for gram"
+    },
+    "kJ": "kJ",
+    "@kJ": {
+        "description": "Energy in a meal in kilo joules, kJ"
+    },
+    "kcal": "kcal",
+    "@kcal": {
+        "description": "Energy in a meal in kilocalories, kcal"
+    },
+    "energy": "Énergie",
+    "@energy": {
+        "description": "Energy in a meal, ingredient etc. e.g. in kJ"
+    },
+    "ingredient": "Ingrédient",
+    "@ingredient": {},
+    "timeEnd": "Horaire de fin",
+    "@timeEnd": {
+        "description": "The end time of a workout"
+    },
+    "timeStart": "Horaire de départ",
+    "@timeStart": {
+        "description": "The starting time of a workout"
+    },
+    "time": "Horaire",
+    "@time": {
+        "description": "The time of a meal or workout"
+    },
+    "date": "Date",
+    "@date": {
+        "description": "The date of a workout log or body weight entry"
+    },
+    "anErrorOccurred": "Une erreur s’est produite !",
+    "@anErrorOccurred": {},
+    "noNutritionalPlans": "Aucun programme nutritionnel",
+    "@noNutritionalPlans": {
+        "description": "Message shown when the user has no nutritional plans"
+    },
+    "nutritionalPlans": "Programmes nutritionnels",
+    "@nutritionalPlans": {},
+    "nutritionalDiary": "Journal nutritionnel",
+    "@nutritionalDiary": {},
+    "nutritionalPlan": "Programme nutritionnel",
+    "@nutritionalPlan": {},
+    "addIngredient": "Ajouter ingrédients",
+    "@addIngredient": {},
+    "mealLogged": "Repas journalisé",
+    "@mealLogged": {},
+    "addMeal": "Ajouter un repas",
+    "@addMeal": {},
+    "add": "Ajouter",
+    "@add": {},
+    "cancel": "Supprimer",
+    "@cancel": {},
+    "save": "Sauvegarder",
+    "@save": {},
+    "description": "Description",
+    "@description": {},
+    "gymMode": "Mode entraînement",
+    "@gymMode": {
+        "description": "Label when starting the gym mode"
+    },
+    "newSet": "Nouvelle série",
+    "@newSet": {
+        "description": "Header when adding a new set to a workout day"
+    },
+    "newDay": "Nouvelle journée",
+    "@newDay": {},
+    "workoutSession": "Session d’entraînement",
+    "@workoutSession": {
+        "description": "A (logged) workout session"
+    },
+    "notes": "Notes",
+    "@notes": {
+        "description": "Personal notes, e.g. for a workout session"
+    },
+    "impression": "Impression",
+    "@impression": {
+        "description": "General impression (e.g. for a workout session) such as good, bad, etc."
+    },
+    "comment": "Commentaire",
+    "@comment": {
+        "description": "Comment, additional information"
+    },
+    "rir": "RsR",
+    "@rir": {
+        "description": "Shorthand for Repetitions In Reserve"
+    },
+    "repetitions": "Répetitions",
+    "@repetitions": {
+        "description": "Repetitions for an exercise set"
+    },
+    "addExercise": "Ajouter un exercice",
+    "@addExercise": {},
+    "exercise": "Exercice",
+    "@exercise": {
+        "description": "An exercise for a workout"
+    },
+    "successfullyDeleted": "Supprimé",
+    "@successfullyDeleted": {
+        "description": "Message when an item was successfully deleted"
+    },
+    "labelDashboard": "Accueil",
+    "@labelDashboard": {
+        "description": "Title for screen dashboard"
+    },
+    "labelWorkoutPlan": "Plan d’entraînement",
+    "@labelWorkoutPlan": {
+        "description": "Title for screen workout plan"
+    },
+    "registerInstead": "Vous n'avez pas de compte ? Inscrivez-vous maintenant",
+    "@registerInstead": {},
+    "loginInstead": "Déjà un compte ? Connectez-vous",
+    "@loginInstead": {},
+    "reset": "Réinitialiser",
+    "@reset": {
+        "description": "Button text allowing the user to reset the entered values to the default"
+    },
+    "useCustomServer": "Utiliser le serveur personnalisé",
+    "@useCustomServer": {
+        "description": "Toggle button allowing users to switch between the default and a custom wger server"
+    },
+    "customServerHint": "Entrez l’adresse de votre propre serveur, sinon le serveur par défaut sera utilisé",
+    "@customServerHint": {
+        "description": "Hint text for the form where the users can enter their own wger instance"
+    },
+    "customServerUrl": "URL de l’instance wger",
+    "@customServerUrl": {
+        "description": "Label in the form where the users can enter their own wger instance"
+    },
+    "invalidUsername": "Veuillez entrer un nom d’utilisateur valide",
+    "@invalidUsername": {
+        "description": "Error message when the user enters an invalid username"
+    },
+    "username": "Nom d’utilisateur",
+    "@username": {},
+    "email": "Adresse courriel",
+    "@email": {},
+    "invalidEmail": "Veuillez entrer une adresse courriel valide",
+    "@invalidEmail": {
+        "description": "Error message when the user enters an invalid email"
+    },
+    "confirmPassword": "Confirmer le mot de passe",
+    "@confirmPassword": {},
+    "password": "Mot de passe",
+    "@password": {},
+    "passwordTooShort": "Le mot de passe est trop court",
+    "@passwordTooShort": {
+        "description": "Error message when the user a password that is too short"
+    },
+    "passwordsDontMatch": "Les mots de passe sont différents",
+    "@passwordsDontMatch": {
+        "description": "Error message when the user enters two different passwords during registration"
+    },
+    "invalidUrl": "Veuillez entrer une URL valide",
+    "@invalidUrl": {
+        "description": "Error message when the user enters an invalid URL, e.g. in the login form"
+    },
+    "useDefaultServer": "Utiliser le serveur par défaut",
+    "@useDefaultServer": {
+        "description": "Toggle button allowing users to switch between the default and a custom wger server"
+    },
+    "register": "S’inscrire",
+    "@register": {
+        "description": "Text for registration button"
+    },
+    "login": "Se connecter",
+    "@login": {
+        "description": "Text for login button"
+    },
+    "set": "Série",
+    "@set": {
+        "description": "A set in a workout plan"
+    },
+    "repetitionUnit": "Unité des répétitions",
+    "@repetitionUnit": {},
+    "weightUnit": "Unité de poids",
+    "@weightUnit": {},
+    "reps": "Réps",
+    "@reps": {
+        "description": "Shorthand for repetitions, used when space constraints are tighter"
+    },
+    "nrOfSets": "Séries par exercice : {nrOfSets}",
+    "@nrOfSets": {
+        "description": "Label shown on the slider where the user selects the nr of sets",
+        "type": "text",
+        "placeholders": {
+            "nrOfSets": {
+                "type": "String"
+            }
+        }
+    },
+    "enterCharacters": "Veuillez saisir un nombre de caractères compris entre {min} et {max}",
+    "@enterCharacters": {
+        "description": "Error message when the user hasn't entered the correct number of characters in a form",
+        "type": "text",
+        "placeholders": {
+            "min": {
+                "type": "String"
+            },
+            "max": {
+                "type": "String"
+            }
+        }
+    },
+    "selectExercise": "Veuillez sélectionner un exercice",
+    "@selectExercise": {
+        "description": "Error message when the user hasn't selected an exercise in the form"
+    },
+    "aboutDescription": "Merci d’utiliser wger ! wger est un projet collaboratif à code source ouvert, réalisé par des passionnés de fitness du monde entier.",
+    "@aboutDescription": {
+        "description": "Text in the about dialog"
+    },
+    "start": "Démarrer",
+    "@start": {
+        "description": "Label on button to start the gym mode (i.e., an imperative)"
+    },
+    "logMeal": "Journaliser ce repas dans l'agenda",
+    "@logMeal": {},
+    "addSet": "Ajouter une série",
+    "@addSet": {
+        "description": "Label for the button that adds a set (to a workout day)"
+    },
+    "todaysWorkout": "Entraînement d’aujourd’hui",
+    "@todaysWorkout": {},
+    "selectExercises": "Si vous voulez faire une supersérie, vous pouvez rechercher plusieurs exercices, ils seront regroupés",
+    "@selectExercises": {},
+    "sameRepetitions": "Si vous faites les mêmes répétitions et le même poids pour toutes les séries, vous pouvez simplement remplir une ligne. Par exemple, pour 4 séries, il suffit d’entrer 10 pour les répétitions, ce qui devient automatiquement « 4 × 10 ».",
+    "@sameRepetitions": {},
+    "setNr": "Série {nr}",
+    "@setNr": {
+        "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.",
+        "type": "text",
+        "placeholders": {
+            "nr": {
+                "type": "String"
+            }
+        }
+    },
+    "dayDescriptionHelp": "Une description de ce qui est fait ce jour-ci (par exemple : « journée de tractions ») ou des parties du corps qui sont entraînées (par exemple : « poitrine et épaules »)",
+    "@dayDescriptionHelp": {},
+    "category": "Catégorie",
+    "@category": {
+        "description": "Category for an exercise, ingredient, etc."
+    },
+    "musclesSecondary": "Muscles secondaires",
+    "@musclesSecondary": {
+        "description": "secondary muscles trained by an exercise"
+    },
+    "muscles": "Muscles",
+    "@muscles": {
+        "description": "(main) muscles trained by an exercise"
+    },
+    "equipment": "Équippement",
+    "@equipment": {
+        "description": "Equipment needed to perform an exercise"
+    },
+    "successfullySaved": "Enregistré",
+    "@successfullySaved": {
+        "description": "Message when an item was successfully saved"
+    },
+    "labelWorkoutLogs": "Journaux d’entraînement",
+    "@labelWorkoutLogs": {
+        "description": "(Workout) logs"
+    },
+    "logout": "Se déconnecter",
+    "@logout": {
+        "description": "Text for logout button"
+    },
+    "addImage": "Ajouter une image",
+    "@addImage": {},
+    "gallery": "Galerie",
+    "@gallery": {},
+    "imageFormatNotSupported": "{imageFormat} non pris en charge",
+    "@imageFormatNotSupported": {
+        "description": "Label shown on the error container when image format is not supported",
+        "type": "text",
+        "placeholders": {
+            "imageFormat": {
+                "type": "String"
+            }
+        }
+    },
+    "imageFormatNotSupportedDetail": "{imageFormat} non pris en charge",
+    "@imageFormatNotSupportedDetail": {
+        "description": "Label shown on the image preview container when image format is not supported",
+        "type": "text",
+        "placeholders": {
+            "imageFormat": {
+                "type": "String"
+            }
+        }
+    },
+    "chooseFromLibrary": "Choisir depuis la bibliothèque",
+    "@chooseFromLibrary": {},
+    "takePicture": "Prendre une photo",
+    "@takePicture": {},
+    "selectImage": "Veuillez sélectionner une image",
+    "@selectImage": {
+        "description": "Label and error message when the user hasn't selected an image to save"
+    },
+    "name": "Nom",
+    "@name": {
+        "description": "Name for a workout or nutritional plan"
+    },
+    "optionsLabel": "Options",
+    "@optionsLabel": {
+        "description": "Label for the popup with general app options"
+    },
+    "setUnitsAndRir": "Définir les unités et RiR",
+    "@setUnitsAndRir": {
+        "description": "Label shown on the slider where the user can toggle showing units and RiR",
+        "type": "text"
+    },
+    "goToDetailPage": "Aller à la page de détails",
+    "@goToDetailPage": {},
+    "jumpTo": "Aller à",
+    "@jumpTo": {
+        "description": "Imperative. Label used in popup allowing the user to jump to a specific exercise while in the gym mode"
+    },
+    "pause": "Pause",
+    "@pause": {
+        "description": "Noun, not an imperative! Label used for the pause when using the gym mode"
+    },
+    "rirNotUsed": "RiR non utilisé",
+    "@rirNotUsed": {
+        "description": "Label used in RiR slider when the RiR value is not used/saved for the current setting or log"
+    },
+    "searchExercise": "Chercher des exos à ajouter",
+    "@searchExercise": {
+        "description": "Label on set form. Selected exercises are added to the set"
+    },
+    "labelBottomNavNutrition": "Nutrition",
+    "@labelBottomNavNutrition": {
+        "description": "Label used in bottom navigation, use a short word"
+    },
+    "labelBottomNavWorkout": "Entraînement",
+    "@labelBottomNavWorkout": {
+        "description": "Label used in bottom navigation, use a short word"
+    },
+    "usernameValidChars": "Un nom d'utilisateur ne peut contenir que des lettres, des chiffres et les caractères @, +, ., - et _",
+    "@usernameValidChars": {
+        "description": "Error message when the user tries to register a username with forbidden characters"
+    },
+    "timeStartAhead": "L'heure de début ne peut pas être après à l'heure de fin",
+    "@timeStartAhead": {},
+    "plateCalculatorNotDivisible": "Impossible d'atteindre le poids avec les disques disponibles",
+    "@plateCalculatorNotDivisible": {
+        "description": "Error message when the current weight is not reachable with plates (e.g. 33.1 kg)"
+    },
+    "plateCalculator": "Disques",
+    "@plateCalculator": {
+        "description": "Label used for the plate calculator in the gym mode"
+    },
+    "total": "Total",
+    "@total": {
+        "description": "Label used for total sums of e.g. calories or similar"
+    },
+    "gPerBodyKg": "g par kg corporel",
+    "@gPerBodyKg": {
+        "description": "Label used for total sums of e.g. calories or similar in grams per Kg of body weight"
+    },
+    "percentEnergy": "Pourcentage de l'énergie",
+    "@percentEnergy": {},
+    "difference": "Différence",
+    "@difference": {},
+    "logged": "Mangé",
+    "@logged": {
+        "description": "Header for the column of 'logged' nutritional values, i.e. what was eaten"
+    },
+    "planned": "Prévu",
+    "@planned": {
+        "description": "Header for the column of 'planned' nutritional values, i.e. what should be eaten"
+    },
+    "macronutrients": "Macronutriments",
+    "@macronutrients": {},
+    "value": "Valeur",
+    "@value": {
+        "description": "The value of a measurement entry"
+    },
+    "measurementEntriesHelpText": "L'unité utilisée pour mesurer la catégorie, comme cm ou %",
+    "@measurementEntriesHelpText": {},
+    "measurementCategoriesHelpText": "Catégorie de mesure, comme « biceps » ou « graisse corporelle »",
+    "@measurementCategoriesHelpText": {},
+    "measurements": "Mesures",
+    "@measurements": {
+        "description": "Categories for the measurements such as biceps size, body fat, etc."
+    },
+    "measurement": "Mesure",
+    "@measurement": {},
+    "dataCopied": "Données copiées dans la nouvelle entrée",
+    "@dataCopied": {
+        "description": "Snackbar message to show on copying data to a new log entry"
+    },
+    "carbohydratesShort": "Gl",
+    "@carbohydratesShort": {
+        "description": "The first letter or short name of the word 'Carbohydrates', used in overviews"
+    },
+    "fatShort": "Gr",
+    "@fatShort": {
+        "description": "The first letter or short name of the word 'Fat', used in overviews"
+    },
+    "energyShort": "E",
+    "@energyShort": {
+        "description": "The first letter or short name of the word 'Energy', used in overviews"
+    },
+    "proteinShort": "P",
+    "@proteinShort": {
+        "description": "The first letter or short name of the word 'Protein', used in overviews"
+    },
+    "appUpdateTitle": "Mise à jour nécessaire",
+    "@appUpdateTitle": {},
+    "appUpdateContent": "Cette version de l'application n'est pas compatible avec le serveur, veuillez mettre à jour votre application.",
+    "@appUpdateContent": {},
+    "recentlyUsedIngredients": "Ingrédients récemment ajoutés",
+    "@recentlyUsedIngredients": {
+        "description": "A message when a user adds a new ingredient to a meal."
+    },
+    "searchIngredient": "Rechercher un ingrédient",
+    "@searchIngredient": {
+        "description": "Label on ingredient search form"
+    },
+    "logIngredient": "Journaliser l'ingrédient dans l'agenda nutritionnel",
+    "@logIngredient": {},
+    "close": "Fermer",
+    "@close": {
+        "description": "Translation for close"
+    },
+    "productFound": "Produit trouvé",
+    "@productFound": {
+        "description": "Header label for dialog when product is found with barcode"
+    },
+    "weekAverage": "Moyenne sur 7 jours",
+    "@weekAverage": {
+        "description": "Header for the column of '7 day average' nutritional values, i.e. what was logged last week"
+    },
+    "success": "Succès",
+    "@success": {
+        "description": "Message when an action completed successfully, usually used as a heading"
+    },
+    "alternativeNames": "Noms alternatifs",
+    "@alternativeNames": {},
+    "oneNamePerLine": "Un nom par ligne",
+    "@oneNamePerLine": {},
+    "selectEntry": "Veuillez sélectionner une entrée",
+    "@selectEntry": {},
+    "variations": "Variantes",
+    "@variations": {
+        "description": "Variations of one exercise (e.g. benchpress and benchpress narrow)"
+    },
+    "productFoundDescription": "Le code-barres correspond à ce produit : {productName}. Voulez-vous continuer ?",
+    "@productFoundDescription": {
+        "description": "Dialog info when product is found with barcode",
+        "type": "text",
+        "placeholders": {
+            "productName": {
+                "type": "String"
+            }
+        }
+    },
+    "productNotFoundDescription": "Le produit dont le code-barres a été scanné {barcode} n'a pas été trouvé dans la base de données wger",
+    "@productNotFoundDescription": {
+        "description": "Dialog info when product is not found with barcode",
+        "type": "text",
+        "placeholders": {
+            "barcode": {
+                "type": "String"
+            }
+        }
+    },
+    "contributeExerciseWarning": "Vous ne pouvez contribuer aux exercices que si votre compte a plus de {days} jours et si vous avez vérifié votre adresse email",
+    "@contributeExerciseWarning": {
+        "description": "Number of days before which a person can add exercise",
+        "placeholders": {
+            "days": {
+                "type": "String",
+                "example": "14"
+            }
+        }
+    },
+    "back": "Dos",
+    "@back": {},
+    "enterMinCharacters": "Veuillez entrer au moins {min} caractères",
+    "@enterMinCharacters": {
+        "description": "Error message when the user hasn't entered the minimum amount characters in a form",
+        "type": "text",
+        "placeholders": {
+            "min": {
+                "type": "String"
+            }
+        }
+    },
+    "baseNameEnglish": "Tous les exercices doivent avoir un nom de base en anglais",
+    "@baseNameEnglish": {},
+    "productNotFound": "Produit non trouvé",
+    "@productNotFound": {
+        "description": "Header label for dialog when product is not found with barcode"
+    },
+    "scanBarcode": "Scanner le code barre",
+    "@scanBarcode": {
+        "description": "Label for scan barcode button"
+    },
+    "add_exercise_image_license": "Les images doivent être compatibles avec la licence CC BY SA. En cas de doute, ne téléchargez que des photos que vous avez prises vous-même.",
+    "@add_exercise_image_license": {},
+    "alsoKnownAs": "Aussi connu sous le nom de : {aliases}",
+    "@alsoKnownAs": {
+        "placeholders": {
+            "aliases": {
+                "type": "String"
+            }
+        },
+        "description": "List of alternative names for an exercise"
+    },
+    "verifiedEmailReason": "Vous devez vérifier votre adresse e-mail pour contribuer aux exercices",
+    "@verifiedEmailReason": {},
+    "verifiedEmailInfo": "Un email de vérification a été envoyé à {email}",
+    "@verifiedEmailInfo": {
+        "placeholders": {
+            "email": {
+                "type": "String"
+            }
+        }
+    },
+    "whatVariationsExist": "Quelles sont les variantes de cet exercice, s'il en existe ?",
+    "@whatVariationsExist": {},
+    "previous": "Précédent",
+    "@previous": {},
+    "next": "Suivant",
+    "@next": {},
+    "images": "Photos",
+    "@images": {},
+    "language": "Langues",
+    "@language": {},
+    "contributeExercise": "Contribuer à un exercice",
+    "@contributeExercise": {},
+    "translation": "Traduction",
+    "@translation": {},
+    "translateExercise": "Traduire cet exercice maintenant",
+    "@translateExercise": {},
+    "baseData": "Les bases en anglais",
+    "@baseData": {
+        "description": "The base data for an exercise such as category, trained muscles, etc."
+    },
+    "bench": "Banc",
+    "@bench": {},
+    "glutes": "Fessiers",
+    "@glutes": {},
+    "kilometers": "Kilomètres",
+    "@kilometers": {},
+    "barbell": "Barre",
+    "@barbell": {},
+    "lower_back": "Bas du dos",
+    "@lower_back": {},
+    "swiss_ball": "Ballon de gymnastique",
+    "@swiss_ball": {},
+    "triceps": "Triceps",
+    "@triceps": {},
+    "none__bodyweight_exercise_": "aucun (exercice au poids du corps)",
+    "@none__bodyweight_exercise_": {},
+    "biceps": "Biceps",
+    "@biceps": {},
+    "chest": "Poitrine",
+    "@chest": {},
+    "kettlebell": "Kettlebell",
+    "@kettlebell": {},
+    "abs": "Abdos",
+    "@abs": {},
+    "dumbbell": "Haltères",
+    "@dumbbell": {},
+    "gym_mat": "Tapis de gymnastique",
+    "@gym_mat": {},
+    "incline_bench": "Banc incliné",
+    "@incline_bench": {},
+    "lats": "Grand dorsal",
+    "@lats": {},
+    "miles": "Miles",
+    "@miles": {},
+    "legs": "Jambes",
+    "@legs": {},
+    "quads": "Quadriceps",
+    "@quads": {},
+    "noMeasurementEntries": "Vous n'avez pas d'entrées de mesure",
+    "@noMeasurementEntries": {},
+    "aboutPageTitle": "À propos de nous et assistance",
+    "@aboutPageTitle": {},
+    "userProfile": "Votre profil",
+    "@userProfile": {},
+    "exerciseList": "Liste d'exercices",
+    "@exerciseList": {},
+    "exercises": "Exercices",
+    "@exercises": {
+        "description": "Multiple exercises for a workout"
+    },
+    "exerciseName": "Nom de l'exercice",
+    "@exerciseName": {
+        "description": "Label for the name of a workout exercise"
+    },
+    "arms": "Bras",
+    "@arms": {},
+    "sz_bar": "Barre EZ",
+    "@sz_bar": {},
+    "moreMeasurementEntries": "Ajouter une mesure",
+    "@moreMeasurementEntries": {
+        "description": "Message shown when the user wants to add new measurement"
+    },
+    "hamstrings": "Ischio-jambiers",
+    "@hamstrings": {},
+    "pull_up_bar": "Barre de traction",
+    "@pull_up_bar": {},
+    "shoulders": "Epaules",
+    "@shoulders": {},
+    "calves": "Mollets",
+    "@calves": {},
+    "verifiedEmail": "Email vérifié",
+    "@verifiedEmail": {},
+    "unVerifiedEmail": "Email non vérifié",
+    "@unVerifiedEmail": {},
+    "cacheWarning": "En raison de la mise en cache, il peut s'écouler un certain temps avant que les changements soient visibles dans toute l'application.",
+    "@cacheWarning": {},
+    "cardio": "Cardio",
+    "@cardio": {},
+    "minutes": "Minutes",
+    "@minutes": {},
+    "seconds": "Secondes",
+    "@seconds": {},
+    "until_failure": "Jusqu'à l'échec",
+    "@until_failure": {},
+    "textPromptTitle": "Prêt à commencer ?",
+    "@textPromptTitle": {},
+    "textPromptSubheading": "Cliquez sur le bouton pour commencer",
+    "@textPromptSubheading": {},
+    "body_weight": "Poids corporel",
+    "@body_weight": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "kilometers_per_hour": "Kilomètres Par Heure",
+    "@kilometers_per_hour": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "miles_per_hour": "Miles Par Heure",
+    "@miles_per_hour": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "plates": "Disques de poids",
+    "@plates": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "kg": "kg",
+    "@kg": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "lb": "lb",
+    "@lb": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "searchNamesInEnglish": "Recherchez également des noms en anglais",
+    "@searchNamesInEnglish": {},
+    "max_reps": "Reps Maxi",
+    "@max_reps": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "verify": "Vérifier",
+    "@verify": {},
+    "noMatchingExerciseFound": "Aucun exercice correspondant n'a été trouvé",
+    "@noMatchingExerciseFound": {
+        "description": "Message returned if no exercises match the searched string"
+    },
+    "today": "Aujourd'hui",
+    "@today": {},
+    "useMetric": "Utiliser le système métrique pour le poids du corps",
+    "@useMetric": {},
+    "onlyLogging": "Suivre uniquement les calories",
+    "@onlyLogging": {},
+    "onlyLoggingHelpText": "Cochez la case si vous souhaitez uniquement enregistrer vos calories et ne souhaitez pas établir un plan nutritionnel détaillé avec des repas spécifiques",
+    "@onlyLoggingHelpText": {},
+    "aboutMastodonTitle": "Mastodon",
+    "@aboutMastodonTitle": {},
+    "aboutDonateTitle": "Faire un don",
+    "@aboutDonateTitle": {},
+    "goalEnergy": "Objectif énergétique",
+    "@goalEnergy": {},
+    "loggedToday": "Journalisé aujourd'hui",
+    "@loggedToday": {},
+    "kcalValue": "{value} kcal",
+    "@kcalValue": {
+        "description": "A value in kcal, e.g. 500 kcal",
+        "type": "text",
+        "placeholders": {
+            "value": {
+                "type": "String"
+            }
+        }
+    },
+    "gValue": "{value} g",
+    "@gValue": {
+        "description": "A value in grams, e.g. 5 g",
+        "type": "text",
+        "placeholders": {
+            "value": {
+                "type": "String"
+            }
+        }
+    },
+    "percentValue": "{value} %",
+    "@percentValue": {
+        "description": "A value in percent, e.g. 10 %",
+        "type": "text",
+        "placeholders": {
+            "value": {
+                "type": "String"
+            }
+        }
+    },
+    "noIngredientsDefined": "Aucun ingrédient défini pour le moment",
+    "@noIngredientsDefined": {},
+    "ingredientLogged": "Ingrédient journalisé dans l'agenda",
+    "@ingredientLogged": {},
+    "goalMacro": "Objectif de macronutriments",
+    "@goalMacro": {
+        "description": "The goal for macronutrients"
+    },
+    "selectMealToLog": "Sélectionner un repas à journaliser dans l'agenda",
+    "@selectMealToLog": {},
+    "goalCarbohydrates": "Objectif glucides",
+    "@goalCarbohydrates": {},
+    "goalProtein": "Objectif protéines",
+    "@goalProtein": {},
+    "goalFat": "Objectif gras",
+    "@goalFat": {},
+    "goalFiber": "Objectif fibre",
+    "@goalFiber": {},
+    "surplus": "surplus",
+    "@surplus": {
+        "description": "Caloric surplus (either planned or unplanned)"
+    },
+    "deficit": "déficit",
+    "@deficit": {
+        "description": "Caloric deficit (either planned or unplanned)"
+    },
+    "aboutDonateText": "Si le projet est gratuit et le restera, l'exploitation du serveur ne l'est pas ! Le développement requiert également beaucoup de temps et d'efforts de la part des bénévoles. Votre contribution finance directement ces coûts et contribue à la fiabilité du service.",
+    "@aboutDonateText": {},
+    "settingsTitle": "Paramètres",
+    "@settingsTitle": {},
+    "settingsCacheTitle": "Cache",
+    "@settingsCacheTitle": {},
+    "settingsExerciseCacheDescription": "Cache d'exercices",
+    "@settingsExerciseCacheDescription": {},
+    "settingsCacheDeletedSnackbar": "Cache nettoyé avec succès",
+    "@settingsCacheDeletedSnackbar": {},
+    "log": "Journaliser",
+    "@log": {
+        "description": "Log a specific meal (imperative form)"
+    },
+    "done": "Fait",
+    "@done": {},
+    "lightMode": "Mode clair permanent",
+    "@lightMode": {},
+    "darkMode": "Mode sombre permanent",
+    "@darkMode": {},
+    "systemMode": "Paramètres du système",
+    "@systemMode": {},
+    "chart30DaysTitle": "{name} les 30 derniers jours",
+    "@chart30DaysTitle": {
+        "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
+        "type": "text",
+        "placeholders": {
+            "name": {
+                "type": "String"
+            }
+        }
+    },
+    "chartAllTimeTitle": "{name} depuis le début",
+    "@chartAllTimeTitle": {
+        "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
+        "type": "text",
+        "placeholders": {
+            "name": {
+                "type": "String"
+            }
+        }
+    },
+    "selectAvailablePlates": "Sélectionnez les poids disponibles",
+    "@selectAvailablePlates": {},
+    "barWeight": "Poids de la barre",
+    "@barWeight": {},
+    "useColors": "Utiliser des couleurs",
+    "@useColors": {},
+    "newRoutine": "Nouvelle routine",
+    "@newRoutine": {},
+    "noRoutines": "Vous n’avez aucune de routine",
+    "@noRoutines": {},
+    "useUsernameAndPassword": "Utiliser le nom d’utilisateur et mot de passe",
+    "@useUsernameAndPassword": {},
+    "routines": "Routines",
+    "@routines": {},
+    "restTime": "Temps de repos",
+    "@restTime": {},
+    "restDay": "Jour de repos",
+    "@restDay": {},
+    "isRestDay": "Est un jour de repos",
+    "@isRestDay": {},
+    "supersetNr": "Supersérie {nr}",
+    "@supersetNr": {
+        "description": "Header in form indicating the number of the current exercise. Can also be translated as something like 'Superset Nr. xy'.",
+        "type": "text",
+        "placeholders": {
+            "nr": {
+                "type": "String"
+            }
+        }
+    },
+    "apiToken": "Jeton API",
+    "@apiToken": {},
+    "routineDays": "Jours de routine",
+    "@routineDays": {},
+    "resultingRoutine": "Routine résultante",
+    "@resultingRoutine": {},
+    "errorInfoDescription": "Nous sommes désolés, mais quelque chose s'est mal passé. Vous pouvez nous aider à résoudre ce problème en le signalant sur GitHub.",
+    "@errorInfoDescription": {},
+    "errorInfoDescription2": "Vous pouvez continuer à utiliser l'application, mais certaines fonctions risquent de ne pas fonctionner.",
+    "@errorInfoDescription2": {},
+    "errorViewDetails": "Détails techniques",
+    "@errorViewDetails": {},
+    "aboutDiscordTitle": "Discord",
+    "@aboutDiscordTitle": {},
+    "others": "Autres",
+    "@others": {},
+    "aboutJoinCommunityTitle": "Rejoindre la communauté",
+    "@aboutJoinCommunityTitle": {},
+    "indicatorAvg": "moy",
+    "@indicatorAvg": {
+        "description": "added for localization of Class Indicator's field text"
+    },
+    "resistance_band": "Bande de résistance",
+    "@resistance_band": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "overallChangeWeight": "Changement global",
+    "@overallChangeWeight": {
+        "description": "Overall change in weight, added for localization"
+    },
+    "needsLogsToAdvanceHelp": "Sélectionnez si vous souhaitez que la routine passe au jour programmé suivant uniquement si vous avez enregistré une séance d'entraînement pour la journée",
+    "@needsLogsToAdvanceHelp": {},
+    "min": "Min",
+    "@min": {},
+    "themeMode": "Thème",
+    "@themeMode": {},
+    "chartDuringPlanTitle": "{chartName} pendant le plan nutritionnel {planName}",
+    "@chartDuringPlanTitle": {
+        "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
+        "type": "text",
+        "placeholders": {
+            "chartName": {
+                "type": "String"
+            },
+            "planName": {
+                "type": "String"
+            }
+        }
+    },
+    "fitInWeek": "Ajouter à la semaine",
+    "@fitInWeek": {},
+    "addSuperset": "Ajouter une supersérie",
+    "@addSuperset": {},
+    "useApiToken": "Utiliser un jeton API",
+    "@useApiToken": {},
+    "apiTokenValidChars": "Une clé API ne peut contenir que les lettres a-f, les chiffres 0-9 et 40 caractères exactement",
+    "@apiTokenValidChars": {
+        "description": "Error message when the user tries to input a API key with forbidden characters"
+    },
+    "invalidApiToken": "Veuillez saisir une clé API valide",
+    "@invalidApiToken": {
+        "description": "Error message when the user enters an invalid API key"
+    },
+    "exerciseNr": "Exercice {nr}",
+    "@exerciseNr": {
+        "description": "Header in form indicating the number of the current exercise. Can also be translated as something like 'Set Nr. xy'.",
+        "type": "text",
+        "placeholders": {
+            "nr": {
+                "type": "String"
+            }
+        }
+    },
+    "sets": "Séries",
+    "@sets": {
+        "description": "The number of sets to be done for one exercise"
+    },
+    "isRestDayHelp": "Veuillez noter que toutes les séries et tous les exercices seront supprimés lorsque vous marquerez un jour comme jour de repos.",
+    "@isRestDayHelp": {},
+    "needsLogsToAdvance": "Nécessite des journaux pour avancer",
+    "@needsLogsToAdvance": {},
+    "errorCouldNotConnectToServer": "Impossible de se connecter au serveur",
+    "@errorCouldNotConnectToServer": {},
+    "errorCouldNotConnectToServerDetails": "L'application n'a pas pu se connecter au serveur. Veuillez vérifier votre connexion internet ou l'URL du serveur et réessayer. Si le problème persiste, contactez l'administrateur du serveur.",
+    "@errorCouldNotConnectToServerDetails": {},
+    "copyToClipboard": "Copier dans le presse-papiers",
+    "@copyToClipboard": {},
+    "max": "Max",
+    "@max": {},
+    "aboutWhySupportTitle": "Open Source et gratuit ❤️",
+    "@aboutWhySupportTitle": {},
+    "aboutContributeText": "Toutes les contributions sont les bienvenues. Que vous soyez développeur, traducteur ou simplement passionné de fitness, chaque contribution est appréciée !",
+    "@aboutContributeText": {},
+    "aboutBugsListTitle": "Signaler un problème ou suggérer une fonctionnalité",
+    "@aboutBugsListTitle": {},
+    "aboutTranslationListTitle": "Traduire l'application",
+    "@aboutTranslationListTitle": {},
+    "aboutSourceListTitle": "Voir le code source",
+    "@aboutSourceListTitle": {},
+    "fitInWeekHelp": "Si cette option est activée, les jours se répéteront selon un cycle hebdomadaire, sinon les jours se suivront séquentiellement sans tenir compte du début d'une nouvelle semaine.",
+    "@fitInWeekHelp": {},
+    "yourCurrentNutritionPlanHasNoMealsDefinedYet": "Votre plan nutritionnel actuel ne comporte pas de repas définis",
+    "@yourCurrentNutritionPlanHasNoMealsDefinedYet": {
+        "description": "Message shown when a nutrition plan doesn't have any meals"
+    },
+    "toAddMealsToThePlanGoToNutritionalPlanDetails": "Pour ajouter des repas au plan, allez dans les détails du plan nutritionnel",
+    "@toAddMealsToThePlanGoToNutritionalPlanDetails": {
+        "description": "Message shown to guide users to the nutritional plan details page to add meals"
+    },
+    "setHasProgression": "La série a une progression",
+    "@setHasProgression": {},
+    "aboutContributeTitle": "Contribuer",
+    "@aboutContributeTitle": {},
+    "setHasProgressionWarning": "Veuillez noter qu'il n'est actuellement pas possible de modifier tous les paramètres d'une série sur l'application mobile ni de configurer la progression automatique. Pour l'instant, veuillez utiliser l'application web.",
+    "@setHasProgressionWarning": {},
+    "setHasNoExercises": "Cette série n'a pas encore d'exercices !",
+    "@setHasNoExercises": {},
+    "settingsIngredientCacheDescription": "Cache d'ingrédients",
+    "@settingsIngredientCacheDescription": {},
+    "simpleMode": "Mode simple",
+    "@simpleMode": {},
+    "simpleModeHelp": "Masquer certains des paramètres les plus avancés lors de l'édition des exercices",
+    "@simpleModeHelp": {},
+    "progressionRules": "Cet exercice a des règles de progression et ne peut pas être édité sur l'application mobile. Veuillez utiliser l'application web pour éditer cet exercice.",
+    "@progressionRules": {},
+    "goalTypeMeals": "Des repas",
+    "@goalTypeMeals": {
+        "description": "added for localization of Class GoalType's filed meals"
+    },
+    "goalTypeBasic": "Basique",
+    "@goalTypeBasic": {
+        "description": "added for localization of Class GoalType's filed basic"
+    },
+    "goalTypeAdvanced": "Avancé",
+    "@goalTypeAdvanced": {
+        "description": "added for localization of Class GoalType's filed advanced"
+    },
+    "indicatorRaw": "brut",
+    "@indicatorRaw": {
+        "description": "added for localization of Class Indicator's field text"
+    },
+    "endDate": "Date de fin",
+    "@endDate": {},
+    "startDate": "Date de début",
+    "@startDate": {}
 }
diff --git a/lib/l10n/app_he.arb b/lib/l10n/app_he.arb
index 73485f55..84233651 100644
--- a/lib/l10n/app_he.arb
+++ b/lib/l10n/app_he.arb
@@ -45,19 +45,19 @@
   "@customServerHint": {
     "description": "Hint text for the form where the users can enter their own wger instance"
   },
-  "labelWorkoutLogs": "יומני אימון",
+  "labelWorkoutLogs": "אימונים מתועדים",
   "@labelWorkoutLogs": {
     "description": "(Workout) logs"
   },
-  "labelWorkoutPlan": "תוכנית כושר",
+  "labelWorkoutPlan": "תוכנית אימונים",
   "@labelWorkoutPlan": {
     "description": "Title for screen workout plan"
   },
-  "labelDashboard": "לוח פעולות",
+  "labelDashboard": "לוח בקרה",
   "@labelDashboard": {
     "description": "Title for screen dashboard"
   },
-  "successfullyDeleted": "נמחק",
+  "successfullyDeleted": "המחיקה בוצעה",
   "@successfullyDeleted": {
     "description": "Message when an item was successfully deleted"
   },
@@ -65,18 +65,14 @@
   "@successfullySaved": {
     "description": "Message when an item was successfully saved"
   },
-  "exercise": "תרגיל כושר",
+  "exercise": "תרגיל",
   "@exercise": {
     "description": "An exercise for a workout"
   },
-  "searchExercise": "חיפוש תרגיל כושר להוספה",
+  "searchExercise": "חיפוש תרגילים להוספה",
   "@searchExercise": {
     "description": "Label on set form. Selected exercises are added to the set"
   },
-  "supersetWith": "סט תרגילים ראשי עם",
-  "@supersetWith": {
-    "description": "Text used between exercise cards when adding a new set. Translate as something like 'in a superset with'"
-  },
   "muscles": "שרירים",
   "@muscles": {
     "description": "(main) muscles trained by an exercise"
@@ -89,14 +85,6 @@
   "@category": {
     "description": "Category for an exercise, ingredient, etc."
   },
-  "newWorkout": "תוכנית כושר חדשה",
-  "@newWorkout": {
-    "description": "Header when adding a new workout"
-  },
-  "noWorkoutPlans": "אין לך תוכניות כושר",
-  "@noWorkoutPlans": {
-    "description": "Message shown when the user has no workout plans"
-  },
   "repetitions": "חזרות",
   "@repetitions": {
     "description": "Repetitions for an exercise set"
@@ -128,7 +116,9 @@
     "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.",
     "type": "text",
     "placeholders": {
-      "nr": {}
+      "nr": {
+        "type": "String"
+      }
     }
   },
   "impression": "התרשמות",
@@ -139,7 +129,7 @@
   "@notes": {
     "description": "Personal notes, e.g. for a workout session"
   },
-  "workoutSession": "אימון",
+  "workoutSession": "סשן אימונים",
   "@workoutSession": {
     "description": "A (logged) workout session"
   },
@@ -175,7 +165,7 @@
   "@mealLogged": {},
   "addIngredient": "הוספת מרכיב",
   "@addIngredient": {},
-  "nutritionalPlan": "תוכנית תזונה",
+  "nutritionalPlan": "תכנון תזונתי",
   "@nutritionalPlan": {},
   "nutritionalDiary": "יומן תזונה",
   "@nutritionalDiary": {},
@@ -209,7 +199,7 @@
   "@value": {
     "description": "The value of a measurement entry"
   },
-  "start": "התחל",
+  "start": "התחלה",
   "@start": {
     "description": "Label on button to start the gym mode (i.e., an imperative)"
   },
@@ -233,7 +223,7 @@
   "@energy": {
     "description": "Energy in a meal, ingredient etc. e.g. in kJ"
   },
-  "logMeal": "רשום את הארוחה הזאת",
+  "logMeal": "תיעוד המנה ביומן התזונתי",
   "@logMeal": {},
   "logHelpEntriesUnits": "שים לב שרק רשומות עם יחידת משקל (ק\"ג או ליברות) וחזרות הן ממופות, ישנה התעלמות משילובים אחרים כגון זמן או עד כשלון.",
   "@logHelpEntriesUnits": {},
@@ -253,7 +243,7 @@
   "@difference": {},
   "percentEnergy": "אחוז של אנרגיה",
   "@percentEnergy": {},
-  "total": "סה\"כ",
+  "total": "סה״כ",
   "@total": {
     "description": "Label used for total sums of e.g. calories or similar"
   },
@@ -283,7 +273,7 @@
   "@amount": {
     "description": "The amount (e.g. in grams) of an ingredient in a meal"
   },
-  "unit": "יחידה",
+  "unit": "יחידת מידה",
   "@unit": {
     "description": "The unit used for a repetition (kg, time, etc.)"
   },
@@ -304,7 +294,9 @@
     "description": "Confirmation text before the user deletes an object",
     "type": "text",
     "placeholders": {
-      "toDelete": {}
+      "toDelete": {
+        "type": "String"
+      }
     }
   },
   "newNutritionalPlan": "תוכנית תזונה חדשה",
@@ -315,18 +307,6 @@
   },
   "goToDetailPage": "עבור לדף פירוט",
   "@goToDetailPage": {},
-  "aboutSourceTitle": "קוד מקור",
-  "@aboutSourceTitle": {
-    "description": "Title for source code section in the about dialog"
-  },
-  "aboutContactUsTitle": "אמור שלום!",
-  "@aboutContactUsTitle": {
-    "description": "Title for contact us section in the about dialog"
-  },
-  "aboutTranslationTitle": "תרגום",
-  "@aboutTranslationTitle": {
-    "description": "Title for translation section in the about dialog"
-  },
   "calendar": "לוח שנה",
   "@calendar": {},
   "goToToday": "עבור להיום",
@@ -337,24 +317,16 @@
   "@enterValue": {
     "description": "Error message when the user hasn't entered a value on a required field"
   },
-  "aboutSourceText": "לקבלת קוד המקור של אפליקציה זאת והשרת שלה בגיטהאב",
-  "@aboutSourceText": {
-    "description": "Text for source code section in the about dialog"
-  },
-  "enterRepetitionsOrWeight": "אנא מלאו את החזרות או את המשקל בלפחות אחד מהסטים",
-  "@enterRepetitionsOrWeight": {
-    "description": "Error message when the user hasn't filled in the forms for exercise sets"
-  },
   "setUnitsAndRir": "יחידות סט וחזרות בעתודה",
   "@setUnitsAndRir": {
     "description": "Label shown on the slider where the user can toggle showing units and RiR",
     "type": "text"
   },
-  "reset": "אתחול",
+  "reset": "איפוס",
   "@reset": {
     "description": "Button text allowing the user to reset the entered values to the default"
   },
-  "loginInstead": "הכנס במקום",
+  "loginInstead": "כבר יש לך חשבון? ניתן להיכנס",
   "@loginInstead": {},
   "selectExercise": "אנא בחר/י אימון",
   "@selectExercise": {
@@ -365,8 +337,12 @@
     "description": "Error message when the user hasn't entered the correct number of characters in a form",
     "type": "text",
     "placeholders": {
-      "min": {},
-      "max": {}
+      "min": {
+        "type": "String"
+      },
+      "max": {
+        "type": "String"
+      }
     }
   },
   "nrOfSets": "כמות סטים לאימון: {nrOfSets}",
@@ -374,7 +350,9 @@
     "description": "Label shown on the slider where the user selects the nr of sets",
     "type": "text",
     "placeholders": {
-      "nrOfSets": {}
+      "nrOfSets": {
+        "type": "String"
+      }
     }
   },
   "enterValidNumber": "אנא הכנס מספר תקין",
@@ -401,7 +379,7 @@
   "@gallery": {},
   "addImage": "הוסף תמונה",
   "@addImage": {},
-  "email": "כתובת מייל",
+  "email": "כתובת דואר אלקטרוני",
   "@email": {},
   "username": "שם משתמש",
   "@username": {},
@@ -421,17 +399,13 @@
   "@passwordsDontMatch": {
     "description": "Error message when the user enters two different passwords during registration"
   },
-  "invalidEmail": "אנא הכנס/י כתובת מייל תקינה",
+  "invalidEmail": "נא להקליד כתובת דואר אלקטרוני תקינה",
   "@invalidEmail": {
     "description": "Error message when the user enters an invalid email"
   },
   "registerInstead": "אין לך חשבון? הירשם עכשיו",
   "@registerInstead": {},
-  "labelWorkoutPlans": "תוכניות כושר",
-  "@labelWorkoutPlans": {
-    "description": "Title for screen workout plans"
-  },
-  "labelBottomNavWorkout": "כושר",
+  "labelBottomNavWorkout": "אימון",
   "@labelBottomNavWorkout": {
     "description": "Label used in bottom navigation, use a short word"
   },
@@ -463,10 +437,6 @@
   "@loadingText": {
     "description": "Text to show when entries are being loaded in the background: Loading..."
   },
-  "aboutBugsTitle": "נתקלת בבעיה או יש לך רעיון?",
-  "@aboutBugsTitle": {
-    "description": "Title for bugs section in the about dialog"
-  },
   "aboutDescription": "תודה לך על השימוש בווגר! ווגר הוא פרויקט קוד פתוח שנעשה על ידי אוהבי כושר מרחבי העולם.",
   "@aboutDescription": {
     "description": "Text in the about dialog"
@@ -475,21 +445,9 @@
   "@selectExercises": {},
   "logHelpEntries": "אם ביום אחד ישנה יותר מרשומה אחת עם אותה כמות חזרות, אבל משקל שונה, רק הרשומה עם המשקל הגבוה יותר תופיע בדיאגרמה.",
   "@logHelpEntries": {},
-  "aboutBugsText": "צרו קשר אם משהו לא מתנהג כצפוי או אם יש תכונה שאתם מרגישים בחוסרה.",
-  "@aboutBugsText": {
-    "description": "Text for bugs section in the about dialog"
-  },
-  "aboutTranslationText": "האפליקציה הזאת מתורגמת ב-weblate. אם גם אתם רוצים לעזור, לחצו על הקישור ותתחילו לתרגם",
-  "@aboutTranslationText": {
-    "description": "Text for translation section in the about dialog"
-  },
-  "aboutContactUsText": "אם אתם רוצים לדבר עמנו, אתם מוזמנים לגשת לשרת הדיסקורד וליצור עמנו קשר שם",
-  "@aboutContactUsText": {
-    "description": "Text for contact us section in the about dialog"
-  },
-  "searchNamesInEnglish": "חפש גם לפי שמות באנגלית",
+  "searchNamesInEnglish": "לחפש גם לפי השמות באנגלית",
   "@searchNamesInEnglish": {},
-  "success": "מוצלח",
+  "success": "הפעולה צלחה",
   "@success": {
     "description": "Message when an action completed successfully, usually used as a heading"
   },
@@ -508,5 +466,501 @@
   "noMatchingExerciseFound": "לא נמצאו תרגילים תואמים",
   "@noMatchingExerciseFound": {
     "description": "Message returned if no exercises match the searched string"
+  },
+  "useColors": "שימוש בצבעים",
+  "@useColors": {},
+  "useApiToken": "שימוש באסימון API",
+  "@useApiToken": {},
+  "useUsernameAndPassword": "שימוש בשם משתמש וסיסמה",
+  "@useUsernameAndPassword": {},
+  "apiToken": "אסימון API",
+  "@apiToken": {},
+  "invalidApiToken": "נא להקליד אסימון API תקין",
+  "@invalidApiToken": {
+    "description": "Error message when the user enters an invalid API key"
+  },
+  "routines": "שגרות",
+  "@routines": {},
+  "newRoutine": "שגרה חדשה",
+  "@newRoutine": {},
+  "noRoutines": "אין לך שגרות",
+  "@noRoutines": {},
+  "restDay": "יום מנוחה",
+  "@restDay": {},
+  "isRestDay": "הוא יום מנוחה",
+  "@isRestDay": {},
+  "routineDays": "ימים בשגרה",
+  "@routineDays": {},
+  "verify": "אימות",
+  "@verify": {},
+  "searchIngredient": "חיפוש מרכיב",
+  "@searchIngredient": {
+    "description": "Label on ingredient search form"
+  },
+  "onlyLogging": "מעקב אחר קלוריות בלבד",
+  "@onlyLogging": {},
+  "goalMacro": "מטרות מזעריות",
+  "@goalMacro": {
+    "description": "The goal for macronutrients"
+  },
+  "goalEnergy": "יעד אנרגיה",
+  "@goalEnergy": {},
+  "goalProtein": "יעד חלבונים",
+  "@goalProtein": {},
+  "goalFat": "יעד שומנים",
+  "@goalFat": {},
+  "goalFiber": "יעד סיבים תזונתיים",
+  "@goalFiber": {},
+  "errorViewDetails": "פרטים טכניים",
+  "@errorViewDetails": {},
+  "errorCouldNotConnectToServer": "לא היה ניתן להתחבר לשרת",
+  "@errorCouldNotConnectToServer": {},
+  "min": "מינ׳",
+  "@min": {},
+  "max": "מקס׳",
+  "@max": {},
+  "today": "היום",
+  "@today": {},
+  "weekAverage": "ממוצע שבועי",
+  "@weekAverage": {
+    "description": "Header for the column of '7 day average' nutritional values, i.e. what was logged last week"
+  },
+  "kcalValue": "{value} ק׳ קלוריות",
+  "@kcalValue": {
+    "description": "A value in kcal, e.g. 500 kcal",
+    "type": "text",
+    "placeholders": {
+      "value": {
+        "type": "String"
+      }
+    }
+  },
+  "gValue": "{value} גר׳",
+  "@gValue": {
+    "description": "A value in grams, e.g. 5 g",
+    "type": "text",
+    "placeholders": {
+      "value": {
+        "type": "String"
+      }
+    }
+  },
+  "percentValue": "{value}%",
+  "@percentValue": {
+    "description": "A value in percent, e.g. 10 %",
+    "type": "text",
+    "placeholders": {
+      "value": {
+        "type": "String"
+      }
+    }
+  },
+  "aboutWhySupportTitle": "תוכנה בקוד פתוח, וחופשית לשימוש ❤️",
+  "@aboutWhySupportTitle": {},
+  "aboutDonateTitle": "תרומה כספית",
+  "@aboutDonateTitle": {},
+  "aboutContributeTitle": "התנדבות",
+  "@aboutContributeTitle": {},
+  "aboutTranslationListTitle": "עזרה בתרגום היישום",
+  "@aboutTranslationListTitle": {},
+  "aboutSourceListTitle": "צפייה בקוד המקור",
+  "@aboutSourceListTitle": {},
+  "aboutJoinCommunityTitle": "הצטרפות לקהילה",
+  "@aboutJoinCommunityTitle": {},
+  "others": "אחרים",
+  "@others": {},
+  "selectEntry": "נא לבחור ערך",
+  "@selectEntry": {},
+  "recentlyUsedIngredients": "מרכיבים שנוספו לאחרונה",
+  "@recentlyUsedIngredients": {
+    "description": "A message when a user adds a new ingredient to a meal."
+  },
+  "appUpdateTitle": "צריך לעדכן",
+  "@appUpdateTitle": {},
+  "appUpdateContent": "גרסה זו של היישום אינה מסוגלת להתחבר לשרת, נא לעדכן את היישום.",
+  "@appUpdateContent": {},
+  "productFound": "המוצר נמצא",
+  "@productFound": {
+    "description": "Header label for dialog when product is found with barcode"
+  },
+  "productNotFound": "המוצר לא נמצא",
+  "@productNotFound": {
+    "description": "Header label for dialog when product is not found with barcode"
+  },
+  "scanBarcode": "סריקת ברקוד",
+  "@scanBarcode": {
+    "description": "Label for scan barcode button"
+  },
+  "close": "סגירה",
+  "@close": {
+    "description": "Translation for close"
+  },
+  "alsoKnownAs": "מוכר גם בתור: {aliases}",
+  "@alsoKnownAs": {
+    "placeholders": {
+      "aliases": {
+        "type": "String"
+      }
+    },
+    "description": "List of alternative names for an exercise"
+  },
+  "alternativeNames": "שמות חלופיים",
+  "@alternativeNames": {},
+  "previous": "הקודם",
+  "@previous": {},
+  "next": "הבא",
+  "@next": {},
+  "images": "תמונות",
+  "@images": {},
+  "language": "שפה",
+  "@language": {},
+  "addExercise": "הוספת תרגיל",
+  "@addExercise": {},
+  "translation": "תרגום",
+  "@translation": {},
+  "translateExercise": "לתרגם את התרגיל הזה כעת",
+  "@translateExercise": {},
+  "settingsTitle": "הגדרות",
+  "@settingsTitle": {},
+  "settingsCacheTitle": "מטמון",
+  "@settingsCacheTitle": {},
+  "settingsExerciseCacheDescription": "מטמון תרגילים",
+  "@settingsExerciseCacheDescription": {},
+  "aboutPageTitle": "מידע כללי ותמיכה",
+  "@aboutPageTitle": {},
+  "simpleMode": "מצב פשוט",
+  "@simpleMode": {},
+  "arms": "זרועות",
+  "@arms": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "back": "גב",
+  "@back": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "biceps": "שרירי הקיבורת (דו־ראשיים)",
+  "@biceps": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "body_weight": "משקל הגוף",
+  "@body_weight": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "cardio": "סיבולת",
+  "@cardio": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "chest": "חזה",
+  "@chest": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "gym_mat": "שטיח אימונים",
+  "@gym_mat": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "kilometers": "קילומטרים",
+  "@kilometers": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "kilometers_per_hour": "קילומטרים לשעה",
+  "@kilometers_per_hour": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "miles": "מילים",
+  "@miles": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "miles_per_hour": "מילים לשעה",
+  "@miles_per_hour": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "minutes": "דקות",
+  "@minutes": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "resistance_band": "רצועת התנגדות",
+  "@resistance_band": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "seconds": "שניות",
+  "@seconds": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "shoulders": "כתפיים",
+  "@shoulders": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "triceps": "השרירים התלת־ראשיים",
+  "@triceps": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "kg": "ק״ג",
+  "@kg": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "goalTypeBasic": "בסיסי",
+  "@goalTypeBasic": {
+    "description": "added for localization of Class GoalType's filed basic"
+  },
+  "goalTypeAdvanced": "מתקדם",
+  "@goalTypeAdvanced": {
+    "description": "added for localization of Class GoalType's filed advanced"
+  },
+  "indicatorAvg": "ממוצע",
+  "@indicatorAvg": {
+    "description": "added for localization of Class Indicator's field text"
+  },
+  "systemMode": "הגדרות מערכת",
+  "@systemMode": {},
+  "copyToClipboard": "העתקה ללוח",
+  "@copyToClipboard": {},
+  "noIngredientsDefined": "עדיין לא הוגדרו מרכיבים",
+  "@noIngredientsDefined": {},
+  "restTime": "זמן מנוחה",
+  "@restTime": {},
+  "sets": "סטים",
+  "@sets": {
+    "description": "The number of sets to be done for one exercise"
+  },
+  "ingredientLogged": "המרכיב תועד ביומן",
+  "@ingredientLogged": {},
+  "logIngredient": "תיעוד המרכיב ביומן התזונתי",
+  "@logIngredient": {},
+  "errorInfoDescription": "משהו השתבש, עמך הסליחה. ניתן לעזור לנו בתיקון התקלה בעזרת דיווח על הבעיה ב־GitHub.",
+  "@errorInfoDescription": {},
+  "errorInfoDescription2": "אפשר להמשיך להשתמש ביישום, אבל ייתכן כי תכונות מסוימות לא יעבדו.",
+  "@errorInfoDescription2": {},
+  "proteinShort": "חל׳",
+  "@proteinShort": {
+    "description": "The first letter or short name of the word 'Protein', used in overviews"
+  },
+  "fatShort": "שומנ׳",
+  "@fatShort": {
+    "description": "The first letter or short name of the word 'Fat', used in overviews"
+  },
+  "moreMeasurementEntries": "הוספת מדד חדש",
+  "@moreMeasurementEntries": {
+    "description": "Message shown when the user wants to add new measurement"
+  },
+  "aboutBugsListTitle": "דיווח על בעיה או הצעת תכונה חדשה",
+  "@aboutBugsListTitle": {},
+  "aboutDiscordTitle": "Discord",
+  "@aboutDiscordTitle": {},
+  "dataCopied": "הנתונים הועתקו לערך החדש",
+  "@dataCopied": {
+    "description": "Snackbar message to show on copying data to a new log entry"
+  },
+  "useMetric": "שימוש בשיטה המטרית למדידת משקל הגוף",
+  "@useMetric": {},
+  "selectMealToLog": "בחירת מנה לתיעוד ביומן",
+  "@selectMealToLog": {},
+  "energyShort": "אנרגיה",
+  "@energyShort": {
+    "description": "The first letter or short name of the word 'Energy', used in overviews"
+  },
+  "loggedToday": "תועדו היום",
+  "@loggedToday": {},
+  "enterMinCharacters": "נא להקליד לפחות {min} תווים",
+  "@enterMinCharacters": {
+    "description": "Error message when the user hasn't entered the minimum amount characters in a form",
+    "type": "text",
+    "placeholders": {
+      "min": {
+        "type": "String"
+      }
+    }
+  },
+  "productFoundDescription": "הברקוד תואם למוצר: {productName}. להמשיך?",
+  "@productFoundDescription": {
+    "description": "Dialog info when product is found with barcode",
+    "type": "text",
+    "placeholders": {
+      "productName": {
+        "type": "String"
+      }
+    }
+  },
+  "productNotFoundDescription": "לא נמצא המוצר עם הברקוד שנסרק {barcode} במאגר של wger",
+  "@productNotFoundDescription": {
+    "description": "Dialog info when product is not found with barcode",
+    "type": "text",
+    "placeholders": {
+      "barcode": {
+        "type": "String"
+      }
+    }
+  },
+  "verifiedEmail": "דוא״ל מאומת",
+  "@verifiedEmail": {},
+  "unVerifiedEmail": "דוא״ל לא מאומת",
+  "@unVerifiedEmail": {},
+  "verifiedEmailInfo": "נשלחה הודעת אימות לכתובת {email}",
+  "@verifiedEmailInfo": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "setHasNoExercises": "עדיין אין אימונים בסט זה!",
+  "@setHasNoExercises": {},
+  "settingsIngredientCacheDescription": "מטמון מרכיב",
+  "@settingsIngredientCacheDescription": {},
+  "settingsCacheDeletedSnackbar": "המטמון נוקה בהצלחה",
+  "@settingsCacheDeletedSnackbar": {},
+  "textPromptTitle": "מוכנים להתחיל?",
+  "@textPromptTitle": {},
+  "abs": "שרירי בטן",
+  "@abs": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "lb": "פאונד",
+  "@lb": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "log": "תיעוד",
+  "@log": {
+    "description": "Log a specific meal (imperative form)"
+  },
+  "done": "סיום",
+  "@done": {},
+  "themeMode": "ערכת עיצוב",
+  "@themeMode": {},
+  "darkMode": "עיצוב כהה תמיד",
+  "@darkMode": {},
+  "lightMode": "עיצוב בהיר תמיד",
+  "@lightMode": {},
+  "barWeight": "משקל Bar",
+  "@barWeight": {},
+  "apiTokenValidChars": "מפתח API יכול להכיל רק את האותיות a-f, את הספרות 0-9, ועליו להיות באורך 40 תווים בדיוק",
+  "@apiTokenValidChars": {
+    "description": "Error message when the user tries to input a API key with forbidden characters"
+  },
+  "exerciseNr": "תרגיל {nr}",
+  "@exerciseNr": {
+    "description": "Header in form indicating the number of the current exercise. Can also be translated as something like 'Set Nr. xy'.",
+    "type": "text",
+    "placeholders": {
+      "nr": {
+        "type": "String"
+      }
+    }
+  },
+  "isRestDayHelp": "לתשומת לבך, כל הסטים והתרגילים יוסרו מימים שהגדרת בתור ימי מנוחה.",
+  "@isRestDayHelp": {},
+  "onlyLoggingHelpText": "נא לסמן תיבה זו אך ורק אם ברצונך לתעד את כמות הקלוריות מבלי להגדיר תוכנית תזונתית עם מנות ספציפיות",
+  "@onlyLoggingHelpText": {},
+  "yourCurrentNutritionPlanHasNoMealsDefinedYet": "לא הוגדרו מנות בתוכניות התזונתית הנוכחית שלך",
+  "@yourCurrentNutritionPlanHasNoMealsDefinedYet": {
+    "description": "Message shown when a nutrition plan doesn't have any meals"
+  },
+  "toAddMealsToThePlanGoToNutritionalPlanDetails": "לצורך הוספת מנות לתוכנית, יש לגשת לפרטי התוכנית התזונתית",
+  "@toAddMealsToThePlanGoToNutritionalPlanDetails": {
+    "description": "Message shown to guide users to the nutritional plan details page to add meals"
+  },
+  "errorCouldNotConnectToServerDetails": "אין באפשרות היישום להתחבר לשרת. נא לבדוק את החיבור לאינטרנט או לכתובת השרת ולנסות שוב. אם הבעיה ממשיכה להתקיים, נא לפנות למנהל השרת.",
+  "@errorCouldNotConnectToServerDetails": {},
+  "chartAllTimeTitle": "{name} בכל הזמנים",
+  "@chartAllTimeTitle": {
+    "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
+    "type": "text",
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "chart30DaysTitle": "{name} ב־30 הימים האחרונים",
+  "@chart30DaysTitle": {
+    "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
+    "type": "text",
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "chartDuringPlanTitle": "{chartName} במסגרת התוכנית התזונתית {planName}",
+  "@chartDuringPlanTitle": {
+    "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
+    "type": "text",
+    "placeholders": {
+      "chartName": {
+        "type": "String"
+      },
+      "planName": {
+        "type": "String"
+      }
+    }
+  },
+  "aboutDonateText": "בעוד המיזם הזה חופשי ותמיד יישאר כך, תפעול השרת כן עולה לנו כסף! גם הפיתוח דורש השקעה משמעותית של זמן ומאמץ של מתנדבים. התרומה שלך תלך ישירות לכיסוי העלויות האלה, המאפשרות לספק את השירות שלנו נאמנה.",
+  "@aboutDonateText": {},
+  "aboutContributeText": "אנחנו מעודדים את כל סוגי התרומה. בין אם היא מתבטאת בפיתוח קוד, תרגום, או אפילו רק תשוקה לכושר, אנו מעריכים כל סוג של תמיכה!",
+  "@aboutContributeText": {},
+  "aboutMastodonTitle": "Mastodon",
+  "@aboutMastodonTitle": {},
+  "baseNameEnglish": "לכל התרגילים נחוץ שם מקור באנגלית",
+  "@baseNameEnglish": {},
+  "add_exercise_image_license": "על התמונות להיות תואמות לרישיון CC BY SA. אם יש ספק כלשהו, יש להעלות רק תמונות שצילמת בעצמך.",
+  "@add_exercise_image_license": {},
+  "variations": "וריאציות",
+  "@variations": {
+    "description": "Variations of one exercise (e.g. benchpress and benchpress narrow)"
+  },
+  "verifiedEmailReason": "עליך לאמת את הדואר האלקטרוני שלך כדי לתרום תרגילים",
+  "@verifiedEmailReason": {},
+  "oneNamePerLine": "שם אחד בכל שורה",
+  "@oneNamePerLine": {},
+  "whatVariationsExist": "מהן הווריאציות שיש לתרגיל זה, אם קיימות?",
+  "@whatVariationsExist": {},
+  "contributeExercise": "לתרום תרגיל",
+  "@contributeExercise": {},
+  "contributeExerciseWarning": "אפשר לתרום תרגילים אך ורק אם החשבון שלך בן יותר מ־{days} ימים וכתובת הדואר האלקטרוני שלך מאומתת",
+  "@contributeExerciseWarning": {
+    "description": "Number of days before which a person can add exercise",
+    "placeholders": {
+      "days": {
+        "type": "String",
+        "example": "14"
+      }
+    }
+  },
+  "textPromptSubheading": "נא ללחוץ על כפתור הפעולה כדי להתחיל",
+  "@textPromptSubheading": {},
+  "bench": "",
+  "@bench": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "dumbbell": "משקולות",
+  "@dumbbell": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "kettlebell": "משקולות קטלבל",
+  "@kettlebell": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "legs": "רגליים",
+  "@legs": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "lower_back": "גב תחתון",
+  "@lower_back": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "max_reps": "מספר מרבי של חזרות",
+  "@max_reps": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "swiss_ball": "כדור התעמלות",
+  "@swiss_ball": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "none__bodyweight_exercise_": "ללא (התרגיל מסתמך על משקל גוף)",
+  "@none__bodyweight_exercise_": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "overallChangeWeight": "שינוי כללי",
+  "@overallChangeWeight": {
+    "description": "Overall change in weight, added for localization"
   }
 }
diff --git a/lib/l10n/app_hi.arb b/lib/l10n/app_hi.arb
index 82c656a9..94eefcfc 100644
--- a/lib/l10n/app_hi.arb
+++ b/lib/l10n/app_hi.arb
@@ -49,8 +49,6 @@
   "@registerInstead": {},
   "loginInstead": "इसके बजाय लॉग इन करें",
   "@loginInstead": {},
-  "labelWorkoutPlans": "कसरत की योजनाएं",
-  "@labelWorkoutPlans": {},
   "labelBottomNavWorkout": "कसरत",
   "@labelBottomNavWorkout": {},
   "labelBottomNavNutrition": "पोषण",
@@ -69,8 +67,6 @@
   "@exercise": {},
   "searchExercise": "जोड़ने के लिए व्यायाम खोजें",
   "@searchExercise": {},
-  "supersetWith": "सुपरसेट के साथ",
-  "@supersetWith": {},
   "equipment": "उपकरण",
   "@equipment": {},
   "muscles": "मांसपेशियों",
@@ -79,10 +75,6 @@
   "@musclesSecondary": {},
   "category": "श्रेणी",
   "@category": {},
-  "newWorkout": "नई कसरत योजना",
-  "@newWorkout": {},
-  "noWorkoutPlans": "आपकी कोई कसरत योजना नहीं है",
-  "@noWorkoutPlans": {},
   "repetitions": "दोहराव",
   "@repetitions": {},
   "reps": "रेप्स",
@@ -149,7 +141,7 @@
   "@logMeal": {},
   "addIngredient": "सामग्री जोड़ें",
   "@addIngredient": {},
-  "logIngredient": "पोषण डायरी में सहेजें",
+  "logIngredient": "पोषण डायरी में सामग्री दर्ज करें",
   "@logIngredient": {},
   "searchIngredient": "सामग्री खोजें",
   "@searchIngredient": {},
@@ -259,26 +251,8 @@
   "@goToDetailPage": {},
   "aboutDescription": "Wger का उपयोग करने के लिए धन्यवाद! Wger एक सहयोगी ओपन सोर्स प्रोजेक्ट है, जिसे दुनिया भर के फिटनेस उत्साही लोगों द्वारा बनाया गया है।",
   "@aboutDescription": {},
-  "aboutSourceTitle": "सोर्स कोड",
-  "@aboutSourceTitle": {},
-  "aboutSourceText": "इस एप्लिकेशन का स्रोत कोड और इसके सर्वर को Github पर प्राप्त करें",
-  "@aboutSourceText": {},
-  "aboutBugsTitle": "कोई समस्या या विचार है?",
-  "@aboutBugsTitle": {},
-  "aboutBugsText": "अगर किसी चीज़ ने अपेक्षा के अनुरूप व्यवहार नहीं किया या कोई ऐसी विशेषता है जो आपको याद आ रही है तो संपर्क करें।",
-  "@aboutBugsText": {},
-  "aboutContactUsTitle": "संपर्क करें",
-  "@aboutContactUsTitle": {},
-  "aboutContactUsText": "यदि आप हमारे साथ चैट करना चाहते हैं, तो Discord सर्वर पर आएं और संपर्क करें",
-  "@aboutContactUsText": {},
-  "aboutTranslationTitle": "अनुवाद",
-  "@aboutTranslationTitle": {},
-  "aboutTranslationText": "इस एप्लिकेशन का वेबलेट पर अनुवाद किया गया है। अगर आप भी मदद करना चाहते हैं, तो लिंक पर क्लिक करें और अनुवाद करना शुरू करें।",
-  "@aboutTranslationText": {},
   "calendar": "कैलेंडर",
   "@calendar": {},
-  "enterRepetitionsOrWeight": "कृपया इनमें से कम से कम एक सेट के लिए दोहराव या वजन भरें",
-  "@enterRepetitionsOrWeight": {},
   "enterValue": "कृपया मान दर्ज करें",
   "@enterValue": {},
   "selectExercise": "कृपया एक पाठ्यक्रम का चयन करें",
@@ -324,5 +298,15 @@
   "scanBarcode": "बारकोड स्कैन करें",
   "@scanBarcode": {},
   "close": "बंद करें",
-  "@close": {}
-}
+  "@close": {},
+  "userProfile": "आपकी प्रोफ़ाइल",
+  "@userProfile": {},
+  "invalidUsername": "कृपया सही यूजरनेम प्रविष्ट करे",
+  "@invalidUsername": {
+    "description": "Error message when the user enters an invalid username"
+  },
+  "onlyLogging": "सिर्फ कैलोरी ट्रैक करें",
+  "@onlyLogging": {},
+  "onlyLoggingHelpText": "यदि आप केवल अपनी कैलोरी लॉग करना चाहते हैं और विशिष्ट भोजन के साथ विस्तृत पोषण योजना नहीं बनाना चाहते हैं तो बॉक्स को चेक करें",
+  "@onlyLoggingHelpText": {}
+}
\ No newline at end of file
diff --git a/lib/l10n/app_hr.arb b/lib/l10n/app_hr.arb
index 70e5e29a..117cd7b0 100644
--- a/lib/l10n/app_hr.arb
+++ b/lib/l10n/app_hr.arb
@@ -1,911 +1,974 @@
 {
-  "todaysWorkout": "Tvoj današnji trening",
-  "@todaysWorkout": {},
-  "mealLogged": "Obrok prijavljen u dnevnik",
-  "@mealLogged": {},
-  "time": "Vrijeme",
-  "@time": {
-    "description": "The time of a meal or workout"
-  },
-  "timeEnd": "Vrijeme završetka",
-  "@timeEnd": {
-    "description": "The end time of a workout"
-  },
-  "username": "Korisničko ime",
-  "@username": {},
-  "passwordsDontMatch": "Lozinke se ne podudaraju",
-  "@passwordsDontMatch": {
-    "description": "Error message when the user enters two different passwords during registration"
-  },
-  "passwordTooShort": "Lozinka je prekratka",
-  "@passwordTooShort": {
-    "description": "Error message when the user a password that is too short"
-  },
-  "password": "Lozinka",
-  "@password": {},
-  "confirmPassword": "Potvrdi lozinku",
-  "@confirmPassword": {},
-  "invalidEmail": "Upiši valjanu e-mail adresu",
-  "@invalidEmail": {
-    "description": "Error message when the user enters an invalid email"
-  },
-  "email": "E-mail adresa",
-  "@email": {},
-  "invalidUrl": "Upiši važeći URL",
-  "@invalidUrl": {
-    "description": "Error message when the user enters an invalid URL, e.g. in the login form"
-  },
-  "useCustomServer": "Koristi prilagođeni poslužitelj",
-  "@useCustomServer": {
-    "description": "Toggle button allowing users to switch between the default and a custom wger server"
-  },
-  "invalidUsername": "Upiši važeće korisničko ime",
-  "@invalidUsername": {
-    "description": "Error message when the user enters an invalid username"
-  },
-  "customServerUrl": "URL wger instance",
-  "@customServerUrl": {
-    "description": "Label in the form where the users can enter their own wger instance"
-  },
-  "customServerHint": "Upiši adresu tvog poslužitelja, inače će se koristiti zadani",
-  "@customServerHint": {
-    "description": "Hint text for the form where the users can enter their own wger instance"
-  },
-  "registerInstead": "Nemaš račun? Registriraj se",
-  "@registerInstead": {},
-  "loginInstead": "Već imaš račun? Prijavi se",
-  "@loginInstead": {},
-  "labelWorkoutPlans": "Planovi treninga",
-  "@labelWorkoutPlans": {
-    "description": "Title for screen workout plans"
-  },
-  "labelBottomNavWorkout": "Trening",
-  "@labelBottomNavWorkout": {
-    "description": "Label used in bottom navigation, use a short word"
-  },
-  "labelBottomNavNutrition": "Prehrana",
-  "@labelBottomNavNutrition": {
-    "description": "Label used in bottom navigation, use a short word"
-  },
-  "labelWorkoutLogs": "Dnevnici treninga",
-  "@labelWorkoutLogs": {
-    "description": "(Workout) logs"
-  },
-  "labelWorkoutPlan": "Plan treninga",
-  "@labelWorkoutPlan": {
-    "description": "Title for screen workout plan"
-  },
-  "labelDashboard": "Kontrolna ploča",
-  "@labelDashboard": {
-    "description": "Title for screen dashboard"
-  },
-  "successfullyDeleted": "Izbrisano",
-  "@successfullyDeleted": {
-    "description": "Message when an item was successfully deleted"
-  },
-  "successfullySaved": "Spremljeno",
-  "@successfullySaved": {
-    "description": "Message when an item was successfully saved"
-  },
-  "exercise": "Vježba",
-  "@exercise": {
-    "description": "An exercise for a workout"
-  },
-  "logHelpEntriesUnits": "Napomena: prikazuju se samo unosi s jedinicom težine (kg ili lb) i ponavljanja, druge kombinacije kao što su vrijeme ili do neuspjeha se ovdje zanemaruju.",
-  "@logHelpEntriesUnits": {},
-  "description": "Opis",
-  "@description": {},
-  "name": "Ime",
-  "@name": {
-    "description": "Name for a workout or nutritional plan"
-  },
-  "nutritionalDiary": "Dnevnik prehrane",
-  "@nutritionalDiary": {},
-  "nutritionalPlans": "Planovi prehrane",
-  "@nutritionalPlans": {},
-  "noNutritionalPlans": "Nemaš planove prehrane",
-  "@noNutritionalPlans": {
-    "description": "Message shown when the user has no nutritional plans"
-  },
-  "anErrorOccurred": "Dogodila se greška!",
-  "@anErrorOccurred": {},
-  "weight": "Težina",
-  "@weight": {
-    "description": "The weight of a workout log or body weight entry"
-  },
-  "measurement": "Mjerenje",
-  "@measurement": {},
-  "measurements": "Mjerenja",
-  "@measurements": {
-    "description": "Categories for the measurements such as biceps size, body fat, etc."
-  },
-  "measurementCategoriesHelpText": "Kategorija mjerenja, kao što su „bicepsi” ili „tjelesna mast”",
-  "@measurementCategoriesHelpText": {},
-  "measurementEntriesHelpText": "Jedinica koja se koristi za mjerenje kategorije kao što su „cm” ili „%”",
-  "@measurementEntriesHelpText": {},
-  "date": "Datum",
-  "@date": {
-    "description": "The date of a workout log or body weight entry"
-  },
-  "repetitions": "Ponavljanja",
-  "@repetitions": {
-    "description": "Repetitions for an exercise set"
-  },
-  "reps": "Ponavljanja",
-  "@reps": {
-    "description": "Shorthand for repetitions, used when space constraints are tighter"
-  },
-  "rir": "PUR",
-  "@rir": {
-    "description": "Shorthand for Repetitions In Reserve"
-  },
-  "rirNotUsed": "PUR se ne koristi",
-  "@rirNotUsed": {
-    "description": "Label used in RiR slider when the RiR value is not used/saved for the current setting or log"
-  },
-  "macronutrients": "Makronutrijenti",
-  "@macronutrients": {},
-  "planned": "Planirano",
-  "@planned": {
-    "description": "Header for the column of 'planned' nutritional values, i.e. what should be eaten"
-  },
-  "logged": "Zabilježeno",
-  "@logged": {
-    "description": "Header for the column of 'logged' nutritional values, i.e. what was eaten"
-  },
-  "difference": "Razlika",
-  "@difference": {},
-  "percentEnergy": "Postotak energije",
-  "@percentEnergy": {},
-  "gPerBodyKg": "g po tjelesnom kg",
-  "@gPerBodyKg": {
-    "description": "Label used for total sums of e.g. calories or similar in grams per Kg of body weight"
-  },
-  "total": "Ukupno",
-  "@total": {
-    "description": "Label used for total sums of e.g. calories or similar"
-  },
-  "kJ": "kJ",
-  "@kJ": {
-    "description": "Energy in a meal in kilo joules, kJ"
-  },
-  "g": "g",
-  "@g": {
-    "description": "Abbreviation for gram"
-  },
-  "proteinShort": "P",
-  "@proteinShort": {
-    "description": "The first letter or short name of the word 'Protein', used in overviews"
-  },
-  "carbohydrates": "Ugljikohidrati",
-  "@carbohydrates": {},
-  "carbohydratesShort": "U",
-  "@carbohydratesShort": {
-    "description": "The first letter or short name of the word 'Carbohydrates', used in overviews"
-  },
-  "sugars": "Šećeri",
-  "@sugars": {},
-  "fat": "Masti",
-  "@fat": {},
-  "fatShort": "M",
-  "@fatShort": {
-    "description": "The first letter or short name of the word 'Fat', used in overviews"
-  },
-  "saturatedFat": "Zasićene masti",
-  "@saturatedFat": {},
-  "fiber": "Vlakna",
-  "@fiber": {},
-  "sodium": "Natrij",
-  "@sodium": {},
-  "toggleDetails": "Prikaži detalje",
-  "@toggleDetails": {
-    "description": "Switch to toggle detail / overview"
-  },
-  "aboutBugsText": "Javi ako se nešto ponaša neočekivano ili ako smatraš da nedostaje neka funkcija.",
-  "@aboutBugsText": {
-    "description": "Text for bugs section in the about dialog"
-  },
-  "aboutContactUsTitle": "Pozdrav!",
-  "@aboutContactUsTitle": {
-    "description": "Title for contact us section in the about dialog"
-  },
-  "enterRepetitionsOrWeight": "Upiši broj ponavljanja ili težinu za barem jednu seriju",
-  "@enterRepetitionsOrWeight": {
-    "description": "Error message when the user hasn't filled in the forms for exercise sets"
-  },
-  "enterValue": "Upiši vrijednost",
-  "@enterValue": {
-    "description": "Error message when the user hasn't entered a value on a required field"
-  },
-  "selectExercise": "Odaberi vježbu",
-  "@selectExercise": {
-    "description": "Error message when the user hasn't selected an exercise in the form"
-  },
-  "enterCharacters": "Upiši {min} do {max} znakova",
-  "@enterCharacters": {
-    "description": "Error message when the user hasn't entered the correct number of characters in a form",
-    "type": "text",
-    "placeholders": {
-      "min": {},
-      "max": {}
-    }
-  },
-  "nrOfSets": "Broj serija po vježbi: {nrOfSets}",
-  "@nrOfSets": {
-    "description": "Label shown on the slider where the user selects the nr of sets",
-    "type": "text",
-    "placeholders": {
-      "nrOfSets": {}
-    }
-  },
-  "setUnitsAndRir": "Postavi jedinice i PUR",
-  "@setUnitsAndRir": {
-    "description": "Label shown on the slider where the user can toggle showing units and RiR",
-    "type": "text"
-  },
-  "enterValidNumber": "Upiši važeći broj",
-  "@enterValidNumber": {
-    "description": "Error message when the user has submitted an invalid number (e.g. '3,.,.,.')"
-  },
-  "selectIngredient": "Odaberi sastojak",
-  "@selectIngredient": {
-    "description": "Error message when the user hasn't selected an ingredient from the autocompleter"
-  },
-  "selectImage": "Odaberi sliku",
-  "@selectImage": {
-    "description": "Label and error message when the user hasn't selected an image to save"
-  },
-  "optionsLabel": "Opcije",
-  "@optionsLabel": {
-    "description": "Label for the popup with general app options"
-  },
-  "takePicture": "Snimi sliku",
-  "@takePicture": {},
-  "chooseFromLibrary": "Odaberi iz biblioteke slika",
-  "@chooseFromLibrary": {},
-  "gallery": "Galerija",
-  "@gallery": {},
-  "addImage": "Dodaj sliku",
-  "@addImage": {},
-  "dataCopied": "Podaci kopirani u novi unos",
-  "@dataCopied": {
-    "description": "Snackbar message to show on copying data to a new log entry"
-  },
-  "usernameValidChars": "Korisničko ime može sadržavati samo slova, brojeve i sljedeće znakove: @, +, ., -, _",
-  "@usernameValidChars": {
-    "description": "Error message when the user tries to register a username with forbidden characters"
-  },
-  "logHelpEntries": "Ako u jednom danu postoji više od jednog unosa s istim brojem ponavljanja, ali različitim težinama, na dijagramu je prikazan samo unos s većom težinom.",
-  "@logHelpEntries": {},
-  "addSet": "Dodaj seriju",
-  "@addSet": {
-    "description": "Label for the button that adds a set (to a workout day)"
-  },
-  "addMeal": "Dodaj obrok",
-  "@addMeal": {},
-  "nutritionalPlan": "Plan prehrane",
-  "@nutritionalPlan": {},
-  "useDefaultServer": "Koristi zadani poslužitelj",
-  "@useDefaultServer": {
-    "description": "Toggle button allowing users to switch between the default and a custom wger server"
-  },
-  "logout": "Odjavi se",
-  "@logout": {
-    "description": "Text for logout button"
-  },
-  "login": "Prijavi se",
-  "@login": {
-    "description": "Text for login button"
-  },
-  "register": "Registracija",
-  "@register": {
-    "description": "Text for registration button"
-  },
-  "reset": "Resetiraj",
-  "@reset": {
-    "description": "Button text allowing the user to reset the entered values to the default"
-  },
-  "jumpTo": "Prijeđi na",
-  "@jumpTo": {
-    "description": "Imperative. Label used in popup allowing the user to jump to a specific exercise while in the gym mode"
-  },
-  "save": "Spremi",
-  "@save": {},
-  "energyShort": "E",
-  "@energyShort": {
-    "description": "The first letter or short name of the word 'Energy', used in overviews"
-  },
-  "addIngredient": "Dodaj sastojak",
-  "@addIngredient": {},
-  "logMeal": "Zapiši obrok u dnevnik prehrane",
-  "@logMeal": {},
-  "value": "Vrijednost",
-  "@value": {
-    "description": "The value of a measurement entry"
-  },
-  "start": "Početak",
-  "@start": {
-    "description": "Label on button to start the gym mode (i.e., an imperative)"
-  },
-  "timeStart": "Vrijeme početka",
-  "@timeStart": {
-    "description": "The starting time of a workout"
-  },
-  "timeStartAhead": "Vrijeme početka ne može biti prije vremena završetka",
-  "@timeStartAhead": {},
-  "ingredient": "Sastojak",
-  "@ingredient": {},
-  "energy": "Energija",
-  "@energy": {
-    "description": "Energy in a meal, ingredient etc. e.g. in kJ"
-  },
-  "protein": "Proteini",
-  "@protein": {},
-  "goToToday": "Idi na danas",
-  "@goToToday": {
-    "description": "Label on button to jump back to 'today' in the calendar widget"
-  },
-  "kcal": "kcal",
-  "@kcal": {
-    "description": "Energy in a meal in kilocalories, kcal"
-  },
-  "unit": "Jedinica",
-  "@unit": {
-    "description": "The unit used for a repetition (kg, time, etc.)"
-  },
-  "edit": "Uredi",
-  "@edit": {},
-  "confirmDelete": "Stvarno želiš izbrisati „{toDelete}”?",
-  "@confirmDelete": {
-    "description": "Confirmation text before the user deletes an object",
-    "type": "text",
-    "placeholders": {
-      "toDelete": {}
-    }
-  },
-  "newNutritionalPlan": "Novi plan prehrane",
-  "@newNutritionalPlan": {},
-  "noWorkoutPlans": "Nemaš planove treninga",
-  "@noWorkoutPlans": {
-    "description": "Message shown when the user has no workout plans"
-  },
-  "amount": "Količina",
-  "@amount": {
-    "description": "The amount (e.g. in grams) of an ingredient in a meal"
-  },
-  "newEntry": "Novi unos",
-  "@newEntry": {
-    "description": "Title when adding a new entry such as a weight or log entry"
-  },
-  "noWeightEntries": "Nemaš unose težine",
-  "@noWeightEntries": {
-    "description": "Message shown when the user has no logged weight entries"
-  },
-  "loadingText": "Učitavanje …",
-  "@loadingText": {
-    "description": "Text to show when entries are being loaded in the background: Loading..."
-  },
-  "delete": "Izbriši",
-  "@delete": {},
-  "goToDetailPage": "Idi na stranicu s detaljima",
-  "@goToDetailPage": {},
-  "aboutDescription": "Hvala što koristiš wger! wger je suradnički projekt otvorenog koda koji su izradili ljubitelji fitnesa iz cijelog svijeta.",
-  "@aboutDescription": {
-    "description": "Text in the about dialog"
-  },
-  "aboutSourceTitle": "Izvorni kod",
-  "@aboutSourceTitle": {
-    "description": "Title for source code section in the about dialog"
-  },
-  "aboutBugsTitle": "Imaš problem ili ideju?",
-  "@aboutBugsTitle": {
-    "description": "Title for bugs section in the about dialog"
-  },
-  "aboutContactUsText": "Ako želiš s nama razgovarati prijeđi na Discord poslužitelj i kontaktiraj nas",
-  "@aboutContactUsText": {
-    "description": "Text for contact us section in the about dialog"
-  },
-  "aboutSourceText": "Preuzmi izvorni kod ove aplikacije i njezinog poslužitelja na githubu",
-  "@aboutSourceText": {
-    "description": "Text for source code section in the about dialog"
-  },
-  "aboutTranslationTitle": "Prijevod",
-  "@aboutTranslationTitle": {
-    "description": "Title for translation section in the about dialog"
-  },
-  "aboutTranslationText": "Ova je aplikacija prevedena putem Weblatea. Ako i ti želiš pomoći, klikni poveznicu i počni prevoditi",
-  "@aboutTranslationText": {
-    "description": "Text for translation section in the about dialog"
-  },
-  "calendar": "Kalendar",
-  "@calendar": {},
-  "musclesSecondary": "Sekundarni mišići",
-  "@musclesSecondary": {
-    "description": "secondary muscles trained by an exercise"
-  },
-  "equipment": "Oprema",
-  "@equipment": {
-    "description": "Equipment needed to perform an exercise"
-  },
-  "supersetWith": "u nasdkup sa",
-  "@supersetWith": {
-    "description": "Text used between exercise cards when adding a new set. Translate as something like 'in a superset with'"
-  },
-  "category": "Kategorija",
-  "@category": {
-    "description": "Category for an exercise, ingredient, etc."
-  },
-  "newWorkout": "Novi plan treninga",
-  "@newWorkout": {
-    "description": "Header when adding a new workout"
-  },
-  "searchExercise": "Traži vježbe koje želiš dodati",
-  "@searchExercise": {
-    "description": "Label on set form. Selected exercises are added to the set"
-  },
-  "muscles": "Mišići",
-  "@muscles": {
-    "description": "(main) muscles trained by an exercise"
-  },
-  "dayDescriptionHelp": "Opis onoga što se radi na današnji dan (npr. „dan povlačenja”) ili koji su dijelovi tijela trenirani (npr. „prsa i ramena”)",
-  "@dayDescriptionHelp": {},
-  "setNr": "Serija br. {nr}",
-  "@setNr": {
-    "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.",
-    "type": "text",
-    "placeholders": {
-      "nr": {}
-    }
-  },
-  "sameRepetitions": "Ako radiš ista ponavljanja i težinu za sve serije, ispuni jedan redak. Na primjer, za 4 serije jednostavno upiši 10 za ponavljanja, to automatski postaje „4 × 10”.",
-  "@sameRepetitions": {},
-  "comment": "Komentar",
-  "@comment": {
-    "description": "Comment, additional information"
-  },
-  "impression": "Dojam",
-  "@impression": {
-    "description": "General impression (e.g. for a workout session) such as good, bad, etc."
-  },
-  "notes": "Bilješke",
-  "@notes": {
-    "description": "Personal notes, e.g. for a workout session"
-  },
-  "workoutSession": "Sesija treninga",
-  "@workoutSession": {
-    "description": "A (logged) workout session"
-  },
-  "newDay": "Novi dan",
-  "@newDay": {},
-  "newSet": "Nova serija",
-  "@newSet": {
-    "description": "Header when adding a new set to a workout day"
-  },
-  "selectExercises": "Ako želiš izraditi nasdkup, traži i odaberi vježbe koje će se grupirati u jednu grupu",
-  "@selectExercises": {},
-  "gymMode": "Modus teretane",
-  "@gymMode": {
-    "description": "Label when starting the gym mode"
-  },
-  "plateCalculator": "Ploče",
-  "@plateCalculator": {
-    "description": "Label used for the plate calculator in the gym mode"
-  },
-  "plateCalculatorNotDivisible": "Nije moguće postići težinu s dostupnim pločastim utezima",
-  "@plateCalculatorNotDivisible": {
-    "description": "Error message when the current weight is not reachable with plates (e.g. 33.1 kg)"
-  },
-  "pause": "Pauza",
-  "@pause": {
-    "description": "Noun, not an imperative! Label used for the pause when using the gym mode"
-  },
-  "weightUnit": "Jedinica težine",
-  "@weightUnit": {},
-  "appUpdateTitle": "Potrebna je nova verzija",
-  "@appUpdateTitle": {},
-  "appUpdateContent": "Ova verzija aplikacije nije kompatibilna s poslužiteljem. Aktualiziraj svoju aplikaciju.",
-  "@appUpdateContent": {},
-  "set": "Serija",
-  "@set": {
-    "description": "A set in a workout plan"
-  },
-  "repetitionUnit": "Jedinica ponavljanja",
-  "@repetitionUnit": {},
-  "recentlyUsedIngredients": "Nedavno dodani sastojci",
-  "@recentlyUsedIngredients": {
-    "description": "A message when a user adds a new ingredient to a meal."
-  },
-  "logIngredient": "Zapiši sastojak u dnevnik prehrane",
-  "@logIngredient": {},
-  "searchIngredient": "Traži sastojak",
-  "@searchIngredient": {
-    "description": "Label on ingredient search form"
-  },
-  "weekAverage": "Sedmodnevni prosjek",
-  "@weekAverage": {
-    "description": "Header for the column of '7 day average' nutritional values, i.e. what was logged last week"
-  },
-  "productFound": "Pronađeni proizvod",
-  "@productFound": {
-    "description": "Header label for dialog when product is found with barcode"
-  },
-  "productFoundDescription": "Barkod odgovara ovom proizvodu: {productName}. Želiš li nastaviti?",
-  "@productFoundDescription": {
-    "description": "Dialog info when product is found with barcode",
-    "type": "text",
-    "placeholders": {
-      "productName": {}
-    }
-  },
-  "productNotFound": "Proizvod nije pronađen",
-  "@productNotFound": {
-    "description": "Header label for dialog when product is not found with barcode"
-  },
-  "productNotFoundDescription": "Proizvod sa skeniranim barkodom {barcode} nije pronađen u wger bazi podataka",
-  "@productNotFoundDescription": {
-    "description": "Dialog info when product is not found with barcode",
-    "type": "text",
-    "placeholders": {
-      "barcode": {}
-    }
-  },
-  "scanBarcode": "Skeniraj barkod",
-  "@scanBarcode": {
-    "description": "Label for scan barcode button"
-  },
-  "close": "Zatvori",
-  "@close": {
-    "description": "Translation for close"
-  },
-  "enterMinCharacters": "Upiši barem {min} znakova",
-  "@enterMinCharacters": {
-    "description": "Error message when the user hasn't entered the minimum amount characters in a form",
-    "type": "text",
-    "placeholders": {
-      "min": {}
-    }
-  },
-  "add_exercise_image_license": "Slike moraju biti kompatibilne s licencom CC BY SA. Ako si u nedoumici, prenesi samo svoje vlastite fotografije.",
-  "@add_exercise_image_license": {},
-  "whatVariationsExist": "Koje varijante ove vježbe postoje?",
-  "@whatVariationsExist": {},
-  "images": "Slike",
-  "@images": {},
-  "alternativeNames": "Alternativna imena",
-  "@alternativeNames": {},
-  "previous": "Prethodna",
-  "@previous": {},
-  "oneNamePerLine": "Jedno ime po retku",
-  "@oneNamePerLine": {},
-  "translation": "Prijevod",
-  "@translation": {},
-  "addExercise": "Dodaj vježbu",
-  "@addExercise": {},
-  "translateExercise": "Prevedi ovu vježbu",
-  "@translateExercise": {},
-  "baseData": "Osnovni podaci na engleskom jeziku",
-  "@baseData": {
-    "description": "The base data for an exercise such as category, trained muscles, etc."
-  },
-  "arms": "Ruke",
-  "@arms": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "back": "Leđa",
-  "@back": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "chest": "Prsa",
-  "@chest": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "sz_bar": "Zaobljena šipka",
-  "@sz_bar": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "userProfile": "Tvoj profil",
-  "@userProfile": {},
-  "exerciseList": "Popis vježbi",
-  "@exerciseList": {},
-  "exercises": "Vježbe",
-  "@exercises": {
-    "description": "Multiple exercises for a workout"
-  },
-  "exerciseName": "Ime vježbe",
-  "@exerciseName": {
-    "description": "Label for the name of a workout exercise"
-  },
-  "selectEntry": "Odaberi unos",
-  "@selectEntry": {},
-  "success": "Uspjeh",
-  "@success": {
-    "description": "Message when an action completed successfully, usually used as a heading"
-  },
-  "noMeasurementEntries": "Nemaš unose mjerenja",
-  "@noMeasurementEntries": {},
-  "moreMeasurementEntries": "Dodaj novo mjerenje",
-  "@moreMeasurementEntries": {
-    "description": "Message shown when the user wants to add new measurement"
-  },
-  "variations": "Varijante",
-  "@variations": {
-    "description": "Variations of one exercise (e.g. benchpress and benchpress narrow)"
-  },
-  "alsoKnownAs": "Poznato i kao: {aliases}",
-  "@alsoKnownAs": {
-    "placeholders": {
-      "aliases": {}
+    "todaysWorkout": "Tvoj današnji trening",
+    "@todaysWorkout": {},
+    "mealLogged": "Obrok prijavljen u dnevnik",
+    "@mealLogged": {},
+    "time": "Vrijeme",
+    "@time": {
+        "description": "The time of a meal or workout"
     },
-    "description": "List of alternative names for an exercise"
-  },
-  "verifiedEmail": "Potvrđena e-mail adresa",
-  "@verifiedEmail": {},
-  "unVerifiedEmail": "Nepotvrđena e-mail adresa",
-  "@unVerifiedEmail": {},
-  "verifiedEmailInfo": "E-mail poruka za potvrdu je poslana na {email}",
-  "@verifiedEmailInfo": {
-    "placeholders": {
-      "email": {}
+    "timeEnd": "Vrijeme završetka",
+    "@timeEnd": {
+        "description": "The end time of a workout"
+    },
+    "username": "Korisničko ime",
+    "@username": {},
+    "passwordsDontMatch": "Lozinke se ne podudaraju",
+    "@passwordsDontMatch": {
+        "description": "Error message when the user enters two different passwords during registration"
+    },
+    "passwordTooShort": "Lozinka je prekratka",
+    "@passwordTooShort": {
+        "description": "Error message when the user a password that is too short"
+    },
+    "password": "Lozinka",
+    "@password": {},
+    "confirmPassword": "Potvrdi lozinku",
+    "@confirmPassword": {},
+    "invalidEmail": "Upiši valjanu e-mail adresu",
+    "@invalidEmail": {
+        "description": "Error message when the user enters an invalid email"
+    },
+    "email": "E-mail adresa",
+    "@email": {},
+    "invalidUrl": "Upiši važeći URL",
+    "@invalidUrl": {
+        "description": "Error message when the user enters an invalid URL, e.g. in the login form"
+    },
+    "useCustomServer": "Koristi prilagođeni poslužitelj",
+    "@useCustomServer": {
+        "description": "Toggle button allowing users to switch between the default and a custom wger server"
+    },
+    "invalidUsername": "Upiši važeće korisničko ime",
+    "@invalidUsername": {
+        "description": "Error message when the user enters an invalid username"
+    },
+    "customServerUrl": "URL wger instance",
+    "@customServerUrl": {
+        "description": "Label in the form where the users can enter their own wger instance"
+    },
+    "customServerHint": "Upiši adresu tvog poslužitelja, inače će se koristiti zadani",
+    "@customServerHint": {
+        "description": "Hint text for the form where the users can enter their own wger instance"
+    },
+    "registerInstead": "Nemaš račun? Registriraj se",
+    "@registerInstead": {},
+    "loginInstead": "Već imaš račun? Prijavi se",
+    "@loginInstead": {},
+    "labelBottomNavWorkout": "Trening",
+    "@labelBottomNavWorkout": {
+        "description": "Label used in bottom navigation, use a short word"
+    },
+    "labelBottomNavNutrition": "Prehrana",
+    "@labelBottomNavNutrition": {
+        "description": "Label used in bottom navigation, use a short word"
+    },
+    "labelWorkoutLogs": "Dnevnici treninga",
+    "@labelWorkoutLogs": {
+        "description": "(Workout) logs"
+    },
+    "labelWorkoutPlan": "Plan treninga",
+    "@labelWorkoutPlan": {
+        "description": "Title for screen workout plan"
+    },
+    "labelDashboard": "Kontrolna ploča",
+    "@labelDashboard": {
+        "description": "Title for screen dashboard"
+    },
+    "successfullyDeleted": "Izbrisano",
+    "@successfullyDeleted": {
+        "description": "Message when an item was successfully deleted"
+    },
+    "successfullySaved": "Spremljeno",
+    "@successfullySaved": {
+        "description": "Message when an item was successfully saved"
+    },
+    "exercise": "Vježba",
+    "@exercise": {
+        "description": "An exercise for a workout"
+    },
+    "logHelpEntriesUnits": "Napomena: prikazuju se samo unosi s jedinicom težine (kg ili lb) i ponavljanja, druge kombinacije kao što su vrijeme ili do neuspjeha se ovdje zanemaruju.",
+    "@logHelpEntriesUnits": {},
+    "description": "Opis",
+    "@description": {},
+    "name": "Ime",
+    "@name": {
+        "description": "Name for a workout or nutritional plan"
+    },
+    "nutritionalDiary": "Dnevnik prehrane",
+    "@nutritionalDiary": {},
+    "nutritionalPlans": "Planovi prehrane",
+    "@nutritionalPlans": {},
+    "noNutritionalPlans": "Nemaš planove prehrane",
+    "@noNutritionalPlans": {
+        "description": "Message shown when the user has no nutritional plans"
+    },
+    "anErrorOccurred": "Dogodila se greška!",
+    "@anErrorOccurred": {},
+    "weight": "Težina",
+    "@weight": {
+        "description": "The weight of a workout log or body weight entry"
+    },
+    "measurement": "Mjerenje",
+    "@measurement": {},
+    "measurements": "Mjerenja",
+    "@measurements": {
+        "description": "Categories for the measurements such as biceps size, body fat, etc."
+    },
+    "measurementCategoriesHelpText": "Kategorija mjerenja, kao što su „bicepsi” ili „tjelesna mast”",
+    "@measurementCategoriesHelpText": {},
+    "measurementEntriesHelpText": "Jedinica koja se koristi za mjerenje kategorije kao što su „cm” ili „%”",
+    "@measurementEntriesHelpText": {},
+    "date": "Datum",
+    "@date": {
+        "description": "The date of a workout log or body weight entry"
+    },
+    "repetitions": "Ponavljanja",
+    "@repetitions": {
+        "description": "Repetitions for an exercise set"
+    },
+    "reps": "Ponavljanja",
+    "@reps": {
+        "description": "Shorthand for repetitions, used when space constraints are tighter"
+    },
+    "rir": "PUR",
+    "@rir": {
+        "description": "Shorthand for Repetitions In Reserve"
+    },
+    "rirNotUsed": "PUR se ne koristi",
+    "@rirNotUsed": {
+        "description": "Label used in RiR slider when the RiR value is not used/saved for the current setting or log"
+    },
+    "macronutrients": "Makronutrijenti",
+    "@macronutrients": {},
+    "planned": "Planirano",
+    "@planned": {
+        "description": "Header for the column of 'planned' nutritional values, i.e. what should be eaten"
+    },
+    "logged": "Zabilježeno",
+    "@logged": {
+        "description": "Header for the column of 'logged' nutritional values, i.e. what was eaten"
+    },
+    "difference": "Razlika",
+    "@difference": {},
+    "percentEnergy": "Postotak energije",
+    "@percentEnergy": {},
+    "gPerBodyKg": "g po tjelesnom kg",
+    "@gPerBodyKg": {
+        "description": "Label used for total sums of e.g. calories or similar in grams per Kg of body weight"
+    },
+    "total": "Ukupno",
+    "@total": {
+        "description": "Label used for total sums of e.g. calories or similar"
+    },
+    "kJ": "kJ",
+    "@kJ": {
+        "description": "Energy in a meal in kilo joules, kJ"
+    },
+    "g": "g",
+    "@g": {
+        "description": "Abbreviation for gram"
+    },
+    "proteinShort": "P",
+    "@proteinShort": {
+        "description": "The first letter or short name of the word 'Protein', used in overviews"
+    },
+    "carbohydrates": "Ugljikohidrati",
+    "@carbohydrates": {},
+    "carbohydratesShort": "U",
+    "@carbohydratesShort": {
+        "description": "The first letter or short name of the word 'Carbohydrates', used in overviews"
+    },
+    "sugars": "Šećeri",
+    "@sugars": {},
+    "fat": "Masti",
+    "@fat": {},
+    "fatShort": "M",
+    "@fatShort": {
+        "description": "The first letter or short name of the word 'Fat', used in overviews"
+    },
+    "saturatedFat": "Zasićene masti",
+    "@saturatedFat": {},
+    "fiber": "Vlakna",
+    "@fiber": {},
+    "sodium": "Natrij",
+    "@sodium": {},
+    "toggleDetails": "Prikaži detalje",
+    "@toggleDetails": {
+        "description": "Switch to toggle detail / overview"
+    },
+    "enterValue": "Upiši vrijednost",
+    "@enterValue": {
+        "description": "Error message when the user hasn't entered a value on a required field"
+    },
+    "selectExercise": "Odaberi vježbu",
+    "@selectExercise": {
+        "description": "Error message when the user hasn't selected an exercise in the form"
+    },
+    "enterCharacters": "Upiši {min} do {max} znakova",
+    "@enterCharacters": {
+        "description": "Error message when the user hasn't entered the correct number of characters in a form",
+        "type": "text",
+        "placeholders": {
+            "min": {
+                "type": "String"
+            },
+            "max": {
+                "type": "String"
+            }
+        }
+    },
+    "nrOfSets": "Broj serija po vježbi: {nrOfSets}",
+    "@nrOfSets": {
+        "description": "Label shown on the slider where the user selects the nr of sets",
+        "type": "text",
+        "placeholders": {
+            "nrOfSets": {
+                "type": "String"
+            }
+        }
+    },
+    "setUnitsAndRir": "Postavi jedinice i PUR",
+    "@setUnitsAndRir": {
+        "description": "Label shown on the slider where the user can toggle showing units and RiR",
+        "type": "text"
+    },
+    "enterValidNumber": "Upiši važeći broj",
+    "@enterValidNumber": {
+        "description": "Error message when the user has submitted an invalid number (e.g. '3,.,.,.')"
+    },
+    "selectIngredient": "Odaberi sastojak",
+    "@selectIngredient": {
+        "description": "Error message when the user hasn't selected an ingredient from the autocompleter"
+    },
+    "selectImage": "Odaberi sliku",
+    "@selectImage": {
+        "description": "Label and error message when the user hasn't selected an image to save"
+    },
+    "optionsLabel": "Opcije",
+    "@optionsLabel": {
+        "description": "Label for the popup with general app options"
+    },
+    "takePicture": "Snimi sliku",
+    "@takePicture": {},
+    "chooseFromLibrary": "Odaberi iz biblioteke slika",
+    "@chooseFromLibrary": {},
+    "gallery": "Galerija",
+    "@gallery": {},
+    "addImage": "Dodaj sliku",
+    "@addImage": {},
+    "dataCopied": "Podaci kopirani u novi unos",
+    "@dataCopied": {
+        "description": "Snackbar message to show on copying data to a new log entry"
+    },
+    "usernameValidChars": "Korisničko ime može sadržavati samo slova, brojeve i sljedeće znakove: @, +, ., -, _",
+    "@usernameValidChars": {
+        "description": "Error message when the user tries to register a username with forbidden characters"
+    },
+    "logHelpEntries": "Ako u jednom danu postoji više od jednog unosa s istim brojem ponavljanja, ali različitim težinama, na dijagramu je prikazan samo unos s većom težinom.",
+    "@logHelpEntries": {},
+    "addSet": "Dodaj seriju",
+    "@addSet": {
+        "description": "Label for the button that adds a set (to a workout day)"
+    },
+    "addMeal": "Dodaj obrok",
+    "@addMeal": {},
+    "nutritionalPlan": "Plan prehrane",
+    "@nutritionalPlan": {},
+    "useDefaultServer": "Koristi zadani poslužitelj",
+    "@useDefaultServer": {
+        "description": "Toggle button allowing users to switch between the default and a custom wger server"
+    },
+    "logout": "Odjavi se",
+    "@logout": {
+        "description": "Text for logout button"
+    },
+    "login": "Prijavi se",
+    "@login": {
+        "description": "Text for login button"
+    },
+    "register": "Registracija",
+    "@register": {
+        "description": "Text for registration button"
+    },
+    "reset": "Resetiraj",
+    "@reset": {
+        "description": "Button text allowing the user to reset the entered values to the default"
+    },
+    "jumpTo": "Prijeđi na",
+    "@jumpTo": {
+        "description": "Imperative. Label used in popup allowing the user to jump to a specific exercise while in the gym mode"
+    },
+    "save": "Spremi",
+    "@save": {},
+    "energyShort": "E",
+    "@energyShort": {
+        "description": "The first letter or short name of the word 'Energy', used in overviews"
+    },
+    "addIngredient": "Dodaj sastojak",
+    "@addIngredient": {},
+    "logMeal": "Zapiši obrok u dnevnik prehrane",
+    "@logMeal": {},
+    "value": "Vrijednost",
+    "@value": {
+        "description": "The value of a measurement entry"
+    },
+    "start": "Početak",
+    "@start": {
+        "description": "Label on button to start the gym mode (i.e., an imperative)"
+    },
+    "timeStart": "Vrijeme početka",
+    "@timeStart": {
+        "description": "The starting time of a workout"
+    },
+    "timeStartAhead": "Vrijeme početka ne može biti prije vremena završetka",
+    "@timeStartAhead": {},
+    "ingredient": "Sastojak",
+    "@ingredient": {},
+    "energy": "Energija",
+    "@energy": {
+        "description": "Energy in a meal, ingredient etc. e.g. in kJ"
+    },
+    "protein": "Proteini",
+    "@protein": {},
+    "goToToday": "Idi na danas",
+    "@goToToday": {
+        "description": "Label on button to jump back to 'today' in the calendar widget"
+    },
+    "kcal": "kcal",
+    "@kcal": {
+        "description": "Energy in a meal in kilocalories, kcal"
+    },
+    "unit": "Jedinica",
+    "@unit": {
+        "description": "The unit used for a repetition (kg, time, etc.)"
+    },
+    "edit": "Uredi",
+    "@edit": {},
+    "confirmDelete": "Stvarno želiš izbrisati „{toDelete}”?",
+    "@confirmDelete": {
+        "description": "Confirmation text before the user deletes an object",
+        "type": "text",
+        "placeholders": {
+            "toDelete": {
+                "type": "String"
+            }
+        }
+    },
+    "newNutritionalPlan": "Novi plan prehrane",
+    "@newNutritionalPlan": {},
+    "amount": "Količina",
+    "@amount": {
+        "description": "The amount (e.g. in grams) of an ingredient in a meal"
+    },
+    "newEntry": "Novi unos",
+    "@newEntry": {
+        "description": "Title when adding a new entry such as a weight or log entry"
+    },
+    "noWeightEntries": "Nemaš unose težine",
+    "@noWeightEntries": {
+        "description": "Message shown when the user has no logged weight entries"
+    },
+    "loadingText": "Učitavanje …",
+    "@loadingText": {
+        "description": "Text to show when entries are being loaded in the background: Loading..."
+    },
+    "delete": "Izbriši",
+    "@delete": {},
+    "goToDetailPage": "Idi na stranicu s detaljima",
+    "@goToDetailPage": {},
+    "aboutDescription": "Hvala što koristiš wger! wger je suradnički projekt otvorenog koda koji su izradili ljubitelji fitnesa iz cijelog svijeta.",
+    "@aboutDescription": {
+        "description": "Text in the about dialog"
+    },
+    "calendar": "Kalendar",
+    "@calendar": {},
+    "musclesSecondary": "Sekundarni mišići",
+    "@musclesSecondary": {
+        "description": "secondary muscles trained by an exercise"
+    },
+    "equipment": "Oprema",
+    "@equipment": {
+        "description": "Equipment needed to perform an exercise"
+    },
+    "category": "Kategorija",
+    "@category": {
+        "description": "Category for an exercise, ingredient, etc."
+    },
+    "searchExercise": "Traži vježbe koje želiš dodati",
+    "@searchExercise": {
+        "description": "Label on set form. Selected exercises are added to the set"
+    },
+    "muscles": "Mišići",
+    "@muscles": {
+        "description": "(main) muscles trained by an exercise"
+    },
+    "dayDescriptionHelp": "Opis onoga što se radi na današnji dan (npr. „dan povlačenja”) ili koji su dijelovi tijela trenirani (npr. „prsa i ramena”)",
+    "@dayDescriptionHelp": {},
+    "setNr": "Serija br. {nr}",
+    "@setNr": {
+        "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.",
+        "type": "text",
+        "placeholders": {
+            "nr": {
+                "type": "String"
+            }
+        }
+    },
+    "sameRepetitions": "Ako radiš ista ponavljanja i težinu za sve serije, ispuni jedan redak. Na primjer, za 4 serije jednostavno upiši 10 za ponavljanja, to automatski postaje „4 × 10”.",
+    "@sameRepetitions": {},
+    "comment": "Komentar",
+    "@comment": {
+        "description": "Comment, additional information"
+    },
+    "impression": "Dojam",
+    "@impression": {
+        "description": "General impression (e.g. for a workout session) such as good, bad, etc."
+    },
+    "notes": "Bilješke",
+    "@notes": {
+        "description": "Personal notes, e.g. for a workout session"
+    },
+    "workoutSession": "Sesija treninga",
+    "@workoutSession": {
+        "description": "A (logged) workout session"
+    },
+    "newDay": "Novi dan",
+    "@newDay": {},
+    "newSet": "Nova serija",
+    "@newSet": {
+        "description": "Header when adding a new set to a workout day"
+    },
+    "selectExercises": "Ako želiš izraditi nasdkup, traži i odaberi vježbe koje će se grupirati u jednu grupu",
+    "@selectExercises": {},
+    "gymMode": "Modus teretane",
+    "@gymMode": {
+        "description": "Label when starting the gym mode"
+    },
+    "plateCalculator": "Ploče",
+    "@plateCalculator": {
+        "description": "Label used for the plate calculator in the gym mode"
+    },
+    "plateCalculatorNotDivisible": "Nije moguće postići težinu s dostupnim pločastim utezima",
+    "@plateCalculatorNotDivisible": {
+        "description": "Error message when the current weight is not reachable with plates (e.g. 33.1 kg)"
+    },
+    "pause": "Pauza",
+    "@pause": {
+        "description": "Noun, not an imperative! Label used for the pause when using the gym mode"
+    },
+    "weightUnit": "Jedinica težine",
+    "@weightUnit": {},
+    "appUpdateTitle": "Potrebna je nova verzija",
+    "@appUpdateTitle": {},
+    "appUpdateContent": "Ova verzija aplikacije nije kompatibilna s poslužiteljem. Aktualiziraj svoju aplikaciju.",
+    "@appUpdateContent": {},
+    "set": "Serija",
+    "@set": {
+        "description": "A set in a workout plan"
+    },
+    "repetitionUnit": "Jedinica ponavljanja",
+    "@repetitionUnit": {},
+    "recentlyUsedIngredients": "Nedavno dodani sastojci",
+    "@recentlyUsedIngredients": {
+        "description": "A message when a user adds a new ingredient to a meal."
+    },
+    "logIngredient": "Zapiši sastojak u dnevnik prehrane",
+    "@logIngredient": {},
+    "searchIngredient": "Traži sastojak",
+    "@searchIngredient": {
+        "description": "Label on ingredient search form"
+    },
+    "weekAverage": "Sedmodnevni prosjek",
+    "@weekAverage": {
+        "description": "Header for the column of '7 day average' nutritional values, i.e. what was logged last week"
+    },
+    "productFound": "Pronađeni proizvod",
+    "@productFound": {
+        "description": "Header label for dialog when product is found with barcode"
+    },
+    "productFoundDescription": "Barkod odgovara ovom proizvodu: {productName}. Želiš li nastaviti?",
+    "@productFoundDescription": {
+        "description": "Dialog info when product is found with barcode",
+        "type": "text",
+        "placeholders": {
+            "productName": {
+                "type": "String"
+            }
+        }
+    },
+    "productNotFound": "Proizvod nije pronađen",
+    "@productNotFound": {
+        "description": "Header label for dialog when product is not found with barcode"
+    },
+    "productNotFoundDescription": "Proizvod sa skeniranim barkodom {barcode} nije pronađen u wger bazi podataka",
+    "@productNotFoundDescription": {
+        "description": "Dialog info when product is not found with barcode",
+        "type": "text",
+        "placeholders": {
+            "barcode": {
+                "type": "String"
+            }
+        }
+    },
+    "scanBarcode": "Skeniraj barkod",
+    "@scanBarcode": {
+        "description": "Label for scan barcode button"
+    },
+    "close": "Zatvori",
+    "@close": {
+        "description": "Translation for close"
+    },
+    "enterMinCharacters": "Upiši barem {min} znakova",
+    "@enterMinCharacters": {
+        "description": "Error message when the user hasn't entered the minimum amount characters in a form",
+        "type": "text",
+        "placeholders": {
+            "min": {
+                "type": "String"
+            }
+        }
+    },
+    "add_exercise_image_license": "Slike moraju biti kompatibilne s licencom CC BY SA. Ako si u nedoumici, prenesi samo svoje vlastite fotografije.",
+    "@add_exercise_image_license": {},
+    "whatVariationsExist": "Koje varijante ove vježbe postoje?",
+    "@whatVariationsExist": {},
+    "images": "Slike",
+    "@images": {},
+    "alternativeNames": "Alternativna imena",
+    "@alternativeNames": {},
+    "previous": "Prethodna",
+    "@previous": {},
+    "oneNamePerLine": "Jedno ime po retku",
+    "@oneNamePerLine": {},
+    "translation": "Prijevod",
+    "@translation": {},
+    "addExercise": "Dodaj vježbu",
+    "@addExercise": {},
+    "translateExercise": "Prevedi ovu vježbu",
+    "@translateExercise": {},
+    "baseData": "Osnovni podaci na engleskom jeziku",
+    "@baseData": {
+        "description": "The base data for an exercise such as category, trained muscles, etc."
+    },
+    "arms": "Ruke",
+    "@arms": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "back": "Leđa",
+    "@back": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "chest": "Prsa",
+    "@chest": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "sz_bar": "Zaobljena šipka",
+    "@sz_bar": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "userProfile": "Tvoj profil",
+    "@userProfile": {},
+    "exerciseList": "Popis vježbi",
+    "@exerciseList": {},
+    "exercises": "Vježbe",
+    "@exercises": {
+        "description": "Multiple exercises for a workout"
+    },
+    "exerciseName": "Ime vježbe",
+    "@exerciseName": {
+        "description": "Label for the name of a workout exercise"
+    },
+    "selectEntry": "Odaberi unos",
+    "@selectEntry": {},
+    "success": "Uspjeh",
+    "@success": {
+        "description": "Message when an action completed successfully, usually used as a heading"
+    },
+    "noMeasurementEntries": "Nemaš unose mjerenja",
+    "@noMeasurementEntries": {},
+    "moreMeasurementEntries": "Dodaj novo mjerenje",
+    "@moreMeasurementEntries": {
+        "description": "Message shown when the user wants to add new measurement"
+    },
+    "variations": "Varijante",
+    "@variations": {
+        "description": "Variations of one exercise (e.g. benchpress and benchpress narrow)"
+    },
+    "alsoKnownAs": "Poznato i kao: {aliases}",
+    "@alsoKnownAs": {
+        "placeholders": {
+            "aliases": {
+                "type": "String"
+            }
+        },
+        "description": "List of alternative names for an exercise"
+    },
+    "verifiedEmail": "Potvrđena e-mail adresa",
+    "@verifiedEmail": {},
+    "unVerifiedEmail": "Nepotvrđena e-mail adresa",
+    "@unVerifiedEmail": {},
+    "verifiedEmailInfo": "E-mail poruka za potvrdu je poslana na {email}",
+    "@verifiedEmailInfo": {
+        "placeholders": {
+            "email": {
+                "type": "String"
+            }
+        }
+    },
+    "contributeExerciseWarning": "Vježbe možeš dodati samo ako je tvoj račun stariji od {days} dana i ako si potvrdio/la tvoju e-mail adresu",
+    "@contributeExerciseWarning": {
+        "description": "Number of days before which a person can add exercise",
+        "placeholders": {
+            "days": {
+                "type": "String",
+                "example": "14"
+            }
+        }
+    },
+    "cacheWarning": "Zbog predmemoriranja, vidljivost promjena u aplikaciji može nešto potrajati.",
+    "@cacheWarning": {},
+    "verifiedEmailReason": "Za dodavanje vježbi moraš potvrditi tvoju e-mail adresu",
+    "@verifiedEmailReason": {},
+    "cardio": "Kardio",
+    "@cardio": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "quads": "Ekstenzije nogu",
+    "@quads": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "pull_up_bar": "Šipka za povlačenje",
+    "@pull_up_bar": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "shoulders": "Ramena",
+    "@shoulders": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "triceps": "Triceps",
+    "@triceps": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "swiss_ball": "Gimnastička lopta",
+    "@swiss_ball": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "until_failure": "Do neuspjeha",
+    "@until_failure": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "none__bodyweight_exercise_": "ništa (vježba za tjelesnu težinu)",
+    "@none__bodyweight_exercise_": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "seconds": "Sekunde",
+    "@seconds": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "textPromptTitle": "Spreman?",
+    "@textPromptTitle": {},
+    "barbell": "Šipka",
+    "@barbell": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "calves": "Lisni mišići",
+    "@calves": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "textPromptSubheading": "Počni pritiskom gumba radnje",
+    "@textPromptSubheading": {},
+    "body_weight": "Tjelesna težina",
+    "@body_weight": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "kilometers": "Kilometri",
+    "@kilometers": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "kilometers_per_hour": "Kilometara na sat",
+    "@kilometers_per_hour": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "lats": "Leđni mišići",
+    "@lats": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "miles_per_hour": "Milja na sat",
+    "@miles_per_hour": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "minutes": "Minute",
+    "@minutes": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "plates": "Ploče",
+    "@plates": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "kg": "kg",
+    "@kg": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "lb": "funta",
+    "@lb": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "searchNamesInEnglish": "Također traži imena na engleskom jeziku",
+    "@searchNamesInEnglish": {},
+    "language": "Jezik",
+    "@language": {},
+    "aboutPageTitle": "Wger informacije",
+    "@aboutPageTitle": {},
+    "abs": "Trbuh",
+    "@abs": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "gym_mat": "Podloga za treniranje",
+    "@gym_mat": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "incline_bench": "Nagnuta klupa",
+    "@incline_bench": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "baseNameEnglish": "Sve vježbe trebaju osnovno ime na engleskom jeziku",
+    "@baseNameEnglish": {},
+    "next": "Sljedeća",
+    "@next": {},
+    "contributeExercise": "Doprinesi vježbu",
+    "@contributeExercise": {},
+    "bench": "Klupa",
+    "@bench": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "dumbbell": "Ručni uteg",
+    "@dumbbell": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "biceps": "Bicepsi",
+    "@biceps": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "glutes": "Stražnjica",
+    "@glutes": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "hamstrings": "Tetive koljena",
+    "@hamstrings": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "kettlebell": "Kuglasti uteg",
+    "@kettlebell": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "legs": "Noge",
+    "@legs": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "miles": "Milje",
+    "@miles": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "max_reps": "Maks. broj ponavljanja",
+    "@max_reps": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "verify": "Potvrdi",
+    "@verify": {},
+    "lower_back": "Donji dio leđa",
+    "@lower_back": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "aboutMastodonTitle": "Mastodon",
+    "@aboutMastodonTitle": {},
+    "noMatchingExerciseFound": "Nisu pronađene odgovarajuće vježbe",
+    "@noMatchingExerciseFound": {
+        "description": "Message returned if no exercises match the searched string"
+    },
+    "aboutDonateTitle": "Doniraj",
+    "@aboutDonateTitle": {},
+    "aboutDonateText": "Pomogni projektu: kupi nam kavu, plati troškove poslužitelja i potiči nas u našem radu",
+    "@aboutDonateText": {},
+    "settingsTitle": "Postavke",
+    "@settingsTitle": {},
+    "settingsCacheTitle": "Predmemorija",
+    "@settingsCacheTitle": {},
+    "settingsExerciseCacheDescription": "Izvrši predmemoriju",
+    "@settingsExerciseCacheDescription": {},
+    "settingsCacheDeletedSnackbar": "Predmemorija je uspješno izbrisana",
+    "@settingsCacheDeletedSnackbar": {},
+    "useMetric": "Koristi metričke jedinice za tjelesnu težinu",
+    "@useMetric": {},
+    "log": "Zapiši",
+    "@log": {
+        "description": "Log a specific meal (imperative form)"
+    },
+    "done": "Obavljeno",
+    "@done": {},
+    "onlyLogging": "Prati samo kalorije",
+    "@onlyLogging": {},
+    "onlyLoggingHelpText": "Označi okvir ako želiš bilježiti samo svoje kalorije i ne želiš postaviti detaljan plan prehrane s određenim obrocima",
+    "@onlyLoggingHelpText": {},
+    "percentValue": "{value} %",
+    "@percentValue": {
+        "description": "A value in percent, e.g. 10 %",
+        "type": "text",
+        "placeholders": {
+            "value": {
+                "type": "String"
+            }
+        }
+    },
+    "goalEnergy": "Cilj za energiju",
+    "@goalEnergy": {},
+    "goalProtein": "Cilj za proteine",
+    "@goalProtein": {},
+    "goalCarbohydrates": "Cilj za ugljikohidrate",
+    "@goalCarbohydrates": {},
+    "goalFat": "Cilj za mast",
+    "@goalFat": {},
+    "today": "Danas",
+    "@today": {},
+    "loggedToday": "Zapisano danas",
+    "@loggedToday": {},
+    "kcalValue": "{value} kcal",
+    "@kcalValue": {
+        "description": "A value in kcal, e.g. 500 kcal",
+        "type": "text",
+        "placeholders": {
+            "value": {
+                "type": "String"
+            }
+        }
+    },
+    "gValue": "{value} g",
+    "@gValue": {
+        "description": "A value in grams, e.g. 5 g",
+        "type": "text",
+        "placeholders": {
+            "value": {
+                "type": "String"
+            }
+        }
+    },
+    "surplus": "višak",
+    "@surplus": {
+        "description": "Caloric surplus (either planned or unplanned)"
+    },
+    "deficit": "manjak",
+    "@deficit": {
+        "description": "Caloric deficit (either planned or unplanned)"
+    },
+    "goalFiber": "Cilj za vlakna",
+    "@goalFiber": {},
+    "goalMacro": "Ciljevi za makronutrijente",
+    "@goalMacro": {
+        "description": "The goal for macronutrients"
+    },
+    "selectMealToLog": "Odaberi obrok za zapis u dnevnik",
+    "@selectMealToLog": {},
+    "ingredientLogged": "Sastojak je upisan u dnevnik",
+    "@ingredientLogged": {},
+    "noIngredientsDefined": "Još nije određen nijedan sastojak",
+    "@noIngredientsDefined": {},
+    "overallChangeWeight": "Sveukupna promjena",
+    "@overallChangeWeight": {
+        "description": "Overall change in weight, added for localization"
+    },
+    "goalTypeMeals": "Od obroka",
+    "@goalTypeMeals": {
+        "description": "added for localization of Class GoalType's filed meals"
+    },
+    "goalTypeBasic": "Osnovni",
+    "@goalTypeBasic": {
+        "description": "added for localization of Class GoalType's filed basic"
+    },
+    "goalTypeAdvanced": "Napredni",
+    "@goalTypeAdvanced": {
+        "description": "added for localization of Class GoalType's filed advanced"
+    },
+    "indicatorRaw": "sirovo",
+    "@indicatorRaw": {
+        "description": "added for localization of Class Indicator's field text"
+    },
+    "indicatorAvg": "prosjek",
+    "@indicatorAvg": {
+        "description": "added for localization of Class Indicator's field text"
+    },
+    "themeMode": "Modus teme",
+    "@themeMode": {},
+    "darkMode": "Uvijek tamni modus",
+    "@darkMode": {},
+    "lightMode": "Uvijek svijetli modus",
+    "@lightMode": {},
+    "systemMode": "Postavke sustava",
+    "@systemMode": {},
+    "chartAllTimeTitle": "{name} – svo vrijeme",
+    "@chartAllTimeTitle": {
+        "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
+        "type": "text",
+        "placeholders": {
+            "name": {
+                "type": "String"
+            }
+        }
+    },
+    "chartDuringPlanTitle": "{chartName} tijekom prehrambenog plana {planName}",
+    "@chartDuringPlanTitle": {
+        "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
+        "type": "text",
+        "placeholders": {
+            "chartName": {
+                "type": "String"
+            },
+            "planName": {
+                "type": "String"
+            }
+        }
+    },
+    "settingsIngredientCacheDescription": "Predmemorija sastojaka",
+    "@settingsIngredientCacheDescription": {},
+    "chart30DaysTitle": "{name} – zadnjih 30 dana",
+    "@chart30DaysTitle": {
+        "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
+        "type": "text",
+        "placeholders": {
+            "name": {
+                "type": "String"
+            }
+        }
+    },
+    "barWeight": "Težina šipke",
+    "@barWeight": {},
+    "useColors": "Koristi boje",
+    "@useColors": {},
+    "selectAvailablePlates": "Odaberi prosjećne ploće",
+    "@selectAvailablePlates": {},
+    "useApiToken": "Koristi API Token",
+    "@useApiToken": {},
+    "useUsernameAndPassword": "Koristi vjerodajenice (Korisničko ime i lozinku)",
+    "@useUsernameAndPassword": {},
+    "apiToken": "API Token",
+    "@apiToken": {},
+    "invalidApiToken": "Molimo provjerite API Token",
+    "@invalidApiToken": {
+        "description": "Error message when the user enters an invalid API key"
+    },
+    "apiTokenValidChars": "API Token može sadržavati a-f, brojeve od 0-9 i mora biti točno 40 znakova dugačak.",
+    "@apiTokenValidChars": {
+        "description": "Error message when the user tries to input a API key with forbidden characters"
+    },
+    "routines": "Rutina",
+    "@routines": {},
+    "newRoutine": "Nova rutina",
+    "@newRoutine": {},
+    "noRoutines": "Vi nemate rutine",
+    "@noRoutines": {},
+    "restTime": "Period odmora",
+    "@restTime": {},
+    "sets": "Vježba ima setova",
+    "@sets": {
+        "description": "The number of sets to be done for one exercise"
     }
-  },
-  "contributeExerciseWarning": "Vježbe možeš dodati samo ako je tvoj račun stariji od {days} dana i ako si potvrdio/la tvoju e-mail adresu",
-  "@contributeExerciseWarning": {
-    "description": "Number of days before which a person can add exercise",
-    "placeholders": {
-      "days": {
-        "type": "String",
-        "example": "14"
-      }
-    }
-  },
-  "cacheWarning": "Zbog predmemoriranja, vidljivost promjena u aplikaciji može nešto potrajati.",
-  "@cacheWarning": {},
-  "verifiedEmailReason": "Za dodavanje vježbi moraš potvrditi tvoju e-mail adresu",
-  "@verifiedEmailReason": {},
-  "cardio": "Kardio",
-  "@cardio": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "quads": "Ekstenzije nogu",
-  "@quads": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "pull_up_bar": "Šipka za povlačenje",
-  "@pull_up_bar": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "shoulders": "Ramena",
-  "@shoulders": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "triceps": "Triceps",
-  "@triceps": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "swiss_ball": "Gimnastička lopta",
-  "@swiss_ball": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "until_failure": "Do neuspjeha",
-  "@until_failure": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "none__bodyweight_exercise_": "ništa (vježba za tjelesnu težinu)",
-  "@none__bodyweight_exercise_": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "seconds": "Sekunde",
-  "@seconds": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "textPromptTitle": "Spreman?",
-  "@textPromptTitle": {},
-  "barbell": "Šipka",
-  "@barbell": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "calves": "Lisni mišići",
-  "@calves": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "textPromptSubheading": "Počni pritiskom gumba radnje",
-  "@textPromptSubheading": {},
-  "body_weight": "Tjelesna težina",
-  "@body_weight": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "kilometers": "Kilometri",
-  "@kilometers": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "kilometers_per_hour": "Kilometara na sat",
-  "@kilometers_per_hour": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "lats": "Leđni mišići",
-  "@lats": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "miles_per_hour": "Milja na sat",
-  "@miles_per_hour": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "minutes": "Minute",
-  "@minutes": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "plates": "Ploče",
-  "@plates": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "kg": "kg",
-  "@kg": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "lb": "funta",
-  "@lb": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "searchNamesInEnglish": "Također traži imena na engleskom jeziku",
-  "@searchNamesInEnglish": {},
-  "language": "Jezik",
-  "@language": {},
-  "aboutPageTitle": "Wger informacije",
-  "@aboutPageTitle": {},
-  "abs": "Trbuh",
-  "@abs": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "gym_mat": "Podloga za treniranje",
-  "@gym_mat": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "incline_bench": "Nagnuta klupa",
-  "@incline_bench": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "baseNameEnglish": "Sve vježbe trebaju osnovno ime na engleskom jeziku",
-  "@baseNameEnglish": {},
-  "next": "Sljedeća",
-  "@next": {},
-  "contributeExercise": "Doprinesi vježbu",
-  "@contributeExercise": {},
-  "bench": "Klupa",
-  "@bench": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "dumbbell": "Ručni uteg",
-  "@dumbbell": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "biceps": "Bicepsi",
-  "@biceps": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "glutes": "Stražnjica",
-  "@glutes": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "hamstrings": "Tetive koljena",
-  "@hamstrings": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "kettlebell": "Kuglasti uteg",
-  "@kettlebell": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "legs": "Noge",
-  "@legs": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "miles": "Milje",
-  "@miles": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "max_reps": "Maks. broj ponavljanja",
-  "@max_reps": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "verify": "Potvrdi",
-  "@verify": {},
-  "lower_back": "Donji dio leđa",
-  "@lower_back": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "aboutMastodonTitle": "Mastodon",
-  "@aboutMastodonTitle": {
-    "description": "Title for mastodon section in the about dialog"
-  },
-  "aboutMastodonText": "Prati nas na Mastodonu za nove verzije i novosti o projektu",
-  "@aboutMastodonText": {
-    "description": "Text for the mastodon section in the about dialog"
-  },
-  "noMatchingExerciseFound": "Nisu pronađene odgovarajuće vježbe",
-  "@noMatchingExerciseFound": {
-    "description": "Message returned if no exercises match the searched string"
-  },
-  "aboutDonateTitle": "Doniraj",
-  "@aboutDonateTitle": {},
-  "aboutDonateText": "Pomogni projektu: kupi nam kavu, plati troškove poslužitelja i potiči nas u našem radu",
-  "@aboutDonateText": {},
-  "settingsTitle": "Postavke",
-  "@settingsTitle": {},
-  "settingsCacheTitle": "Predmemorija",
-  "@settingsCacheTitle": {},
-  "settingsExerciseCacheDescription": "Izvrši predmemoriju",
-  "@settingsExerciseCacheDescription": {},
-  "settingsCacheDeletedSnackbar": "Predmemorija je uspješno izbrisana",
-  "@settingsCacheDeletedSnackbar": {},
-  "useMetric": "Koristi metričke jedinice za tjelesnu težinu",
-  "@useMetric": {},
-  "log": "Zapiši",
-  "@log": {
-    "description": "Log a specific meal (imperative form)"
-  },
-  "done": "Obavljeno",
-  "@done": {},
-  "onlyLogging": "Prati samo kalorije",
-  "@onlyLogging": {},
-  "onlyLoggingHelpText": "Označi okvir ako želiš bilježiti samo svoje kalorije i ne želiš postaviti detaljan plan prehrane s određenim obrocima",
-  "@onlyLoggingHelpText": {},
-  "addGoalsToPlanHelpText": "Ovo omogućuje postavljanje općih ciljeva za energiju, proteine, ugljikohidrate ili masti za plan. Imaj na umu da će ove vrijednosti imati prednost ako postaviš detaljan plan obroka.",
-  "@addGoalsToPlanHelpText": {},
-  "percentValue": "{value} %",
-  "@percentValue": {
-    "description": "A value in percent, e.g. 10 %",
-    "type": "text",
-    "placeholders": {
-      "value": {}
-    }
-  },
-  "addGoalsToPlan": "Dodaj ciljeve ovom planu",
-  "@addGoalsToPlan": {},
-  "goalEnergy": "Cilj za energiju",
-  "@goalEnergy": {},
-  "goalProtein": "Cilj za proteine",
-  "@goalProtein": {},
-  "goalCarbohydrates": "Cilj za ugljikohidrate",
-  "@goalCarbohydrates": {},
-  "goalFat": "Cilj za mast",
-  "@goalFat": {},
-  "today": "Danas",
-  "@today": {},
-  "loggedToday": "Zapisano danas",
-  "@loggedToday": {},
-  "kcalValue": "{value} kcal",
-  "@kcalValue": {
-    "description": "A value in kcal, e.g. 500 kcal",
-    "type": "text",
-    "placeholders": {
-      "value": {}
-    }
-  },
-  "gValue": "{value} g",
-  "@gValue": {
-    "description": "A value in grams, e.g. 5 g",
-    "type": "text",
-    "placeholders": {
-      "value": {}
-    }
-  },
-  "surplus": "višak",
-  "@surplus": {
-    "description": "Caloric surplus (either planned or unplanned)"
-  },
-  "deficit": "manjak",
-  "@deficit": {
-    "description": "Caloric deficit (either planned or unplanned)"
-  },
-  "goalFiber": "Cilj za vlakna",
-  "@goalFiber": {},
-  "goalMacro": "Ciljevi za makronutrijente",
-  "@goalMacro": {
-    "description": "The goal for macronutrients"
-  },
-  "selectMealToLog": "Odaberi obrok za zapis u dnevnik",
-  "@selectMealToLog": {},
-  "ingredientLogged": "Sastojak je upisan u dnevnik",
-  "@ingredientLogged": {},
-  "noIngredientsDefined": "Još nije određen nijedan sastojak",
-  "@noIngredientsDefined": {}
 }
diff --git a/lib/l10n/app_hu.arb b/lib/l10n/app_hu.arb
index 0967ef42..dfde275e 100644
--- a/lib/l10n/app_hu.arb
+++ b/lib/l10n/app_hu.arb
@@ -1 +1,80 @@
-{}
+{
+  "login": "Bejelentkezés",
+  "@login": {
+    "description": "Text for login button"
+  },
+  "invalidEmail": "Nem megfelelő e-mail cím",
+  "@invalidEmail": {
+    "description": "Error message when the user enters an invalid email"
+  },
+  "customServerHint": "Add meg a saját szervered címét, máskülönben az alapértelmezettet használjuk",
+  "@customServerHint": {
+    "description": "Hint text for the form where the users can enter their own wger instance"
+  },
+  "userProfile": "Profil",
+  "@userProfile": {},
+  "logout": "Kijelentkezés",
+  "@logout": {
+    "description": "Text for logout button"
+  },
+  "register": "Regisztráció",
+  "@register": {
+    "description": "Text for registration button"
+  },
+  "useDefaultServer": "Alapértelmezett szerver",
+  "@useDefaultServer": {
+    "description": "Toggle button allowing users to switch between the default and a custom wger server"
+  },
+  "useCustomServer": "Egyedi szerver",
+  "@useCustomServer": {
+    "description": "Toggle button allowing users to switch between the default and a custom wger server"
+  },
+  "invalidUrl": "Nem megfelelő URL",
+  "@invalidUrl": {
+    "description": "Error message when the user enters an invalid URL, e.g. in the login form"
+  },
+  "password": "Jelszó",
+  "@password": {},
+  "passwordTooShort": "A jelszó túl rövid",
+  "@passwordTooShort": {
+    "description": "Error message when the user a password that is too short"
+  },
+  "usernameValidChars": "A felhasználónév csak betűket, számokat és @, +, ., -, és _ karaktereket tartalmazhat",
+  "@usernameValidChars": {
+    "description": "Error message when the user tries to register a username with forbidden characters"
+  },
+  "passwordsDontMatch": "A jelszavak nem egyeznek",
+  "@passwordsDontMatch": {
+    "description": "Error message when the user enters two different passwords during registration"
+  },
+  "labelBottomNavNutrition": "Táplálkozás",
+  "@labelBottomNavNutrition": {
+    "description": "Label used in bottom navigation, use a short word"
+  },
+  "username": "Felhasználónév",
+  "@username": {},
+  "email": "E-mail cím",
+  "@email": {},
+  "confirmPassword": "Jelszó újra",
+  "@confirmPassword": {},
+  "invalidUsername": "Nem megfelelő felhasználónév",
+  "@invalidUsername": {
+    "description": "Error message when the user enters an invalid username"
+  },
+  "customServerUrl": "A wger szerver URL-je",
+  "@customServerUrl": {
+    "description": "Label in the form where the users can enter their own wger instance"
+  },
+  "reset": "Visszaállítás",
+  "@reset": {
+    "description": "Button text allowing the user to reset the entered values to the default"
+  },
+  "registerInstead": "Nincs fiókod? Regisztrálj most",
+  "@registerInstead": {},
+  "loginInstead": "Már van fiókod? Bejelentkezés",
+  "@loginInstead": {},
+  "labelBottomNavWorkout": "Edzés",
+  "@labelBottomNavWorkout": {
+    "description": "Label used in bottom navigation, use a short word"
+  }
+}
diff --git a/lib/l10n/app_id.arb b/lib/l10n/app_id.arb
index e18079dc..398849e8 100644
--- a/lib/l10n/app_id.arb
+++ b/lib/l10n/app_id.arb
@@ -36,9 +36,9 @@
   "@passwordTooShort": {
     "description": "Error message when the user a password that is too short"
   },
-  "password": "Password",
+  "password": "Kata sandi",
   "@password": {},
-  "confirmPassword": "Konfirmasi Password",
+  "confirmPassword": "Konfirmasi Kata Sandi",
   "@confirmPassword": {},
   "invalidEmail": "Mohon masukkan E-mail yang valid",
   "@invalidEmail": {
@@ -46,7 +46,7 @@
   },
   "email": "Alamat E-mail",
   "@email": {},
-  "username": "Username",
+  "username": "Nama pengguna",
   "@username": {},
   "invalidUsername": "Mohon masukkan username yang valid",
   "@invalidUsername": {
@@ -68,10 +68,6 @@
   "@registerInstead": {},
   "loginInstead": "Punya akun? Masuk",
   "@loginInstead": {},
-  "labelWorkoutPlans": "Daftar rencana workout",
-  "@labelWorkoutPlans": {
-    "description": "Title for screen workout plans"
-  },
   "labelBottomNavWorkout": "Workout",
   "@labelBottomNavWorkout": {
     "description": "Label used in bottom navigation, use a short word"
@@ -108,10 +104,6 @@
   "@searchExercise": {
     "description": "Label on set form. Selected exercises are added to the set"
   },
-  "supersetWith": "tambahkan dengan",
-  "@supersetWith": {
-    "description": "Text used between exercise cards when adding a new set. Translate as something like 'in a superset with'"
-  },
   "equipment": "Perlengkapan",
   "@equipment": {
     "description": "Equipment needed to perform an exercise"
@@ -128,23 +120,15 @@
   "@category": {
     "description": "Category for an exercise, ingredient, etc."
   },
-  "newWorkout": "Rencana workout baru",
-  "@newWorkout": {
-    "description": "Header when adding a new workout"
-  },
-  "noWorkoutPlans": "Kamu belum mempunyain rencana workout",
-  "@noWorkoutPlans": {
-    "description": "Message shown when the user has no workout plans"
-  },
   "repetitions": "Pengulangan",
   "@repetitions": {
     "description": "Repetitions for an exercise set"
   },
-  "reps": "Reps",
+  "reps": "Repetisi",
   "@reps": {
     "description": "Shorthand for repetitions, used when space constraints are tighter"
   },
-  "rir": "RiR",
+  "rir": "Repetisi tersisa",
   "@rir": {
     "description": "Shorthand for Repetitions In Reserve"
   },
@@ -167,7 +151,9 @@
     "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.",
     "type": "text",
     "placeholders": {
-      "nr": {}
+      "nr": {
+        "type": "String"
+      }
     }
   },
   "sameRepetitions": "Jika Anda melakukan pengulangan dan bobot yang sama untuk semua set, Anda cukup mengisi satu baris. Misalnya untuk 4 set cukup masukkan 10 untuk pengulangan, ini secara otomatis menjadi \"4 x 10\".",
@@ -200,7 +186,7 @@
   "@gymMode": {
     "description": "Label when starting the gym mode"
   },
-  "plateCalculator": "Plates",
+  "plateCalculator": "Lempeng Beban",
   "@plateCalculator": {
     "description": "Label used for the plate calculator in the gym mode"
   },
@@ -218,9 +204,9 @@
   },
   "todaysWorkout": "Latihanmu hari ini",
   "@todaysWorkout": {},
-  "logHelpEntries": "If on a single day there is more than one entry with the same number of repetitions, but different weights, only the entry with the higher weight is shown in the diagram.",
+  "logHelpEntries": "Jika dalam satu hari terdapat lebih dari satu entri dengan jumlah repetisi yang sama namun beban berbeda, hanya entri dengan beban tertinggi yang akan ditampilkan di diagram.",
   "@logHelpEntries": {},
-  "logHelpEntriesUnits": "Note that only entries with a weight unit (kg or lb) and repetitions are charted, other combinations such as time or until failure are ignored here.",
+  "logHelpEntriesUnits": "Perlu dicatat bahwa hanya entri dengan satuan beban (kg atau lb) dan repetisi yang akan ditampilkan di grafik. Kombinasi lain seperti waktu atau hingga gagal tidak diperhitungkan di sini.",
   "@logHelpEntriesUnits": {},
   "description": "Description",
   "@description": {},
@@ -236,49 +222,49 @@
   },
   "addMeal": "Tambah makanan",
   "@addMeal": {},
-  "mealLogged": "Meal logged to diary",
+  "mealLogged": "Makanan ditambahkan ke buku harian",
   "@mealLogged": {},
-  "logMeal": "Catat makanan ini",
+  "logMeal": "Catat makanan ke buku harian nutrisi",
   "@logMeal": {},
   "addIngredient": "Tambah komposisi",
   "@addIngredient": {},
-  "logIngredient": "Simpan di diari nutrisi",
+  "logIngredient": "Catat bahan ke buku harian nutrisi",
   "@logIngredient": {},
   "searchIngredient": "Cari komposisi",
   "@searchIngredient": {
     "description": "Label on ingredient search form"
   },
-  "nutritionalPlan": "Nutritional plan",
+  "nutritionalPlan": "Rencana Nutrisi",
   "@nutritionalPlan": {},
-  "nutritionalDiary": "Nutritional diary",
+  "nutritionalDiary": "Buku Harian Nutrisi",
   "@nutritionalDiary": {},
-  "nutritionalPlans": "Nutritional plans",
+  "nutritionalPlans": "Rencana Nutrisi",
   "@nutritionalPlans": {},
-  "noNutritionalPlans": "You have no nutritional plans",
+  "noNutritionalPlans": "Anda belum memiliki rencana nutrisi",
   "@noNutritionalPlans": {
     "description": "Message shown when the user has no nutritional plans"
   },
-  "anErrorOccurred": "An Error Occurred!",
+  "anErrorOccurred": "Terjadi kesalahan!",
   "@anErrorOccurred": {},
-  "weight": "Weight",
+  "weight": "Berat",
   "@weight": {
     "description": "The weight of a workout log or body weight entry"
   },
   "measurement": "Ukuran",
   "@measurement": {},
-  "measurements": "Measurements",
+  "measurements": "Pengukuran",
   "@measurements": {
     "description": "Categories for the measurements such as biceps size, body fat, etc."
   },
-  "measurementCategoriesHelpText": "Measurement category, such as 'biceps' or 'body fat'",
+  "measurementCategoriesHelpText": "Kategori pengukuran, seperti 'bisep' atau 'lemak tubuh'",
   "@measurementCategoriesHelpText": {},
-  "measurementEntriesHelpText": "The unit used to measure the category such as 'cm' or '%'",
+  "measurementEntriesHelpText": "Satuan yang digunakan untuk mengukur kategori, seperti 'cm' atau '%'",
   "@measurementEntriesHelpText": {},
   "date": "Date",
   "@date": {
     "description": "The date of a workout log or body weight entry"
   },
-  "value": "Value",
+  "value": "Nilai",
   "@value": {
     "description": "The value of a measurement entry"
   },
@@ -286,23 +272,23 @@
   "@start": {
     "description": "Label on button to start the gym mode (i.e., an imperative)"
   },
-  "time": "Time",
+  "time": "Waktu",
   "@time": {
     "description": "The time of a meal or workout"
   },
-  "timeStart": "Start time",
+  "timeStart": "Waktu mulai",
   "@timeStart": {
     "description": "The starting time of a workout"
   },
-  "timeEnd": "End time",
+  "timeEnd": "Waktu selesai",
   "@timeEnd": {
     "description": "The end time of a workout"
   },
-  "timeStartAhead": "Start time cannot be ahead of end time",
+  "timeStartAhead": "Waktu mulai tidak boleh melebihi waktu selesai",
   "@timeStartAhead": {},
-  "ingredient": "Ingredient",
+  "ingredient": "Komposisi",
   "@ingredient": {},
-  "energy": "Energy",
+  "energy": "Energi",
   "@energy": {
     "description": "Energy in a meal, ingredient etc. e.g. in kJ"
   },
@@ -310,29 +296,29 @@
   "@energyShort": {
     "description": "The first letter or short name of the word 'Energy', used in overviews"
   },
-  "kcal": "kcal",
+  "kcal": "kkal",
   "@kcal": {
     "description": "Energy in a meal in kilocalories, kcal"
   },
-  "macronutrients": "Macronutrients",
+  "macronutrients": "Makronutrien",
   "@macronutrients": {},
-  "planned": "Planned",
+  "planned": "Direncanakan",
   "@planned": {
     "description": "Header for the column of 'planned' nutritional values, i.e. what should be eaten"
   },
-  "logged": "Logged",
+  "logged": "Dicatat",
   "@logged": {
     "description": "Header for the column of 'logged' nutritional values, i.e. what was eaten"
   },
-  "weekAverage": "7 day average",
+  "weekAverage": "Rata-rata 7 hari",
   "@weekAverage": {
     "description": "Header for the column of '7 day average' nutritional values, i.e. what was logged last week"
   },
-  "difference": "Difference",
+  "difference": "Perbedaan",
   "@difference": {},
   "percentEnergy": "Persenan Energi",
   "@percentEnergy": {},
-  "gPerBodyKg": "g per body kg",
+  "gPerBodyKg": "g per kg tubuh",
   "@gPerBodyKg": {
     "description": "Label used for total sums of e.g. calories or similar in grams per Kg of body weight"
   },
@@ -354,27 +340,27 @@
   "@proteinShort": {
     "description": "The first letter or short name of the word 'Protein', used in overviews"
   },
-  "carbohydrates": "Carbohydrates",
+  "carbohydrates": "Karbohidrat",
   "@carbohydrates": {},
   "carbohydratesShort": "C",
   "@carbohydratesShort": {
     "description": "The first letter or short name of the word 'Carbohydrates', used in overviews"
   },
-  "sugars": "Sugars",
+  "sugars": "Gula",
   "@sugars": {},
-  "fat": "Fat",
+  "fat": "Lemak",
   "@fat": {},
   "fatShort": "F",
   "@fatShort": {
     "description": "The first letter or short name of the word 'Fat', used in overviews"
   },
-  "saturatedFat": "Saturated fat",
+  "saturatedFat": "Lemak jenuh",
   "@saturatedFat": {},
   "fiber": "Fibre",
   "@fiber": {},
   "sodium": "Sodium",
   "@sodium": {},
-  "amount": "Amount",
+  "amount": "Jumlah",
   "@amount": {
     "description": "The amount (e.g. in grams) of an ingredient in a meal"
   },
@@ -382,11 +368,11 @@
   "@unit": {
     "description": "The unit used for a repetition (kg, time, etc.)"
   },
-  "newEntry": "New entry",
+  "newEntry": "Entri baru",
   "@newEntry": {
     "description": "Title when adding a new entry such as a weight or log entry"
   },
-  "noWeightEntries": "You have no weight entries",
+  "noWeightEntries": "Anda belum memiliki entri berat badan",
   "@noWeightEntries": {
     "description": "Message shown when the user has no logged weight entries"
   },
@@ -398,111 +384,83 @@
   },
   "delete": "Delete",
   "@delete": {},
-  "confirmDelete": "Are you sure you want to delete '{toDelete}'?",
+  "confirmDelete": "Apakah anda yakin ingin menghapus '{toDelete}'?",
   "@confirmDelete": {
     "description": "Confirmation text before the user deletes an object",
     "type": "text",
     "placeholders": {
-      "toDelete": {}
+      "toDelete": {
+        "type": "String"
+      }
     }
   },
-  "newNutritionalPlan": "New nutritional plan",
+  "newNutritionalPlan": "Rencana nutrisi baru",
   "@newNutritionalPlan": {},
-  "toggleDetails": "Toggle details",
+  "toggleDetails": "Toggle rincian",
   "@toggleDetails": {
     "description": "Switch to toggle detail / overview"
   },
   "goToDetailPage": "Go to detail page",
   "@goToDetailPage": {},
-  "aboutDescription": "Thank you for using wger! wger is a collaborative open source project, made by fitness enthusiasts from around the world.",
+  "aboutDescription": "Terima kasih telah menggunakan wger! wger proyek open source kolaboratif, dibuat oleh para penggemar kebugaran dari seluruh dunia.",
   "@aboutDescription": {
     "description": "Text in the about dialog"
   },
-  "aboutSourceTitle": "Source code",
-  "@aboutSourceTitle": {
-    "description": "Title for source code section in the about dialog"
-  },
-  "aboutSourceText": "Get the source code of this application and its server on github",
-  "@aboutSourceText": {
-    "description": "Text for source code section in the about dialog"
-  },
-  "aboutBugsTitle": "Have a problem or idea?",
-  "@aboutBugsTitle": {
-    "description": "Title for bugs section in the about dialog"
-  },
-  "aboutBugsText": "Get in touch if something didn't behave as expected or if there is a feature that you feel is missing.",
-  "@aboutBugsText": {
-    "description": "Text for bugs section in the about dialog"
-  },
-  "aboutContactUsTitle": "Say hi!",
-  "@aboutContactUsTitle": {
-    "description": "Title for contact us section in the about dialog"
-  },
-  "aboutContactUsText": "If you want to chat with us, hop on the Discord server and get in touch",
-  "@aboutContactUsText": {
-    "description": "Text for contact us section in the about dialog"
-  },
-  "aboutTranslationTitle": "Translation",
-  "@aboutTranslationTitle": {
-    "description": "Title for translation section in the about dialog"
-  },
-  "aboutTranslationText": "This application is translated on weblate. If you also want to help, click the link and start translating",
-  "@aboutTranslationText": {
-    "description": "Text for translation section in the about dialog"
-  },
-  "calendar": "Calendar",
+  "calendar": "Kalender",
   "@calendar": {},
-  "goToToday": "Go to today",
+  "goToToday": "Pergi ke hari ini",
   "@goToToday": {
     "description": "Label on button to jump back to 'today' in the calendar widget"
   },
-  "enterRepetitionsOrWeight": "Please fill in either the repetitions or the weight for at least one of the sets",
-  "@enterRepetitionsOrWeight": {
-    "description": "Error message when the user hasn't filled in the forms for exercise sets"
-  },
-  "enterValue": "Please enter a value",
+  "enterValue": "Silakan masukan nilai",
   "@enterValue": {
     "description": "Error message when the user hasn't entered a value on a required field"
   },
-  "selectExercise": "Please select an exercise",
+  "selectExercise": "Silakan pilih latihan",
   "@selectExercise": {
     "description": "Error message when the user hasn't selected an exercise in the form"
   },
-  "enterCharacters": "Please enter between {min} and {max} characters",
+  "enterCharacters": "Silakan masukan antara {min} dan {max} karakter",
   "@enterCharacters": {
     "description": "Error message when the user hasn't entered the correct number of characters in a form",
     "type": "text",
     "placeholders": {
-      "min": {},
-      "max": {}
+      "min": {
+        "type": "String"
+      },
+      "max": {
+        "type": "String"
+      }
     }
   },
-  "nrOfSets": "Sets per exercise: {nrOfSets}",
+  "nrOfSets": "Sets per latihan: {nrOfSets}",
   "@nrOfSets": {
     "description": "Label shown on the slider where the user selects the nr of sets",
     "type": "text",
     "placeholders": {
-      "nrOfSets": {}
+      "nrOfSets": {
+        "type": "String"
+      }
     }
   },
-  "setUnitsAndRir": "Set units and RiR",
+  "setUnitsAndRir": "Unit Set and RiR",
   "@setUnitsAndRir": {
     "description": "Label shown on the slider where the user can toggle showing units and RiR",
     "type": "text"
   },
-  "enterValidNumber": "Please enter a valid number",
+  "enterValidNumber": "Silakan masukan angka yang valid",
   "@enterValidNumber": {
     "description": "Error message when the user has submitted an invalid number (e.g. '3,.,.,.')"
   },
-  "selectIngredient": "Please select an ingredient",
+  "selectIngredient": "Silakan pilih komposisi",
   "@selectIngredient": {
     "description": "Error message when the user hasn't selected an ingredient from the autocompleter"
   },
-  "recentlyUsedIngredients": "Recently added ingredients",
+  "recentlyUsedIngredients": "Komposisi yang baru ditambahkan",
   "@recentlyUsedIngredients": {
     "description": "A message when a user adds a new ingredient to a meal."
   },
-  "selectImage": "Please select an image",
+  "selectImage": "Silakan pilih gambar",
   "@selectImage": {
     "description": "Label and error message when the user hasn't selected an image to save"
   },
@@ -510,55 +468,59 @@
   "@optionsLabel": {
     "description": "Label for the popup with general app options"
   },
-  "takePicture": "Take a picture",
+  "takePicture": "Ambil gambar",
   "@takePicture": {},
-  "chooseFromLibrary": "Choose from photo library",
+  "chooseFromLibrary": "Pilih foto dari library",
   "@chooseFromLibrary": {},
-  "gallery": "Gallery",
+  "gallery": "Galeri",
   "@gallery": {},
   "addImage": "Add image",
   "@addImage": {},
-  "dataCopied": "Data copied to new entry",
+  "dataCopied": "Data disalin ke entri baru",
   "@dataCopied": {
     "description": "Snackbar message to show on copying data to a new log entry"
   },
-  "appUpdateTitle": "Update needed",
+  "appUpdateTitle": "Pembaruan diperlukan",
   "@appUpdateTitle": {},
-  "appUpdateContent": "This version of the app is not compatible with the server, please update your application.",
+  "appUpdateContent": "Versi aplikasi ini tidak kompatibel dengan server, silakan perbarui aplikasi Anda.",
   "@appUpdateContent": {},
-  "productFound": "Product found",
+  "productFound": "Produk ditemukan",
   "@productFound": {
     "description": "Header label for dialog when product is found with barcode"
   },
-  "productFoundDescription": "The barcode corresponds to this product: {productName}. Do you want to continue?",
+  "productFoundDescription": "Kode batang ini sesuai dengan produk: {productName}. Apakah Anda ingin melanjutkan?",
   "@productFoundDescription": {
     "description": "Dialog info when product is found with barcode",
     "type": "text",
     "placeholders": {
-      "productName": {}
+      "productName": {
+        "type": "String"
+      }
     }
   },
-  "productNotFound": "Product not found",
+  "productNotFound": "Produk tidak ditemukan",
   "@productNotFound": {
     "description": "Header label for dialog when product is not found with barcode"
   },
-  "productNotFoundDescription": "The product with the scanned barcode {barcode} was not found in the wger database",
+  "productNotFoundDescription": "Produk dengan kode batang {barcode} tidak ditemukan dalam database wger",
   "@productNotFoundDescription": {
     "description": "Dialog info when product is not found with barcode",
     "type": "text",
     "placeholders": {
-      "barcode": {}
+      "barcode": {
+        "type": "String"
+      }
     }
   },
-  "scanBarcode": "Scan barcode",
+  "scanBarcode": "Pindai kode batang",
   "@scanBarcode": {
     "description": "Label for scan barcode button"
   },
-  "close": "Close",
+  "close": "Tutup",
   "@close": {
     "description": "Translation for close"
   },
-  "userProfile": "Profilmu",
+  "userProfile": "Profil Kamu",
   "@userProfile": {},
   "verify": "Verifikasi",
   "@verify": {},
@@ -596,10 +558,510 @@
   "@searchNamesInEnglish": {},
   "noIngredientsDefined": "Belum ada bahan yang ditetapkan",
   "@noIngredientsDefined": {},
-  "ingredientLogged": "Bahan telah dicatat",
+  "ingredientLogged": "Komposisi telah dicatat",
   "@ingredientLogged": {},
   "triceps": "Trisep",
   "@triceps": {
     "description": "Generated entry for translation for server strings"
-  }
+  },
+  "goalFiber": "Target serat",
+  "@goalFiber": {},
+  "abs": "Otot perut",
+  "@abs": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "selectAvailablePlates": "Pilih lempeng beban yang tersedia",
+  "@selectAvailablePlates": {},
+  "useColors": "Gunakan warna",
+  "@useColors": {},
+  "barWeight": "Berat batang",
+  "@barWeight": {},
+  "routineDays": "Hari dalam rutinitas",
+  "@routineDays": {},
+  "resultingRoutine": "Rutinitas yang dihasilkan",
+  "@resultingRoutine": {},
+  "goalCarbohydrates": "Target karbohidrat",
+  "@goalCarbohydrates": {},
+  "alternativeNames": "Nama lain",
+  "@alternativeNames": {},
+  "back": "Punggung",
+  "@back": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "routines": "Rutinitas",
+  "@routines": {},
+  "newRoutine": "Rutinitas baru",
+  "@newRoutine": {},
+  "sets": "Set",
+  "@sets": {
+    "description": "The number of sets to be done for one exercise"
+  },
+  "isRestDayHelp": "Harap diperhatikan bahwa semua set dan latihan akan dihapus ketika Anda menandai suatu hari sebagai hari istirahat.",
+  "@isRestDayHelp": {},
+  "max": "Maksimal",
+  "@max": {},
+  "today": "Hari ini",
+  "@today": {},
+  "noMeasurementEntries": "Anda belum memiliki entri pengukuran apa pun",
+  "@noMeasurementEntries": {},
+  "log": "Catat",
+  "@log": {
+    "description": "Log a specific meal (imperative form)"
+  },
+  "settingsTitle": "Pengaturan",
+  "@settingsTitle": {},
+  "biceps": "Bisep",
+  "@biceps": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "miles_per_hour": "Mil Per Jam",
+  "@miles_per_hour": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "selectEntry": "Silakan pilih entri",
+  "@selectEntry": {},
+  "next": "Selanjutnya",
+  "@next": {},
+  "simpleMode": "Mode sederhana",
+  "@simpleMode": {},
+  "body_weight": "Berat Badan",
+  "@body_weight": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "incline_bench": "Bangku Incline",
+  "@incline_bench": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "legs": "Kaki",
+  "@legs": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "aboutDonateTitle": "Beri donasi",
+  "@aboutDonateTitle": {},
+  "bench": "Bangku",
+  "@bench": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "useUsernameAndPassword": "Gunakan nama pengguna dan kata sandi",
+  "@useUsernameAndPassword": {},
+  "useApiToken": "Gunakan Token API",
+  "@useApiToken": {},
+  "restTime": "Waktu istirahat",
+  "@restTime": {},
+  "restDay": "Hari istirahat",
+  "@restDay": {},
+  "exerciseNr": "Latihan ke-{nr}",
+  "@exerciseNr": {
+    "description": "Header in form indicating the number of the current exercise. Can also be translated as something like 'Set Nr. xy'.",
+    "type": "text",
+    "placeholders": {
+      "nr": {
+        "type": "String"
+      }
+    }
+  },
+  "errorCouldNotConnectToServer": "Tidak dapat terhubung ke server",
+  "@errorCouldNotConnectToServer": {},
+  "errorInfoDescription": "Maaf, terjadi kesalahan. Anda dapat membantu kami memperbaikinya dengan melaporkan masalah ini di GitHub.",
+  "@errorInfoDescription": {},
+  "min": "Minimal",
+  "@min": {},
+  "chartAllTimeTitle": "{name}Sepanjang waktu",
+  "@chartAllTimeTitle": {
+    "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
+    "type": "text",
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "chart30DaysTitle": "{name} 30 hari terakhir",
+  "@chart30DaysTitle": {
+    "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
+    "type": "text",
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "chartDuringPlanTitle": "{chartName} selama rencana nutrisi {planName}",
+  "@chartDuringPlanTitle": {
+    "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
+    "type": "text",
+    "placeholders": {
+      "chartName": {
+        "type": "String"
+      },
+      "planName": {
+        "type": "String"
+      }
+    }
+  },
+  "aboutWhySupportTitle": "Bersifat open source & gratis ❤️",
+  "@aboutWhySupportTitle": {},
+  "aboutSourceListTitle": "Lihat kode sumber",
+  "@aboutSourceListTitle": {},
+  "aboutJoinCommunityTitle": "Gabung komunitas",
+  "@aboutJoinCommunityTitle": {},
+  "previous": "Sebelumnya",
+  "@previous": {},
+  "setHasProgressionWarning": "Perlu diketahui, saat ini pengaturan lengkap untuk set dan konfigurasi progresi otomatis belum bisa dilakukan di aplikasi mobile. Silakan gunakan aplikasi web untuk fitur tersebut.",
+  "@setHasProgressionWarning": {},
+  "settingsExerciseCacheDescription": "Cache latihan",
+  "@settingsExerciseCacheDescription": {},
+  "settingsIngredientCacheDescription": "Cache komposisi",
+  "@settingsIngredientCacheDescription": {},
+  "settingsCacheDeletedSnackbar": "Cache berhasil dibersihkan",
+  "@settingsCacheDeletedSnackbar": {},
+  "aboutPageTitle": "Tentang kami dan dukungan",
+  "@aboutPageTitle": {},
+  "simpleModeHelp": "Sembunyikan beberapa pengaturan lanjutan saat mengedit latihan",
+  "@simpleModeHelp": {},
+  "kilometers": "Kilometer",
+  "@kilometers": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "lats": "Otot Punggung Samping",
+  "@lats": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "lower_back": "Punggung Bawah",
+  "@lower_back": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "minutes": "Menit",
+  "@minutes": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "until_failure": "Sampai tidak mampu lagi",
+  "@until_failure": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "kg": "kg",
+  "@kg": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "done": "Selesai",
+  "@done": {},
+  "overallChangeWeight": "Perubahan keseluruhan",
+  "@overallChangeWeight": {
+    "description": "Overall change in weight, added for localization"
+  },
+  "goalTypeMeals": "Dari makanan",
+  "@goalTypeMeals": {
+    "description": "added for localization of Class GoalType's filed meals"
+  },
+  "goalTypeBasic": "Dasar",
+  "@goalTypeBasic": {
+    "description": "added for localization of Class GoalType's filed basic"
+  },
+  "goalTypeAdvanced": "Lanjutan",
+  "@goalTypeAdvanced": {
+    "description": "added for localization of Class GoalType's filed advanced"
+  },
+  "indicatorRaw": "Mentah",
+  "@indicatorRaw": {
+    "description": "added for localization of Class Indicator's field text"
+  },
+  "indicatorAvg": "rata-rata",
+  "@indicatorAvg": {
+    "description": "added for localization of Class Indicator's field text"
+  },
+  "themeMode": "mode Tema",
+  "@themeMode": {},
+  "systemMode": "Pengaturan sitem",
+  "@systemMode": {},
+  "pull_up_bar": "Palang Pull-up",
+  "@pull_up_bar": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "onlyLoggingHelpText": "Centang kotak ini jika Anda hanya ingin mencatat kalori dan tidak ingin menyusun rencana nutrisi secara rinci dengan menu khusus",
+  "@onlyLoggingHelpText": {},
+  "goalEnergy": "Target energi",
+  "@goalEnergy": {},
+  "moreMeasurementEntries": "Tambah pengukuran baru",
+  "@moreMeasurementEntries": {
+    "description": "Message shown when the user wants to add new measurement"
+  },
+  "baseNameEnglish": "Semua latihan memerlukan nama dasar dalam Bahasa Inggris",
+  "@baseNameEnglish": {},
+  "add_exercise_image_license": "Gambar harus kompatibel dengan lisensi CC BY SA. Jika ragu, unggah hanya foto yang anda ambil sendiri.",
+  "@add_exercise_image_license": {},
+  "verifiedEmail": "Email terverifikasi",
+  "@verifiedEmail": {},
+  "max_reps": "Repetisi Maksimal",
+  "@max_reps": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "miles": "Mil",
+  "@miles": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "lb": "lb",
+  "@lb": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "verifiedEmailReason": "Anda perlu memverifikasi email untuk dapat menambahkan latihan",
+  "@verifiedEmailReason": {},
+  "baseData": "Dasar dalam Bahasa Inggris",
+  "@baseData": {
+    "description": "The base data for an exercise such as category, trained muscles, etc."
+  },
+  "textPromptSubheading": "Tekan tombol untuk mulai",
+  "@textPromptSubheading": {},
+  "cacheWarning": "Karena sistem cache, perubahan mungkin membutuhkan waktu sebelum terlihat di seluruh aplikasi.",
+  "@cacheWarning": {},
+  "textPromptTitle": "Siap memulai?",
+  "@textPromptTitle": {},
+  "yourCurrentNutritionPlanHasNoMealsDefinedYet": "Rencana nutrisi Anda saat ini belum memiliki menu yang ditentukan",
+  "@yourCurrentNutritionPlanHasNoMealsDefinedYet": {
+    "description": "Message shown when a nutrition plan doesn't have any meals"
+  },
+  "toAddMealsToThePlanGoToNutritionalPlanDetails": "Untuk menambahkan menu ke dalam rencana, buka detail rencana nutrisi",
+  "@toAddMealsToThePlanGoToNutritionalPlanDetails": {
+    "description": "Message shown to guide users to the nutritional plan details page to add meals"
+  },
+  "goalFat": "Target lemak",
+  "@goalFat": {},
+  "errorInfoDescription2": "Anda masih dapat menggunakan aplikasi, namun beberapa fitur mungkin tidak berfungsi.",
+  "@errorInfoDescription2": {},
+  "errorViewDetails": "Rincian teknis",
+  "@errorViewDetails": {},
+  "copyToClipboard": "Salin ke papan klip",
+  "@copyToClipboard": {},
+  "loggedToday": "Dicatat hari ini",
+  "@loggedToday": {},
+  "aboutDonateText": "Meskipun proyek ini gratis dan akan selalu begitu, menjalankan server tetap memerlukan biaya! Pengembangan juga membutuhkan waktu dan tenaga yang tidak sedikit dari para relawan. Kontribusi Anda secara langsung membantu menutup biaya-biaya ini dan menjaga layanan tetap andal.",
+  "@aboutDonateText": {},
+  "aboutContributeText": "Semua jenis kontribusi sangat kami hargai. Baik Anda seorang pengembang, penerjemah, atau sekadar memiliki semangat di bidang kebugaran, setiap bentuk dukungan sangat berarti!",
+  "@aboutContributeText": {},
+  "aboutTranslationListTitle": "Terjemahkan aplikasi",
+  "@aboutTranslationListTitle": {},
+  "others": "Lainnya",
+  "@others": {},
+  "verifiedEmailInfo": "Email verifikasi telah dikirim ke {email}",
+  "@verifiedEmailInfo": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "oneNamePerLine": "Satu nama per baris",
+  "@oneNamePerLine": {},
+  "whatVariationsExist": "Apakah ada variasi dari latihan ini? Jika ada, apa saja?",
+  "@whatVariationsExist": {},
+  "images": "Gambar",
+  "@images": {},
+  "fitInWeek": "Bugar dalam seminggu",
+  "@fitInWeek": {},
+  "fitInWeekHelp": "Jika diaktifkan, hari-hari akan berulang dalam siklus mingguan. Jika tidak, hari-hari akan berjalan secara berurutan tanpa memperhatikan awal minggu baru.",
+  "@fitInWeekHelp": {},
+  "calves": "Betis",
+  "@calves": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "cardio": "Kardio",
+  "@cardio": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "dumbbell": "Dumbel",
+  "@dumbbell": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "gym_mat": "Matras Gym",
+  "@gym_mat": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "hamstrings": "Paha Belakang",
+  "@hamstrings": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "kettlebell": "Kettlebell",
+  "@kettlebell": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "kilometers_per_hour": "Kilometer Per Jam",
+  "@kilometers_per_hour": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "darkMode": "Selalu mode gelap",
+  "@darkMode": {},
+  "goalMacro": "Target makronutrien",
+  "@goalMacro": {
+    "description": "The goal for macronutrients"
+  },
+  "selectMealToLog": "Pilih makanan untuk dicatat ke dalam buku harian",
+  "@selectMealToLog": {},
+  "surplus": "Surplus",
+  "@surplus": {
+    "description": "Caloric surplus (either planned or unplanned)"
+  },
+  "kcalValue": "{value} kkal",
+  "@kcalValue": {
+    "description": "A value in kcal, e.g. 500 kcal",
+    "type": "text",
+    "placeholders": {
+      "value": {
+        "type": "String"
+      }
+    }
+  },
+  "gValue": "{value} g",
+  "@gValue": {
+    "description": "A value in grams, e.g. 5 g",
+    "type": "text",
+    "placeholders": {
+      "value": {
+        "type": "String"
+      }
+    }
+  },
+  "percentValue": "{value} %",
+  "@percentValue": {
+    "description": "A value in percent, e.g. 10 %",
+    "type": "text",
+    "placeholders": {
+      "value": {
+        "type": "String"
+      }
+    }
+  },
+  "aboutMastodonTitle": "Mastodon",
+  "@aboutMastodonTitle": {},
+  "variations": "Variasi",
+  "@variations": {
+    "description": "Variations of one exercise (e.g. benchpress and benchpress narrow)"
+  },
+  "alsoKnownAs": "Juga dikenal sebagai: {aliases}",
+  "@alsoKnownAs": {
+    "placeholders": {
+      "aliases": {
+        "type": "String"
+      }
+    },
+    "description": "List of alternative names for an exercise"
+  },
+  "language": "Bahasa",
+  "@language": {},
+  "contributeExercise": "Tambahkan latihan",
+  "@contributeExercise": {},
+  "addExercise": "Tambah latihan",
+  "@addExercise": {},
+  "translation": "Terjemahan",
+  "@translation": {},
+  "settingsCacheTitle": "Cache",
+  "@settingsCacheTitle": {},
+  "contributeExerciseWarning": "Anda hanya dapat menambahkan latihan jika akun Anda berusia lebih dari {days} hari dan email Anda telah terverifikasi",
+  "@contributeExerciseWarning": {
+    "description": "Number of days before which a person can add exercise",
+    "placeholders": {
+      "days": {
+        "type": "String",
+        "example": "14"
+      }
+    }
+  },
+  "arms": "Lengan",
+  "@arms": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "chest": "Dada",
+  "@chest": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "plates": "Lempeng Beban",
+  "@plates": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "quads": "Paha Depan",
+  "@quads": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "none__bodyweight_exercise_": "Tanpa alat (Latihan Berat Badan Sendiri)",
+  "@none__bodyweight_exercise_": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "deficit": "defisit",
+  "@deficit": {
+    "description": "Caloric deficit (either planned or unplanned)"
+  },
+  "addSuperset": "Tambah superset",
+  "@addSuperset": {},
+  "isRestDay": "Hari ini adalah hari istirahat",
+  "@isRestDay": {},
+  "apiTokenValidChars": "Kunci API hanya boleh berisi huruf a-f, angka 0-9 dan harus berjumlah 40 karakter",
+  "@apiTokenValidChars": {
+    "description": "Error message when the user tries to input a API key with forbidden characters"
+  },
+  "needsLogsToAdvance": "Perlu log untuk melanjutkan",
+  "@needsLogsToAdvance": {},
+  "invalidApiToken": "Mohon masukan kunci API yang valid",
+  "@invalidApiToken": {
+    "description": "Error message when the user enters an invalid API key"
+  },
+  "goalProtein": "Target protein",
+  "@goalProtein": {},
+  "noRoutines": "Kamu tidak memiliki rutinitas",
+  "@noRoutines": {},
+  "apiToken": "Token API",
+  "@apiToken": {},
+  "supersetNr": "Superset ke-{nr}",
+  "@supersetNr": {
+    "description": "Header in form indicating the number of the current exercise. Can also be translated as something like 'Superset Nr. xy'.",
+    "type": "text",
+    "placeholders": {
+      "nr": {
+        "type": "String"
+      }
+    }
+  },
+  "aboutContributeTitle": "Kontribusi",
+  "@aboutContributeTitle": {},
+  "translateExercise": "Terjemahkan latihan ini sekarang",
+  "@translateExercise": {},
+  "enterMinCharacters": "Silakan masukan minimal {min} karakter",
+  "@enterMinCharacters": {
+    "description": "Error message when the user hasn't entered the minimum amount characters in a form",
+    "type": "text",
+    "placeholders": {
+      "min": {
+        "type": "String"
+      }
+    }
+  },
+  "swiss_ball": "Bola Gym",
+  "@swiss_ball": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "needsLogsToAdvanceHelp": "Pilih opsi ini jika Anda ingin rutinitas berlanjut ke hari berikutnya hanya setelah Anda mencatat latihan pada hari tersebut",
+  "@needsLogsToAdvanceHelp": {},
+  "setHasNoExercises": "Set ini belum memiliki latihan apa pun!",
+  "@setHasNoExercises": {},
+  "aboutBugsListTitle": "Laporkan masalah atau usulkan fitur",
+  "@aboutBugsListTitle": {},
+  "errorCouldNotConnectToServerDetails": "Aplikasi tidak dapat terhubung ke server. Silakan periksa koneksi internet atau URL server anda, lalu coba lagi. Jika masalah terus berlanjut, hubungi administrator server.",
+  "@errorCouldNotConnectToServerDetails": {},
+  "unVerifiedEmail": "Email belum diverifikasi",
+  "@unVerifiedEmail": {},
+  "progressionRules": "Latihan ini memiliki aturan peningkatan dan tidak dapat diedit melalui aplikasi mobile. Silakan gunakan aplikasi web untuk mengedit latihan ini.",
+  "@progressionRules": {},
+  "setHasProgression": "Set memiliki peningkatan",
+  "@setHasProgression": {},
+  "barbell": "Barbel",
+  "@barbell": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "glutes": "Bokong",
+  "@glutes": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "resistance_band": "Karet Latihan",
+  "@resistance_band": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "lightMode": "Selalu mode terang",
+  "@lightMode": {}
 }
diff --git a/lib/l10n/app_it.arb b/lib/l10n/app_it.arb
index 8c20bfbe..d45f77f7 100644
--- a/lib/l10n/app_it.arb
+++ b/lib/l10n/app_it.arb
@@ -1,857 +1,1080 @@
 {
-  "anErrorOccurred": "È avvenuto un errore!",
-  "@anErrorOccurred": {},
-  "selectIngredient": "Seleziona un ingrediente",
-  "@selectIngredient": {
-    "description": "Error message when the user hasn't selected an ingredient from the autocompleter"
-  },
-  "enterValidNumber": "Inserisci un numero valido",
-  "@enterValidNumber": {
-    "description": "Error message when the user has submitted an invalid number (e.g. '3,.,.,.')"
-  },
-  "enterValue": "Inserisci un valore",
-  "@enterValue": {
-    "description": "Error message when the user hasn't entered a value on a required field"
-  },
-  "goToToday": "Seleziona giorno",
-  "@goToToday": {
-    "description": "Label on button to jump back to 'today' in the calendar widget"
-  },
-  "calendar": "Calendario",
-  "@calendar": {},
-  "aboutText": "wger è rilasciato con \"permesso d'autore\", licenza AGPLv3+ e disponibile su GitHub:",
-  "@aboutText": {
-    "description": "Text in the about dialog"
-  },
-  "toggleDetails": "Scegli dettagli",
-  "@toggleDetails": {
-    "description": "Switch to toggle detail / overview"
-  },
-  "newNutritionalPlan": "Nuovo piano nutrizionale",
-  "@newNutritionalPlan": {},
-  "confirmDelete": "Sei sicuro/a di voler cancellare '{toDelete}'?",
-  "@confirmDelete": {
-    "description": "Confirmation text before the user deletes an object",
-    "type": "text",
-    "placeholders": {
-      "toDelete": {}
-    }
-  },
-  "delete": "Elimina",
-  "@delete": {},
-  "loadingText": "Caricamento…",
-  "@loadingText": {
-    "description": "Text to show when entries are being loaded in the background: Loading..."
-  },
-  "edit": "Modifica",
-  "@edit": {},
-  "noWeightEntries": "Non hai nessun dato sul peso",
-  "@noWeightEntries": {
-    "description": "Message shown when the user has no logged weight entries"
-  },
-  "newEntry": "Nuovo dato",
-  "@newEntry": {
-    "description": "Title when adding a new entry such as a weight or log entry"
-  },
-  "unit": "Unità",
-  "@unit": {
-    "description": "The unit used for a repetition (kg, time, etc.)"
-  },
-  "amount": "Quatità",
-  "@amount": {
-    "description": "The amount (e.g. in grams) of an ingredient in a meal"
-  },
-  "sodium": "Sodio",
-  "@sodium": {},
-  "fiber": "Fibre",
-  "@fiber": {},
-  "saturatedFat": "Grassi saturi",
-  "@saturatedFat": {},
-  "fat": "Grassi",
-  "@fat": {},
-  "sugars": "Zuccheri",
-  "@sugars": {},
-  "carbohydrates": "Carboidrati",
-  "@carbohydrates": {},
-  "protein": "Proteine",
-  "@protein": {},
-  "g": "g",
-  "@g": {
-    "description": "Abbreviation for gram"
-  },
-  "kJ": "kJ",
-  "@kJ": {
-    "description": "Energy in a meal in kilo joules, kJ"
-  },
-  "kcal": "kcal",
-  "@kcal": {
-    "description": "Energy in a meal in kilocalories, kcal"
-  },
-  "energy": "Energia",
-  "@energy": {
-    "description": "Energy in a meal, ingredient etc. e.g. in kJ"
-  },
-  "ingredient": "Ingrediente",
-  "@ingredient": {},
-  "timeEnd": "Ora di fine",
-  "@timeEnd": {
-    "description": "The end time of a workout"
-  },
-  "timeStart": "Ora di inizio",
-  "@timeStart": {
-    "description": "The starting time of a workout"
-  },
-  "time": "Orario",
-  "@time": {
-    "description": "The time of a meal or workout"
-  },
-  "date": "Data",
-  "@date": {
-    "description": "The date of a workout log or body weight entry"
-  },
-  "weight": "Peso",
-  "@weight": {
-    "description": "The weight of a workout log or body weight entry"
-  },
-  "dismiss": "Annulla",
-  "@dismiss": {},
-  "noNutritionalPlans": "Non hai nessun piano nutrizionale",
-  "@noNutritionalPlans": {
-    "description": "Message shown when the user has no nutritional plans"
-  },
-  "nutritionalPlans": "Piani nutrizionali",
-  "@nutritionalPlans": {},
-  "nutritionalDiary": "Diario nutrizionale",
-  "@nutritionalDiary": {},
-  "nutritionalPlan": "Piano nutrizionale",
-  "@nutritionalPlan": {},
-  "addIngredient": "Aggiungi ingrediente",
-  "@addIngredient": {},
-  "mealLogged": "Pasto registrato nel diario",
-  "@mealLogged": {},
-  "addMeal": "Aggiungi pasto",
-  "@addMeal": {},
-  "add": "Aggiungi",
-  "@add": {},
-  "cancel": "Cancella",
-  "@cancel": {},
-  "save": "Salva",
-  "@save": {},
-  "description": "Descrizione",
-  "@description": {},
-  "logHelpEntriesUnits": "Da notare che solo i dati con l'unità del peso (kg o lb) e le ripetizioni sono mostrate. Altre combinazioni come tempo o «a cedimento» sono ignorate.",
-  "@logHelpEntriesUnits": {},
-  "logHelpEntries": "Se in una giornata c'è più di esercizio con lo stesso numero di ripetizioni, ma con pesi differenti, solo l'esercizio con il peso più alto viene mostrato nel diagramma.",
-  "@logHelpEntries": {},
-  "gymMode": "Modalità allenamento",
-  "@gymMode": {
-    "description": "Label when starting the gym mode"
-  },
-  "newSet": "Nuova serie",
-  "@newSet": {
-    "description": "Header when adding a new set to a workout day"
-  },
-  "newDay": "Nuovo giorno",
-  "@newDay": {},
-  "workoutSession": "Sessione di allenamento",
-  "@workoutSession": {
-    "description": "A (logged) workout session"
-  },
-  "notes": "Note",
-  "@notes": {
-    "description": "Personal notes, e.g. for a workout session"
-  },
-  "impression": "Sensazione",
-  "@impression": {
-    "description": "General impression (e.g. for a workout session) such as good, bad, etc."
-  },
-  "comment": "Commento",
-  "@comment": {
-    "description": "Comment, additional information"
-  },
-  "rir": "RiR",
-  "@rir": {
-    "description": "Shorthand for Repetitions In Reserve"
-  },
-  "repetitions": "Ripetizioni",
-  "@repetitions": {
-    "description": "Repetitions for an exercise set"
-  },
-  "addExercise": "Aggiungi esercizi",
-  "@addExercise": {},
-  "noWorkoutPlans": "Non hai nessun piano di allenamento",
-  "@noWorkoutPlans": {
-    "description": "Message shown when the user has no workout plans"
-  },
-  "newWorkout": "Nuovo piano di allenamento",
-  "@newWorkout": {
-    "description": "Header when adding a new workout"
-  },
-  "exercise": "Esercizio",
-  "@exercise": {
-    "description": "An exercise for a workout"
-  },
-  "successfullyDeleted": "Cancellato",
-  "@successfullyDeleted": {
-    "description": "Message when an item was successfully deleted"
-  },
-  "labelDashboard": "Pannello di controllo",
-  "@labelDashboard": {
-    "description": "Title for screen dashboard"
-  },
-  "labelWorkoutPlan": "Piano di allenamento",
-  "@labelWorkoutPlan": {
-    "description": "Title for screen workout plan"
-  },
-  "labelWorkoutPlans": "Piani di allenamento",
-  "@labelWorkoutPlans": {
-    "description": "Title for screen workout plans"
-  },
-  "loginInstead": "Hai già un account? Registrati ora",
-  "@loginInstead": {},
-  "registerInstead": "Non hai un account? Registrati ora",
-  "@registerInstead": {},
-  "reset": "Rerimposta",
-  "@reset": {
-    "description": "Button text allowing the user to reset the entered values to the default"
-  },
-  "customServerHint": "Inserisci l'indirizzo del tuo server personale o quello predefinito verrà utilizzato",
-  "@customServerHint": {
-    "description": "Hint text for the form where the users can enter their own wger instance"
-  },
-  "customServerUrl": "URL istanza wger",
-  "@customServerUrl": {
-    "description": "Label in the form where the users can enter their own wger instance"
-  },
-  "invalidUsername": "Inserisci un nome utente valido",
-  "@invalidUsername": {
-    "description": "Error message when the user enters an invalid username"
-  },
-  "username": "Nome utente",
-  "@username": {},
-  "email": "Indirizzo e-mail",
-  "@email": {},
-  "invalidEmail": "Inserisci un indirizzo e-mail valido",
-  "@invalidEmail": {
-    "description": "Error message when the user enters an invalid email"
-  },
-  "confirmPassword": "Conferma password",
-  "@confirmPassword": {},
-  "password": "Password",
-  "@password": {},
-  "passwordTooShort": "La password è troppo corta",
-  "@passwordTooShort": {
-    "description": "Error message when the user a password that is too short"
-  },
-  "passwordsDontMatch": "Le passwords non coincidono",
-  "@passwordsDontMatch": {
-    "description": "Error message when the user enters two different passwords during registration"
-  },
-  "invalidUrl": "Inserisci un URL valido",
-  "@invalidUrl": {
-    "description": "Error message when the user enters an invalid URL, e.g. in the login form"
-  },
-  "useCustomServer": "Usa un server personale",
-  "@useCustomServer": {
-    "description": "Toggle button allowing users to switch between the default and a custom wger server"
-  },
-  "useDefaultServer": "Usa il server predefinito",
-  "@useDefaultServer": {
-    "description": "Toggle button allowing users to switch between the default and a custom wger server"
-  },
-  "register": "Registrati",
-  "@register": {
-    "description": "Text for registration button"
-  },
-  "login": "Entra",
-  "@login": {
-    "description": "Text for login button"
-  },
-  "nrOfSets": "Serie per esercizio: {nrOfSets}",
-  "@nrOfSets": {
-    "description": "Label shown on the slider where the user selects the nr of sets",
-    "type": "text",
-    "placeholders": {
-      "nrOfSets": {}
-    }
-  },
-  "enterCharacters": "Inserisci una stringa tra {min} e {max} caratteri",
-  "@enterCharacters": {
-    "description": "Error message when the user hasn't entered the correct number of characters in a form",
-    "type": "text",
-    "placeholders": {
-      "min": {},
-      "max": {}
-    }
-  },
-  "selectExercise": "Prego, seleziona un esercizio",
-  "@selectExercise": {
-    "description": "Error message when the user hasn't selected an exercise in the form"
-  },
-  "todaysWorkout": "Allenamento di oggi",
-  "@todaysWorkout": {},
-  "selectExercises": "Se vuoi fare un circuito (super set), puoi cercare e aggiungere diversi esercizi. Questi verranno collegati come circuito",
-  "@selectExercises": {},
-  "sameRepetitions": "Se fai le stesse ripetizioni e peso per tutte le serie puoi compilare una sola riga. Per esempio per 4 serie inserisci semplicemente 10 per le ripetizioni, automaticamente diventerà una 4x10.",
-  "@sameRepetitions": {},
-  "setNr": "Serie {nr}",
-  "@setNr": {
-    "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.",
-    "type": "text",
-    "placeholders": {
-      "nr": {}
-    }
-  },
-  "dayDescriptionHelp": "Una descrizione di ciò che è stato fatto. (p.e. «allenamento gambe») o quale parte del corpo sono state allenate (p.e. «petto e spalle»)",
-  "@dayDescriptionHelp": {},
-  "set": "Serie",
-  "@set": {
-    "description": "A set in a workout plan"
-  },
-  "repetitionUnit": "Unità ripetizioni",
-  "@repetitionUnit": {},
-  "weightUnit": "Unità peso",
-  "@weightUnit": {},
-  "reps": "Ripetizioni",
-  "@reps": {
-    "description": "Shorthand for repetitions, used when space constraints are tighter"
-  },
-  "addSet": "Aggiungi serie",
-  "@addSet": {
-    "description": "Label for the button that adds a set (to a workout day)"
-  },
-  "start": "Inizia",
-  "@start": {
-    "description": "Label on button to start the gym mode (i.e., an imperative)"
-  },
-  "successfullySaved": "Salvato",
-  "@successfullySaved": {
-    "description": "Message when an item was successfully saved"
-  },
-  "labelWorkoutLogs": "Registri allenamenti",
-  "@labelWorkoutLogs": {
-    "description": "(Workout) logs"
-  },
-  "logout": "Disconnetti",
-  "@logout": {
-    "description": "Text for logout button"
-  },
-  "enterRepetitionsOrWeight": "Inserisci sia le ripetizioni che il peso per almeno una delle serie",
-  "@enterRepetitionsOrWeight": {
-    "description": "Error message when the user hasn't filled in the forms for exercise sets"
-  },
-  "aboutTranslationText": "Questa applicazione è tradotta su weblate. Se anche tu vuoi contribuire, clicca sul link e inizia a tradurre",
-  "@aboutTranslationText": {
-    "description": "Text for translation section in the about dialog"
-  },
-  "aboutTranslationTitle": "Traduzione",
-  "@aboutTranslationTitle": {
-    "description": "Title for translation section in the about dialog"
-  },
-  "aboutContactUsText": "Se vuoi parlare con noi, vieni nel nostro server su Discord",
-  "@aboutContactUsText": {
-    "description": "Text for contact us section in the about dialog"
-  },
-  "aboutContactUsTitle": "Fatti conoscere!",
-  "@aboutContactUsTitle": {
-    "description": "Title for contact us section in the about dialog"
-  },
-  "aboutBugsText": "Entra in contatto con noi se hai trovato qualche errore o se vuoi proporre qualche funzionalità.",
-  "@aboutBugsText": {
-    "description": "Text for bugs section in the about dialog"
-  },
-  "aboutBugsTitle": "Problemi o idee?",
-  "@aboutBugsTitle": {
-    "description": "Title for bugs section in the about dialog"
-  },
-  "aboutSourceText": "Codice sorgente dell'applicazione e repository su github",
-  "@aboutSourceText": {
-    "description": "Text for source code section in the about dialog"
-  },
-  "aboutSourceTitle": "Codice sorgente",
-  "@aboutSourceTitle": {
-    "description": "Title for source code section in the about dialog"
-  },
-  "aboutDescription": "Grazie per esserti registrato/a su wger! wger è un progetto collaborativo con codice aperto, creato da entusiasti del fitness in tutto il mondo.",
-  "@aboutDescription": {
-    "description": "Text in the about dialog"
-  },
-  "logMeal": "Registra questo pasto",
-  "@logMeal": {},
-  "category": "Categoria",
-  "@category": {
-    "description": "Category for an exercise, ingredient, etc."
-  },
-  "equipment": "Equipaggiamento",
-  "@equipment": {
-    "description": "Equipment needed to perform an exercise"
-  },
-  "musclesSecondary": "Muscoli secondari",
-  "@musclesSecondary": {
-    "description": "secondary muscles trained by an exercise"
-  },
-  "muscles": "Muscoli",
-  "@muscles": {
-    "description": "(main) muscles trained by an exercise"
-  },
-  "addImage": "Aggiungi un'immagine",
-  "@addImage": {},
-  "gallery": "Galleria",
-  "@gallery": {},
-  "chooseFromLibrary": "Scegli dalla raccolta",
-  "@chooseFromLibrary": {},
-  "takePicture": "Scatta una foto",
-  "@takePicture": {},
-  "selectImage": "Si prega di selezionare un'immagine",
-  "@selectImage": {
-    "description": "Label and error message when the user hasn't selected an image to save"
-  },
-  "name": "Nome",
-  "@name": {
-    "description": "Name for a workout or nutritional plan"
-  },
-  "optionsLabel": "Opzioni",
-  "@optionsLabel": {
-    "description": "Label for the popup with general app options"
-  },
-  "goToDetailPage": "Vai alla pagina dettagli",
-  "@goToDetailPage": {},
-  "jumpTo": "Vai a",
-  "@jumpTo": {
-    "description": "Imperative. Label used in popup allowing the user to jump to a specific exercise while in the gym mode"
-  },
-  "pause": "Pausa",
-  "@pause": {
-    "description": "Noun, not an imperative! Label used for the pause when using the gym mode"
-  },
-  "searchExercise": "Cerca esercizio da aggiungere",
-  "@searchExercise": {
-    "description": "Label on set form. Selected exercises are added to the set"
-  },
-  "labelBottomNavWorkout": "Allenamento",
-  "@labelBottomNavWorkout": {
-    "description": "Label used in bottom navigation, use a short word"
-  },
-  "setUnitsAndRir": "Scegli le unità e le RiR",
-  "@setUnitsAndRir": {
-    "description": "Label shown on the slider where the user can toggle showing units and RiR",
-    "type": "text"
-  },
-  "rirNotUsed": "RiR (Repetitions in Reserve) non utilizzato",
-  "@rirNotUsed": {
-    "description": "Label used in RiR slider when the RiR value is not used/saved for the current setting or log"
-  },
-  "labelBottomNavNutrition": "Nutrizione",
-  "@labelBottomNavNutrition": {
-    "description": "Label used in bottom navigation, use a short word"
-  },
-  "usernameValidChars": "Un nome utente può contenere solo lettere, cifre e i caratteri @, +, ., - e _",
-  "@usernameValidChars": {
-    "description": "Error message when the user tries to register a username with forbidden characters"
-  },
-  "total": "Totale",
-  "@total": {
-    "description": "Label used for total sums of e.g. calories or similar"
-  },
-  "appUpdateTitle": "Aggiornamento necessario",
-  "@appUpdateTitle": {},
-  "appUpdateContent": "Questa versione dell'applicazione non è compatibile con il server, per favore aggiorna la tua applicazione.",
-  "@appUpdateContent": {},
-  "dataCopied": "Dati copiati nella nuova voce",
-  "@dataCopied": {
-    "description": "Snackbar message to show on copying data to a new log entry"
-  },
-  "proteinShort": "P",
-  "@proteinShort": {
-    "description": "The first letter or short name of the word 'Protein', used in overviews"
-  },
-  "carbohydratesShort": "C",
-  "@carbohydratesShort": {
-    "description": "The first letter or short name of the word 'Carbohydrates', used in overviews"
-  },
-  "percentEnergy": "Percentuale di energia",
-  "@percentEnergy": {},
-  "fatShort": "Gr",
-  "@fatShort": {
-    "description": "The first letter or short name of the word 'Fat', used in overviews"
-  },
-  "logged": "Registrato",
-  "@logged": {
-    "description": "Header for the column of 'logged' nutritional values, i.e. what was eaten"
-  },
-  "difference": "Differenza",
-  "@difference": {},
-  "gPerBodyKg": "g per kg di corpo",
-  "@gPerBodyKg": {
-    "description": "Label used for total sums of e.g. calories or similar in grams per Kg of body weight"
-  },
-  "timeStartAhead": "L'ora di inizio non può essere più avanti dell'ora di fine",
-  "@timeStartAhead": {},
-  "value": "Valore",
-  "@value": {
-    "description": "The value of a measurement entry"
-  },
-  "measurements": "Misure",
-  "@measurements": {
-    "description": "Categories for the measurements such as biceps size, body fat, etc."
-  },
-  "measurementCategoriesHelpText": "Categoria di misura, come «bicipiti» o «grasso corporeo»",
-  "@measurementCategoriesHelpText": {},
-  "measurementEntriesHelpText": "L'unità usata per misurare la categoria come «cm» o «%»",
-  "@measurementEntriesHelpText": {},
-  "energyShort": "E",
-  "@energyShort": {
-    "description": "The first letter or short name of the word 'Energy', used in overviews"
-  },
-  "macronutrients": "Macronutrienti",
-  "@macronutrients": {},
-  "planned": "Pianificato",
-  "@planned": {
-    "description": "Header for the column of 'planned' nutritional values, i.e. what should be eaten"
-  },
-  "measurement": "Misura",
-  "@measurement": {},
-  "recentlyUsedIngredients": "Ingredienti aggiunti di recente",
-  "@recentlyUsedIngredients": {
-    "description": "A message when a user adds a new ingredient to a meal."
-  },
-  "supersetWith": "superset con",
-  "@supersetWith": {
-    "description": "Text used between exercise cards when adding a new set. Translate as something like 'in a superset with'"
-  },
-  "plateCalculator": "Piastre",
-  "@plateCalculator": {
-    "description": "Label used for the plate calculator in the gym mode"
-  },
-  "plateCalculatorNotDivisible": "Non è possibile raggiungere il peso con le piastre disponibili",
-  "@plateCalculatorNotDivisible": {
-    "description": "Error message when the current weight is not reachable with plates (e.g. 33.1 kg)"
-  },
-  "productNotFoundDescription": "Il prodotto con il codice a barre scansionato {barcode} non è stato trovato nel database wger",
-  "@productNotFoundDescription": {
-    "description": "Dialog info when product is not found with barcode",
-    "type": "text",
-    "placeholders": {
-      "barcode": {}
-    }
-  },
-  "productNotFound": "Prodotto non trovato",
-  "@productNotFound": {
-    "description": "Header label for dialog when product is not found with barcode"
-  },
-  "scanBarcode": "Scansiona il codice a barre",
-  "@scanBarcode": {
-    "description": "Label for scan barcode button"
-  },
-  "weekAverage": "Media di 7 giorni",
-  "@weekAverage": {
-    "description": "Header for the column of '7 day average' nutritional values, i.e. what was logged last week"
-  },
-  "productFound": "Prodotto trovato",
-  "@productFound": {
-    "description": "Header label for dialog when product is found with barcode"
-  },
-  "productFoundDescription": "Il codice a barre corrisponde a questo prodotto: {productName}. Vuoi continuare?",
-  "@productFoundDescription": {
-    "description": "Dialog info when product is found with barcode",
-    "type": "text",
-    "placeholders": {
-      "productName": {}
-    }
-  },
-  "close": "Chiudi",
-  "@close": {
-    "description": "Translation for close"
-  },
-  "logIngredient": "Salva nel diario nutrizionale",
-  "@logIngredient": {},
-  "searchIngredient": "Cerca ingrediente",
-  "@searchIngredient": {
-    "description": "Label on ingredient search form"
-  },
-  "userProfile": "Il tuo profilo",
-  "@userProfile": {},
-  "exerciseList": "Lista esercizi",
-  "@exerciseList": {},
-  "exercises": "Esercizi",
-  "@exercises": {
-    "description": "Multiple exercises for a workout"
-  },
-  "exerciseName": "Nome Esercizio",
-  "@exerciseName": {
-    "description": "Label for the name of a workout exercise"
-  },
-  "previous": "Precedente",
-  "@previous": {},
-  "next": "Successivo",
-  "@next": {},
-  "gym_mat": "Materassino da palestra",
-  "@gym_mat": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "verifiedEmailInfo": "Un'email di verifica è stata inviata a {email}",
-  "@verifiedEmailInfo": {
-    "placeholders": {
-      "email": {}
-    }
-  },
-  "oneNamePerLine": "Un nome per linea",
-  "@oneNamePerLine": {},
-  "textPromptTitle": "Pronto a iniziare?",
-  "@textPromptTitle": {},
-  "moreMeasurementEntries": "Aggiungi una nuova misura",
-  "@moreMeasurementEntries": {
-    "description": "Message shown when the user wants to add new measurement"
-  },
-  "searchNamesInEnglish": "Cerca anche nei nomi in inglese",
-  "@searchNamesInEnglish": {},
-  "verify": "Verifica",
-  "@verify": {},
-  "legs": "Gambe",
-  "@legs": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "miles": "Miglia",
-  "@miles": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "seconds": "Secondi",
-  "@seconds": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "shoulders": "Spalle",
-  "@shoulders": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "max_reps": "Ripetizioni massime",
-  "@max_reps": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "kg": "kg",
-  "@kg": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "triceps": "Tricipiti",
-  "@triceps": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "chest": "Petto",
-  "@chest": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "selectEntry": "Per favore seleziona un elemento",
-  "@selectEntry": {},
-  "success": "Completato",
-  "@success": {
-    "description": "Message when an action completed successfully, usually used as a heading"
-  },
-  "verifiedEmailReason": "Devi verificare la tua email per contribuire agli esercizi",
-  "@verifiedEmailReason": {},
-  "cardio": "Cardio",
-  "@cardio": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "quads": "Quadricipiti",
-  "@quads": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "kilometers_per_hour": "Chilometri all'ora",
-  "@kilometers_per_hour": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "kilometers": "Chilometri",
-  "@kilometers": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "glutes": "Glutei",
-  "@glutes": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "minutes": "Minuti",
-  "@minutes": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "miles_per_hour": "Miglia per ora",
-  "@miles_per_hour": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "noMeasurementEntries": "Non hai voci di misurazione",
-  "@noMeasurementEntries": {},
-  "add_exercise_image_license": "Le immagini devono essere compatibili con la licenza CC BY SA. In caso di dubbi, carica solo le foto che hai scattato tu stesso.",
-  "@add_exercise_image_license": {},
-  "baseNameEnglish": "Tutti gli esercizi necessitano di un nome base in inglese",
-  "@baseNameEnglish": {},
-  "aboutMastodonTitle": "Mastodonte",
-  "@aboutMastodonTitle": {
-    "description": "Title for mastodon section in the about dialog"
-  },
-  "aboutMastodonText": "Seguici su mastodon per aggiornamenti e novità sul progetto",
-  "@aboutMastodonText": {
-    "description": "Text for the mastodon section in the about dialog"
-  },
-  "enterMinCharacters": "Inserisci almeno {min} caratteri",
-  "@enterMinCharacters": {
-    "description": "Error message when the user hasn't entered the minimum amount characters in a form",
-    "type": "text",
-    "placeholders": {
-      "min": {}
-    }
-  },
-  "sz_bar": "SZ-Bar",
-  "@sz_bar": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "variations": "Variazioni",
-  "@variations": {
-    "description": "Variations of one exercise (e.g. benchpress and benchpress narrow)"
-  },
-  "unVerifiedEmail": "Email non Verificata",
-  "@unVerifiedEmail": {},
-  "alsoKnownAs": "Conosciuto anche come: {aliases}",
-  "@alsoKnownAs": {
-    "placeholders": {
-      "aliases": {}
+    "anErrorOccurred": "È avvenuto un errore!",
+    "@anErrorOccurred": {},
+    "selectIngredient": "Seleziona un ingrediente",
+    "@selectIngredient": {
+        "description": "Error message when the user hasn't selected an ingredient from the autocompleter"
     },
-    "description": "List of alternative names for an exercise"
-  },
-  "verifiedEmail": "Email Verificata",
-  "@verifiedEmail": {},
-  "alternativeNames": "Nomi Alternativi",
-  "@alternativeNames": {},
-  "translation": "Traduzione",
-  "@translation": {},
-  "translateExercise": "Traduci questo esercizio ora",
-  "@translateExercise": {},
-  "baseData": "Informazioni Base in Inglese",
-  "@baseData": {
-    "description": "The base data for an exercise such as category, trained muscles, etc."
-  },
-  "contributeExercise": "Contribuisci aggiungendo un esercizio",
-  "@contributeExercise": {},
-  "barbell": "Bilanciere",
-  "@barbell": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "swiss_ball": "Fitball",
-  "@swiss_ball": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "none__bodyweight_exercise_": "nessuno (esercizio con il peso corporeo)",
-  "@none__bodyweight_exercise_": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "biceps": "Bicipiti",
-  "@biceps": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "calves": "Polpacci",
-  "@calves": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "abs": "Addominali",
-  "@abs": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "kettlebell": "Kettlebell",
-  "@kettlebell": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "images": "Immagini",
-  "@images": {},
-  "incline_bench": "Panca Inclinata",
-  "@incline_bench": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "lats": "Muscoli Dorsali",
-  "@lats": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "aboutPageTitle": "A proposito di Wger",
-  "@aboutPageTitle": {},
-  "contributeExerciseWarning": "Puoi contribuire agli esercizi solo se il tuo account è più vecchio di {days} giorni e hai verificato la tua email",
-  "@contributeExerciseWarning": {
-    "description": "Number of days before which a person can add exercise",
-    "placeholders": {
-      "days": {
-        "type": "String",
-        "example": "14"
-      }
-    }
-  },
-  "language": "Lingua",
-  "@language": {},
-  "textPromptSubheading": "Premi il pulsante azione per iniziare",
-  "@textPromptSubheading": {},
-  "arms": "Braccia",
-  "@arms": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "bench": "Panca",
-  "@bench": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "body_weight": "Peso Corporeo",
-  "@body_weight": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "dumbbell": "Manubrio",
-  "@dumbbell": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "plates": "Piastre",
-  "@plates": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "until_failure": "Fino al fallimento",
-  "@until_failure": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "lb": "lb",
-  "@lb": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "hamstrings": "Cosce",
-  "@hamstrings": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "pull_up_bar": "Barra per trazioni",
-  "@pull_up_bar": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "noMatchingExerciseFound": "Non sono stati trovati esercizi corrispondenti",
-  "@noMatchingExerciseFound": {
-    "description": "Message returned if no exercises match the searched string"
-  },
-  "whatVariationsExist": "Ci sono delle variazioni per questo esercizio, se ne esistono?",
-  "@whatVariationsExist": {},
-  "cacheWarning": "A causa del caching potrebbe volerci del tempo affinchè i cambiamenti siano visibili attraverso l'applicazione.",
-  "@cacheWarning": {},
-  "back": "Schiena",
-  "@back": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "lower_back": "Zona Lombare",
-  "@lower_back": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "useMetric": "Us",
-  "@useMetric": {},
-  "log": "Log",
-  "@log": {
-    "description": "Log a specific meal (imperative form)"
-  },
-  "aboutDonateTitle": "Donare",
-  "@aboutDonateTitle": {},
-  "aboutDonateText": "Offrici un caffè per aiutare il progetto, pagare i costi del server e mantenerci alimentati",
-  "@aboutDonateText": {},
-  "settingsTitle": "Impostazioni",
-  "@settingsTitle": {},
-  "settingsCacheTitle": "Cache",
-  "@settingsCacheTitle": {},
-  "settingsExerciseCacheDescription": "Cache degli esercizi",
-  "@settingsExerciseCacheDescription": {},
-  "settingsCacheDeletedSnackbar": "Cache svuotata con successo",
-  "@settingsCacheDeletedSnackbar": {},
-  "done": "Fatto",
-  "@done": {}
+    "enterValidNumber": "Inserisci un numero valido",
+    "@enterValidNumber": {
+        "description": "Error message when the user has submitted an invalid number (e.g. '3,.,.,.')"
+    },
+    "enterValue": "Inserisci un valore",
+    "@enterValue": {
+        "description": "Error message when the user hasn't entered a value on a required field"
+    },
+    "goToToday": "Seleziona giorno",
+    "@goToToday": {
+        "description": "Label on button to jump back to 'today' in the calendar widget"
+    },
+    "calendar": "Calendario",
+    "@calendar": {},
+    "toggleDetails": "Scegli dettagli",
+    "@toggleDetails": {
+        "description": "Switch to toggle detail / overview"
+    },
+    "newNutritionalPlan": "Nuovo piano nutrizionale",
+    "@newNutritionalPlan": {},
+    "confirmDelete": "Sei sicuro/a di voler cancellare '{toDelete}'?",
+    "@confirmDelete": {
+        "description": "Confirmation text before the user deletes an object",
+        "type": "text",
+        "placeholders": {
+            "toDelete": {
+                "type": "String"
+            }
+        }
+    },
+    "delete": "Elimina",
+    "@delete": {},
+    "loadingText": "Caricamento…",
+    "@loadingText": {
+        "description": "Text to show when entries are being loaded in the background: Loading..."
+    },
+    "edit": "Modifica",
+    "@edit": {},
+    "noWeightEntries": "Non hai nessun dato sul peso",
+    "@noWeightEntries": {
+        "description": "Message shown when the user has no logged weight entries"
+    },
+    "newEntry": "Nuovo dato",
+    "@newEntry": {
+        "description": "Title when adding a new entry such as a weight or log entry"
+    },
+    "unit": "Unità",
+    "@unit": {
+        "description": "The unit used for a repetition (kg, time, etc.)"
+    },
+    "amount": "Quatità",
+    "@amount": {
+        "description": "The amount (e.g. in grams) of an ingredient in a meal"
+    },
+    "sodium": "Sodio",
+    "@sodium": {},
+    "fiber": "Fibre",
+    "@fiber": {},
+    "saturatedFat": "Grassi saturi",
+    "@saturatedFat": {},
+    "fat": "Grassi",
+    "@fat": {},
+    "sugars": "Zuccheri",
+    "@sugars": {},
+    "carbohydrates": "Carboidrati",
+    "@carbohydrates": {},
+    "protein": "Proteine",
+    "@protein": {},
+    "g": "g",
+    "@g": {
+        "description": "Abbreviation for gram"
+    },
+    "kJ": "kJ",
+    "@kJ": {
+        "description": "Energy in a meal in kilo joules, kJ"
+    },
+    "kcal": "kcal",
+    "@kcal": {
+        "description": "Energy in a meal in kilocalories, kcal"
+    },
+    "energy": "Energia",
+    "@energy": {
+        "description": "Energy in a meal, ingredient etc. e.g. in kJ"
+    },
+    "ingredient": "Ingrediente",
+    "@ingredient": {},
+    "timeEnd": "Ora di fine",
+    "@timeEnd": {
+        "description": "The end time of a workout"
+    },
+    "timeStart": "Ora di inizio",
+    "@timeStart": {
+        "description": "The starting time of a workout"
+    },
+    "time": "Orario",
+    "@time": {
+        "description": "The time of a meal or workout"
+    },
+    "date": "Data",
+    "@date": {
+        "description": "The date of a workout log or body weight entry"
+    },
+    "weight": "Peso",
+    "@weight": {
+        "description": "The weight of a workout log or body weight entry"
+    },
+    "noNutritionalPlans": "Non hai nessun piano nutrizionale",
+    "@noNutritionalPlans": {
+        "description": "Message shown when the user has no nutritional plans"
+    },
+    "nutritionalPlans": "Piani nutrizionali",
+    "@nutritionalPlans": {},
+    "nutritionalDiary": "Diario nutrizionale",
+    "@nutritionalDiary": {},
+    "nutritionalPlan": "Piano nutrizionale",
+    "@nutritionalPlan": {},
+    "addIngredient": "Aggiungi ingrediente",
+    "@addIngredient": {},
+    "mealLogged": "Pasto registrato nel diario",
+    "@mealLogged": {},
+    "addMeal": "Aggiungi pasto",
+    "@addMeal": {},
+    "add": "Aggiungi",
+    "@add": {},
+    "cancel": "Cancella",
+    "@cancel": {},
+    "save": "Salva",
+    "@save": {},
+    "description": "Descrizione",
+    "@description": {},
+    "logHelpEntriesUnits": "Da notare che solo i dati con l'unità del peso (kg o lb) e le ripetizioni sono mostrate. Altre combinazioni come tempo o «a cedimento» sono ignorate.",
+    "@logHelpEntriesUnits": {},
+    "logHelpEntries": "Se in una giornata c'è più di esercizio con lo stesso numero di ripetizioni, ma con pesi differenti, solo l'esercizio con il peso più alto viene mostrato nel diagramma.",
+    "@logHelpEntries": {},
+    "gymMode": "Modalità allenamento",
+    "@gymMode": {
+        "description": "Label when starting the gym mode"
+    },
+    "newSet": "Nuova serie",
+    "@newSet": {
+        "description": "Header when adding a new set to a workout day"
+    },
+    "newDay": "Nuovo giorno",
+    "@newDay": {},
+    "workoutSession": "Sessione di allenamento",
+    "@workoutSession": {
+        "description": "A (logged) workout session"
+    },
+    "notes": "Note",
+    "@notes": {
+        "description": "Personal notes, e.g. for a workout session"
+    },
+    "impression": "Sensazione",
+    "@impression": {
+        "description": "General impression (e.g. for a workout session) such as good, bad, etc."
+    },
+    "comment": "Commento",
+    "@comment": {
+        "description": "Comment, additional information"
+    },
+    "rir": "RiR",
+    "@rir": {
+        "description": "Shorthand for Repetitions In Reserve"
+    },
+    "repetitions": "Ripetizioni",
+    "@repetitions": {
+        "description": "Repetitions for an exercise set"
+    },
+    "addExercise": "Aggiungi esercizi",
+    "@addExercise": {},
+    "exercise": "Esercizio",
+    "@exercise": {
+        "description": "An exercise for a workout"
+    },
+    "successfullyDeleted": "Cancellato",
+    "@successfullyDeleted": {
+        "description": "Message when an item was successfully deleted"
+    },
+    "labelDashboard": "Pannello di controllo",
+    "@labelDashboard": {
+        "description": "Title for screen dashboard"
+    },
+    "labelWorkoutPlan": "Piano di allenamento",
+    "@labelWorkoutPlan": {
+        "description": "Title for screen workout plan"
+    },
+    "loginInstead": "Hai già un account? Registrati ora",
+    "@loginInstead": {},
+    "registerInstead": "Non hai un account? Registrati ora",
+    "@registerInstead": {},
+    "reset": "Rerimposta",
+    "@reset": {
+        "description": "Button text allowing the user to reset the entered values to the default"
+    },
+    "customServerHint": "Inserisci l'indirizzo del tuo server personale o quello predefinito verrà utilizzato",
+    "@customServerHint": {
+        "description": "Hint text for the form where the users can enter their own wger instance"
+    },
+    "customServerUrl": "URL istanza wger",
+    "@customServerUrl": {
+        "description": "Label in the form where the users can enter their own wger instance"
+    },
+    "invalidUsername": "Inserisci un nome utente valido",
+    "@invalidUsername": {
+        "description": "Error message when the user enters an invalid username"
+    },
+    "username": "Nome utente",
+    "@username": {},
+    "email": "Indirizzo e-mail",
+    "@email": {},
+    "invalidEmail": "Inserisci un indirizzo e-mail valido",
+    "@invalidEmail": {
+        "description": "Error message when the user enters an invalid email"
+    },
+    "confirmPassword": "Conferma password",
+    "@confirmPassword": {},
+    "password": "Password",
+    "@password": {},
+    "passwordTooShort": "La password è troppo corta",
+    "@passwordTooShort": {
+        "description": "Error message when the user a password that is too short"
+    },
+    "passwordsDontMatch": "Le passwords non coincidono",
+    "@passwordsDontMatch": {
+        "description": "Error message when the user enters two different passwords during registration"
+    },
+    "invalidUrl": "Inserisci un URL valido",
+    "@invalidUrl": {
+        "description": "Error message when the user enters an invalid URL, e.g. in the login form"
+    },
+    "useCustomServer": "Usa un server personale",
+    "@useCustomServer": {
+        "description": "Toggle button allowing users to switch between the default and a custom wger server"
+    },
+    "useDefaultServer": "Usa il server predefinito",
+    "@useDefaultServer": {
+        "description": "Toggle button allowing users to switch between the default and a custom wger server"
+    },
+    "register": "Registrati",
+    "@register": {
+        "description": "Text for registration button"
+    },
+    "login": "Entra",
+    "@login": {
+        "description": "Text for login button"
+    },
+    "nrOfSets": "Serie per esercizio: {nrOfSets}",
+    "@nrOfSets": {
+        "description": "Label shown on the slider where the user selects the nr of sets",
+        "type": "text",
+        "placeholders": {
+            "nrOfSets": {
+                "type": "String"
+            }
+        }
+    },
+    "enterCharacters": "Inserisci una stringa tra {min} e {max} caratteri",
+    "@enterCharacters": {
+        "description": "Error message when the user hasn't entered the correct number of characters in a form",
+        "type": "text",
+        "placeholders": {
+            "min": {
+                "type": "String"
+            },
+            "max": {
+                "type": "String"
+            }
+        }
+    },
+    "selectExercise": "Prego, seleziona un esercizio",
+    "@selectExercise": {
+        "description": "Error message when the user hasn't selected an exercise in the form"
+    },
+    "todaysWorkout": "Allenamento di oggi",
+    "@todaysWorkout": {},
+    "selectExercises": "Se vuoi fare un circuito (super set), puoi cercare e aggiungere diversi esercizi. Questi verranno collegati come circuito",
+    "@selectExercises": {},
+    "sameRepetitions": "Se fai le stesse ripetizioni e peso per tutte le serie puoi compilare una sola riga. Per esempio per 4 serie inserisci semplicemente 10 per le ripetizioni, automaticamente diventerà una 4x10.",
+    "@sameRepetitions": {},
+    "setNr": "Serie {nr}",
+    "@setNr": {
+        "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.",
+        "type": "text",
+        "placeholders": {
+            "nr": {
+                "type": "String"
+            }
+        }
+    },
+    "dayDescriptionHelp": "Una descrizione di ciò che è stato fatto. (p.e. «allenamento gambe») o quale parte del corpo sono state allenate (p.e. «petto e spalle»)",
+    "@dayDescriptionHelp": {},
+    "set": "Serie",
+    "@set": {
+        "description": "A set in a workout plan"
+    },
+    "repetitionUnit": "Unità ripetizioni",
+    "@repetitionUnit": {},
+    "weightUnit": "Unità peso",
+    "@weightUnit": {},
+    "reps": "Ripetizioni",
+    "@reps": {
+        "description": "Shorthand for repetitions, used when space constraints are tighter"
+    },
+    "addSet": "Aggiungi serie",
+    "@addSet": {
+        "description": "Label for the button that adds a set (to a workout day)"
+    },
+    "start": "Inizia",
+    "@start": {
+        "description": "Label on button to start the gym mode (i.e., an imperative)"
+    },
+    "successfullySaved": "Salvato",
+    "@successfullySaved": {
+        "description": "Message when an item was successfully saved"
+    },
+    "labelWorkoutLogs": "Registri allenamenti",
+    "@labelWorkoutLogs": {
+        "description": "(Workout) logs"
+    },
+    "logout": "Disconnetti",
+    "@logout": {
+        "description": "Text for logout button"
+    },
+    "aboutDescription": "Grazie per esserti registrato/a su wger! wger è un progetto collaborativo con codice aperto, creato da entusiasti del fitness in tutto il mondo.",
+    "@aboutDescription": {
+        "description": "Text in the about dialog"
+    },
+    "logMeal": "Registra questo pasto nel diario",
+    "@logMeal": {},
+    "category": "Categoria",
+    "@category": {
+        "description": "Category for an exercise, ingredient, etc."
+    },
+    "equipment": "Equipaggiamento",
+    "@equipment": {
+        "description": "Equipment needed to perform an exercise"
+    },
+    "musclesSecondary": "Muscoli secondari",
+    "@musclesSecondary": {
+        "description": "secondary muscles trained by an exercise"
+    },
+    "muscles": "Muscoli",
+    "@muscles": {
+        "description": "(main) muscles trained by an exercise"
+    },
+    "addImage": "Aggiungi un'immagine",
+    "@addImage": {},
+    "gallery": "Galleria",
+    "@gallery": {},
+    "chooseFromLibrary": "Scegli dalla raccolta",
+    "@chooseFromLibrary": {},
+    "takePicture": "Scatta una foto",
+    "@takePicture": {},
+    "selectImage": "Si prega di selezionare un'immagine",
+    "@selectImage": {
+        "description": "Label and error message when the user hasn't selected an image to save"
+    },
+    "name": "Nome",
+    "@name": {
+        "description": "Name for a workout or nutritional plan"
+    },
+    "optionsLabel": "Opzioni",
+    "@optionsLabel": {
+        "description": "Label for the popup with general app options"
+    },
+    "goToDetailPage": "Vai alla pagina dettagli",
+    "@goToDetailPage": {},
+    "jumpTo": "Vai a",
+    "@jumpTo": {
+        "description": "Imperative. Label used in popup allowing the user to jump to a specific exercise while in the gym mode"
+    },
+    "pause": "Pausa",
+    "@pause": {
+        "description": "Noun, not an imperative! Label used for the pause when using the gym mode"
+    },
+    "searchExercise": "Cerca esercizio da aggiungere",
+    "@searchExercise": {
+        "description": "Label on set form. Selected exercises are added to the set"
+    },
+    "labelBottomNavWorkout": "Allenamento",
+    "@labelBottomNavWorkout": {
+        "description": "Label used in bottom navigation, use a short word"
+    },
+    "setUnitsAndRir": "Scegli le unità e le RiR",
+    "@setUnitsAndRir": {
+        "description": "Label shown on the slider where the user can toggle showing units and RiR",
+        "type": "text"
+    },
+    "rirNotUsed": "RiR (Repetitions in Reserve) non utilizzato",
+    "@rirNotUsed": {
+        "description": "Label used in RiR slider when the RiR value is not used/saved for the current setting or log"
+    },
+    "labelBottomNavNutrition": "Nutrizione",
+    "@labelBottomNavNutrition": {
+        "description": "Label used in bottom navigation, use a short word"
+    },
+    "usernameValidChars": "Un nome utente può contenere solo lettere, cifre e i caratteri @, +, ., - e _",
+    "@usernameValidChars": {
+        "description": "Error message when the user tries to register a username with forbidden characters"
+    },
+    "total": "Totale",
+    "@total": {
+        "description": "Label used for total sums of e.g. calories or similar"
+    },
+    "appUpdateTitle": "Aggiornamento necessario",
+    "@appUpdateTitle": {},
+    "appUpdateContent": "Questa versione dell'applicazione non è compatibile con il server, per favore aggiorna la tua applicazione.",
+    "@appUpdateContent": {},
+    "dataCopied": "Dati copiati nella nuova voce",
+    "@dataCopied": {
+        "description": "Snackbar message to show on copying data to a new log entry"
+    },
+    "proteinShort": "P",
+    "@proteinShort": {
+        "description": "The first letter or short name of the word 'Protein', used in overviews"
+    },
+    "carbohydratesShort": "C",
+    "@carbohydratesShort": {
+        "description": "The first letter or short name of the word 'Carbohydrates', used in overviews"
+    },
+    "percentEnergy": "Percentuale di energia",
+    "@percentEnergy": {},
+    "fatShort": "Gr",
+    "@fatShort": {
+        "description": "The first letter or short name of the word 'Fat', used in overviews"
+    },
+    "logged": "Registrato",
+    "@logged": {
+        "description": "Header for the column of 'logged' nutritional values, i.e. what was eaten"
+    },
+    "difference": "Differenza",
+    "@difference": {},
+    "gPerBodyKg": "g per kg di corpo",
+    "@gPerBodyKg": {
+        "description": "Label used for total sums of e.g. calories or similar in grams per Kg of body weight"
+    },
+    "timeStartAhead": "L'ora di inizio non può essere più avanti dell'ora di fine",
+    "@timeStartAhead": {},
+    "value": "Valore",
+    "@value": {
+        "description": "The value of a measurement entry"
+    },
+    "measurements": "Misure",
+    "@measurements": {
+        "description": "Categories for the measurements such as biceps size, body fat, etc."
+    },
+    "measurementCategoriesHelpText": "Categoria di misura, come «bicipiti» o «grasso corporeo»",
+    "@measurementCategoriesHelpText": {},
+    "measurementEntriesHelpText": "L'unità usata per misurare la categoria come «cm» o «%»",
+    "@measurementEntriesHelpText": {},
+    "energyShort": "E",
+    "@energyShort": {
+        "description": "The first letter or short name of the word 'Energy', used in overviews"
+    },
+    "macronutrients": "Macronutrienti",
+    "@macronutrients": {},
+    "planned": "Pianificato",
+    "@planned": {
+        "description": "Header for the column of 'planned' nutritional values, i.e. what should be eaten"
+    },
+    "measurement": "Misura",
+    "@measurement": {},
+    "recentlyUsedIngredients": "Ingredienti aggiunti di recente",
+    "@recentlyUsedIngredients": {
+        "description": "A message when a user adds a new ingredient to a meal."
+    },
+    "plateCalculator": "Piastre",
+    "@plateCalculator": {
+        "description": "Label used for the plate calculator in the gym mode"
+    },
+    "plateCalculatorNotDivisible": "Non è possibile raggiungere il peso con le piastre disponibili",
+    "@plateCalculatorNotDivisible": {
+        "description": "Error message when the current weight is not reachable with plates (e.g. 33.1 kg)"
+    },
+    "productNotFoundDescription": "Il prodotto con il codice a barre scansionato {barcode} non è stato trovato nel database wger",
+    "@productNotFoundDescription": {
+        "description": "Dialog info when product is not found with barcode",
+        "type": "text",
+        "placeholders": {
+            "barcode": {
+                "type": "String"
+            }
+        }
+    },
+    "productNotFound": "Prodotto non trovato",
+    "@productNotFound": {
+        "description": "Header label for dialog when product is not found with barcode"
+    },
+    "scanBarcode": "Scansiona il codice a barre",
+    "@scanBarcode": {
+        "description": "Label for scan barcode button"
+    },
+    "weekAverage": "Media di 7 giorni",
+    "@weekAverage": {
+        "description": "Header for the column of '7 day average' nutritional values, i.e. what was logged last week"
+    },
+    "productFound": "Prodotto trovato",
+    "@productFound": {
+        "description": "Header label for dialog when product is found with barcode"
+    },
+    "productFoundDescription": "Il codice a barre corrisponde a questo prodotto: {productName}. Vuoi continuare?",
+    "@productFoundDescription": {
+        "description": "Dialog info when product is found with barcode",
+        "type": "text",
+        "placeholders": {
+            "productName": {
+                "type": "String"
+            }
+        }
+    },
+    "close": "Chiudi",
+    "@close": {
+        "description": "Translation for close"
+    },
+    "logIngredient": "Salva l'ingrediente nel diario nutrizionale",
+    "@logIngredient": {},
+    "searchIngredient": "Cerca ingrediente",
+    "@searchIngredient": {
+        "description": "Label on ingredient search form"
+    },
+    "userProfile": "Il tuo profilo",
+    "@userProfile": {},
+    "exerciseList": "Lista esercizi",
+    "@exerciseList": {},
+    "exercises": "Esercizi",
+    "@exercises": {
+        "description": "Multiple exercises for a workout"
+    },
+    "exerciseName": "Nome Esercizio",
+    "@exerciseName": {
+        "description": "Label for the name of a workout exercise"
+    },
+    "previous": "Precedente",
+    "@previous": {},
+    "next": "Successivo",
+    "@next": {},
+    "gym_mat": "Materassino da palestra",
+    "@gym_mat": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "verifiedEmailInfo": "Un'email di verifica è stata inviata a {email}",
+    "@verifiedEmailInfo": {
+        "placeholders": {
+            "email": {
+                "type": "String"
+            }
+        }
+    },
+    "oneNamePerLine": "Un nome per linea",
+    "@oneNamePerLine": {},
+    "textPromptTitle": "Pronto a iniziare?",
+    "@textPromptTitle": {},
+    "moreMeasurementEntries": "Aggiungi una nuova misura",
+    "@moreMeasurementEntries": {
+        "description": "Message shown when the user wants to add new measurement"
+    },
+    "searchNamesInEnglish": "Cerca anche nei nomi in inglese",
+    "@searchNamesInEnglish": {},
+    "verify": "Verifica",
+    "@verify": {},
+    "legs": "Gambe",
+    "@legs": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "miles": "Miglia",
+    "@miles": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "seconds": "Secondi",
+    "@seconds": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "shoulders": "Spalle",
+    "@shoulders": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "max_reps": "Ripetizioni massime",
+    "@max_reps": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "kg": "kg",
+    "@kg": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "triceps": "Tricipiti",
+    "@triceps": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "chest": "Petto",
+    "@chest": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "selectEntry": "Per favore seleziona un elemento",
+    "@selectEntry": {},
+    "success": "Completato",
+    "@success": {
+        "description": "Message when an action completed successfully, usually used as a heading"
+    },
+    "verifiedEmailReason": "Devi verificare la tua email per contribuire agli esercizi",
+    "@verifiedEmailReason": {},
+    "cardio": "Cardio",
+    "@cardio": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "quads": "Quadricipiti",
+    "@quads": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "kilometers_per_hour": "Chilometri all'ora",
+    "@kilometers_per_hour": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "kilometers": "Chilometri",
+    "@kilometers": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "glutes": "Glutei",
+    "@glutes": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "minutes": "Minuti",
+    "@minutes": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "miles_per_hour": "Miglia per ora",
+    "@miles_per_hour": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "noMeasurementEntries": "Non hai voci di misurazione",
+    "@noMeasurementEntries": {},
+    "add_exercise_image_license": "Le immagini devono essere compatibili con la licenza CC BY SA. In caso di dubbi, carica solo le foto che hai scattato tu stesso.",
+    "@add_exercise_image_license": {},
+    "baseNameEnglish": "Tutti gli esercizi necessitano di un nome base in inglese",
+    "@baseNameEnglish": {},
+    "aboutMastodonTitle": "Mastodonte",
+    "@aboutMastodonTitle": {},
+    "enterMinCharacters": "Inserisci almeno {min} caratteri",
+    "@enterMinCharacters": {
+        "description": "Error message when the user hasn't entered the minimum amount characters in a form",
+        "type": "text",
+        "placeholders": {
+            "min": {
+                "type": "String"
+            }
+        }
+    },
+    "sz_bar": "SZ-Bar",
+    "@sz_bar": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "variations": "Variazioni",
+    "@variations": {
+        "description": "Variations of one exercise (e.g. benchpress and benchpress narrow)"
+    },
+    "unVerifiedEmail": "Email non Verificata",
+    "@unVerifiedEmail": {},
+    "alsoKnownAs": "Conosciuto anche come: {aliases}",
+    "@alsoKnownAs": {
+        "placeholders": {
+            "aliases": {
+                "type": "String"
+            }
+        },
+        "description": "List of alternative names for an exercise"
+    },
+    "verifiedEmail": "Email Verificata",
+    "@verifiedEmail": {},
+    "alternativeNames": "Nomi Alternativi",
+    "@alternativeNames": {},
+    "translation": "Traduzione",
+    "@translation": {},
+    "translateExercise": "Traduci questo esercizio ora",
+    "@translateExercise": {},
+    "baseData": "Informazioni Base in Inglese",
+    "@baseData": {
+        "description": "The base data for an exercise such as category, trained muscles, etc."
+    },
+    "contributeExercise": "Contribuisci aggiungendo un esercizio",
+    "@contributeExercise": {},
+    "barbell": "Bilanciere",
+    "@barbell": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "swiss_ball": "Fitball",
+    "@swiss_ball": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "none__bodyweight_exercise_": "nessuno (esercizio con il peso corporeo)",
+    "@none__bodyweight_exercise_": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "biceps": "Bicipiti",
+    "@biceps": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "calves": "Polpacci",
+    "@calves": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "abs": "Addominali",
+    "@abs": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "kettlebell": "Kettlebell",
+    "@kettlebell": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "images": "Immagini",
+    "@images": {},
+    "incline_bench": "Panca Inclinata",
+    "@incline_bench": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "lats": "Muscoli Dorsali",
+    "@lats": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "aboutPageTitle": "Chi siamo & Supporto",
+    "@aboutPageTitle": {},
+    "contributeExerciseWarning": "Puoi contribuire agli esercizi solo se il tuo account è più vecchio di {days} giorni e hai verificato la tua email",
+    "@contributeExerciseWarning": {
+        "description": "Number of days before which a person can add exercise",
+        "placeholders": {
+            "days": {
+                "type": "String",
+                "example": "14"
+            }
+        }
+    },
+    "language": "Lingua",
+    "@language": {},
+    "textPromptSubheading": "Premi il pulsante azione per iniziare",
+    "@textPromptSubheading": {},
+    "arms": "Braccia",
+    "@arms": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "bench": "Panca",
+    "@bench": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "body_weight": "Peso Corporeo",
+    "@body_weight": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "dumbbell": "Manubrio",
+    "@dumbbell": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "plates": "Piastre",
+    "@plates": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "until_failure": "Fino al fallimento",
+    "@until_failure": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "lb": "lb",
+    "@lb": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "hamstrings": "Cosce",
+    "@hamstrings": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "pull_up_bar": "Barra per trazioni",
+    "@pull_up_bar": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "noMatchingExerciseFound": "Non sono stati trovati esercizi corrispondenti",
+    "@noMatchingExerciseFound": {
+        "description": "Message returned if no exercises match the searched string"
+    },
+    "whatVariationsExist": "Ci sono delle variazioni per questo esercizio, se ne esistono?",
+    "@whatVariationsExist": {},
+    "cacheWarning": "A causa del caching potrebbe volerci del tempo affinchè i cambiamenti siano visibili attraverso l'applicazione.",
+    "@cacheWarning": {},
+    "back": "Schiena",
+    "@back": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "lower_back": "Zona Lombare",
+    "@lower_back": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "useMetric": "Us",
+    "@useMetric": {},
+    "log": "Log",
+    "@log": {
+        "description": "Log a specific meal (imperative form)"
+    },
+    "aboutDonateTitle": "Fai una donazione",
+    "@aboutDonateTitle": {},
+    "aboutDonateText": "Mentre il progetto è gratuito e lo sarà sempre, tenere il server attivo no! Lo sviluppo richiede molto tempo e sforzo dai volontari. Il tuo contributo supporta direttamente questi costi, aiutando a tenere il servizio affidabile.",
+    "@aboutDonateText": {},
+    "settingsTitle": "Impostazioni",
+    "@settingsTitle": {},
+    "settingsCacheTitle": "Cache",
+    "@settingsCacheTitle": {},
+    "settingsExerciseCacheDescription": "Cache degli esercizi",
+    "@settingsExerciseCacheDescription": {},
+    "settingsCacheDeletedSnackbar": "Cache svuotata con successo",
+    "@settingsCacheDeletedSnackbar": {},
+    "done": "Fatto",
+    "@done": {},
+    "ingredientLogged": "Ingrediente registrato nel diario",
+    "@ingredientLogged": {},
+    "chartDuringPlanTitle": "{chartName} durante il piano nutrizionale {planName}",
+    "@chartDuringPlanTitle": {
+        "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
+        "type": "text",
+        "placeholders": {
+            "chartName": {
+                "type": "String"
+            },
+            "planName": {
+                "type": "String"
+            }
+        }
+    },
+    "chart30DaysTitle": "{name} ultimi 30 giorni",
+    "@chart30DaysTitle": {
+        "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
+        "type": "text",
+        "placeholders": {
+            "name": {
+                "type": "String"
+            }
+        }
+    },
+    "goalMacro": "Obiettivi dei macronutrienti",
+    "@goalMacro": {
+        "description": "The goal for macronutrients"
+    },
+    "goalFiber": "Obbiettivo fibre",
+    "@goalFiber": {},
+    "overallChangeWeight": "Variazione complessiva",
+    "@overallChangeWeight": {
+        "description": "Overall change in weight, added for localization"
+    },
+    "goalTypeMeals": "Dai pasti",
+    "@goalTypeMeals": {
+        "description": "added for localization of Class GoalType's filed meals"
+    },
+    "goalTypeBasic": "Base",
+    "@goalTypeBasic": {
+        "description": "added for localization of Class GoalType's filed basic"
+    },
+    "goalTypeAdvanced": "Avanzato",
+    "@goalTypeAdvanced": {
+        "description": "added for localization of Class GoalType's filed advanced"
+    },
+    "indicatorRaw": "grezzo",
+    "@indicatorRaw": {
+        "description": "added for localization of Class Indicator's field text"
+    },
+    "indicatorAvg": "med",
+    "@indicatorAvg": {
+        "description": "added for localization of Class Indicator's field text"
+    },
+    "themeMode": "Modalità del tema",
+    "@themeMode": {},
+    "lightMode": "Sempre in modalità chiara",
+    "@lightMode": {},
+    "systemMode": "Parametri di sistema",
+    "@systemMode": {},
+    "settingsIngredientCacheDescription": "Cache ingredienti",
+    "@settingsIngredientCacheDescription": {},
+    "onlyLogging": "Traccia solo le calorie",
+    "@onlyLogging": {},
+    "goalEnergy": "Obiettivo energetico",
+    "@goalEnergy": {},
+    "goalProtein": "Obbiettivo proteine",
+    "@goalProtein": {},
+    "goalCarbohydrates": "Obbiettivo carboidrati",
+    "@goalCarbohydrates": {},
+    "goalFat": "Obbiettivo grassi",
+    "@goalFat": {},
+    "today": "Oggi",
+    "@today": {},
+    "loggedToday": "Registrato oggi",
+    "@loggedToday": {},
+    "kcalValue": "{value} kcal",
+    "@kcalValue": {
+        "description": "A value in kcal, e.g. 500 kcal",
+        "type": "text",
+        "placeholders": {
+            "value": {
+                "type": "String"
+            }
+        }
+    },
+    "gValue": "{value} g",
+    "@gValue": {
+        "description": "A value in grams, e.g. 5 g",
+        "type": "text",
+        "placeholders": {
+            "value": {
+                "type": "String"
+            }
+        }
+    },
+    "percentValue": "{value} %",
+    "@percentValue": {
+        "description": "A value in percent, e.g. 10 %",
+        "type": "text",
+        "placeholders": {
+            "value": {
+                "type": "String"
+            }
+        }
+    },
+    "onlyLoggingHelpText": "Selezionate la casella se volete registrare solo le calorie e non volete impostare un piano nutrizionale dettagliato con pasti specifici",
+    "@onlyLoggingHelpText": {},
+    "noIngredientsDefined": "Nessun ingrediente ancora definito",
+    "@noIngredientsDefined": {},
+    "selectMealToLog": "Selezionare un pasto da registrare nel diario",
+    "@selectMealToLog": {},
+    "surplus": "eccedenza",
+    "@surplus": {
+        "description": "Caloric surplus (either planned or unplanned)"
+    },
+    "deficit": "deficit",
+    "@deficit": {
+        "description": "Caloric deficit (either planned or unplanned)"
+    },
+    "chartAllTimeTitle": "{name} totale",
+    "@chartAllTimeTitle": {
+        "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
+        "type": "text",
+        "placeholders": {
+            "name": {
+                "type": "String"
+            }
+        }
+    },
+    "darkMode": "Sempre in modalità scura",
+    "@darkMode": {},
+    "routines": "Routine",
+    "@routines": {},
+    "newRoutine": "Nuova routine",
+    "@newRoutine": {},
+    "noRoutines": "Non hai nessuna routine",
+    "@noRoutines": {},
+    "restTime": "Tempo di riposo",
+    "@restTime": {},
+    "exerciseNr": "Esercizio {nr}",
+    "@exerciseNr": {
+        "description": "Header in form indicating the number of the current exercise. Can also be translated as something like 'Set Nr. xy'.",
+        "type": "text",
+        "placeholders": {
+            "nr": {
+                "type": "String"
+            }
+        }
+    },
+    "restDay": "Giorno di riposo",
+    "@restDay": {},
+    "needsLogsToAdvance": "Ha bisogno di registri per avanzare",
+    "@needsLogsToAdvance": {},
+    "isRestDayHelp": "Tieni presente che tutte le serie e gli esercizi verranno rimossi quando contrassegni un giorno come giorno di riposo.",
+    "@isRestDayHelp": {},
+    "useColors": "Usa colori",
+    "@useColors": {},
+    "invalidApiToken": "Per favore inserisci una chiave API valida",
+    "@invalidApiToken": {
+        "description": "Error message when the user enters an invalid API key"
+    },
+    "apiToken": "API Token",
+    "@apiToken": {},
+    "useApiToken": "Usa il Token API",
+    "@useApiToken": {},
+    "useUsernameAndPassword": "Usa username e password",
+    "@useUsernameAndPassword": {},
+    "apiTokenValidChars": "Una chiave API può contenere solo lettere a-f, numeri 0-9 e deve essere lunga 40 caratteri",
+    "@apiTokenValidChars": {
+        "description": "Error message when the user tries to input a API key with forbidden characters"
+    },
+    "selectAvailablePlates": "Seleziona i piatti disponibili",
+    "@selectAvailablePlates": {},
+    "barWeight": "Peso della barra",
+    "@barWeight": {},
+    "isRestDay": "È il giorno di riposo",
+    "@isRestDay": {},
+    "needsLogsToAdvanceHelp": "Seleziona se desideri che la routine proceda al giorno programmato successivo solo se hai registrato un allenamento per quel giorno",
+    "@needsLogsToAdvanceHelp": {},
+    "routineDays": "Giorni di routine",
+    "@routineDays": {},
+    "yourCurrentNutritionPlanHasNoMealsDefinedYet": "Il tuo attuale piano nutrizionale non ha pasti definiti",
+    "@yourCurrentNutritionPlanHasNoMealsDefinedYet": {
+        "description": "Message shown when a nutrition plan doesn't have any meals"
+    },
+    "toAddMealsToThePlanGoToNutritionalPlanDetails": "Per aggiungere pasti al piano, vai ai dettagli del piano nutrizionale",
+    "@toAddMealsToThePlanGoToNutritionalPlanDetails": {
+        "description": "Message shown to guide users to the nutritional plan details page to add meals"
+    },
+    "errorInfoDescription": "Ci dispiace, ma si è verificato un problema. Puoi aiutarci a risolverlo segnalando il problema su GitHub.",
+    "@errorInfoDescription": {},
+    "errorInfoDescription2": "Puoi continuare a utilizzare l'app, ma alcune funzionalità potrebbero non funzionare.",
+    "@errorInfoDescription2": {},
+    "errorViewDetails": "Dettagli Tecnici",
+    "@errorViewDetails": {},
+    "errorCouldNotConnectToServer": "Impossibile connettersi al server",
+    "@errorCouldNotConnectToServer": {},
+    "errorCouldNotConnectToServerDetails": "L'applicazione non è riuscita a connettersi al server. Controlla la tua connessione Internet o l'URL del server e riprova. Se il problema persiste, contatta l'amministratore del server.",
+    "@errorCouldNotConnectToServerDetails": {},
+    "copyToClipboard": "Copia negli appunti",
+    "@copyToClipboard": {},
+    "aboutTranslationListTitle": "Tradurre l'applicazione",
+    "@aboutTranslationListTitle": {},
+    "aboutSourceListTitle": "Visualizza il codice sorgente",
+    "@aboutSourceListTitle": {},
+    "aboutJoinCommunityTitle": "Unisciti alla comunità",
+    "@aboutJoinCommunityTitle": {},
+    "others": "Altri",
+    "@others": {},
+    "fitInWeekHelp": "Se abilitata, i giorni si ripeteranno in un ciclo settimanale, altrimenti i giorni si susseguiranno in sequenza, senza tener conto dell'inizio di una nuova settimana.",
+    "@fitInWeekHelp": {},
+    "addSuperset": "Aggiungi superset",
+    "@addSuperset": {},
+    "setHasProgression": "Il set ha una progressione",
+    "@setHasProgression": {},
+    "setHasProgressionWarning": "Si prega di notare che al momento non è possibile modificare tutte le impostazioni di un set sull'applicazione mobile o configurare la progressione automatica. Per ora, si prega di utilizzare l'applicazione web.",
+    "@setHasProgressionWarning": {},
+    "setHasNoExercises": "Questo set non contiene ancora esercizi!",
+    "@setHasNoExercises": {},
+    "simpleMode": "Modalità semplice",
+    "@simpleMode": {},
+    "simpleModeHelp": "Nascondi alcune delle impostazioni più avanzate durante la modifica degli esercizi",
+    "@simpleModeHelp": {},
+    "progressionRules": "Questo esercizio ha delle regole di progressione e non può essere modificato sull'app mobile. Per modificare questo esercizio, utilizza l'applicazione web.",
+    "@progressionRules": {},
+    "resistance_band": "Fascia di resistenza",
+    "@resistance_band": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "endDate": "Data di fine",
+    "@endDate": {},
+    "startDate": "Data di inizio",
+    "@startDate": {},
+    "sets": "Serie",
+    "@sets": {
+        "description": "The number of sets to be done for one exercise"
+    },
+    "supersetNr": "Serie combinata{nr }",
+    "@supersetNr": {
+        "description": "Header in form indicating the number of the current exercise. Can also be translated as something like 'Superset Nr. xy'.",
+        "type": "text",
+        "placeholders": {
+            "nr": {
+                "type": "String"
+            }
+        }
+    },
+    "resultingRoutine": "Risultato Routine",
+    "@resultingRoutine": {},
+    "min": "Min",
+    "@min": {},
+    "max": "Max",
+    "@max": {},
+    "aboutWhySupportTitle": "Open Source & uso gratuito ❤️",
+    "@aboutWhySupportTitle": {},
+    "aboutContributeTitle": "Contribuisci",
+    "@aboutContributeTitle": {},
+    "aboutContributeText": "Incoraggiamo ogni tipo di contributo. Che tu sia uno sviluppatore, un traduttore, o semplicemente appassionato di fitness, ogni piccolo supporto verrà apprezzato!",
+    "@aboutContributeText": {},
+    "aboutBugsListTitle": "Segnala un problema o suggerisci una funzionalità",
+    "@aboutBugsListTitle": {},
+    "aboutDiscordTitle": "Discord",
+    "@aboutDiscordTitle": {},
+    "fitInWeek": "Settimana Fit in",
+    "@fitInWeek": {}
 }
diff --git a/lib/l10n/app_ja.arb b/lib/l10n/app_ja.arb
index 3f8110a8..7f6ddf35 100644
--- a/lib/l10n/app_ja.arb
+++ b/lib/l10n/app_ja.arb
@@ -1,618 +1,682 @@
 {
-  "login": "ログイン",
-  "@login": {
-    "description": "Text for login button"
-  },
-  "logout": "ログアウト",
-  "@logout": {
-    "description": "Text for logout button"
-  },
-  "register": "登録",
-  "@register": {
-    "description": "Text for registration button"
-  },
-  "useDefaultServer": "デフォルトサーバを使用する",
-  "@useDefaultServer": {
-    "description": "Toggle button allowing users to switch between the default and a custom wger server"
-  },
-  "useCustomServer": "カスタムサーバを使用する",
-  "@useCustomServer": {
-    "description": "Toggle button allowing users to switch between the default and a custom wger server"
-  },
-  "invalidUrl": "有効なURLを入力してください",
-  "@invalidUrl": {
-    "description": "Error message when the user enters an invalid URL, e.g. in the login form"
-  },
-  "usernameValidChars": "ユーザー名に含められるのは文字，数字と@, +, ., -, _の記号のみです",
-  "@usernameValidChars": {
-    "description": "Error message when the user tries to register a username with forbidden characters"
-  },
-  "passwordsDontMatch": "パスワードが合致しません",
-  "@passwordsDontMatch": {
-    "description": "Error message when the user enters two different passwords during registration"
-  },
-  "passwordTooShort": "パスワードが短すぎます",
-  "@passwordTooShort": {
-    "description": "Error message when the user a password that is too short"
-  },
-  "password": "パスワード",
-  "@password": {},
-  "confirmPassword": "パスワードを決定する",
-  "@confirmPassword": {},
-  "invalidEmail": "有効なメールアドレスを入力してください",
-  "@invalidEmail": {
-    "description": "Error message when the user enters an invalid email"
-  },
-  "email": "Eメールアドレス",
-  "@email": {},
-  "username": "ユーザー名",
-  "@username": {},
-  "invalidUsername": "有効なユーザー名を入力してください",
-  "@invalidUsername": {
-    "description": "Error message when the user enters an invalid username"
-  },
-  "customServerUrl": "wgerのインスタンスURL",
-  "@customServerUrl": {
-    "description": "Label in the form where the users can enter their own wger instance"
-  },
-  "customServerHint": "あなたのサーバのアドレスを入力するか, そうでなければデフォルトのサーバが使用されます",
-  "@customServerHint": {
-    "description": "Hint text for the form where the users can enter their own wger instance"
-  },
-  "reset": "リセット",
-  "@reset": {
-    "description": "Button text allowing the user to reset the entered values to the default"
-  },
-  "registerInstead": "新規登録",
-  "@registerInstead": {},
-  "loginInstead": "Log in instead",
-  "@loginInstead": {},
-  "labelWorkoutPlans": "Workout plans",
-  "@labelWorkoutPlans": {
-    "description": "Title for screen workout plans"
-  },
-  "labelBottomNavWorkout": "運動",
-  "@labelBottomNavWorkout": {
-    "description": "Label used in bottom navigation, use a short word"
-  },
-  "labelBottomNavNutrition": "栄養",
-  "@labelBottomNavNutrition": {
-    "description": "Label used in bottom navigation, use a short word"
-  },
-  "labelWorkoutLogs": "トレーニング履歴",
-  "@labelWorkoutLogs": {
-    "description": "(Workout) logs"
-  },
-  "labelWorkoutPlan": "運動メニュー",
-  "@labelWorkoutPlan": {
-    "description": "Title for screen workout plan"
-  },
-  "labelDashboard": "ダッシュボード",
-  "@labelDashboard": {
-    "description": "Title for screen dashboard"
-  },
-  "successfullyDeleted": "削除されました",
-  "@successfullyDeleted": {
-    "description": "Message when an item was successfully deleted"
-  },
-  "successfullySaved": "保存されました",
-  "@successfullySaved": {
-    "description": "Message when an item was successfully saved"
-  },
-  "exercise": "運動",
-  "@exercise": {
-    "description": "An exercise for a workout"
-  },
-  "searchExercise": "運動を探す",
-  "@searchExercise": {
-    "description": "Label on set form. Selected exercises are added to the set"
-  },
-  "supersetWith": "セットで",
-  "@supersetWith": {
-    "description": "Text used between exercise cards when adding a new set. Translate as something like 'in a superset with'"
-  },
-  "equipment": "器具",
-  "@equipment": {
-    "description": "Equipment needed to perform an exercise"
-  },
-  "muscles": "メインとなる筋肉",
-  "@muscles": {
-    "description": "(main) muscles trained by an exercise"
-  },
-  "musclesSecondary": "補助的な筋肉",
-  "@musclesSecondary": {
-    "description": "secondary muscles trained by an exercise"
-  },
-  "category": "分類",
-  "@category": {
-    "description": "Category for an exercise, ingredient, etc."
-  },
-  "newWorkout": "新しい運動メニュー",
-  "@newWorkout": {
-    "description": "Header when adding a new workout"
-  },
-  "noWorkoutPlans": "運動メニューはありません",
-  "@noWorkoutPlans": {
-    "description": "Message shown when the user has no workout plans"
-  },
-  "repetitions": "繰り返し",
-  "@repetitions": {
-    "description": "Repetitions for an exercise set"
-  },
-  "reps": "反復",
-  "@reps": {
-    "description": "Shorthand for repetitions, used when space constraints are tighter"
-  },
-  "rir": "予備レップ",
-  "@rir": {
-    "description": "Shorthand for Repetitions In Reserve"
-  },
-  "rirNotUsed": "予備レップは保存されていません",
-  "@rirNotUsed": {
-    "description": "Label used in RiR slider when the RiR value is not used/saved for the current setting or log"
-  },
-  "weightUnit": "重量単位",
-  "@weightUnit": {},
-  "repetitionUnit": "反復単位",
-  "@repetitionUnit": {},
-  "set": "セット",
-  "@set": {
-    "description": "A set in a workout plan"
-  },
-  "dayDescriptionHelp": "A description of what is done on this day (e.g. 'pull day') or what body parts are trained (e.g. 'chest and shoulders')",
-  "@dayDescriptionHelp": {},
-  "setNr": "Set {nr}",
-  "@setNr": {
-    "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.",
-    "type": "text",
-    "placeholders": {
-      "nr": {}
-    }
-  },
-  "sameRepetitions": "If you do the same repetitions and weight for all sets you can just fill in one row. For example for 4 sets just enter 10 for the repetitions, this automatically becomes \"4 x 10\".",
-  "@sameRepetitions": {},
-  "comment": "コメント",
-  "@comment": {
-    "description": "Comment, additional information"
-  },
-  "impression": "評価",
-  "@impression": {
-    "description": "General impression (e.g. for a workout session) such as good, bad, etc."
-  },
-  "notes": "メモ",
-  "@notes": {
-    "description": "Personal notes, e.g. for a workout session"
-  },
-  "workoutSession": "Workout session",
-  "@workoutSession": {
-    "description": "A (logged) workout session"
-  },
-  "newDay": "新しい日",
-  "@newDay": {},
-  "newSet": "新しいセット",
-  "@newSet": {
-    "description": "Header when adding a new set to a workout day"
-  },
-  "selectExercises": "If you want to do a superset you can search for several exercises, they will be grouped together",
-  "@selectExercises": {},
-  "gymMode": "ジムモード",
-  "@gymMode": {
-    "description": "Label when starting the gym mode"
-  },
-  "plateCalculator": "プレート",
-  "@plateCalculator": {
-    "description": "Label used for the plate calculator in the gym mode"
-  },
-  "plateCalculatorNotDivisible": "Not possible to reach weight with available plates",
-  "@plateCalculatorNotDivisible": {
-    "description": "Error message when the current weight is not reachable with plates (e.g. 33.1 kg)"
-  },
-  "pause": "休止",
-  "@pause": {
-    "description": "Noun, not an imperative! Label used for the pause when using the gym mode"
-  },
-  "jumpTo": "ジャンプ",
-  "@jumpTo": {
-    "description": "Imperative. Label used in popup allowing the user to jump to a specific exercise while in the gym mode"
-  },
-  "todaysWorkout": "あなたの今日の運動",
-  "@todaysWorkout": {},
-  "logHelpEntries": "If on a single day there is more than one entry with the same number of repetitions, but different weights, only the entry with the higher weight is shown in the diagram.",
-  "@logHelpEntries": {},
-  "logHelpEntriesUnits": "Note that only entries with a weight unit (kg or lb) and repetitions are charted, other combinations such as time or until failure are ignored here.",
-  "@logHelpEntriesUnits": {},
-  "description": "説明",
-  "@description": {},
-  "name": "名称",
-  "@name": {
-    "description": "Name for a workout or nutritional plan"
-  },
-  "save": "保存",
-  "@save": {},
-  "addSet": "セットを追加",
-  "@addSet": {
-    "description": "Label for the button that adds a set (to a workout day)"
-  },
-  "addMeal": "食事を追加",
-  "@addMeal": {},
-  "mealLogged": "食事が日記に記録されました",
-  "@mealLogged": {},
-  "logMeal": "この食事を記録する",
-  "@logMeal": {},
-  "addIngredient": "食材を追加する",
-  "@addIngredient": {},
-  "logIngredient": "栄養日記に記録する",
-  "@logIngredient": {},
-  "searchIngredient": "食材を探す",
-  "@searchIngredient": {
-    "description": "Label on ingredient search form"
-  },
-  "nutritionalPlan": "栄養メニュー",
-  "@nutritionalPlan": {},
-  "nutritionalDiary": "栄養日記",
-  "@nutritionalDiary": {},
-  "nutritionalPlans": "栄養メニュー一覧",
-  "@nutritionalPlans": {},
-  "noNutritionalPlans": "栄養メニューがありません",
-  "@noNutritionalPlans": {
-    "description": "Message shown when the user has no nutritional plans"
-  },
-  "anErrorOccurred": "エラーが発生しました",
-  "@anErrorOccurred": {},
-  "weight": "重量",
-  "@weight": {
-    "description": "The weight of a workout log or body weight entry"
-  },
-  "measurement": "測定",
-  "@measurement": {},
-  "measurements": "測定結果",
-  "@measurements": {
-    "description": "Categories for the measurements such as biceps size, body fat, etc."
-  },
-  "measurementCategoriesHelpText": "Measurement category, such as 'biceps' or 'body fat'",
-  "@measurementCategoriesHelpText": {},
-  "measurementEntriesHelpText": "The unit used to measure the category such as 'cm' or '%'",
-  "@measurementEntriesHelpText": {},
-  "date": "日付",
-  "@date": {
-    "description": "The date of a workout log or body weight entry"
-  },
-  "value": "値",
-  "@value": {
-    "description": "The value of a measurement entry"
-  },
-  "start": "開始",
-  "@start": {
-    "description": "Label on button to start the gym mode (i.e., an imperative)"
-  },
-  "time": "時間",
-  "@time": {
-    "description": "The time of a meal or workout"
-  },
-  "timeStart": "開始時刻",
-  "@timeStart": {
-    "description": "The starting time of a workout"
-  },
-  "timeEnd": "終了時刻",
-  "@timeEnd": {
-    "description": "The end time of a workout"
-  },
-  "timeStartAhead": "終了時刻を開始時刻より前にすることはできません",
-  "@timeStartAhead": {},
-  "ingredient": "食材",
-  "@ingredient": {},
-  "energy": "エネルギー",
-  "@energy": {
-    "description": "Energy in a meal, ingredient etc. e.g. in kJ"
-  },
-  "energyShort": "E",
-  "@energyShort": {
-    "description": "The first letter or short name of the word 'Energy', used in overviews"
-  },
-  "kcal": "kcal",
-  "@kcal": {
-    "description": "Energy in a meal in kilocalories, kcal"
-  },
-  "macronutrients": "大栄養素",
-  "@macronutrients": {},
-  "planned": "計画された",
-  "@planned": {
-    "description": "Header for the column of 'planned' nutritional values, i.e. what should be eaten"
-  },
-  "logged": "記録された",
-  "@logged": {
-    "description": "Header for the column of 'logged' nutritional values, i.e. what was eaten"
-  },
-  "weekAverage": "1週間平均",
-  "@weekAverage": {
-    "description": "Header for the column of '7 day average' nutritional values, i.e. what was logged last week"
-  },
-  "difference": "違い",
-  "@difference": {},
-  "percentEnergy": "エネルギーの割合（%）",
-  "@percentEnergy": {},
-  "gPerBodyKg": "体重（kg）に対するエネルギー（g）の割合",
-  "@gPerBodyKg": {
-    "description": "Label used for total sums of e.g. calories or similar in grams per Kg of body weight"
-  },
-  "total": "合計",
-  "@total": {
-    "description": "Label used for total sums of e.g. calories or similar"
-  },
-  "kJ": "kJ",
-  "@kJ": {
-    "description": "Energy in a meal in kilo joules, kJ"
-  },
-  "g": "g",
-  "@g": {
-    "description": "Abbreviation for gram"
-  },
-  "protein": "タンパク質",
-  "@protein": {},
-  "proteinShort": "P",
-  "@proteinShort": {
-    "description": "The first letter or short name of the word 'Protein', used in overviews"
-  },
-  "carbohydrates": "炭水化物",
-  "@carbohydrates": {},
-  "carbohydratesShort": "C",
-  "@carbohydratesShort": {
-    "description": "The first letter or short name of the word 'Carbohydrates', used in overviews"
-  },
-  "sugars": "糖分",
-  "@sugars": {},
-  "fat": "脂肪",
-  "@fat": {},
-  "fatShort": "F",
-  "@fatShort": {
-    "description": "The first letter or short name of the word 'Fat', used in overviews"
-  },
-  "saturatedFat": "Saturated fat",
-  "@saturatedFat": {},
-  "fiber": "Fibre",
-  "@fiber": {},
-  "sodium": "Sodium",
-  "@sodium": {},
-  "amount": "Amount",
-  "@amount": {
-    "description": "The amount (e.g. in grams) of an ingredient in a meal"
-  },
-  "unit": "Unit",
-  "@unit": {
-    "description": "The unit used for a repetition (kg, time, etc.)"
-  },
-  "newEntry": "New entry",
-  "@newEntry": {
-    "description": "Title when adding a new entry such as a weight or log entry"
-  },
-  "noWeightEntries": "You have no weight entries",
-  "@noWeightEntries": {
-    "description": "Message shown when the user has no logged weight entries"
-  },
-  "edit": "Edit",
-  "@edit": {},
-  "loadingText": "Loading...",
-  "@loadingText": {
-    "description": "Text to show when entries are being loaded in the background: Loading..."
-  },
-  "delete": "Delete",
-  "@delete": {},
-  "confirmDelete": "Are you sure you want to delete '{toDelete}'?",
-  "@confirmDelete": {
-    "description": "Confirmation text before the user deletes an object",
-    "type": "text",
-    "placeholders": {
-      "toDelete": {}
-    }
-  },
-  "newNutritionalPlan": "New nutritional plan",
-  "@newNutritionalPlan": {},
-  "toggleDetails": "Toggle details",
-  "@toggleDetails": {
-    "description": "Switch to toggle detail / overview"
-  },
-  "goToDetailPage": "Go to detail page",
-  "@goToDetailPage": {},
-  "aboutDescription": "Thank you for using wger! wger is a collaborative open source project, made by fitness enthusiasts from around the world.",
-  "@aboutDescription": {
-    "description": "Text in the about dialog"
-  },
-  "aboutSourceTitle": "Source code",
-  "@aboutSourceTitle": {
-    "description": "Title for source code section in the about dialog"
-  },
-  "aboutSourceText": "Get the source code of this application and its server on github",
-  "@aboutSourceText": {
-    "description": "Text for source code section in the about dialog"
-  },
-  "aboutBugsTitle": "Have a problem or idea?",
-  "@aboutBugsTitle": {
-    "description": "Title for bugs section in the about dialog"
-  },
-  "aboutBugsText": "Get in touch if something didn't behave as expected or if there is a feature that you feel is missing.",
-  "@aboutBugsText": {
-    "description": "Text for bugs section in the about dialog"
-  },
-  "aboutContactUsTitle": "Say hi!",
-  "@aboutContactUsTitle": {
-    "description": "Title for contact us section in the about dialog"
-  },
-  "aboutContactUsText": "If you want to chat with us, hop on the Discord server and get in touch",
-  "@aboutContactUsText": {
-    "description": "Text for contact us section in the about dialog"
-  },
-  "aboutTranslationTitle": "Translation",
-  "@aboutTranslationTitle": {
-    "description": "Title for translation section in the about dialog"
-  },
-  "aboutTranslationText": "This application is translated on weblate. If you also want to help, click the link and start translating",
-  "@aboutTranslationText": {
-    "description": "Text for translation section in the about dialog"
-  },
-  "calendar": "Calendar",
-  "@calendar": {},
-  "goToToday": "Go to today",
-  "@goToToday": {
-    "description": "Label on button to jump back to 'today' in the calendar widget"
-  },
-  "enterRepetitionsOrWeight": "Please fill in either the repetitions or the weight for at least one of the sets",
-  "@enterRepetitionsOrWeight": {
-    "description": "Error message when the user hasn't filled in the forms for exercise sets"
-  },
-  "enterValue": "Please enter a value",
-  "@enterValue": {
-    "description": "Error message when the user hasn't entered a value on a required field"
-  },
-  "selectExercise": "Please select an exercise",
-  "@selectExercise": {
-    "description": "Error message when the user hasn't selected an exercise in the form"
-  },
-  "enterCharacters": "Please enter between {min} and {max} characters",
-  "@enterCharacters": {
-    "description": "Error message when the user hasn't entered the correct number of characters in a form",
-    "type": "text",
-    "placeholders": {
-      "min": {},
-      "max": {}
-    }
-  },
-  "nrOfSets": "Sets per exercise: {nrOfSets}",
-  "@nrOfSets": {
-    "description": "Label shown on the slider where the user selects the nr of sets",
-    "type": "text",
-    "placeholders": {
-      "nrOfSets": {}
-    }
-  },
-  "setUnitsAndRir": "Set units and RiR",
-  "@setUnitsAndRir": {
-    "description": "Label shown on the slider where the user can toggle showing units and RiR",
-    "type": "text"
-  },
-  "enterValidNumber": "Please enter a valid number",
-  "@enterValidNumber": {
-    "description": "Error message when the user has submitted an invalid number (e.g. '3,.,.,.')"
-  },
-  "selectIngredient": "Please select an ingredient",
-  "@selectIngredient": {
-    "description": "Error message when the user hasn't selected an ingredient from the autocompleter"
-  },
-  "recentlyUsedIngredients": "Recently added ingredients",
-  "@recentlyUsedIngredients": {
-    "description": "A message when a user adds a new ingredient to a meal."
-  },
-  "selectImage": "Please select an image",
-  "@selectImage": {
-    "description": "Label and error message when the user hasn't selected an image to save"
-  },
-  "optionsLabel": "Options",
-  "@optionsLabel": {
-    "description": "Label for the popup with general app options"
-  },
-  "takePicture": "Take a picture",
-  "@takePicture": {},
-  "chooseFromLibrary": "Choose from photo library",
-  "@chooseFromLibrary": {},
-  "gallery": "Gallery",
-  "@gallery": {},
-  "addImage": "Add image",
-  "@addImage": {},
-  "dataCopied": "Data copied to new entry",
-  "@dataCopied": {
-    "description": "Snackbar message to show on copying data to a new log entry"
-  },
-  "appUpdateTitle": "Update needed",
-  "@appUpdateTitle": {},
-  "appUpdateContent": "This version of the app is not compatible with the server, please update your application.",
-  "@appUpdateContent": {},
-  "productFound": "Product found",
-  "@productFound": {
-    "description": "Header label for dialog when product is found with barcode"
-  },
-  "productFoundDescription": "The barcode corresponds to this product: {productName}. Do you want to continue?",
-  "@productFoundDescription": {
-    "description": "Dialog info when product is found with barcode",
-    "type": "text",
-    "placeholders": {
-      "productName": {}
-    }
-  },
-  "productNotFound": "Product not found",
-  "@productNotFound": {
-    "description": "Header label for dialog when product is not found with barcode"
-  },
-  "productNotFoundDescription": "The product with the scanned barcode {barcode} was not found in the wger database",
-  "@productNotFoundDescription": {
-    "description": "Dialog info when product is not found with barcode",
-    "type": "text",
-    "placeholders": {
-      "barcode": {}
-    }
-  },
-  "scanBarcode": "Scan barcode",
-  "@scanBarcode": {
-    "description": "Label for scan barcode button"
-  },
-  "close": "Close",
-  "@close": {
-    "description": "Translation for close"
-  },
-  "userProfile": "あなたのプロフィール",
-  "@userProfile": {},
-  "barbell": "バーベル",
-  "@barbell": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "arms": "腕",
-  "@arms": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "chest": "胸",
-  "@chest": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "dumbbell": "ダンベル",
-  "@dumbbell": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "success": "成功",
-  "@success": {
-    "description": "Message when an action completed successfully, usually used as a heading"
-  },
-  "cardio": "有酸素運動",
-  "@cardio": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "bench": "ベンチ",
-  "@bench": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "settingsExerciseCacheDescription": "エクササイズキャッシュ",
-  "@settingsExerciseCacheDescription": {},
-  "settingsTitle": "設定",
-  "@settingsTitle": {},
-  "settingsCacheTitle": "キャッシュ",
-  "@settingsCacheTitle": {},
-  "back": "戻る",
-  "@back": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "abs": "腹筋",
-  "@abs": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "biceps": "力こぶ",
-  "@biceps": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "body_weight": "体重",
-  "@body_weight": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "verify": "確認する",
-  "@verify": {},
-  "calves": "ふくらはぎ",
-  "@calves": {
-    "description": "Generated entry for translation for server strings"
-  }
+    "login": "ログイン",
+    "@login": {
+        "description": "Text for login button"
+    },
+    "logout": "ログアウト",
+    "@logout": {
+        "description": "Text for logout button"
+    },
+    "register": "登録",
+    "@register": {
+        "description": "Text for registration button"
+    },
+    "useDefaultServer": "デフォルトサーバを使用する",
+    "@useDefaultServer": {
+        "description": "Toggle button allowing users to switch between the default and a custom wger server"
+    },
+    "useCustomServer": "カスタムサーバを使用する",
+    "@useCustomServer": {
+        "description": "Toggle button allowing users to switch between the default and a custom wger server"
+    },
+    "invalidUrl": "有効なURLを入力してください",
+    "@invalidUrl": {
+        "description": "Error message when the user enters an invalid URL, e.g. in the login form"
+    },
+    "usernameValidChars": "ユーザー名に含められるのは文字，数字と@, +, ., -, _の記号のみです",
+    "@usernameValidChars": {
+        "description": "Error message when the user tries to register a username with forbidden characters"
+    },
+    "passwordsDontMatch": "パスワードが合致しません",
+    "@passwordsDontMatch": {
+        "description": "Error message when the user enters two different passwords during registration"
+    },
+    "passwordTooShort": "パスワードが短すぎます",
+    "@passwordTooShort": {
+        "description": "Error message when the user a password that is too short"
+    },
+    "password": "パスワード",
+    "@password": {},
+    "confirmPassword": "パスワードを決定する",
+    "@confirmPassword": {},
+    "invalidEmail": "有効なメールアドレスを入力してください",
+    "@invalidEmail": {
+        "description": "Error message when the user enters an invalid email"
+    },
+    "email": "Eメールアドレス",
+    "@email": {},
+    "username": "ユーザー名",
+    "@username": {},
+    "invalidUsername": "有効なユーザー名を入力してください",
+    "@invalidUsername": {
+        "description": "Error message when the user enters an invalid username"
+    },
+    "customServerUrl": "wgerのインスタンスURL",
+    "@customServerUrl": {
+        "description": "Label in the form where the users can enter their own wger instance"
+    },
+    "customServerHint": "あなたのサーバのアドレスを入力してください（入力しない場合、デフォルトのサーバアドレスが使用されます）",
+    "@customServerHint": {
+        "description": "Hint text for the form where the users can enter their own wger instance"
+    },
+    "reset": "リセット",
+    "@reset": {
+        "description": "Button text allowing the user to reset the entered values to the default"
+    },
+    "registerInstead": "新規登録",
+    "@registerInstead": {},
+    "loginInstead": "既にアカウントをお持ちの方はこちらからログイン",
+    "@loginInstead": {},
+    "labelBottomNavWorkout": "運動",
+    "@labelBottomNavWorkout": {
+        "description": "Label used in bottom navigation, use a short word"
+    },
+    "labelBottomNavNutrition": "栄養",
+    "@labelBottomNavNutrition": {
+        "description": "Label used in bottom navigation, use a short word"
+    },
+    "labelWorkoutLogs": "トレーニング履歴",
+    "@labelWorkoutLogs": {
+        "description": "(Workout) logs"
+    },
+    "labelWorkoutPlan": "運動メニュー",
+    "@labelWorkoutPlan": {
+        "description": "Title for screen workout plan"
+    },
+    "labelDashboard": "ダッシュボード",
+    "@labelDashboard": {
+        "description": "Title for screen dashboard"
+    },
+    "successfullyDeleted": "削除されました",
+    "@successfullyDeleted": {
+        "description": "Message when an item was successfully deleted"
+    },
+    "successfullySaved": "保存されました",
+    "@successfullySaved": {
+        "description": "Message when an item was successfully saved"
+    },
+    "exercise": "運動",
+    "@exercise": {
+        "description": "An exercise for a workout"
+    },
+    "searchExercise": "運動を探す",
+    "@searchExercise": {
+        "description": "Label on set form. Selected exercises are added to the set"
+    },
+    "equipment": "器具",
+    "@equipment": {
+        "description": "Equipment needed to perform an exercise"
+    },
+    "muscles": "メインとなる筋肉",
+    "@muscles": {
+        "description": "(main) muscles trained by an exercise"
+    },
+    "musclesSecondary": "補助的な筋肉",
+    "@musclesSecondary": {
+        "description": "secondary muscles trained by an exercise"
+    },
+    "category": "分類",
+    "@category": {
+        "description": "Category for an exercise, ingredient, etc."
+    },
+    "repetitions": "繰り返し",
+    "@repetitions": {
+        "description": "Repetitions for an exercise set"
+    },
+    "reps": "反復",
+    "@reps": {
+        "description": "Shorthand for repetitions, used when space constraints are tighter"
+    },
+    "rir": "予備レップ",
+    "@rir": {
+        "description": "Shorthand for Repetitions In Reserve"
+    },
+    "rirNotUsed": "予備レップは保存されていません",
+    "@rirNotUsed": {
+        "description": "Label used in RiR slider when the RiR value is not used/saved for the current setting or log"
+    },
+    "weightUnit": "重量単位",
+    "@weightUnit": {},
+    "repetitionUnit": "反復単位",
+    "@repetitionUnit": {},
+    "set": "セット",
+    "@set": {
+        "description": "A set in a workout plan"
+    },
+    "dayDescriptionHelp": "A description of what is done on this day (e.g. 'pull day') or what body parts are trained (e.g. 'chest and shoulders')",
+    "@dayDescriptionHelp": {},
+    "setNr": "Set {nr}",
+    "@setNr": {
+        "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.",
+        "type": "text",
+        "placeholders": {
+            "nr": {
+                "type": "String"
+            }
+        }
+    },
+    "sameRepetitions": "If you do the same repetitions and weight for all sets you can just fill in one row. For example for 4 sets just enter 10 for the repetitions, this automatically becomes \"4 x 10\".",
+    "@sameRepetitions": {},
+    "comment": "コメント",
+    "@comment": {
+        "description": "Comment, additional information"
+    },
+    "impression": "評価",
+    "@impression": {
+        "description": "General impression (e.g. for a workout session) such as good, bad, etc."
+    },
+    "notes": "メモ",
+    "@notes": {
+        "description": "Personal notes, e.g. for a workout session"
+    },
+    "workoutSession": "Workout session",
+    "@workoutSession": {
+        "description": "A (logged) workout session"
+    },
+    "newDay": "新しい日",
+    "@newDay": {},
+    "newSet": "新しいセット",
+    "@newSet": {
+        "description": "Header when adding a new set to a workout day"
+    },
+    "selectExercises": "If you want to do a superset you can search for several exercises, they will be grouped together",
+    "@selectExercises": {},
+    "gymMode": "ジムモード",
+    "@gymMode": {
+        "description": "Label when starting the gym mode"
+    },
+    "plateCalculator": "プレート",
+    "@plateCalculator": {
+        "description": "Label used for the plate calculator in the gym mode"
+    },
+    "plateCalculatorNotDivisible": "Not possible to reach weight with available plates",
+    "@plateCalculatorNotDivisible": {
+        "description": "Error message when the current weight is not reachable with plates (e.g. 33.1 kg)"
+    },
+    "pause": "休止",
+    "@pause": {
+        "description": "Noun, not an imperative! Label used for the pause when using the gym mode"
+    },
+    "jumpTo": "ジャンプ",
+    "@jumpTo": {
+        "description": "Imperative. Label used in popup allowing the user to jump to a specific exercise while in the gym mode"
+    },
+    "todaysWorkout": "あなたの今日の運動",
+    "@todaysWorkout": {},
+    "logHelpEntries": "If on a single day there is more than one entry with the same number of repetitions, but different weights, only the entry with the higher weight is shown in the diagram.",
+    "@logHelpEntries": {},
+    "logHelpEntriesUnits": "Note that only entries with a weight unit (kg or lb) and repetitions are charted, other combinations such as time or until failure are ignored here.",
+    "@logHelpEntriesUnits": {},
+    "description": "説明",
+    "@description": {},
+    "name": "名称",
+    "@name": {
+        "description": "Name for a workout or nutritional plan"
+    },
+    "save": "保存",
+    "@save": {},
+    "addSet": "セットを追加",
+    "@addSet": {
+        "description": "Label for the button that adds a set (to a workout day)"
+    },
+    "addMeal": "食事を追加",
+    "@addMeal": {},
+    "mealLogged": "食事が日記に記録されました",
+    "@mealLogged": {},
+    "logMeal": "この食事を記録する",
+    "@logMeal": {},
+    "addIngredient": "食材を追加する",
+    "@addIngredient": {},
+    "logIngredient": "栄養日記に記録する",
+    "@logIngredient": {},
+    "searchIngredient": "食材を探す",
+    "@searchIngredient": {
+        "description": "Label on ingredient search form"
+    },
+    "nutritionalPlan": "栄養メニュー",
+    "@nutritionalPlan": {},
+    "nutritionalDiary": "栄養日記",
+    "@nutritionalDiary": {},
+    "nutritionalPlans": "栄養メニュー一覧",
+    "@nutritionalPlans": {},
+    "noNutritionalPlans": "栄養メニューがありません",
+    "@noNutritionalPlans": {
+        "description": "Message shown when the user has no nutritional plans"
+    },
+    "anErrorOccurred": "エラーが発生しました",
+    "@anErrorOccurred": {},
+    "weight": "重量",
+    "@weight": {
+        "description": "The weight of a workout log or body weight entry"
+    },
+    "measurement": "測定",
+    "@measurement": {},
+    "measurements": "測定結果",
+    "@measurements": {
+        "description": "Categories for the measurements such as biceps size, body fat, etc."
+    },
+    "measurementCategoriesHelpText": "Measurement category, such as 'biceps' or 'body fat'",
+    "@measurementCategoriesHelpText": {},
+    "measurementEntriesHelpText": "The unit used to measure the category such as 'cm' or '%'",
+    "@measurementEntriesHelpText": {},
+    "date": "日付",
+    "@date": {
+        "description": "The date of a workout log or body weight entry"
+    },
+    "value": "値",
+    "@value": {
+        "description": "The value of a measurement entry"
+    },
+    "start": "開始",
+    "@start": {
+        "description": "Label on button to start the gym mode (i.e., an imperative)"
+    },
+    "time": "時間",
+    "@time": {
+        "description": "The time of a meal or workout"
+    },
+    "timeStart": "開始時刻",
+    "@timeStart": {
+        "description": "The starting time of a workout"
+    },
+    "timeEnd": "終了時刻",
+    "@timeEnd": {
+        "description": "The end time of a workout"
+    },
+    "timeStartAhead": "終了時刻を開始時刻より前にすることはできません",
+    "@timeStartAhead": {},
+    "ingredient": "食材",
+    "@ingredient": {},
+    "energy": "エネルギー",
+    "@energy": {
+        "description": "Energy in a meal, ingredient etc. e.g. in kJ"
+    },
+    "energyShort": "E",
+    "@energyShort": {
+        "description": "The first letter or short name of the word 'Energy', used in overviews"
+    },
+    "kcal": "kcal",
+    "@kcal": {
+        "description": "Energy in a meal in kilocalories, kcal"
+    },
+    "macronutrients": "大栄養素",
+    "@macronutrients": {},
+    "planned": "計画された",
+    "@planned": {
+        "description": "Header for the column of 'planned' nutritional values, i.e. what should be eaten"
+    },
+    "logged": "記録された",
+    "@logged": {
+        "description": "Header for the column of 'logged' nutritional values, i.e. what was eaten"
+    },
+    "weekAverage": "1週間平均",
+    "@weekAverage": {
+        "description": "Header for the column of '7 day average' nutritional values, i.e. what was logged last week"
+    },
+    "difference": "違い",
+    "@difference": {},
+    "percentEnergy": "エネルギーの割合（%）",
+    "@percentEnergy": {},
+    "gPerBodyKg": "体重（kg）に対するエネルギー（g）の割合",
+    "@gPerBodyKg": {
+        "description": "Label used for total sums of e.g. calories or similar in grams per Kg of body weight"
+    },
+    "total": "合計",
+    "@total": {
+        "description": "Label used for total sums of e.g. calories or similar"
+    },
+    "kJ": "kJ",
+    "@kJ": {
+        "description": "Energy in a meal in kilo joules, kJ"
+    },
+    "g": "g",
+    "@g": {
+        "description": "Abbreviation for gram"
+    },
+    "protein": "タンパク質",
+    "@protein": {},
+    "proteinShort": "P",
+    "@proteinShort": {
+        "description": "The first letter or short name of the word 'Protein', used in overviews"
+    },
+    "carbohydrates": "炭水化物",
+    "@carbohydrates": {},
+    "carbohydratesShort": "C",
+    "@carbohydratesShort": {
+        "description": "The first letter or short name of the word 'Carbohydrates', used in overviews"
+    },
+    "sugars": "糖分",
+    "@sugars": {},
+    "fat": "脂肪",
+    "@fat": {},
+    "fatShort": "F",
+    "@fatShort": {
+        "description": "The first letter or short name of the word 'Fat', used in overviews"
+    },
+    "saturatedFat": "Saturated fat",
+    "@saturatedFat": {},
+    "fiber": "Fibre",
+    "@fiber": {},
+    "sodium": "Sodium",
+    "@sodium": {},
+    "amount": "Amount",
+    "@amount": {
+        "description": "The amount (e.g. in grams) of an ingredient in a meal"
+    },
+    "unit": "Unit",
+    "@unit": {
+        "description": "The unit used for a repetition (kg, time, etc.)"
+    },
+    "newEntry": "New entry",
+    "@newEntry": {
+        "description": "Title when adding a new entry such as a weight or log entry"
+    },
+    "noWeightEntries": "You have no weight entries",
+    "@noWeightEntries": {
+        "description": "Message shown when the user has no logged weight entries"
+    },
+    "edit": "Edit",
+    "@edit": {},
+    "loadingText": "Loading...",
+    "@loadingText": {
+        "description": "Text to show when entries are being loaded in the background: Loading..."
+    },
+    "delete": "Delete",
+    "@delete": {},
+    "confirmDelete": "Are you sure you want to delete '{toDelete}'?",
+    "@confirmDelete": {
+        "description": "Confirmation text before the user deletes an object",
+        "type": "text",
+        "placeholders": {
+            "toDelete": {
+                "type": "String"
+            }
+        }
+    },
+    "newNutritionalPlan": "New nutritional plan",
+    "@newNutritionalPlan": {},
+    "toggleDetails": "Toggle details",
+    "@toggleDetails": {
+        "description": "Switch to toggle detail / overview"
+    },
+    "goToDetailPage": "Go to detail page",
+    "@goToDetailPage": {},
+    "aboutDescription": "Thank you for using wger! wger is a collaborative open source project, made by fitness enthusiasts from around the world.",
+    "@aboutDescription": {
+        "description": "Text in the about dialog"
+    },
+    "calendar": "Calendar",
+    "@calendar": {},
+    "goToToday": "Go to today",
+    "@goToToday": {
+        "description": "Label on button to jump back to 'today' in the calendar widget"
+    },
+    "enterValue": "Please enter a value",
+    "@enterValue": {
+        "description": "Error message when the user hasn't entered a value on a required field"
+    },
+    "selectExercise": "Please select an exercise",
+    "@selectExercise": {
+        "description": "Error message when the user hasn't selected an exercise in the form"
+    },
+    "enterCharacters": "Please enter between {min} and {max} characters",
+    "@enterCharacters": {
+        "description": "Error message when the user hasn't entered the correct number of characters in a form",
+        "type": "text",
+        "placeholders": {
+            "min": {
+                "type": "String"
+            },
+            "max": {
+                "type": "String"
+            }
+        }
+    },
+    "nrOfSets": "Sets per exercise: {nrOfSets}",
+    "@nrOfSets": {
+        "description": "Label shown on the slider where the user selects the nr of sets",
+        "type": "text",
+        "placeholders": {
+            "nrOfSets": {
+                "type": "String"
+            }
+        }
+    },
+    "setUnitsAndRir": "Set units and RiR",
+    "@setUnitsAndRir": {
+        "description": "Label shown on the slider where the user can toggle showing units and RiR",
+        "type": "text"
+    },
+    "enterValidNumber": "Please enter a valid number",
+    "@enterValidNumber": {
+        "description": "Error message when the user has submitted an invalid number (e.g. '3,.,.,.')"
+    },
+    "selectIngredient": "Please select an ingredient",
+    "@selectIngredient": {
+        "description": "Error message when the user hasn't selected an ingredient from the autocompleter"
+    },
+    "recentlyUsedIngredients": "Recently added ingredients",
+    "@recentlyUsedIngredients": {
+        "description": "A message when a user adds a new ingredient to a meal."
+    },
+    "selectImage": "Please select an image",
+    "@selectImage": {
+        "description": "Label and error message when the user hasn't selected an image to save"
+    },
+    "optionsLabel": "Options",
+    "@optionsLabel": {
+        "description": "Label for the popup with general app options"
+    },
+    "takePicture": "Take a picture",
+    "@takePicture": {},
+    "chooseFromLibrary": "Choose from photo library",
+    "@chooseFromLibrary": {},
+    "gallery": "Gallery",
+    "@gallery": {},
+    "imageFormatNotSupported": "{imageFormat}はサポートされていません",
+    "@imageFormatNotSupported": {
+        "description": "Label shown on the error container when image format is not supported",
+        "type": "text",
+        "placeholders": {
+            "imageFormat": {
+                "type": "String"
+            }
+        }
+    },
+    "imageFormatNotSupportedDetail": "{imageFormat}形式の画像はまだサポートされていません。",
+    "@imageFormatNotSupportedDetail": {
+        "description": "Label shown on the image preview container when image format is not supported",
+        "type": "text",
+        "placeholders": {
+            "imageFormat": {
+                "type": "String"
+            }
+        }
+    },
+    "addImage": "Add image",
+    "@addImage": {},
+    "dataCopied": "Data copied to new entry",
+    "@dataCopied": {
+        "description": "Snackbar message to show on copying data to a new log entry"
+    },
+    "appUpdateTitle": "Update needed",
+    "@appUpdateTitle": {},
+    "appUpdateContent": "This version of the app is not compatible with the server, please update your application.",
+    "@appUpdateContent": {},
+    "productFound": "Product found",
+    "@productFound": {
+        "description": "Header label for dialog when product is found with barcode"
+    },
+    "productFoundDescription": "The barcode corresponds to this product: {productName}. Do you want to continue?",
+    "@productFoundDescription": {
+        "description": "Dialog info when product is found with barcode",
+        "type": "text",
+        "placeholders": {
+            "productName": {
+                "type": "String"
+            }
+        }
+    },
+    "productNotFound": "Product not found",
+    "@productNotFound": {
+        "description": "Header label for dialog when product is not found with barcode"
+    },
+    "productNotFoundDescription": "The product with the scanned barcode {barcode} was not found in the wger database",
+    "@productNotFoundDescription": {
+        "description": "Dialog info when product is not found with barcode",
+        "type": "text",
+        "placeholders": {
+            "barcode": {
+                "type": "String"
+            }
+        }
+    },
+    "scanBarcode": "Scan barcode",
+    "@scanBarcode": {
+        "description": "Label for scan barcode button"
+    },
+    "close": "Close",
+    "@close": {
+        "description": "Translation for close"
+    },
+    "userProfile": "あなたのプロフィール",
+    "@userProfile": {},
+    "barbell": "バーベル",
+    "@barbell": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "arms": "腕",
+    "@arms": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "chest": "胸",
+    "@chest": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "dumbbell": "ダンベル",
+    "@dumbbell": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "success": "成功",
+    "@success": {
+        "description": "Message when an action completed successfully, usually used as a heading"
+    },
+    "cardio": "有酸素運動",
+    "@cardio": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "bench": "ベンチ",
+    "@bench": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "settingsExerciseCacheDescription": "エクササイズキャッシュ",
+    "@settingsExerciseCacheDescription": {},
+    "settingsTitle": "設定",
+    "@settingsTitle": {},
+    "settingsCacheTitle": "キャッシュ",
+    "@settingsCacheTitle": {},
+    "back": "戻る",
+    "@back": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "abs": "腹筋",
+    "@abs": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "biceps": "力こぶ",
+    "@biceps": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "body_weight": "体重",
+    "@body_weight": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "verify": "確認する",
+    "@verify": {},
+    "calves": "ふくらはぎ",
+    "@calves": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "selectAvailablePlates": "利用可能なプレートを選択してください",
+    "@selectAvailablePlates": {},
+    "barWeight": "バーの重さ",
+    "@barWeight": {},
+    "useColors": "色を使用する",
+    "@useColors": {},
+    "useApiToken": "APIトークンを使用する",
+    "@useApiToken": {},
+    "useUsernameAndPassword": "ユーザー名とパスワードを使用する",
+    "@useUsernameAndPassword": {},
+    "apiToken": "APIトークン",
+    "@apiToken": {},
+    "invalidApiToken": "有効なAPIキーを入力してください",
+    "@invalidApiToken": {
+        "description": "Error message when the user enters an invalid API key"
+    },
+    "apiTokenValidChars": "APIキーはアルファベットのa~f、数字の0~9のみで構成されており、ちょうど40文字の長さです",
+    "@apiTokenValidChars": {
+        "description": "Error message when the user tries to input a API key with forbidden characters"
+    },
+    "exerciseList": "エクササイズ一覧",
+    "@exerciseList": {},
+    "exercises": "ワークアウトを構成する複数のエクササイズ",
+    "@exercises": {
+        "description": "Multiple exercises for a workout"
+    },
+    "exerciseName": "ワークアウトエクササイズの名前にラベルを付ける",
+    "@exerciseName": {
+        "description": "Label for the name of a workout exercise"
+    },
+    "noIngredientsDefined": "要素が定義されていません",
+    "@noIngredientsDefined": {},
+    "noMatchingExerciseFound": "一致するエクササイズがありません",
+    "@noMatchingExerciseFound": {
+        "description": "Message returned if no exercises match the searched string"
+    },
+    "searchNamesInEnglish": "英語での名前検索",
+    "@searchNamesInEnglish": {},
+    "endDate": "終了日",
+    "@endDate": {},
+    "startDate": "開始日",
+    "@startDate": {},
+    "routines": "ルーティン",
+    "@routines": {},
+    "newRoutine": "新しいルーティン",
+    "@newRoutine": {},
+    "noRoutines": "ルーティンがありません",
+    "@noRoutines": {},
+    "restTime": "休憩時間",
+    "@restTime": {},
+    "sets": "セット",
+    "@sets": {
+        "description": "The number of sets to be done for one exercise"
+    },
+    "useMetric": "体重の単位",
+    "@useMetric": {},
+    "exerciseNr": "エクササイズ {nr}",
+    "@exerciseNr": {
+        "description": "Header in form indicating the number of the current exercise. Can also be translated as something like 'Set Nr. xy'.",
+        "type": "text",
+        "placeholders": {
+            "nr": {
+                "type": "String"
+            }
+        }
+    },
+    "supersetNr": "スーパーセット {nr}",
+    "@supersetNr": {
+        "description": "Header in form indicating the number of the current exercise. Can also be translated as something like 'Superset Nr. xy'.",
+        "type": "text",
+        "placeholders": {
+            "nr": {
+                "type": "String"
+            }
+        }
+    },
+    "restDay": "休息日",
+    "@restDay": {},
+    "isRestDay": "休息日",
+    "@isRestDay": {},
+    "isRestDayHelp": "休憩日を設定する際はすべてのセットとエクササイズが削除されていることを確認してください。",
+    "@isRestDayHelp": {}
 }
diff --git a/lib/l10n/app_ko.arb b/lib/l10n/app_ko.arb
new file mode 100644
index 00000000..4ea773ce
--- /dev/null
+++ b/lib/l10n/app_ko.arb
@@ -0,0 +1,1054 @@
+{
+  "apiTokenValidChars": "API 키값은 영소문자(a-f), 숫자(0-9), 40자 이어야 합니다",
+  "@apiTokenValidChars": {
+    "description": "Error message when the user tries to input a API key with forbidden characters"
+  },
+  "userProfile": "환경설정",
+  "@userProfile": {},
+  "success": "성공",
+  "@success": {
+    "description": "Message when an action completed successfully, usually used as a heading"
+  },
+  "login": "로그인",
+  "@login": {
+    "description": "Text for login button"
+  },
+  "dayDescriptionHelp": "이 날에 무엇을 하는지에 대한 설명(예: '풀 데이') 또는 어떤 신체 부위를 훈련하는지에 대한 설명(예: '가슴과 어깨')",
+  "@dayDescriptionHelp": {},
+  "successfullySaved": "저장",
+  "@successfullySaved": {
+    "description": "Message when an item was successfully saved"
+  },
+  "customServerHint": "서버 주소를 입력하세요 미입력시 기본 주소가 사용됩니다",
+  "@customServerHint": {
+    "description": "Hint text for the form where the users can enter their own wger instance"
+  },
+  "register": "등록",
+  "@register": {
+    "description": "Text for registration button"
+  },
+  "labelDashboard": "대시보드",
+  "@labelDashboard": {
+    "description": "Title for screen dashboard"
+  },
+  "logout": "로그아웃",
+  "@logout": {
+    "description": "Text for logout button"
+  },
+  "useDefaultServer": "기본 서버 정보",
+  "@useDefaultServer": {
+    "description": "Toggle button allowing users to switch between the default and a custom wger server"
+  },
+  "useCustomServer": "커스텀 서버 정보",
+  "@useCustomServer": {
+    "description": "Toggle button allowing users to switch between the default and a custom wger server"
+  },
+  "invalidUrl": "올바른 URL 정보를 입력하세요",
+  "@invalidUrl": {
+    "description": "Error message when the user enters an invalid URL, e.g. in the login form"
+  },
+  "usernameValidChars": "사용자명은 문자, 숫자, '@, +, ., -, _' 만 가능합니다",
+  "@usernameValidChars": {
+    "description": "Error message when the user tries to register a username with forbidden characters"
+  },
+  "passwordTooShort": "비밀번호가 너무 짧습니다",
+  "@passwordTooShort": {
+    "description": "Error message when the user a password that is too short"
+  },
+  "password": "비밀번호",
+  "@password": {},
+  "confirmPassword": "비밀번호 확인",
+  "@confirmPassword": {},
+  "invalidEmail": "올바른 이메일 주소를 입력하세요",
+  "@invalidEmail": {
+    "description": "Error message when the user enters an invalid email"
+  },
+  "email": "이메일 주소",
+  "@email": {},
+  "username": "사용자명",
+  "@username": {},
+  "invalidUsername": "올바른 사용자명을 입력하세요",
+  "@invalidUsername": {
+    "description": "Error message when the user enters an invalid username"
+  },
+  "useApiToken": "API 토큰값 사용",
+  "@useApiToken": {},
+  "useUsernameAndPassword": "사용자명, 비밀번호 사용",
+  "@useUsernameAndPassword": {},
+  "apiToken": "API 토큰값",
+  "@apiToken": {},
+  "invalidApiToken": "올바른 API 토큰값을 입력하세요",
+  "@invalidApiToken": {
+    "description": "Error message when the user enters an invalid API key"
+  },
+  "customServerUrl": "wger 인스턴스의 URL",
+  "@customServerUrl": {
+    "description": "Label in the form where the users can enter their own wger instance"
+  },
+  "reset": "초기화",
+  "@reset": {
+    "description": "Button text allowing the user to reset the entered values to the default"
+  },
+  "registerInstead": "계정이 없나요? 지금 등록하세요",
+  "@registerInstead": {},
+  "loginInstead": "이미 계정이 있으신가요? 로그인하세요",
+  "@loginInstead": {},
+  "labelBottomNavWorkout": "운동",
+  "@labelBottomNavWorkout": {
+    "description": "Label used in bottom navigation, use a short word"
+  },
+  "labelWorkoutLogs": "트레이닝 이력",
+  "@labelWorkoutLogs": {
+    "description": "(Workout) logs"
+  },
+  "noIngredientsDefined": "아직 정의된 성분이 없어요",
+  "@noIngredientsDefined": {},
+  "exerciseList": "예시 목록",
+  "@exerciseList": {},
+  "exercise": "예시",
+  "@exercise": {
+    "description": "An exercise for a workout"
+  },
+  "exercises": "운동",
+  "@exercises": {
+    "description": "Multiple exercises for a workout"
+  },
+  "exerciseName": "예시명",
+  "@exerciseName": {
+    "description": "Label for the name of a workout exercise"
+  },
+  "searchExercise": "추가할 예시 검색",
+  "@searchExercise": {
+    "description": "Label on set form. Selected exercises are added to the set"
+  },
+  "noMatchingExerciseFound": "예시를 찾을 수 없어요",
+  "@noMatchingExerciseFound": {
+    "description": "Message returned if no exercises match the searched string"
+  },
+  "searchNamesInEnglish": "영어 이름도 검색해 보세요",
+  "@searchNamesInEnglish": {},
+  "equipment": "장비",
+  "@equipment": {
+    "description": "Equipment needed to perform an exercise"
+  },
+  "muscles": "근육",
+  "@muscles": {
+    "description": "(main) muscles trained by an exercise"
+  },
+  "musclesSecondary": "이차 근육",
+  "@musclesSecondary": {
+    "description": "secondary muscles trained by an exercise"
+  },
+  "category": "카테고리",
+  "@category": {
+    "description": "Category for an exercise, ingredient, etc."
+  },
+  "routines": "루틴",
+  "@routines": {},
+  "newRoutine": "새로운 루틴",
+  "@newRoutine": {},
+  "noRoutines": "루틴이 없어요",
+  "@noRoutines": {},
+  "reps": "랩스",
+  "@reps": {
+    "description": "Shorthand for repetitions, used when space constraints are tighter"
+  },
+  "restTime": "휴식 시간",
+  "@restTime": {},
+  "sets": "세트",
+  "@sets": {
+    "description": "The number of sets to be done for one exercise"
+  },
+  "rir": "RiR",
+  "@rir": {
+    "description": "Shorthand for Repetitions In Reserve"
+  },
+  "useMetric": "체중에는 미터법 단위를 사용하세요",
+  "@useMetric": {},
+  "weightUnit": "체중",
+  "@weightUnit": {},
+  "repetitionUnit": "반복단위",
+  "@repetitionUnit": {},
+  "set": "세트",
+  "@set": {
+    "description": "A set in a workout plan"
+  },
+  "exerciseNr": "예시 {nr}",
+  "@exerciseNr": {
+    "description": "Header in form indicating the number of the current exercise. Can also be translated as something like 'Set Nr. xy'.",
+    "type": "text",
+    "placeholders": {
+      "nr": {
+        "type": "String"
+      }
+    }
+  },
+  "supersetNr": "슈퍼세트 {nr}",
+  "@supersetNr": {
+    "description": "Header in form indicating the number of the current exercise. Can also be translated as something like 'Superset Nr. xy'.",
+    "type": "text",
+    "placeholders": {
+      "nr": {
+        "type": "String"
+      }
+    }
+  },
+  "labelWorkoutPlan": "운동 계획",
+  "@labelWorkoutPlan": {
+    "description": "Title for screen workout plan"
+  },
+  "passwordsDontMatch": "비밀번호가 불일치 합니다",
+  "@passwordsDontMatch": {
+    "description": "Error message when the user enters two different passwords during registration"
+  },
+  "labelBottomNavNutrition": "영양물 섭취",
+  "@labelBottomNavNutrition": {
+    "description": "Label used in bottom navigation, use a short word"
+  },
+  "successfullyDeleted": "삭제",
+  "@successfullyDeleted": {
+    "description": "Message when an item was successfully deleted"
+  },
+  "rirNotUsed": "RiR 미사용",
+  "@rirNotUsed": {
+    "description": "Label used in RiR slider when the RiR value is not used/saved for the current setting or log"
+  },
+  "todaysWorkout": "오늘 운동",
+  "@todaysWorkout": {},
+  "logHelpEntriesUnits": "무게 단위(kg 또는 lb)와 반복 횟수가 있는 항목만 차트에 표시되며, 시간이나 실패할 때까지의 시간 등의 다른 조합은 여기서는 무시됩니다.",
+  "@logHelpEntriesUnits": {},
+  "description": "설명",
+  "@description": {},
+  "mealLogged": "식사 기록이 일기에 기록됨",
+  "@mealLogged": {},
+  "ingredientLogged": "일기에 기록된 재료",
+  "@ingredientLogged": {},
+  "logMeal": "영양 일지에 식사 기록하기",
+  "@logMeal": {},
+  "addIngredient": "성분 추가",
+  "@addIngredient": {},
+  "nutritionalPlan": "영양 계획",
+  "@nutritionalPlan": {},
+  "nutritionalDiary": "영양 일기",
+  "@nutritionalDiary": {},
+  "nutritionalPlans": "영양 계획",
+  "@nutritionalPlans": {},
+  "goalMacro": "거시적 목표",
+  "@goalMacro": {
+    "description": "The goal for macronutrients"
+  },
+  "goalCarbohydrates": "탄수화물 목표",
+  "@goalCarbohydrates": {},
+  "goalFat": "지방 목표",
+  "@goalFat": {},
+  "goalFiber": "섬유질 목표",
+  "@goalFiber": {},
+  "errorInfoDescription2": "앱을 계속 사용할 수 있지만 일부 기능이 작동하지 않을 수 있습니다.",
+  "@errorInfoDescription2": {},
+  "errorViewDetails": "기술적인 세부사항",
+  "@errorViewDetails": {},
+  "errorCouldNotConnectToServer": "서버에 연결할 수 없습니다",
+  "@errorCouldNotConnectToServer": {},
+  "copyToClipboard": "클립보드에 복사",
+  "@copyToClipboard": {},
+  "weight": "체중",
+  "@weight": {
+    "description": "The weight of a workout log or body weight entry"
+  },
+  "min": "최소",
+  "@min": {},
+  "chart30DaysTitle": "{name} 지난 30일",
+  "@chart30DaysTitle": {
+    "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
+    "type": "text",
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "chartDuringPlanTitle": "{chartName} 영양 계획 {planName} 중",
+  "@chartDuringPlanTitle": {
+    "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
+    "type": "text",
+    "placeholders": {
+      "chartName": {
+        "type": "String"
+      },
+      "planName": {
+        "type": "String"
+      }
+    }
+  },
+  "measurements": "측정",
+  "@measurements": {
+    "description": "Categories for the measurements such as biceps size, body fat, etc."
+  },
+  "measurementCategoriesHelpText": "'이두근'이나 '체지방'과 같은 측정 범주",
+  "@measurementCategoriesHelpText": {},
+  "measurementEntriesHelpText": "'cm' 또는 '%'와 같이 범주를 측정하는 데 사용되는 단위",
+  "@measurementEntriesHelpText": {},
+  "date": "일자",
+  "@date": {
+    "description": "The date of a workout log or body weight entry"
+  },
+  "value": "값",
+  "@value": {
+    "description": "The value of a measurement entry"
+  },
+  "timeStart": "시작 시간",
+  "@timeStart": {
+    "description": "The starting time of a workout"
+  },
+  "timeEnd": "종료 시간",
+  "@timeEnd": {
+    "description": "The end time of a workout"
+  },
+  "logged": "기록됨",
+  "@logged": {
+    "description": "Header for the column of 'logged' nutritional values, i.e. what was eaten"
+  },
+  "weekAverage": "7일 평균",
+  "@weekAverage": {
+    "description": "Header for the column of '7 day average' nutritional values, i.e. what was logged last week"
+  },
+  "deficit": "부족",
+  "@deficit": {
+    "description": "Caloric deficit (either planned or unplanned)"
+  },
+  "percentEnergy": "에너지 비율",
+  "@percentEnergy": {},
+  "confirmDelete": "'{toDelete}'을 삭제하시겠습니까?",
+  "@confirmDelete": {
+    "description": "Confirmation text before the user deletes an object",
+    "type": "text",
+    "placeholders": {
+      "toDelete": {
+        "type": "String"
+      }
+    }
+  },
+  "aboutWhySupportTitle": "오픈 소스 & 무료로 사용 가능 ❤️",
+  "@aboutWhySupportTitle": {},
+  "aboutDescription": "wger를 이용해 주셔서 감사합니다! wger는 전 세계 피트니스 애호가들이 만든 협업 오픈 소스 프로젝트입니다.",
+  "@aboutDescription": {
+    "description": "Text in the about dialog"
+  },
+  "aboutDonateTitle": "기부하기",
+  "@aboutDonateTitle": {},
+  "aboutBugsListTitle": "문제를 보고하거나 기능을 제안하세요",
+  "@aboutBugsListTitle": {},
+  "aboutTranslationListTitle": "어플리케이션 번역",
+  "@aboutTranslationListTitle": {},
+  "aboutSourceListTitle": "소스코드 보기",
+  "@aboutSourceListTitle": {},
+  "aboutJoinCommunityTitle": "커뮤니티에 가입하세요",
+  "@aboutJoinCommunityTitle": {},
+  "aboutMastodonTitle": "Mastodon",
+  "@aboutMastodonTitle": {},
+  "aboutDiscordTitle": "Discord",
+  "@aboutDiscordTitle": {},
+  "calendar": "달력",
+  "@calendar": {},
+  "goToToday": "오늘로 이동",
+  "@goToToday": {
+    "description": "Label on button to jump back to 'today' in the calendar widget"
+  },
+  "selectExercise": "운동을 선택해주세요",
+  "@selectExercise": {
+    "description": "Error message when the user hasn't selected an exercise in the form"
+  },
+  "nrOfSets": "운동당 세트: {nrOfSets}",
+  "@nrOfSets": {
+    "description": "Label shown on the slider where the user selects the nr of sets",
+    "type": "text",
+    "placeholders": {
+      "nrOfSets": {
+        "type": "String"
+      }
+    }
+  },
+  "setUnitsAndRir": "단위 및 RiR 설정",
+  "@setUnitsAndRir": {
+    "description": "Label shown on the slider where the user can toggle showing units and RiR",
+    "type": "text"
+  },
+  "enterValidNumber": "유효한 숫자를 입력하세요",
+  "@enterValidNumber": {
+    "description": "Error message when the user has submitted an invalid number (e.g. '3,.,.,.')"
+  },
+  "selectImage": "이미지를 선택하세요",
+  "@selectImage": {
+    "description": "Label and error message when the user hasn't selected an image to save"
+  },
+  "optionsLabel": "옵션",
+  "@optionsLabel": {
+    "description": "Label for the popup with general app options"
+  },
+  "takePicture": "사진을 찍으세요",
+  "@takePicture": {},
+  "gallery": "갤러리",
+  "@gallery": {},
+  "appUpdateTitle": "업데이트 필요",
+  "@appUpdateTitle": {},
+  "appUpdateContent": "이 버전의 앱은 서버와 호환되지 않습니다. 애플리케이션을 업데이트하세요.",
+  "@appUpdateContent": {},
+  "productFound": "제품 발견",
+  "@productFound": {
+    "description": "Header label for dialog when product is found with barcode"
+  },
+  "productNotFound": "제품을 찾을 수 없습니다",
+  "@productNotFound": {
+    "description": "Header label for dialog when product is not found with barcode"
+  },
+  "scanBarcode": "바코드 스캔",
+  "@scanBarcode": {
+    "description": "Label for scan barcode button"
+  },
+  "close": "닫기",
+  "@close": {
+    "description": "Translation for close"
+  },
+  "verifiedEmail": "확인된 이메일",
+  "@verifiedEmail": {},
+  "unVerifiedEmail": "확인되지 않은 이메일",
+  "@unVerifiedEmail": {},
+  "verifiedEmailReason": "연습문제에 참여하려면 이메일을 확인해야 합니다",
+  "@verifiedEmailReason": {},
+  "previous": "이전",
+  "@previous": {},
+  "next": "다음",
+  "@next": {},
+  "images": "이미지",
+  "@images": {},
+  "language": "언어",
+  "@language": {},
+  "fitInWeek": "일주일에 맞춰",
+  "@fitInWeek": {},
+  "addSuperset": "슈퍼세트 추가",
+  "@addSuperset": {},
+  "setHasProgression": "세트 진행 상황",
+  "@setHasProgression": {},
+  "setHasProgressionWarning": "현재 모바일 앱에서는 세트의 모든 설정을 편집하거나 자동 진행을 설정할 수 없습니다. 당분간은 웹 앱을 이용해 주세요.",
+  "@setHasProgressionWarning": {},
+  "setHasNoExercises": "이 세트에는 아직 운동이 없습니다!",
+  "@setHasNoExercises": {},
+  "contributeExercise": "운동에 기여하다",
+  "@contributeExercise": {},
+  "translation": "번역",
+  "@translation": {},
+  "translateExercise": "지금 이 운동을 번역하세요",
+  "@translateExercise": {},
+  "baseData": "영어를 기본으로",
+  "@baseData": {
+    "description": "The base data for an exercise such as category, trained muscles, etc."
+  },
+  "settingsExerciseCacheDescription": "운동 캐시",
+  "@settingsExerciseCacheDescription": {},
+  "simpleMode": "단순 모드",
+  "@simpleMode": {},
+  "simpleModeHelp": "운동 편집 시 고급 설정 중 일부를 숨깁니다",
+  "@simpleModeHelp": {},
+  "back": "뒤로",
+  "@back": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "arms": "팔",
+  "@arms": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "body_weight": "체중",
+  "@body_weight": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "calves": "장딴지",
+  "@calves": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "cardio": "심장강화",
+  "@cardio": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "glutes": "엉덩이",
+  "@glutes": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "gym_mat": "체육관 매트",
+  "@gym_mat": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "hamstrings": "햄스트링",
+  "@hamstrings": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "kettlebell": "케틀벨",
+  "@kettlebell": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "lats": "Lats",
+  "@lats": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "legs": "다리",
+  "@legs": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "max_reps": "최대 랩스",
+  "@max_reps": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "plates": "플레이트",
+  "@plates": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "pull_up_bar": "풀업 바",
+  "@pull_up_bar": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "quads": "쿼드",
+  "@quads": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "repetitions": "반복",
+  "@repetitions": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "resistance_band": "저항밴드",
+  "@resistance_band": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "sz_bar": "SZ-바",
+  "@sz_bar": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "seconds": "초",
+  "@seconds": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "until_failure": "실패할 때까지",
+  "@until_failure": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "kg": "kg",
+  "@kg": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "lb": "lb",
+  "@lb": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "none__bodyweight_exercise_": "없음(체중 운동)",
+  "@none__bodyweight_exercise_": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "goalTypeBasic": "기본",
+  "@goalTypeBasic": {
+    "description": "added for localization of Class GoalType's filed basic"
+  },
+  "indicatorRaw": "raw",
+  "@indicatorRaw": {
+    "description": "added for localization of Class Indicator's field text"
+  },
+  "indicatorAvg": "평균",
+  "@indicatorAvg": {
+    "description": "added for localization of Class Indicator's field text"
+  },
+  "themeMode": "테마 모드",
+  "@themeMode": {},
+  "lightMode": "항상 라이트 모드",
+  "@lightMode": {},
+  "systemMode": "시스템 설정",
+  "@systemMode": {},
+  "enterValue": "값을 입력하세요",
+  "@enterValue": {
+    "description": "Error message when the user hasn't entered a value on a required field"
+  },
+  "pause": "중지",
+  "@pause": {
+    "description": "Noun, not an imperative! Label used for the pause when using the gym mode"
+  },
+  "errorInfoDescription": "죄송합니다. 문제가 발생했습니다. GitHub에 문제를 신고해 주시면 문제 해결에 도움이 됩니다.",
+  "@errorInfoDescription": {},
+  "difference": "차이점",
+  "@difference": {},
+  "kJ": "kJ",
+  "@kJ": {
+    "description": "Energy in a meal in kilo joules, kJ"
+  },
+  "sugars": "설탕",
+  "@sugars": {},
+  "gValue": "{value} g",
+  "@gValue": {
+    "description": "A value in grams, e.g. 5 g",
+    "type": "text",
+    "placeholders": {
+      "value": {
+        "type": "String"
+      }
+    }
+  },
+  "timeStartAhead": "시작 시간은 종료 시간보다 앞설 수 없습니다",
+  "@timeStartAhead": {},
+  "saturatedFat": "포화지방",
+  "@saturatedFat": {},
+  "newEntry": "신규 항목",
+  "@newEntry": {
+    "description": "Title when adding a new entry such as a weight or log entry"
+  },
+  "addSet": "세트 추가",
+  "@addSet": {
+    "description": "Label for the button that adds a set (to a workout day)"
+  },
+  "selectExercises": "슈퍼세트를 하고 싶다면 여러 운동을 검색하면 운동이 그룹화됩니다",
+  "@selectExercises": {},
+  "restDay": "휴일",
+  "@restDay": {},
+  "workoutSession": "운동 세션",
+  "@workoutSession": {
+    "description": "A (logged) workout session"
+  },
+  "gymMode": "체육관 모드",
+  "@gymMode": {
+    "description": "Label when starting the gym mode"
+  },
+  "save": "저장",
+  "@save": {},
+  "isRestDayHelp": "휴식일로 표시하면 모든 세트와 운동이 삭제됩니다.",
+  "@isRestDayHelp": {},
+  "plateCalculator": "플레이트",
+  "@plateCalculator": {
+    "description": "Label used for the plate calculator in the gym mode"
+  },
+  "needsLogsToAdvanceHelp": "운동을 기록한 경우에만 다음 예정된 날짜로 루틴을 진행하려면 선택하십시오",
+  "@needsLogsToAdvanceHelp": {},
+  "routineDays": "일상적인 루틴",
+  "@routineDays": {},
+  "name": "이름",
+  "@name": {
+    "description": "Name for a workout or nutritional plan"
+  },
+  "addMeal": "식사 추가",
+  "@addMeal": {},
+  "jumpTo": "다음으로 이동",
+  "@jumpTo": {
+    "description": "Imperative. Label used in popup allowing the user to jump to a specific exercise while in the gym mode"
+  },
+  "useColors": "색상 사용",
+  "@useColors": {},
+  "newSet": "새 세트",
+  "@newSet": {
+    "description": "Header when adding a new set to a workout day"
+  },
+  "selectAvailablePlates": "사용 가능한 플레이트 선택",
+  "@selectAvailablePlates": {},
+  "isRestDay": "쉬는 날인가",
+  "@isRestDay": {},
+  "logHelpEntries": "같은 날에 반복 횟수는 같지만 가중치가 다른 항목이 두 개 이상 있는 경우 다이어그램에는 가중치가 더 높은 항목만 표시됩니다.",
+  "@logHelpEntries": {},
+  "needsLogsToAdvance": "진행하려면 로그가 필요합니다",
+  "@needsLogsToAdvance": {},
+  "barWeight": "바 무게",
+  "@barWeight": {},
+  "anErrorOccurred": "오류가 발생했습니다!",
+  "@anErrorOccurred": {},
+  "onlyLoggingHelpText": "칼로리만 기록하고 특정 식사에 대한 자세한 영양 계획을 세우고 싶지 않은 경우 상자를 체크하세요",
+  "@onlyLoggingHelpText": {},
+  "measurement": "측정",
+  "@measurement": {},
+  "chartAllTimeTitle": "{name} 역대",
+  "@chartAllTimeTitle": {
+    "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
+    "type": "text",
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "energy": "에너지",
+  "@energy": {
+    "description": "Energy in a meal, ingredient etc. e.g. in kJ"
+  },
+  "g": "g",
+  "@g": {
+    "description": "Abbreviation for gram"
+  },
+  "logIngredient": "영양 일지에 재료 기록하기",
+  "@logIngredient": {},
+  "gPerBodyKg": "g 몸당 kg",
+  "@gPerBodyKg": {
+    "description": "Label used for total sums of e.g. calories or similar in grams per Kg of body weight"
+  },
+  "percentValue": "{value} %",
+  "@percentValue": {
+    "description": "A value in percent, e.g. 10 %",
+    "type": "text",
+    "placeholders": {
+      "value": {
+        "type": "String"
+      }
+    }
+  },
+  "onlyLogging": "칼로리만 추적 가능합니다",
+  "@onlyLogging": {},
+  "searchIngredient": "성분 검색",
+  "@searchIngredient": {
+    "description": "Label on ingredient search form"
+  },
+  "plateCalculatorNotDivisible": "사용 가능한 플레이트로는 무게에 도달할 수 없습니다",
+  "@plateCalculatorNotDivisible": {
+    "description": "Error message when the current weight is not reachable with plates (e.g. 33.1 kg)"
+  },
+  "goalEnergy": "에너지 목표",
+  "@goalEnergy": {},
+  "goalProtein": "단백질 목표",
+  "@goalProtein": {},
+  "ingredient": "재료",
+  "@ingredient": {},
+  "noMeasurementEntries": "측정 항목이 없습니다",
+  "@noMeasurementEntries": {},
+  "time": "시간",
+  "@time": {
+    "description": "The time of a meal or workout"
+  },
+  "newNutritionalPlan": "새로운 영양 계획",
+  "@newNutritionalPlan": {},
+  "verify": "확인",
+  "@verify": {},
+  "energyShort": "E",
+  "@energyShort": {
+    "description": "The first letter or short name of the word 'Energy', used in overviews"
+  },
+  "aboutContributeTitle": "기여하다",
+  "@aboutContributeTitle": {},
+  "productNotFoundDescription": "스캔된 바코드 {barcode}가 있는 제품을 wger 데이터베이스에서 찾을 수 없습니다",
+  "@productNotFoundDescription": {
+    "description": "Dialog info when product is not found with barcode",
+    "type": "text",
+    "placeholders": {
+      "barcode": {
+        "type": "String"
+      }
+    }
+  },
+  "aboutPageTitle": "회사 소개 및 지원",
+  "@aboutPageTitle": {},
+  "biceps": "이두근",
+  "@biceps": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "abs": "복근",
+  "@abs": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "add_exercise_image_license": "이미지는 CC BY SA 라이선스를 준수해야 합니다. 확실하지 않은 경우 직접 촬영한 사진만 업로드하세요.",
+  "@add_exercise_image_license": {},
+  "fitInWeekHelp": "이 기능을 활성화하면 요일이 주 단위로 반복되고, 활성화하지 않으면 새로운 주가 시작되는지 여부와 관계없이 요일이 순차적으로 반복됩니다.",
+  "@fitInWeekHelp": {},
+  "textPromptTitle": "시작할 준비가 되셨나요?",
+  "@textPromptTitle": {},
+  "resultingRoutine": "결과 루틴",
+  "@resultingRoutine": {},
+  "noNutritionalPlans": "영양 계획이 없습니다",
+  "@noNutritionalPlans": {
+    "description": "Message shown when the user has no nutritional plans"
+  },
+  "selectMealToLog": "일기에 기록할 식사를 선택하세요",
+  "@selectMealToLog": {},
+  "kcal": "kcal",
+  "@kcal": {
+    "description": "Energy in a meal in kilocalories, kcal"
+  },
+  "macronutrients": "다량 영양소",
+  "@macronutrients": {},
+  "surplus": "여분",
+  "@surplus": {
+    "description": "Caloric surplus (either planned or unplanned)"
+  },
+  "carbohydrates": "탄수화물",
+  "@carbohydrates": {},
+  "toggleDetails": "세부정보 전환",
+  "@toggleDetails": {
+    "description": "Switch to toggle detail / overview"
+  },
+  "errorCouldNotConnectToServerDetails": "애플리케이션이 서버에 연결할 수 없습니다. 인터넷 연결이나 서버 URL을 확인하고 다시 시도해 주세요. 문제가 지속되면 서버 관리자에게 문의하세요.",
+  "@errorCouldNotConnectToServerDetails": {},
+  "max": "최대",
+  "@max": {},
+  "protein": "단백질",
+  "@protein": {},
+  "proteinShort": "P",
+  "@proteinShort": {
+    "description": "The first letter or short name of the word 'Protein', used in overviews"
+  },
+  "start": "시작",
+  "@start": {
+    "description": "Label on button to start the gym mode (i.e., an imperative)"
+  },
+  "planned": "예정",
+  "@planned": {
+    "description": "Header for the column of 'planned' nutritional values, i.e. what should be eaten"
+  },
+  "total": "총",
+  "@total": {
+    "description": "Label used for total sums of e.g. calories or similar"
+  },
+  "kcalValue": "{value} kcal",
+  "@kcalValue": {
+    "description": "A value in kcal, e.g. 500 kcal",
+    "type": "text",
+    "placeholders": {
+      "value": {
+        "type": "String"
+      }
+    }
+  },
+  "recentlyUsedIngredients": "최근 추가된 성분",
+  "@recentlyUsedIngredients": {
+    "description": "A message when a user adds a new ingredient to a meal."
+  },
+  "carbohydratesShort": "C",
+  "@carbohydratesShort": {
+    "description": "The first letter or short name of the word 'Carbohydrates', used in overviews"
+  },
+  "unit": "단위",
+  "@unit": {
+    "description": "The unit used for a repetition (kg, time, etc.)"
+  },
+  "goToDetailPage": "상세페이지로 이동",
+  "@goToDetailPage": {},
+  "aboutDonateText": "이 프로젝트는 무료이며 앞으로도 계속 무료일 것이지만, 서버 운영은 그렇지 않습니다! 개발에는 자원봉사자들의 상당한 시간과 노력이 필요합니다. 여러분의 기부는 이러한 비용을 직접적으로 지원하여 서비스의 안정성을 유지하는 데 도움이 됩니다.",
+  "@aboutDonateText": {},
+  "amount": "양",
+  "@amount": {
+    "description": "The amount (e.g. in grams) of an ingredient in a meal"
+  },
+  "delete": "삭제",
+  "@delete": {},
+  "fat": "지방",
+  "@fat": {},
+  "fiber": "섬유질",
+  "@fiber": {},
+  "sodium": "나트륨",
+  "@sodium": {},
+  "noWeightEntries": "무게 항목이 없습니다",
+  "@noWeightEntries": {
+    "description": "Message shown when the user has no logged weight entries"
+  },
+  "loadingText": "로딩...",
+  "@loadingText": {
+    "description": "Text to show when entries are being loaded in the background: Loading..."
+  },
+  "fatShort": "F",
+  "@fatShort": {
+    "description": "The first letter or short name of the word 'Fat', used in overviews"
+  },
+  "moreMeasurementEntries": "새 측정 추가",
+  "@moreMeasurementEntries": {
+    "description": "Message shown when the user wants to add new measurement"
+  },
+  "edit": "편집",
+  "@edit": {},
+  "chooseFromLibrary": "사진 라이브러리에서 선택",
+  "@chooseFromLibrary": {},
+  "oneNamePerLine": "한 줄에 하나의 이름",
+  "@oneNamePerLine": {},
+  "settingsCacheTitle": "캐쉬",
+  "@settingsCacheTitle": {},
+  "aboutContributeText": "모든 유형의 기여를 환영합니다. 개발자, 번역가, 또는 단순히 피트니스에 열정이 있는 분이라면 누구든 환영합니다!",
+  "@aboutContributeText": {},
+  "selectEntry": "항목을 선택하세요",
+  "@selectEntry": {},
+  "enterMinCharacters": "최소 {min}자 이상 입력해주세요",
+  "@enterMinCharacters": {
+    "description": "Error message when the user hasn't entered the minimum amount characters in a form",
+    "type": "text",
+    "placeholders": {
+      "min": {
+        "type": "String"
+      }
+    }
+  },
+  "enterCharacters": "{min}~{max}자 사이로 입력해 주세요",
+  "@enterCharacters": {
+    "description": "Error message when the user hasn't entered the correct number of characters in a form",
+    "type": "text",
+    "placeholders": {
+      "min": {
+        "type": "String"
+      },
+      "max": {
+        "type": "String"
+      }
+    }
+  },
+  "dataCopied": "새 항목에 데이터가 복사되었습니다",
+  "@dataCopied": {
+    "description": "Snackbar message to show on copying data to a new log entry"
+  },
+  "baseNameEnglish": "모든 운동에는 영어로 된 기본 이름이 필요합니다",
+  "@baseNameEnglish": {},
+  "addExercise": "운동 추가",
+  "@addExercise": {},
+  "settingsIngredientCacheDescription": "재료 캐시",
+  "@settingsIngredientCacheDescription": {},
+  "cacheWarning": "캐싱으로 인해 변경 사항이 애플리케이션 전체에 표시될 때까지 시간이 걸릴 수 있습니다.",
+  "@cacheWarning": {},
+  "selectIngredient": "성분을 선택해주세요",
+  "@selectIngredient": {
+    "description": "Error message when the user hasn't selected an ingredient from the autocompleter"
+  },
+  "addImage": "이미지 추가",
+  "@addImage": {},
+  "verifiedEmailInfo": "{email}로 확인 이메일이 전송되었습니다",
+  "@verifiedEmailInfo": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "productFoundDescription": "바코드는 {productName} 제품에 해당합니다. 계속하시겠습니까?",
+  "@productFoundDescription": {
+    "description": "Dialog info when product is found with barcode",
+    "type": "text",
+    "placeholders": {
+      "productName": {
+        "type": "String"
+      }
+    }
+  },
+  "variations": "변형",
+  "@variations": {
+    "description": "Variations of one exercise (e.g. benchpress and benchpress narrow)"
+  },
+  "alsoKnownAs": "별칭으로도 알려짐: {aliases}",
+  "@alsoKnownAs": {
+    "placeholders": {
+      "aliases": {
+        "type": "String"
+      }
+    },
+    "description": "List of alternative names for an exercise"
+  },
+  "whatVariationsExist": "이 운동에는 어떤 변형이 있나요?",
+  "@whatVariationsExist": {},
+  "alternativeNames": "대체 이름",
+  "@alternativeNames": {},
+  "settingsCacheDeletedSnackbar": "캐시가 성공적으로 지워졌습니다",
+  "@settingsCacheDeletedSnackbar": {},
+  "lower_back": "허리 아래",
+  "@lower_back": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "minutes": "분",
+  "@minutes": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "settingsTitle": "설정",
+  "@settingsTitle": {},
+  "contributeExerciseWarning": "계정이 {days}일 이상 경과하고 이메일을 인증한 경우에만 운동에 참여할 수 있습니다",
+  "@contributeExerciseWarning": {
+    "description": "Number of days before which a person can add exercise",
+    "placeholders": {
+      "days": {
+        "type": "String",
+        "example": "14"
+      }
+    }
+  },
+  "incline_bench": "인클라인 벤치",
+  "@incline_bench": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "bench": "벤치프레스",
+  "@bench": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "overallChangeWeight": "전반적인 변화",
+  "@overallChangeWeight": {
+    "description": "Overall change in weight, added for localization"
+  },
+  "goalTypeMeals": "식사부터",
+  "@goalTypeMeals": {
+    "description": "added for localization of Class GoalType's filed meals"
+  },
+  "progressionRules": "이 운동에는 진행 규칙이 있으며 모바일 앱에서는 편집할 수 없습니다. 웹 애플리케이션을 사용하여 연습을 편집하세요.",
+  "@progressionRules": {},
+  "textPromptSubheading": "시작하려면 작업 버튼을 누르세요",
+  "@textPromptSubheading": {},
+  "barbell": "바벨",
+  "@barbell": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "chest": "가슴",
+  "@chest": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "dumbbell": "덤벨",
+  "@dumbbell": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "kilometers": "킬로미터",
+  "@kilometers": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "kilometers_per_hour": "km/h",
+  "@kilometers_per_hour": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "log": "로그",
+  "@log": {
+    "description": "Log a specific meal (imperative form)"
+  },
+  "miles_per_hour": "mi/h",
+  "@miles_per_hour": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "done": "완료",
+  "@done": {},
+  "triceps": "삼두근",
+  "@triceps": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "miles": "마일스",
+  "@miles": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "swiss_ball": "스위스볼",
+  "@swiss_ball": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "darkMode": "항상 다크 모드",
+  "@darkMode": {},
+  "shoulders": "어깨",
+  "@shoulders": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "goalTypeAdvanced": "고급",
+  "@goalTypeAdvanced": {
+    "description": "added for localization of Class GoalType's filed advanced"
+  },
+  "sameRepetitions": "모든 세트에 동일한 반복 횟수와 중량을 적용하는 경우 한 줄만 입력하면 됩니다. 예를 들어 4세트를 하는 경우 반복 횟수에 10을 입력하면 자동으로 \"4 x 10\"이 됩니다.",
+  "@sameRepetitions": {},
+  "comment": "댓글",
+  "@comment": {
+    "description": "Comment, additional information"
+  },
+  "impression": "인상",
+  "@impression": {
+    "description": "General impression (e.g. for a workout session) such as good, bad, etc."
+  },
+  "notes": "메모",
+  "@notes": {
+    "description": "Personal notes, e.g. for a workout session"
+  },
+  "newDay": "새로운 날",
+  "@newDay": {},
+  "today": "오늘",
+  "@today": {},
+  "loggedToday": "오늘 기록",
+  "@loggedToday": {},
+  "others": "기타",
+  "@others": {}
+}
diff --git a/lib/l10n/app_nb.arb b/lib/l10n/app_nb.arb
index f0833669..d3da3c7d 100644
--- a/lib/l10n/app_nb.arb
+++ b/lib/l10n/app_nb.arb
@@ -1,10 +1,6 @@
 {
-  "aboutText": "wger arbeidsøkthåndterer er gemenhetslig fri programvare, lisensiert AGPLv3+ og tilgjengelig på GitHub:",
-  "@aboutText": {
-    "description": "Text in the about dialog"
-  },
   "fiber": "Fiber",
-  "@fibres": {},
+  "@fiber": {},
   "mealLogged": "Måltid lagt til i dagbok",
   "@mealLogged": {},
   "successfullyDeleted": "Slettet",
@@ -35,7 +31,7 @@
   "@newNutritionalPlan": {},
   "delete": "Slett",
   "@delete": {},
-  "loadingText": "Laster …",
+  "loadingText": "Laster…",
   "@loadingText": {
     "description": "Text to show when entries are being loaded in the background: Loading..."
   },
@@ -91,8 +87,6 @@
   "@weight": {
     "description": "The weight of a workout log or body weight entry"
   },
-  "dismiss": "Forkast",
-  "@dismiss": {},
   "anErrorOccurred": "En feil inntraff.",
   "@anErrorOccurred": {},
   "nutritionalPlans": "Ernæringsplaner",
@@ -127,7 +121,7 @@
   "@workoutSession": {
     "description": "A (logged) workout session"
   },
-  "notes": "Notiser",
+  "notes": "Notater",
   "@notes": {
     "description": "Personal notes, e.g. for a workout session"
   },
@@ -139,10 +133,6 @@
   "@repetitions": {
     "description": "Repetitions for an exercise set"
   },
-  "newWorkout": "Ny treningsøktplan",
-  "@newWorkout": {
-    "description": "Header when adding a new workout"
-  },
   "exercise": "Øvelse",
   "@exercise": {
     "description": "An exercise for a workout"
@@ -155,10 +145,6 @@
   "@labelWorkoutPlan": {
     "description": "Title for screen workout plan"
   },
-  "labelWorkoutPlans": "Treningsøktplaner",
-  "@labelWorkoutPlans": {
-    "description": "Title for screen workout plans"
-  },
   "logHelpEntriesUnits": "Kun oppføringer med vekt vises, ingen andre kombinasjoner.",
   "@logHelpEntriesUnits": {},
   "logHelpEntries": "Kun tyngre vekt vises hvis én dag har forskjellige vekter med samme antall repetisjoner.",
@@ -270,5 +256,11 @@
     "description": "Text for logout button"
   },
   "difference": "Forskjell",
-  "@difference": {}
+  "@difference": {},
+  "copyToClipboard": "Kopier til utklippstavlen",
+  "@copyToClipboard": {},
+  "value": "Verdi",
+  "@value": {
+    "description": "The value of a measurement entry"
+  }
 }
diff --git a/lib/l10n/app_nl.arb b/lib/l10n/app_nl.arb
new file mode 100644
index 00000000..7e592ea4
--- /dev/null
+++ b/lib/l10n/app_nl.arb
@@ -0,0 +1,94 @@
+{
+  "passwordTooShort": "Het wachtwoord is te kort",
+  "@passwordTooShort": {
+    "description": "Error message when the user a password that is too short"
+  },
+  "register": "Registreren",
+  "@register": {
+    "description": "Text for registration button"
+  },
+  "logout": "Uitloggen",
+  "@logout": {
+    "description": "Text for logout button"
+  },
+  "usernameValidChars": "Een gebruikersnaam mag alleen letters, nummers en de tekens @, +, ., -, en _ bevatten",
+  "@usernameValidChars": {
+    "description": "Error message when the user tries to register a username with forbidden characters"
+  },
+  "passwordsDontMatch": "De wachtwoorden komen niet overeen",
+  "@passwordsDontMatch": {
+    "description": "Error message when the user enters two different passwords during registration"
+  },
+  "login": "Inloggen",
+  "@login": {
+    "description": "Text for login button"
+  },
+  "invalidEmail": "Vul een geldig e-mailadres in",
+  "@invalidEmail": {
+    "description": "Error message when the user enters an invalid email"
+  },
+  "confirmPassword": "Bevestig wachtwoord",
+  "@confirmPassword": {},
+  "userProfile": "Jouw profiel",
+  "@userProfile": {},
+  "useDefaultServer": "Gebruik standaard server",
+  "@useDefaultServer": {
+    "description": "Toggle button allowing users to switch between the default and a custom wger server"
+  },
+  "useCustomServer": "Gebruik aangepaste server",
+  "@useCustomServer": {
+    "description": "Toggle button allowing users to switch between the default and a custom wger server"
+  },
+  "password": "Wachtwoord",
+  "@password": {},
+  "invalidUrl": "Vul een geldige URL in",
+  "@invalidUrl": {
+    "description": "Error message when the user enters an invalid URL, e.g. in the login form"
+  },
+  "email": "E-mailadres",
+  "@email": {},
+  "username": "Gebruikersnaam",
+  "@username": {},
+  "invalidUsername": "Vul een geldige gebruikersnaam in",
+  "@invalidUsername": {
+    "description": "Error message when the user enters an invalid username"
+  },
+  "customServerUrl": "URL van de wger instantie",
+  "@customServerUrl": {
+    "description": "Label in the form where the users can enter their own wger instance"
+  },
+  "successfullySaved": "Opgeslagen",
+  "@successfullySaved": {
+    "description": "Message when an item was successfully saved"
+  },
+  "exerciseList": "Oefeningen lijst",
+  "@exerciseList": {},
+  "exercise": "Oefening",
+  "@exercise": {
+    "description": "An exercise for a workout"
+  },
+  "exercises": "Oefeningen",
+  "@exercises": {
+    "description": "Multiple exercises for a workout"
+  },
+  "exerciseName": "Oefening naam",
+  "@exerciseName": {
+    "description": "Label for the name of a workout exercise"
+  },
+  "success": "Succes",
+  "@success": {
+    "description": "Message when an action completed successfully, usually used as a heading"
+  },
+  "category": "Categorie",
+  "@category": {
+    "description": "Category for an exercise, ingredient, etc."
+  },
+  "reps": "Herhalingen",
+  "@reps": {
+    "description": "Shorthand for repetitions, used when space constraints are tighter"
+  },
+  "muscles": "Spieren",
+  "@muscles": {
+    "description": "(main) muscles trained by an exercise"
+  }
+}
\ No newline at end of file
diff --git a/lib/l10n/app_pl.arb b/lib/l10n/app_pl.arb
index e1979345..4cba50c4 100644
--- a/lib/l10n/app_pl.arb
+++ b/lib/l10n/app_pl.arb
@@ -1,851 +1,1016 @@
 {
-  "invalidUsername": "Podaj poprawną nazwę użytkownika",
-  "@invalidUsername": {
-    "description": "Error message when the user enters an invalid username"
-  },
-  "username": "Nazwa użytkownika",
-  "@username": {},
-  "email": "Adres email",
-  "@email": {},
-  "invalidEmail": "Podaj poprawny adres email",
-  "@invalidEmail": {
-    "description": "Error message when the user enters an invalid email"
-  },
-  "confirmPassword": "Potwierdź hasło",
-  "@confirmPassword": {},
-  "password": "Hasło",
-  "@password": {},
-  "passwordTooShort": "Hasło jest zbyt krótkie",
-  "@passwordTooShort": {
-    "description": "Error message when the user a password that is too short"
-  },
-  "passwordsDontMatch": "Hasła nie są identyczne",
-  "@passwordsDontMatch": {
-    "description": "Error message when the user enters two different passwords during registration"
-  },
-  "usernameValidChars": "Nazwa użytkownika może zawierać tylko litery, cyfry i znaki specjalne: @,+,.,-, _",
-  "@usernameValidChars": {
-    "description": "Error message when the user tries to register a username with forbidden characters"
-  },
-  "invalidUrl": "Wpisz poprawny adres URL",
-  "@invalidUrl": {
-    "description": "Error message when the user enters an invalid URL, e.g. in the login form"
-  },
-  "useCustomServer": "Używaj niestandardowego serwera",
-  "@useCustomServer": {
-    "description": "Toggle button allowing users to switch between the default and a custom wger server"
-  },
-  "useDefaultServer": "Używaj domyślnego serwera",
-  "@useDefaultServer": {
-    "description": "Toggle button allowing users to switch between the default and a custom wger server"
-  },
-  "register": "Zarejestruj się",
-  "@register": {
-    "description": "Text for registration button"
-  },
-  "logout": "Wyloguj się",
-  "@logout": {
-    "description": "Text for logout button"
-  },
-  "login": "Zaloguj się",
-  "@login": {
-    "description": "Text for login button"
-  },
-  "save": "Zapisz",
-  "@save": {},
-  "customServerUrl": "Adres URL instancji wger",
-  "@customServerUrl": {
-    "description": "Label in the form where the users can enter their own wger instance"
-  },
-  "customServerHint": "Wpisz adres własnego serwera, w przeciwnym razie zostanie użyty domyślny",
-  "@customServerHint": {
-    "description": "Hint text for the form where the users can enter their own wger instance"
-  },
-  "reset": "Reset",
-  "@reset": {
-    "description": "Button text allowing the user to reset the entered values to the default"
-  },
-  "macronutrients": "Makroelementy",
-  "@macronutrients": {},
-  "energyShort": "E",
-  "@energyShort": {
-    "description": "The first letter or short name of the word 'Energy', used in overviews"
-  },
-  "logged": "Zapisane",
-  "@logged": {
-    "description": "Header for the column of 'logged' nutritional values, i.e. what was eaten"
-  },
-  "addImage": "Dodaj obraz",
-  "@addImage": {},
-  "weekAverage": "Średnia z poprzedniego tygodnia",
-  "@weekAverage": {
-    "description": "Header for the column of '7 day average' nutritional values, i.e. what was logged last week"
-  },
-  "total": "Sumarycznie",
-  "@total": {
-    "description": "Label used for total sums of e.g. calories or similar"
-  },
-  "unit": "Jednostka",
-  "@unit": {
-    "description": "The unit used for a repetition (kg, time, etc.)"
-  },
-  "aboutDescription": "Dziękujemy za używanie wger! Wger jest projektem open-source stworzonym przy współpracy entuzjastów fitnessu z całego świata.",
-  "@aboutDescription": {
-    "description": "Text in the about dialog"
-  },
-  "aboutSourceTitle": "Kod źródłowy",
-  "@aboutSourceTitle": {
-    "description": "Title for source code section in the about dialog"
-  },
-  "productFoundDescription": "Kod kreskowy odpowiada temu produktowi: {productName}. Czy chcesz kontynuować?",
-  "@productFoundDescription": {
-    "description": "Dialog info when product is found with barcode",
-    "type": "text",
-    "placeholders": {
-      "productName": {}
-    }
-  },
-  "dataCopied": "Dane skopiowane do nowego dziennika",
-  "@dataCopied": {
-    "description": "Snackbar message to show on copying data to a new log entry"
-  },
-  "noWeightEntries": "Nie masz wpisów dotyczących wagi",
-  "@noWeightEntries": {
-    "description": "Message shown when the user has no logged weight entries"
-  },
-  "loadingText": "Ładowanie...",
-  "@loadingText": {
-    "description": "Text to show when entries are being loaded in the background: Loading..."
-  },
-  "calendar": "Kalendarz",
-  "@calendar": {},
-  "selectExercise": "Wybierz ćwiczenie",
-  "@selectExercise": {
-    "description": "Error message when the user hasn't selected an exercise in the form"
-  },
-  "enterCharacters": "Wprowadź od {min} do {max} znaków",
-  "@enterCharacters": {
-    "description": "Error message when the user hasn't entered the correct number of characters in a form",
-    "type": "text",
-    "placeholders": {
-      "min": {},
-      "max": {}
-    }
-  },
-  "nrOfSets": "Ilość serii ćwiczenia: {nrOfSets}",
-  "@nrOfSets": {
-    "description": "Label shown on the slider where the user selects the nr of sets",
-    "type": "text",
-    "placeholders": {
-      "nrOfSets": {}
-    }
-  },
-  "supersetWith": "Dodatkowa seria",
-  "@supersetWith": {
-    "description": "Text used between exercise cards when adding a new set. Translate as something like 'in a superset with'"
-  },
-  "rirNotUsed": "Bez rezerwy powtórzeń",
-  "@rirNotUsed": {
-    "description": "Label used in RiR slider when the RiR value is not used/saved for the current setting or log"
-  },
-  "weightUnit": "Jednostka wagi",
-  "@weightUnit": {},
-  "repetitionUnit": "Jednostka powtórzeń",
-  "@repetitionUnit": {},
-  "set": "Seria",
-  "@set": {
-    "description": "A set in a workout plan"
-  },
-  "dayDescriptionHelp": "Opis tego, co jest robione w tym dniu (np. „dzień podciągania”) lub jakie części ciała są trenowane (np. „klatka piersiowa i ramiona”)",
-  "@dayDescriptionHelp": {},
-  "setNr": "{nr} serii",
-  "@setNr": {
-    "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.",
-    "type": "text",
-    "placeholders": {
-      "nr": {}
-    }
-  },
-  "sameRepetitions": "Jeśli wykonasz tą sama liczbę powtórzenia z tym samym ciężarem dla wszystkich serii, możesz po prostu wypełnić jeden wiersz. Na przykład dla 4 serii wystarczy wpisać 10 dla powtórzeń, automatycznie zmieni się to na „4 x 10”.",
-  "@sameRepetitions": {},
-  "comment": "Komentarz",
-  "@comment": {
-    "description": "Comment, additional information"
-  },
-  "impression": "Ocena treningu",
-  "@impression": {
-    "description": "General impression (e.g. for a workout session) such as good, bad, etc."
-  },
-  "workoutSession": "Sesja treningowa",
-  "@workoutSession": {
-    "description": "A (logged) workout session"
-  },
-  "newSet": "Nowa seria",
-  "@newSet": {
-    "description": "Header when adding a new set to a workout day"
-  },
-  "selectExercises": "Jeśli chcesz zrobić super serię, możesz wyszukać kilka ćwiczeń, zostaną one zgrupowane razem",
-  "@selectExercises": {},
-  "gymMode": "Tryb treningu",
-  "@gymMode": {
-    "description": "Label when starting the gym mode"
-  },
-  "equipment": "Sprzęt",
-  "@equipment": {
-    "description": "Equipment needed to perform an exercise"
-  },
-  "muscles": "Mięśnie",
-  "@muscles": {
-    "description": "(main) muscles trained by an exercise"
-  },
-  "musclesSecondary": "Mięśnie pomocnicze",
-  "@musclesSecondary": {
-    "description": "secondary muscles trained by an exercise"
-  },
-  "category": "Kategoria",
-  "@category": {
-    "description": "Category for an exercise, ingredient, etc."
-  },
-  "newWorkout": "Nowy plan treningowy",
-  "@newWorkout": {
-    "description": "Header when adding a new workout"
-  },
-  "noWorkoutPlans": "Nie masz planów treningowych",
-  "@noWorkoutPlans": {
-    "description": "Message shown when the user has no workout plans"
-  },
-  "repetitions": "Powtórzenia",
-  "@repetitions": {
-    "description": "Repetitions for an exercise set"
-  },
-  "reps": "Powtórzenia",
-  "@reps": {
-    "description": "Shorthand for repetitions, used when space constraints are tighter"
-  },
-  "rir": "Liczba powtórzeń w rezerwie",
-  "@rir": {
-    "description": "Shorthand for Repetitions In Reserve"
-  },
-  "successfullySaved": "Zapisane",
-  "@successfullySaved": {
-    "description": "Message when an item was successfully saved"
-  },
-  "exercise": "Ćwiczenie",
-  "@exercise": {
-    "description": "An exercise for a workout"
-  },
-  "searchExercise": "Wyszukaj ćwiczenie do dodania",
-  "@searchExercise": {
-    "description": "Label on set form. Selected exercises are added to the set"
-  },
-  "logHelpEntries": "Jeśli w ciągu jednego dnia jest więcej niż jeden wpis z tą samą liczbą powtórzeń, ale z różnymi wagami, na wykresie pokazany jest tylko wpis o wyższej wadze.",
-  "@logHelpEntries": {},
-  "logHelpEntriesUnits": "Zwróć uwagę, że na wykresie są tylko wpisy z jednostką masy (kg lub lb) i powtórzeniami, inne kombinacje, takie jak czas lub czas do błędu, są tutaj ignorowane.",
-  "@logHelpEntriesUnits": {},
-  "description": "Opis",
-  "@description": {},
-  "name": "Nazwa",
-  "@name": {
-    "description": "Name for a workout or nutritional plan"
-  },
-  "addSet": "Dodaj serię",
-  "@addSet": {
-    "description": "Label for the button that adds a set (to a workout day)"
-  },
-  "addMeal": "Dodaj posiłek",
-  "@addMeal": {},
-  "fat": "Tłuszcz",
-  "@fat": {},
-  "measurement": "Pomiar",
-  "@measurement": {},
-  "measurements": "Pomiar",
-  "@measurements": {
-    "description": "Categories for the measurements such as biceps size, body fat, etc."
-  },
-  "registerInstead": "Nie posiadasz konta? Zarejestruj się teraz",
-  "@registerInstead": {},
-  "loginInstead": "Posiadasz konto? Zaloguj się",
-  "@loginInstead": {},
-  "labelWorkoutPlans": "Plany treningowe",
-  "@labelWorkoutPlans": {
-    "description": "Title for screen workout plans"
-  },
-  "labelBottomNavWorkout": "Trening",
-  "@labelBottomNavWorkout": {
-    "description": "Label used in bottom navigation, use a short word"
-  },
-  "labelBottomNavNutrition": "Żywienie",
-  "@labelBottomNavNutrition": {
-    "description": "Label used in bottom navigation, use a short word"
-  },
-  "labelWorkoutLogs": "Dzienniki treningowe",
-  "@labelWorkoutLogs": {
-    "description": "(Workout) logs"
-  },
-  "labelWorkoutPlan": "Plan treningu",
-  "@labelWorkoutPlan": {
-    "description": "Title for screen workout plan"
-  },
-  "successfullyDeleted": "Usunięto",
-  "@successfullyDeleted": {
-    "description": "Message when an item was successfully deleted"
-  },
-  "labelDashboard": "Pulpit",
-  "@labelDashboard": {
-    "description": "Title for screen dashboard"
-  },
-  "notes": "Notatki",
-  "@notes": {
-    "description": "Personal notes, e.g. for a workout session"
-  },
-  "newDay": "Nowy dzień",
-  "@newDay": {},
-  "pause": "Przerwa",
-  "@pause": {
-    "description": "Noun, not an imperative! Label used for the pause when using the gym mode"
-  },
-  "todaysWorkout": "Twój dzisiejszy trening",
-  "@todaysWorkout": {},
-  "date": "Data",
-  "@date": {
-    "description": "The date of a workout log or body weight entry"
-  },
-  "jumpTo": "Wybierz ćwiczenie",
-  "@jumpTo": {
-    "description": "Imperative. Label used in popup allowing the user to jump to a specific exercise while in the gym mode"
-  },
-  "noNutritionalPlans": "Nie masz planów żywieniowych",
-  "@noNutritionalPlans": {
-    "description": "Message shown when the user has no nutritional plans"
-  },
-  "plateCalculator": "Obciążnik",
-  "@plateCalculator": {
-    "description": "Label used for the plate calculator in the gym mode"
-  },
-  "plateCalculatorNotDivisible": "Nie można osiągnąć wagi z dostępnymi obciążeniami",
-  "@plateCalculatorNotDivisible": {
-    "description": "Error message when the current weight is not reachable with plates (e.g. 33.1 kg)"
-  },
-  "mealLogged": "Posiłek zarejestrowany w dzienniku",
-  "@mealLogged": {},
-  "logMeal": "Zapisz ten posiłek w dzienniku",
-  "@logMeal": {},
-  "addIngredient": "Dodaj składnik",
-  "@addIngredient": {},
-  "nutritionalPlan": "Plan diety",
-  "@nutritionalPlan": {},
-  "nutritionalDiary": "Dziennik żywieniowy",
-  "@nutritionalDiary": {},
-  "nutritionalPlans": "Plany żywieniowe",
-  "@nutritionalPlans": {},
-  "start": "Rozpocznij",
-  "@start": {
-    "description": "Label on button to start the gym mode (i.e., an imperative)"
-  },
-  "timeStart": "Czas rozpoczęcia",
-  "@timeStart": {
-    "description": "The starting time of a workout"
-  },
-  "timeEnd": "Czas zakończenia",
-  "@timeEnd": {
-    "description": "The end time of a workout"
-  },
-  "ingredient": "Składnik",
-  "@ingredient": {},
-  "energy": "Energia",
-  "@energy": {
-    "description": "Energy in a meal, ingredient etc. e.g. in kJ"
-  },
-  "time": "Czas",
-  "@time": {
-    "description": "The time of a meal or workout"
-  },
-  "anErrorOccurred": "Wystąpił błąd!",
-  "@anErrorOccurred": {},
-  "weight": "Waga",
-  "@weight": {
-    "description": "The weight of a workout log or body weight entry"
-  },
-  "kJ": "kJ",
-  "@kJ": {
-    "description": "Energy in a meal in kilo joules, kJ"
-  },
-  "g": "g",
-  "@g": {
-    "description": "Abbreviation for gram"
-  },
-  "protein": "Białko",
-  "@protein": {},
-  "carbohydrates": "Węglowodany",
-  "@carbohydrates": {},
-  "confirmDelete": "Czy na pewno chcesz usunąć '{toDelete}'?",
-  "@confirmDelete": {
-    "description": "Confirmation text before the user deletes an object",
-    "type": "text",
-    "placeholders": {
-      "toDelete": {}
-    }
-  },
-  "planned": "Zaplanowane",
-  "@planned": {
-    "description": "Header for the column of 'planned' nutritional values, i.e. what should be eaten"
-  },
-  "difference": "Różnice",
-  "@difference": {},
-  "percentEnergy": "Procent energii",
-  "@percentEnergy": {},
-  "gPerBodyKg": "g / kg",
-  "@gPerBodyKg": {
-    "description": "Label used for total sums of e.g. calories or similar in grams per Kg of body weight"
-  },
-  "proteinShort": "B",
-  "@proteinShort": {
-    "description": "The first letter or short name of the word 'Protein', used in overviews"
-  },
-  "carbohydratesShort": "W",
-  "@carbohydratesShort": {
-    "description": "The first letter or short name of the word 'Carbohydrates', used in overviews"
-  },
-  "sugars": "Cukier",
-  "@sugars": {},
-  "fatShort": "T",
-  "@fatShort": {
-    "description": "The first letter or short name of the word 'Fat', used in overviews"
-  },
-  "saturatedFat": "Tłuszcz nasycony",
-  "@saturatedFat": {},
-  "fiber": "Błonnik",
-  "@fiber": {},
-  "sodium": "Sód",
-  "@sodium": {},
-  "amount": "Ilość",
-  "@amount": {
-    "description": "The amount (e.g. in grams) of an ingredient in a meal"
-  },
-  "newEntry": "Nowy",
-  "@newEntry": {
-    "description": "Title when adding a new entry such as a weight or log entry"
-  },
-  "edit": "Edytuj",
-  "@edit": {},
-  "delete": "Usuń",
-  "@delete": {},
-  "newNutritionalPlan": "Nowy plan żywieniowy",
-  "@newNutritionalPlan": {},
-  "toggleDetails": "Przełącz szczegóły",
-  "@toggleDetails": {
-    "description": "Switch to toggle detail / overview"
-  },
-  "goToDetailPage": "Przejdź do strony szczegółów",
-  "@goToDetailPage": {},
-  "aboutSourceText": "Zobacz kod źródłowy tej aplikacji i jej serwera na Githubie",
-  "@aboutSourceText": {
-    "description": "Text for source code section in the about dialog"
-  },
-  "takePicture": "Zrób zdjęcie",
-  "@takePicture": {},
-  "chooseFromLibrary": "Wybierz z galerii zdjęć",
-  "@chooseFromLibrary": {},
-  "gallery": "Galeria",
-  "@gallery": {},
-  "appUpdateTitle": "Wymagana aktualizacja",
-  "@appUpdateTitle": {},
-  "appUpdateContent": "Ta wersja aplikacji nie jest kompatybilna z serwerem, zaktualizuj swoją aplikację.",
-  "@appUpdateContent": {},
-  "productFound": "Znaleziono produkt",
-  "@productFound": {
-    "description": "Header label for dialog when product is found with barcode"
-  },
-  "productNotFound": "Produkt nie znaleziony",
-  "@productNotFound": {
-    "description": "Header label for dialog when product is not found with barcode"
-  },
-  "productNotFoundDescription": "Produkt z zeskanowanym kodem kreskowym {barcode} nie został znaleziony w bazie danych wger",
-  "@productNotFoundDescription": {
-    "description": "Dialog info when product is not found with barcode",
-    "type": "text",
-    "placeholders": {
-      "barcode": {}
-    }
-  },
-  "scanBarcode": "Zeskanuj kod kreskowy",
-  "@scanBarcode": {
-    "description": "Label for scan barcode button"
-  },
-  "close": "Zamknij",
-  "@close": {
-    "description": "Translation for close"
-  },
-  "logIngredient": "Zapisz składnik w dzienniku żywieniowym",
-  "@logIngredient": {},
-  "searchIngredient": "Wyszukaj składnik",
-  "@searchIngredient": {
-    "description": "Label on ingredient search form"
-  },
-  "measurementCategoriesHelpText": "Kategoria pomiaru, np. „biceps” lub „pomiar warstwy podskórnej tłuszczu”",
-  "@measurementCategoriesHelpText": {},
-  "measurementEntriesHelpText": "Jednostka pomiaru np. „cm” lub „%”",
-  "@measurementEntriesHelpText": {},
-  "value": "Wartość",
-  "@value": {
-    "description": "The value of a measurement entry"
-  },
-  "timeStartAhead": "Czas rozpoczęcia nie może być wcześniejszy niż czas zakończenia",
-  "@timeStartAhead": {},
-  "kcal": "kcal",
-  "@kcal": {
-    "description": "Energy in a meal in kilocalories, kcal"
-  },
-  "aboutBugsTitle": "Masz problem lub pomysł?",
-  "@aboutBugsTitle": {
-    "description": "Title for bugs section in the about dialog"
-  },
-  "aboutBugsText": "Skontaktuj się z nami, jeżeli coś zachowało się w niespodziewany sposób lub czujesz, że brakuje jakiejś funkcji.",
-  "@aboutBugsText": {
-    "description": "Text for bugs section in the about dialog"
-  },
-  "aboutContactUsTitle": "Przywitaj się!",
-  "@aboutContactUsTitle": {
-    "description": "Title for contact us section in the about dialog"
-  },
-  "aboutContactUsText": "Jeśli chcesz z nami porozmawiać, wskocz na serwer Discorda i przywitaj się",
-  "@aboutContactUsText": {
-    "description": "Text for contact us section in the about dialog"
-  },
-  "aboutTranslationTitle": "Tłumaczenie",
-  "@aboutTranslationTitle": {
-    "description": "Title for translation section in the about dialog"
-  },
-  "selectIngredient": "Wybierz składnik",
-  "@selectIngredient": {
-    "description": "Error message when the user hasn't selected an ingredient from the autocompleter"
-  },
-  "recentlyUsedIngredients": "Ostatnio dodane składniki",
-  "@recentlyUsedIngredients": {
-    "description": "A message when a user adds a new ingredient to a meal."
-  },
-  "selectImage": "Wybierz obraz",
-  "@selectImage": {
-    "description": "Label and error message when the user hasn't selected an image to save"
-  },
-  "optionsLabel": "Opcje",
-  "@optionsLabel": {
-    "description": "Label for the popup with general app options"
-  },
-  "aboutTranslationText": "Ta aplikacja jest tłumaczona poprzez Weblate. Jeśli też chcesz pomóc, kliknij link i zacznij tłumaczyć",
-  "@aboutTranslationText": {
-    "description": "Text for translation section in the about dialog"
-  },
-  "goToToday": "Przejdź do dziś",
-  "@goToToday": {
-    "description": "Label on button to jump back to 'today' in the calendar widget"
-  },
-  "enterRepetitionsOrWeight": "Proszę wypełnić powtórzenia lub wagę przynajmniej jednej serii",
-  "@enterRepetitionsOrWeight": {
-    "description": "Error message when the user hasn't filled in the forms for exercise sets"
-  },
-  "enterValue": "proszę wprowadzić wartość",
-  "@enterValue": {
-    "description": "Error message when the user hasn't entered a value on a required field"
-  },
-  "setUnitsAndRir": "Ustaw jednostki oraz rezerwę liczby powtórzeń",
-  "@setUnitsAndRir": {
-    "description": "Label shown on the slider where the user can toggle showing units and RiR",
-    "type": "text"
-  },
-  "enterValidNumber": "Proszę wprowadzić poprawny numer",
-  "@enterValidNumber": {
-    "description": "Error message when the user has submitted an invalid number (e.g. '3,.,.,.')"
-  },
-  "noMeasurementEntries": "Nie masz wpisów pomiarowych",
-  "@noMeasurementEntries": {},
-  "moreMeasurementEntries": "Dodaj nowy pomiar",
-  "@moreMeasurementEntries": {
-    "description": "Message shown when the user wants to add new measurement"
-  },
-  "enterMinCharacters": "Proszę wpisać co najmniej {min} znaków",
-  "@enterMinCharacters": {
-    "description": "Error message when the user hasn't entered the minimum amount characters in a form",
-    "type": "text",
-    "placeholders": {
-      "min": {}
-    }
-  },
-  "baseNameEnglish": "Wszystkie ćwiczenia wymagają nazwy podstawowej w języku angielskim",
-  "@baseNameEnglish": {},
-  "images": "Obrazy",
-  "@images": {},
-  "language": "Język",
-  "@language": {},
-  "add_exercise_image_license": "Obrazy muszą być zgodne z licencją CC BY SA. Jeśli masz wątpliwości przesyłaj tylko zdjęcia które sam zrobiłeś.",
-  "@add_exercise_image_license": {},
-  "variations": "Wariacje",
-  "@variations": {
-    "description": "Variations of one exercise (e.g. benchpress and benchpress narrow)"
-  },
-  "alsoKnownAs": "Znany również jako: {aliases}",
-  "@alsoKnownAs": {
-    "placeholders": {
-      "aliases": {}
+    "invalidUsername": "Podaj poprawną nazwę użytkownika",
+    "@invalidUsername": {
+        "description": "Error message when the user enters an invalid username"
     },
-    "description": "List of alternative names for an exercise"
-  },
-  "unVerifiedEmail": "Niezweryfikowany adres e-mail",
-  "@unVerifiedEmail": {},
-  "verifiedEmail": "Zweryfikowany adres e-mail",
-  "@verifiedEmail": {},
-  "verifiedEmailReason": "Aby współtworzyć ćwiczenia musisz zweryfikować swój adres e-mail",
-  "@verifiedEmailReason": {},
-  "verifiedEmailInfo": "Wiadomość weryfikacyjna została wysłana na adres {email}",
-  "@verifiedEmailInfo": {
-    "placeholders": {
-      "email": {}
-    }
-  },
-  "alternativeNames": "Alternatywne nazwy",
-  "@alternativeNames": {},
-  "oneNamePerLine": "Jedna nazwa w wierszu",
-  "@oneNamePerLine": {},
-  "whatVariationsExist": "Czy istnieją wariacje tego ćwiczenia?",
-  "@whatVariationsExist": {},
-  "previous": "Wstecz",
-  "@previous": {},
-  "next": "Następny",
-  "@next": {},
-  "addExercise": "Dodaj ćwiczenie",
-  "@addExercise": {},
-  "translation": "Tłumaczenie",
-  "@translation": {},
-  "contributeExercise": "Przekaż ćwiczenie",
-  "@contributeExercise": {},
-  "translateExercise": "Przetłumacz to ćwiczenie teraz",
-  "@translateExercise": {},
-  "minutes": "Minuty",
-  "@minutes": {},
-  "kilometers": "Kilometry",
-  "@kilometers": {},
-  "until_failure": "Aż do awarii",
-  "@until_failure": {},
-  "seconds": "Sekundy",
-  "@seconds": {},
-  "bench": "Ławka",
-  "@bench": {},
-  "triceps": "Triceps",
-  "@triceps": {},
-  "swiss_ball": "Piłka lekarska",
-  "@swiss_ball": {},
-  "none__bodyweight_exercise_": "brak (ćwiczenie z masą ciała)",
-  "@none__bodyweight_exercise_": {},
-  "pull_up_bar": "Drążek do podciągania",
-  "@pull_up_bar": {},
-  "biceps": "Biceps",
-  "@biceps": {},
-  "userProfile": "Twój profil",
-  "@userProfile": {},
-  "exerciseList": "Lista ćwiczeń",
-  "@exerciseList": {},
-  "exercises": "Ćwiczenia",
-  "@exercises": {
-    "description": "Multiple exercises for a workout"
-  },
-  "exerciseName": "Nazwa ćwiczenia",
-  "@exerciseName": {
-    "description": "Label for the name of a workout exercise"
-  },
-  "selectEntry": "Wybierz wpis",
-  "@selectEntry": {},
-  "incline_bench": "Ławka skośna",
-  "@incline_bench": {},
-  "gym_mat": "Mata gimnastyczna",
-  "@gym_mat": {},
-  "aboutPageTitle": "Więcej o Wger",
-  "@aboutPageTitle": {},
-  "glutes": "Pośladki",
-  "@glutes": {},
-  "baseData": "Podstawy po angielsku",
-  "@baseData": {
-    "description": "The base data for an exercise such as category, trained muscles, etc."
-  },
-  "barbell": "Sztanga",
-  "@barbell": {},
-  "lats": "Mięsień najszerszy pleców",
-  "@lats": {},
-  "legs": "Nogi",
-  "@legs": {},
-  "arms": "Ręce",
-  "@arms": {},
-  "sz_bar": "Gryf łamany",
-  "@sz_bar": {},
-  "miles": "Mile",
-  "@miles": {},
-  "shoulders": "Barki",
-  "@shoulders": {},
-  "calves": "Łydki",
-  "@calves": {},
-  "hamstrings": "Mięsień dwugłowy uda",
-  "@hamstrings": {},
-  "chest": "Klatka piersiowa",
-  "@chest": {},
-  "back": "Plecy",
-  "@back": {},
-  "lower_back": "Dolna część pleców",
-  "@lower_back": {},
-  "kettlebell": "Kettle",
-  "@kettlebell": {},
-  "dumbbell": "Hantla",
-  "@dumbbell": {},
-  "abs": "Brzuch",
-  "@abs": {},
-  "quads": "Mięsień czworogłowy uda",
-  "@quads": {},
-  "cardio": "Kardio",
-  "@cardio": {},
-  "contributeExerciseWarning": "Możesz dodawać ćwiczenia tylko wtedy, gdy Twoje konto jest starsze niż {days} dni i zweryfikowałeś swój adres e-mail",
-  "@contributeExerciseWarning": {
-    "description": "Number of days before which a person can add exercise",
-    "placeholders": {
-      "days": {
-        "type": "String",
-        "example": "14"
-      }
-    }
-  },
-  "success": "Sukces",
-  "@success": {
-    "description": "Message when an action completed successfully, usually used as a heading"
-  },
-  "cacheWarning": "Ze względu na buforowanie może minąć trochę czasu zanim zmiany będą widoczne w całej aplikacji.",
-  "@cacheWarning": {},
-  "useMetric": "Używaj systemu metrycznego (kg) dla masy ciała",
-  "@useMetric": {},
-  "verify": "Zweryfikuj",
-  "@verify": {},
-  "settingsTitle": "Ustawienia",
-  "@settingsTitle": {},
-  "settingsCacheDeletedSnackbar": "Pamięć podręczna pomyślnie została wyczyszczona",
-  "@settingsCacheDeletedSnackbar": {},
-  "settingsExerciseCacheDescription": "Pamięć podręczna ćwiczeń",
-  "@settingsExerciseCacheDescription": {},
-  "log": "Zarejestruj",
-  "@log": {
-    "description": "Log a specific meal (imperative form)"
-  },
-  "kilometers_per_hour": "Kilometrów na godzinę",
-  "@kilometers_per_hour": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "done": "Ukończone",
-  "@done": {},
-  "noMatchingExerciseFound": "Nie znaleziono ćwiczeń",
-  "@noMatchingExerciseFound": {
-    "description": "Message returned if no exercises match the searched string"
-  },
-  "searchNamesInEnglish": "Szukaj również w języku angielskim",
-  "@searchNamesInEnglish": {},
-  "aboutMastodonTitle": "Mastodon",
-  "@aboutMastodonTitle": {
-    "description": "Title for mastodon section in the about dialog"
-  },
-  "plates": "Talerze",
-  "@plates": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "lb": "lb",
-  "@lb": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "textPromptTitle": "Gotowy do startu?",
-  "@textPromptTitle": {},
-  "onlyLogging": "Tylko licz kalorie",
-  "@onlyLogging": {},
-  "onlyLoggingHelpText": "Zaznacz to pole jeśli wyłącznie chcesz śledzić kalorie i nie chcesz tworzyć szczegółowego planu diety z poszczególnymi posiłkami",
-  "@onlyLoggingHelpText": {},
-  "goalEnergy": "Cel energii",
-  "@goalEnergy": {},
-  "goalProtein": "Cel białka",
-  "@goalProtein": {},
-  "goalCarbohydrates": "Cel węglowodanów",
-  "@goalCarbohydrates": {},
-  "goalFat": "Cel tłuszczów",
-  "@goalFat": {},
-  "today": "Dzisiaj",
-  "@today": {},
-  "loggedToday": "Zarejestrowane dzisiaj",
-  "@loggedToday": {},
-  "kcalValue": "{value} kcal",
-  "@kcalValue": {
-    "description": "A value in kcal, e.g. 500 kcal",
-    "type": "text",
-    "placeholders": {
-      "value": {}
-    }
-  },
-  "gValue": "{value} g",
-  "@gValue": {
-    "description": "A value in grams, e.g. 5 g",
-    "type": "text",
-    "placeholders": {
-      "value": {}
-    }
-  },
-  "percentValue": "{value} %",
-  "@percentValue": {
-    "description": "A value in percent, e.g. 10 %",
-    "type": "text",
-    "placeholders": {
-      "value": {}
-    }
-  },
-  "aboutMastodonText": "Obserwuj nas na Mastodonie, aby otrzymywać aktualizacje i aktualności na temat projektu",
-  "@aboutMastodonText": {
-    "description": "Text for the mastodon section in the about dialog"
-  },
-  "settingsCacheTitle": "Pamięć podręczna",
-  "@settingsCacheTitle": {},
-  "body_weight": "Masa ciała",
-  "@body_weight": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "textPromptSubheading": "Naciśnij przycisk, aby rozpocząć",
-  "@textPromptSubheading": {},
-  "aboutDonateText": "Zakup nam kawę, aby wspomóc projekt, opłacić koszty serwera i zapewnić nam energię",
-  "@aboutDonateText": {},
-  "aboutDonateTitle": "Wspomóż",
-  "@aboutDonateTitle": {},
-  "max_reps": "Maksymalna ilość powtórzeń",
-  "@max_reps": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "miles_per_hour": "Mil na godzinę",
-  "@miles_per_hour": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "kg": "kg",
-  "@kg": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "addGoalsToPlan": "Dodaj cele do tego planu",
-  "@addGoalsToPlan": {},
-  "addGoalsToPlanHelpText": "To pozwoli Ci ustawić ogólne cele dla energii, białka, węglowodanów i tłuszczy dla planu. Pamiętaj, że jeśli skonfigurujesz szczegółowy plan posiłków, te wartości będą miały pierwszeństwo.",
-  "@addGoalsToPlanHelpText": {},
-  "goalMacro": "Cele makro",
-  "@goalMacro": {
-    "description": "The goal for macronutrients"
-  },
-  "surplus": "nadwyżka",
-  "@surplus": {
-    "description": "Caloric surplus (either planned or unplanned)"
-  },
-  "goalFiber": "Cel błonnikowy",
-  "@goalFiber": {},
-  "noIngredientsDefined": "Nie zdefiniowano jeszcze żadnych składników",
-  "@noIngredientsDefined": {},
-  "ingredientLogged": "Składnik zarejestrowany w dzienniku",
-  "@ingredientLogged": {},
-  "selectMealToLog": "Wybierz posiłek, który chcesz zapisać w dzienniku",
-  "@selectMealToLog": {},
-  "deficit": "deficyt",
-  "@deficit": {
-    "description": "Caloric deficit (either planned or unplanned)"
-  }
+    "username": "Nazwa użytkownika",
+    "@username": {},
+    "email": "Adres email",
+    "@email": {},
+    "invalidEmail": "Podaj poprawny adres email",
+    "@invalidEmail": {
+        "description": "Error message when the user enters an invalid email"
+    },
+    "confirmPassword": "Potwierdź hasło",
+    "@confirmPassword": {},
+    "password": "Hasło",
+    "@password": {},
+    "passwordTooShort": "Hasło jest zbyt krótkie",
+    "@passwordTooShort": {
+        "description": "Error message when the user a password that is too short"
+    },
+    "passwordsDontMatch": "Hasła nie są identyczne",
+    "@passwordsDontMatch": {
+        "description": "Error message when the user enters two different passwords during registration"
+    },
+    "usernameValidChars": "Nazwa użytkownika może zawierać tylko litery, cyfry i znaki specjalne: @,+,.,-, _",
+    "@usernameValidChars": {
+        "description": "Error message when the user tries to register a username with forbidden characters"
+    },
+    "invalidUrl": "Wpisz poprawny adres URL",
+    "@invalidUrl": {
+        "description": "Error message when the user enters an invalid URL, e.g. in the login form"
+    },
+    "useCustomServer": "Używaj niestandardowego serwera",
+    "@useCustomServer": {
+        "description": "Toggle button allowing users to switch between the default and a custom wger server"
+    },
+    "useDefaultServer": "Używaj domyślnego serwera",
+    "@useDefaultServer": {
+        "description": "Toggle button allowing users to switch between the default and a custom wger server"
+    },
+    "register": "Zarejestruj się",
+    "@register": {
+        "description": "Text for registration button"
+    },
+    "logout": "Wyloguj się",
+    "@logout": {
+        "description": "Text for logout button"
+    },
+    "login": "Zaloguj się",
+    "@login": {
+        "description": "Text for login button"
+    },
+    "save": "Zapisz",
+    "@save": {},
+    "customServerUrl": "Adres URL instancji wger",
+    "@customServerUrl": {
+        "description": "Label in the form where the users can enter their own wger instance"
+    },
+    "customServerHint": "Wpisz adres własnego serwera, w przeciwnym razie zostanie użyty domyślny",
+    "@customServerHint": {
+        "description": "Hint text for the form where the users can enter their own wger instance"
+    },
+    "reset": "Reset",
+    "@reset": {
+        "description": "Button text allowing the user to reset the entered values to the default"
+    },
+    "macronutrients": "Makroelementy",
+    "@macronutrients": {},
+    "energyShort": "E",
+    "@energyShort": {
+        "description": "The first letter or short name of the word 'Energy', used in overviews"
+    },
+    "logged": "Zapisane",
+    "@logged": {
+        "description": "Header for the column of 'logged' nutritional values, i.e. what was eaten"
+    },
+    "addImage": "Dodaj obraz",
+    "@addImage": {},
+    "weekAverage": "Średnia z poprzedniego tygodnia",
+    "@weekAverage": {
+        "description": "Header for the column of '7 day average' nutritional values, i.e. what was logged last week"
+    },
+    "total": "Sumarycznie",
+    "@total": {
+        "description": "Label used for total sums of e.g. calories or similar"
+    },
+    "unit": "Jednostka",
+    "@unit": {
+        "description": "The unit used for a repetition (kg, time, etc.)"
+    },
+    "aboutDescription": "Dziękujemy za używanie wger! Wger jest projektem open-source stworzonym przy współpracy entuzjastów fitnessu z całego świata.",
+    "@aboutDescription": {
+        "description": "Text in the about dialog"
+    },
+    "productFoundDescription": "Kod kreskowy odpowiada temu produktowi: {productName}. Czy chcesz kontynuować?",
+    "@productFoundDescription": {
+        "description": "Dialog info when product is found with barcode",
+        "type": "text",
+        "placeholders": {
+            "productName": {
+                "type": "String"
+            }
+        }
+    },
+    "dataCopied": "Dane skopiowane do nowego dziennika",
+    "@dataCopied": {
+        "description": "Snackbar message to show on copying data to a new log entry"
+    },
+    "noWeightEntries": "Nie masz wpisów dotyczących wagi",
+    "@noWeightEntries": {
+        "description": "Message shown when the user has no logged weight entries"
+    },
+    "loadingText": "Ładowanie...",
+    "@loadingText": {
+        "description": "Text to show when entries are being loaded in the background: Loading..."
+    },
+    "calendar": "Kalendarz",
+    "@calendar": {},
+    "selectExercise": "Wybierz ćwiczenie",
+    "@selectExercise": {
+        "description": "Error message when the user hasn't selected an exercise in the form"
+    },
+    "enterCharacters": "Wprowadź od {min} do {max} znaków",
+    "@enterCharacters": {
+        "description": "Error message when the user hasn't entered the correct number of characters in a form",
+        "type": "text",
+        "placeholders": {
+            "min": {
+                "type": "String"
+            },
+            "max": {
+                "type": "String"
+            }
+        }
+    },
+    "nrOfSets": "Ilość serii ćwiczenia: {nrOfSets}",
+    "@nrOfSets": {
+        "description": "Label shown on the slider where the user selects the nr of sets",
+        "type": "text",
+        "placeholders": {
+            "nrOfSets": {
+                "type": "String"
+            }
+        }
+    },
+    "rirNotUsed": "Bez rezerwy powtórzeń",
+    "@rirNotUsed": {
+        "description": "Label used in RiR slider when the RiR value is not used/saved for the current setting or log"
+    },
+    "weightUnit": "Jednostka wagi",
+    "@weightUnit": {},
+    "repetitionUnit": "Jednostka powtórzeń",
+    "@repetitionUnit": {},
+    "set": "Seria",
+    "@set": {
+        "description": "A set in a workout plan"
+    },
+    "dayDescriptionHelp": "Opis tego, co jest robione w tym dniu (np. „dzień podciągania”) lub jakie części ciała są trenowane (np. „klatka piersiowa i ramiona”)",
+    "@dayDescriptionHelp": {},
+    "setNr": "{nr} serii",
+    "@setNr": {
+        "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.",
+        "type": "text",
+        "placeholders": {
+            "nr": {
+                "type": "String"
+            }
+        }
+    },
+    "sameRepetitions": "Jeśli wykonasz tą sama liczbę powtórzenia z tym samym ciężarem dla wszystkich serii, możesz po prostu wypełnić jeden wiersz. Na przykład dla 4 serii wystarczy wpisać 10 dla powtórzeń, automatycznie zmieni się to na „4 x 10”.",
+    "@sameRepetitions": {},
+    "comment": "Komentarz",
+    "@comment": {
+        "description": "Comment, additional information"
+    },
+    "impression": "Ocena treningu",
+    "@impression": {
+        "description": "General impression (e.g. for a workout session) such as good, bad, etc."
+    },
+    "workoutSession": "Sesja treningowa",
+    "@workoutSession": {
+        "description": "A (logged) workout session"
+    },
+    "newSet": "Nowa seria",
+    "@newSet": {
+        "description": "Header when adding a new set to a workout day"
+    },
+    "selectExercises": "Jeśli chcesz zrobić super serię, możesz wyszukać kilka ćwiczeń, zostaną one zgrupowane razem",
+    "@selectExercises": {},
+    "gymMode": "Tryb treningu",
+    "@gymMode": {
+        "description": "Label when starting the gym mode"
+    },
+    "equipment": "Sprzęt",
+    "@equipment": {
+        "description": "Equipment needed to perform an exercise"
+    },
+    "muscles": "Mięśnie",
+    "@muscles": {
+        "description": "(main) muscles trained by an exercise"
+    },
+    "musclesSecondary": "Mięśnie pomocnicze",
+    "@musclesSecondary": {
+        "description": "secondary muscles trained by an exercise"
+    },
+    "category": "Kategoria",
+    "@category": {
+        "description": "Category for an exercise, ingredient, etc."
+    },
+    "repetitions": "Powtórzenia",
+    "@repetitions": {
+        "description": "Repetitions for an exercise set"
+    },
+    "reps": "Powtórzenia",
+    "@reps": {
+        "description": "Shorthand for repetitions, used when space constraints are tighter"
+    },
+    "rir": "Liczba powtórzeń w rezerwie",
+    "@rir": {
+        "description": "Shorthand for Repetitions In Reserve"
+    },
+    "successfullySaved": "Zapisane",
+    "@successfullySaved": {
+        "description": "Message when an item was successfully saved"
+    },
+    "exercise": "Ćwiczenie",
+    "@exercise": {
+        "description": "An exercise for a workout"
+    },
+    "searchExercise": "Wyszukaj ćwiczenie do dodania",
+    "@searchExercise": {
+        "description": "Label on set form. Selected exercises are added to the set"
+    },
+    "logHelpEntries": "Jeśli w ciągu jednego dnia jest więcej niż jeden wpis z tą samą liczbą powtórzeń, ale z różnymi wagami, na wykresie pokazany jest tylko wpis o wyższej wadze.",
+    "@logHelpEntries": {},
+    "logHelpEntriesUnits": "Zwróć uwagę, że na wykresie są tylko wpisy z jednostką masy (kg lub lb) i powtórzeniami, inne kombinacje, takie jak czas lub czas do błędu, są tutaj ignorowane.",
+    "@logHelpEntriesUnits": {},
+    "description": "Opis",
+    "@description": {},
+    "name": "Nazwa",
+    "@name": {
+        "description": "Name for a workout or nutritional plan"
+    },
+    "addSet": "Dodaj serię",
+    "@addSet": {
+        "description": "Label for the button that adds a set (to a workout day)"
+    },
+    "addMeal": "Dodaj posiłek",
+    "@addMeal": {},
+    "fat": "Tłuszcz",
+    "@fat": {},
+    "measurement": "Pomiar",
+    "@measurement": {},
+    "measurements": "Pomiar",
+    "@measurements": {
+        "description": "Categories for the measurements such as biceps size, body fat, etc."
+    },
+    "registerInstead": "Nie posiadasz konta? Zarejestruj się teraz",
+    "@registerInstead": {},
+    "loginInstead": "Posiadasz konto? Zaloguj się",
+    "@loginInstead": {},
+    "labelBottomNavWorkout": "Trening",
+    "@labelBottomNavWorkout": {
+        "description": "Label used in bottom navigation, use a short word"
+    },
+    "labelBottomNavNutrition": "Żywienie",
+    "@labelBottomNavNutrition": {
+        "description": "Label used in bottom navigation, use a short word"
+    },
+    "labelWorkoutLogs": "Dzienniki treningowe",
+    "@labelWorkoutLogs": {
+        "description": "(Workout) logs"
+    },
+    "labelWorkoutPlan": "Plan treningu",
+    "@labelWorkoutPlan": {
+        "description": "Title for screen workout plan"
+    },
+    "successfullyDeleted": "Usunięto",
+    "@successfullyDeleted": {
+        "description": "Message when an item was successfully deleted"
+    },
+    "labelDashboard": "Pulpit",
+    "@labelDashboard": {
+        "description": "Title for screen dashboard"
+    },
+    "notes": "Notatki",
+    "@notes": {
+        "description": "Personal notes, e.g. for a workout session"
+    },
+    "newDay": "Nowy dzień",
+    "@newDay": {},
+    "pause": "Przerwa",
+    "@pause": {
+        "description": "Noun, not an imperative! Label used for the pause when using the gym mode"
+    },
+    "todaysWorkout": "Twój dzisiejszy trening",
+    "@todaysWorkout": {},
+    "date": "Data",
+    "@date": {
+        "description": "The date of a workout log or body weight entry"
+    },
+    "jumpTo": "Wybierz ćwiczenie",
+    "@jumpTo": {
+        "description": "Imperative. Label used in popup allowing the user to jump to a specific exercise while in the gym mode"
+    },
+    "noNutritionalPlans": "Nie masz planów żywieniowych",
+    "@noNutritionalPlans": {
+        "description": "Message shown when the user has no nutritional plans"
+    },
+    "plateCalculator": "Obciążnik",
+    "@plateCalculator": {
+        "description": "Label used for the plate calculator in the gym mode"
+    },
+    "plateCalculatorNotDivisible": "Nie można osiągnąć wagi z dostępnymi obciążeniami",
+    "@plateCalculatorNotDivisible": {
+        "description": "Error message when the current weight is not reachable with plates (e.g. 33.1 kg)"
+    },
+    "mealLogged": "Posiłek zarejestrowany w dzienniku",
+    "@mealLogged": {},
+    "logMeal": "Zapisz ten posiłek w dzienniku",
+    "@logMeal": {},
+    "addIngredient": "Dodaj składnik",
+    "@addIngredient": {},
+    "nutritionalPlan": "Plan diety",
+    "@nutritionalPlan": {},
+    "nutritionalDiary": "Dziennik żywieniowy",
+    "@nutritionalDiary": {},
+    "nutritionalPlans": "Plany żywieniowe",
+    "@nutritionalPlans": {},
+    "start": "Uruchom",
+    "@start": {
+        "description": "Label on button to start the gym mode (i.e., an imperative)"
+    },
+    "timeStart": "Czas rozpoczęcia",
+    "@timeStart": {
+        "description": "The starting time of a workout"
+    },
+    "timeEnd": "Czas zakończenia",
+    "@timeEnd": {
+        "description": "The end time of a workout"
+    },
+    "ingredient": "Składnik",
+    "@ingredient": {},
+    "energy": "Energia",
+    "@energy": {
+        "description": "Energy in a meal, ingredient etc. e.g. in kJ"
+    },
+    "time": "Czas",
+    "@time": {
+        "description": "The time of a meal or workout"
+    },
+    "anErrorOccurred": "Wystąpił błąd!",
+    "@anErrorOccurred": {},
+    "weight": "Waga",
+    "@weight": {
+        "description": "The weight of a workout log or body weight entry"
+    },
+    "kJ": "kJ",
+    "@kJ": {
+        "description": "Energy in a meal in kilo joules, kJ"
+    },
+    "g": "g",
+    "@g": {
+        "description": "Abbreviation for gram"
+    },
+    "protein": "Białko",
+    "@protein": {},
+    "carbohydrates": "Węglowodany",
+    "@carbohydrates": {},
+    "confirmDelete": "Czy na pewno chcesz usunąć '{toDelete}'?",
+    "@confirmDelete": {
+        "description": "Confirmation text before the user deletes an object",
+        "type": "text",
+        "placeholders": {
+            "toDelete": {
+                "type": "String"
+            }
+        }
+    },
+    "planned": "Zaplanowane",
+    "@planned": {
+        "description": "Header for the column of 'planned' nutritional values, i.e. what should be eaten"
+    },
+    "difference": "Różnice",
+    "@difference": {},
+    "percentEnergy": "Procent energii",
+    "@percentEnergy": {},
+    "gPerBodyKg": "g / kg",
+    "@gPerBodyKg": {
+        "description": "Label used for total sums of e.g. calories or similar in grams per Kg of body weight"
+    },
+    "proteinShort": "B",
+    "@proteinShort": {
+        "description": "The first letter or short name of the word 'Protein', used in overviews"
+    },
+    "carbohydratesShort": "W",
+    "@carbohydratesShort": {
+        "description": "The first letter or short name of the word 'Carbohydrates', used in overviews"
+    },
+    "sugars": "Cukier",
+    "@sugars": {},
+    "fatShort": "T",
+    "@fatShort": {
+        "description": "The first letter or short name of the word 'Fat', used in overviews"
+    },
+    "saturatedFat": "Tłuszcz nasycony",
+    "@saturatedFat": {},
+    "fiber": "Błonnik",
+    "@fiber": {},
+    "sodium": "Sód",
+    "@sodium": {},
+    "amount": "Ilość",
+    "@amount": {
+        "description": "The amount (e.g. in grams) of an ingredient in a meal"
+    },
+    "newEntry": "Nowy",
+    "@newEntry": {
+        "description": "Title when adding a new entry such as a weight or log entry"
+    },
+    "edit": "Edytuj",
+    "@edit": {},
+    "delete": "Usuń",
+    "@delete": {},
+    "newNutritionalPlan": "Nowy plan żywieniowy",
+    "@newNutritionalPlan": {},
+    "toggleDetails": "Przełącz szczegóły",
+    "@toggleDetails": {
+        "description": "Switch to toggle detail / overview"
+    },
+    "goToDetailPage": "Przejdź do strony szczegółów",
+    "@goToDetailPage": {},
+    "takePicture": "Zrób zdjęcie",
+    "@takePicture": {},
+    "chooseFromLibrary": "Wybierz z galerii zdjęć",
+    "@chooseFromLibrary": {},
+    "gallery": "Galeria",
+    "@gallery": {},
+    "appUpdateTitle": "Wymagana aktualizacja",
+    "@appUpdateTitle": {},
+    "appUpdateContent": "Ta wersja aplikacji nie jest kompatybilna z serwerem, zaktualizuj swoją aplikację.",
+    "@appUpdateContent": {},
+    "productFound": "Znaleziono produkt",
+    "@productFound": {
+        "description": "Header label for dialog when product is found with barcode"
+    },
+    "productNotFound": "Produkt nie znaleziony",
+    "@productNotFound": {
+        "description": "Header label for dialog when product is not found with barcode"
+    },
+    "productNotFoundDescription": "Produkt z zeskanowanym kodem kreskowym {barcode} nie został znaleziony w bazie danych wger",
+    "@productNotFoundDescription": {
+        "description": "Dialog info when product is not found with barcode",
+        "type": "text",
+        "placeholders": {
+            "barcode": {
+                "type": "String"
+            }
+        }
+    },
+    "scanBarcode": "Zeskanuj kod kreskowy",
+    "@scanBarcode": {
+        "description": "Label for scan barcode button"
+    },
+    "close": "Zamknij",
+    "@close": {
+        "description": "Translation for close"
+    },
+    "logIngredient": "Zapisz składnik w dzienniku żywieniowym",
+    "@logIngredient": {},
+    "searchIngredient": "Wyszukaj składnik",
+    "@searchIngredient": {
+        "description": "Label on ingredient search form"
+    },
+    "measurementCategoriesHelpText": "Kategoria pomiaru, np. „biceps” lub „pomiar warstwy podskórnej tłuszczu”",
+    "@measurementCategoriesHelpText": {},
+    "measurementEntriesHelpText": "Jednostka pomiaru np. „cm” lub „%”",
+    "@measurementEntriesHelpText": {},
+    "value": "Wartość",
+    "@value": {
+        "description": "The value of a measurement entry"
+    },
+    "timeStartAhead": "Czas rozpoczęcia nie może być wcześniejszy niż czas zakończenia",
+    "@timeStartAhead": {},
+    "kcal": "kcal",
+    "@kcal": {
+        "description": "Energy in a meal in kilocalories, kcal"
+    },
+    "selectIngredient": "Wybierz składnik",
+    "@selectIngredient": {
+        "description": "Error message when the user hasn't selected an ingredient from the autocompleter"
+    },
+    "recentlyUsedIngredients": "Ostatnio dodane składniki",
+    "@recentlyUsedIngredients": {
+        "description": "A message when a user adds a new ingredient to a meal."
+    },
+    "selectImage": "Wybierz obraz",
+    "@selectImage": {
+        "description": "Label and error message when the user hasn't selected an image to save"
+    },
+    "optionsLabel": "Opcje",
+    "@optionsLabel": {
+        "description": "Label for the popup with general app options"
+    },
+    "goToToday": "Przejdź do dziś",
+    "@goToToday": {
+        "description": "Label on button to jump back to 'today' in the calendar widget"
+    },
+    "enterValue": "proszę wprowadzić wartość",
+    "@enterValue": {
+        "description": "Error message when the user hasn't entered a value on a required field"
+    },
+    "setUnitsAndRir": "Ustaw jednostki oraz rezerwę liczby powtórzeń",
+    "@setUnitsAndRir": {
+        "description": "Label shown on the slider where the user can toggle showing units and RiR",
+        "type": "text"
+    },
+    "enterValidNumber": "Proszę wprowadzić poprawny numer",
+    "@enterValidNumber": {
+        "description": "Error message when the user has submitted an invalid number (e.g. '3,.,.,.')"
+    },
+    "noMeasurementEntries": "Nie masz wpisów pomiarowych",
+    "@noMeasurementEntries": {},
+    "moreMeasurementEntries": "Dodaj nowy pomiar",
+    "@moreMeasurementEntries": {
+        "description": "Message shown when the user wants to add new measurement"
+    },
+    "enterMinCharacters": "Proszę wpisać co najmniej {min} znaków",
+    "@enterMinCharacters": {
+        "description": "Error message when the user hasn't entered the minimum amount characters in a form",
+        "type": "text",
+        "placeholders": {
+            "min": {
+                "type": "String"
+            }
+        }
+    },
+    "baseNameEnglish": "Wszystkie ćwiczenia wymagają nazwy podstawowej w języku angielskim",
+    "@baseNameEnglish": {},
+    "images": "Obrazy",
+    "@images": {},
+    "language": "Język",
+    "@language": {},
+    "add_exercise_image_license": "Obrazy muszą być zgodne z licencją CC BY SA. Jeśli masz wątpliwości przesyłaj tylko zdjęcia które sam zrobiłeś.",
+    "@add_exercise_image_license": {},
+    "variations": "Wariacje",
+    "@variations": {
+        "description": "Variations of one exercise (e.g. benchpress and benchpress narrow)"
+    },
+    "alsoKnownAs": "Znany również jako: {aliases}",
+    "@alsoKnownAs": {
+        "placeholders": {
+            "aliases": {
+                "type": "String"
+            }
+        },
+        "description": "List of alternative names for an exercise"
+    },
+    "unVerifiedEmail": "Niezweryfikowany adres e-mail",
+    "@unVerifiedEmail": {},
+    "verifiedEmail": "Zweryfikowany adres e-mail",
+    "@verifiedEmail": {},
+    "verifiedEmailReason": "Aby współtworzyć ćwiczenia musisz zweryfikować swój adres e-mail",
+    "@verifiedEmailReason": {},
+    "verifiedEmailInfo": "Wiadomość weryfikacyjna została wysłana na adres {email}",
+    "@verifiedEmailInfo": {
+        "placeholders": {
+            "email": {
+                "type": "String"
+            }
+        }
+    },
+    "alternativeNames": "Alternatywne nazwy",
+    "@alternativeNames": {},
+    "oneNamePerLine": "Jedna nazwa w wierszu",
+    "@oneNamePerLine": {},
+    "whatVariationsExist": "Czy istnieją wariacje tego ćwiczenia?",
+    "@whatVariationsExist": {},
+    "previous": "Wstecz",
+    "@previous": {},
+    "next": "Następny",
+    "@next": {},
+    "addExercise": "Dodaj ćwiczenie",
+    "@addExercise": {},
+    "translation": "Tłumaczenie",
+    "@translation": {},
+    "contributeExercise": "Przekaż ćwiczenie",
+    "@contributeExercise": {},
+    "translateExercise": "Przetłumacz to ćwiczenie teraz",
+    "@translateExercise": {},
+    "minutes": "Minuty",
+    "@minutes": {},
+    "kilometers": "Kilometry",
+    "@kilometers": {},
+    "until_failure": "Aż do awarii",
+    "@until_failure": {},
+    "seconds": "Sekundy",
+    "@seconds": {},
+    "bench": "Ławka",
+    "@bench": {},
+    "triceps": "Triceps",
+    "@triceps": {},
+    "swiss_ball": "Piłka lekarska",
+    "@swiss_ball": {},
+    "none__bodyweight_exercise_": "brak (ćwiczenie z masą ciała)",
+    "@none__bodyweight_exercise_": {},
+    "pull_up_bar": "Drążek do podciągania",
+    "@pull_up_bar": {},
+    "biceps": "Biceps",
+    "@biceps": {},
+    "userProfile": "Twój profil",
+    "@userProfile": {},
+    "exerciseList": "Lista ćwiczeń",
+    "@exerciseList": {},
+    "exercises": "Ćwiczenia",
+    "@exercises": {
+        "description": "Multiple exercises for a workout"
+    },
+    "exerciseName": "Nazwa ćwiczenia",
+    "@exerciseName": {
+        "description": "Label for the name of a workout exercise"
+    },
+    "selectEntry": "Wybierz wpis",
+    "@selectEntry": {},
+    "incline_bench": "Ławka skośna",
+    "@incline_bench": {},
+    "gym_mat": "Mata gimnastyczna",
+    "@gym_mat": {},
+    "aboutPageTitle": "O nas i wsparcie",
+    "@aboutPageTitle": {},
+    "glutes": "Pośladki",
+    "@glutes": {},
+    "baseData": "Podstawy po angielsku",
+    "@baseData": {
+        "description": "The base data for an exercise such as category, trained muscles, etc."
+    },
+    "barbell": "Sztanga",
+    "@barbell": {},
+    "lats": "Mięsień najszerszy pleców",
+    "@lats": {},
+    "legs": "Nogi",
+    "@legs": {},
+    "arms": "Ręce",
+    "@arms": {},
+    "sz_bar": "Gryf łamany",
+    "@sz_bar": {},
+    "miles": "Mile",
+    "@miles": {},
+    "shoulders": "Barki",
+    "@shoulders": {},
+    "calves": "Łydki",
+    "@calves": {},
+    "hamstrings": "Mięsień dwugłowy uda",
+    "@hamstrings": {},
+    "chest": "Klatka piersiowa",
+    "@chest": {},
+    "back": "Plecy",
+    "@back": {},
+    "lower_back": "Dolna część pleców",
+    "@lower_back": {},
+    "kettlebell": "Kettle",
+    "@kettlebell": {},
+    "dumbbell": "Hantla",
+    "@dumbbell": {},
+    "abs": "Brzuch",
+    "@abs": {},
+    "quads": "Mięsień czworogłowy uda",
+    "@quads": {},
+    "cardio": "Kardio",
+    "@cardio": {},
+    "contributeExerciseWarning": "Możesz dodawać ćwiczenia tylko wtedy, gdy Twoje konto jest starsze niż {days} dni i zweryfikowałeś swój adres e-mail",
+    "@contributeExerciseWarning": {
+        "description": "Number of days before which a person can add exercise",
+        "placeholders": {
+            "days": {
+                "type": "String",
+                "example": "14"
+            }
+        }
+    },
+    "success": "Sukces",
+    "@success": {
+        "description": "Message when an action completed successfully, usually used as a heading"
+    },
+    "cacheWarning": "Ze względu na buforowanie może minąć trochę czasu zanim zmiany będą widoczne w całej aplikacji.",
+    "@cacheWarning": {},
+    "useMetric": "Używaj systemu metrycznego (kg) dla masy ciała",
+    "@useMetric": {},
+    "verify": "Zweryfikuj",
+    "@verify": {},
+    "settingsTitle": "Ustawienia",
+    "@settingsTitle": {},
+    "settingsCacheDeletedSnackbar": "Pamięć podręczna pomyślnie została wyczyszczona",
+    "@settingsCacheDeletedSnackbar": {},
+    "settingsExerciseCacheDescription": "Pamięć podręczna ćwiczeń",
+    "@settingsExerciseCacheDescription": {},
+    "log": "Zarejestruj",
+    "@log": {
+        "description": "Log a specific meal (imperative form)"
+    },
+    "kilometers_per_hour": "Kilometrów na godzinę",
+    "@kilometers_per_hour": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "done": "Ukończone",
+    "@done": {},
+    "noMatchingExerciseFound": "Nie znaleziono ćwiczeń",
+    "@noMatchingExerciseFound": {
+        "description": "Message returned if no exercises match the searched string"
+    },
+    "searchNamesInEnglish": "Szukaj również w języku angielskim",
+    "@searchNamesInEnglish": {},
+    "aboutMastodonTitle": "Mastodon",
+    "@aboutMastodonTitle": {},
+    "plates": "Talerze",
+    "@plates": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "lb": "lb",
+    "@lb": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "textPromptTitle": "Gotowy do startu?",
+    "@textPromptTitle": {},
+    "onlyLogging": "Tylko licz kalorie",
+    "@onlyLogging": {},
+    "onlyLoggingHelpText": "Zaznacz to pole jeśli wyłącznie chcesz śledzić kalorie i nie chcesz tworzyć szczegółowego planu diety z poszczególnymi posiłkami",
+    "@onlyLoggingHelpText": {},
+    "goalEnergy": "Cel energii",
+    "@goalEnergy": {},
+    "goalProtein": "Cel białka",
+    "@goalProtein": {},
+    "goalCarbohydrates": "Cel węglowodanów",
+    "@goalCarbohydrates": {},
+    "goalFat": "Cel tłuszczów",
+    "@goalFat": {},
+    "today": "Dzisiaj",
+    "@today": {},
+    "loggedToday": "Zarejestrowane dzisiaj",
+    "@loggedToday": {},
+    "kcalValue": "{value} kcal",
+    "@kcalValue": {
+        "description": "A value in kcal, e.g. 500 kcal",
+        "type": "text",
+        "placeholders": {
+            "value": {
+                "type": "String"
+            }
+        }
+    },
+    "gValue": "{value} g",
+    "@gValue": {
+        "description": "A value in grams, e.g. 5 g",
+        "type": "text",
+        "placeholders": {
+            "value": {
+                "type": "String"
+            }
+        }
+    },
+    "percentValue": "{value} %",
+    "@percentValue": {
+        "description": "A value in percent, e.g. 10 %",
+        "type": "text",
+        "placeholders": {
+            "value": {
+                "type": "String"
+            }
+        }
+    },
+    "settingsCacheTitle": "Pamięć podręczna",
+    "@settingsCacheTitle": {},
+    "body_weight": "Masa ciała",
+    "@body_weight": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "textPromptSubheading": "Naciśnij przycisk, aby rozpocząć",
+    "@textPromptSubheading": {},
+    "aboutDonateText": "Dopóki nasz projekt jest darmowy i tak zostanie na zawsze, ale działanie serweru nie jest! Także tworzenie naszego projektu zajmuje dużo czasu i wysiłku od wolontariuszów. Twoja kontrybucja bezpośrednią pokrywa te koszty, sprawia że nasz projekt się rowzija.",
+    "@aboutDonateText": {},
+    "aboutDonateTitle": "Wspomóż",
+    "@aboutDonateTitle": {},
+    "max_reps": "Maksymalna ilość powtórzeń",
+    "@max_reps": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "miles_per_hour": "Mil na godzinę",
+    "@miles_per_hour": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "kg": "kg",
+    "@kg": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "goalMacro": "Cele makro",
+    "@goalMacro": {
+        "description": "The goal for macronutrients"
+    },
+    "surplus": "nadwyżka",
+    "@surplus": {
+        "description": "Caloric surplus (either planned or unplanned)"
+    },
+    "goalFiber": "Cel błonnikowy",
+    "@goalFiber": {},
+    "noIngredientsDefined": "Nie zdefiniowano jeszcze żadnych składników",
+    "@noIngredientsDefined": {},
+    "ingredientLogged": "Składnik zarejestrowany w dzienniku",
+    "@ingredientLogged": {},
+    "selectMealToLog": "Wybierz posiłek, który chcesz zapisać w dzienniku",
+    "@selectMealToLog": {},
+    "deficit": "deficyt",
+    "@deficit": {
+        "description": "Caloric deficit (either planned or unplanned)"
+    },
+    "chartAllTimeTitle": "{name} Z całego okresu",
+    "@chartAllTimeTitle": {
+        "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
+        "type": "text",
+        "placeholders": {
+            "name": {
+                "type": "String"
+            }
+        }
+    },
+    "chart30DaysTitle": "{name} ostatnie 30 dni",
+    "@chart30DaysTitle": {
+        "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
+        "type": "text",
+        "placeholders": {
+            "name": {
+                "type": "String"
+            }
+        }
+    },
+    "useApiToken": "Użyj API Token",
+    "@useApiToken": {},
+    "apiToken": "API Token",
+    "@apiToken": {},
+    "restTime": "Czas odpoczynku",
+    "@restTime": {},
+    "errorCouldNotConnectToServer": "Nie możemy połączyć się z serwerem",
+    "@errorCouldNotConnectToServer": {},
+    "errorCouldNotConnectToServerDetails": "Aplikacja nie może połączyć się z serwerem. Prosimy sprawdzić swoje połączenie z internetem lub adres URL i spróbować ponownie. Jeżeli problem nadal występuje, skontaktuj się z administratorem.",
+    "@errorCouldNotConnectToServerDetails": {},
+    "aboutWhySupportTitle": "Open Source & za darmo ❤️",
+    "@aboutWhySupportTitle": {},
+    "routines": "Rutyny",
+    "@routines": {},
+    "newRoutine": "Nowa rutyna",
+    "@newRoutine": {},
+    "min": "Min",
+    "@min": {},
+    "max": "Max",
+    "@max": {},
+    "copyToClipboard": "Skopiuj do schowku (clipboard)",
+    "@copyToClipboard": {},
+    "errorInfoDescription": "Przepraszamy coś poszło źle. Możesz pomóc nam rozwiązać ten problem zgłaszając go na GitHub.",
+    "@errorInfoDescription": {},
+    "invalidApiToken": "Wpisz poprawny token API",
+    "@invalidApiToken": {
+        "description": "Error message when the user enters an invalid API key"
+    },
+    "errorViewDetails": "Techniczne szczegóły",
+    "@errorViewDetails": {},
+    "exerciseNr": "Ćwiczenie {nr}",
+    "@exerciseNr": {
+        "description": "Header in form indicating the number of the current exercise. Can also be translated as something like 'Set Nr. xy'.",
+        "type": "text",
+        "placeholders": {
+            "nr": {
+                "type": "String"
+            }
+        }
+    },
+    "apiTokenValidChars": "Klucz API może zawierać wyłącznie litery od a-f (ang.), i cyrfy (0-9) i musi mieć długość dokładnie 40 znaków",
+    "@apiTokenValidChars": {
+        "description": "Error message when the user tries to input a API key with forbidden characters"
+    },
+    "noRoutines": "Ty nie masz żadnej rutyny",
+    "@noRoutines": {},
+    "restDay": "Dzień odpoczynkowy",
+    "@restDay": {},
+    "errorInfoDescription2": "Możesz kontynuować używanie tej aplikacji, ale niektóre funkcje mogą być niedostępne.",
+    "@errorInfoDescription2": {},
+    "resistance_band": "Guma oporowa",
+    "@resistance_band": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "selectAvailablePlates": "Wybierz dostępne obciążenie",
+    "@selectAvailablePlates": {},
+    "barWeight": "Waga sztangi",
+    "@barWeight": {},
+    "useColors": "Użyj kolorów",
+    "@useColors": {},
+    "useUsernameAndPassword": "Użyj nazwy użytkownika i hasła",
+    "@useUsernameAndPassword": {},
+    "endDate": "Data zakończenia",
+    "@endDate": {},
+    "startDate": "Data rozpoczęcia",
+    "@startDate": {},
+    "sets": "Liczba serii do wykonania dla jednego ćwiczenia",
+    "@sets": {
+        "description": "The number of sets to be done for one exercise"
+    },
+    "supersetNr": "Superset {nr}",
+    "@supersetNr": {
+        "description": "Header in form indicating the number of the current exercise. Can also be translated as something like 'Superset Nr. xy'.",
+        "type": "text",
+        "placeholders": {
+            "nr": {
+                "type": "String"
+            }
+        }
+    },
+    "isRestDay": "Czy to dzień odpoczynku",
+    "@isRestDay": {},
+    "isRestDayHelp": "Pamiętaj, że wszystkie zestawy i ćwiczenia zostaną usunięte, gdy oznaczysz dzień jako dzień odpoczynku.",
+    "@isRestDayHelp": {},
+    "needsLogsToAdvance": "Potrzebuje dzienników, aby przejść dalej",
+    "@needsLogsToAdvance": {},
+    "needsLogsToAdvanceHelp": "Wybierz tę opcję, jeśli chcesz, aby program przechodził do następnego zaplanowanego dnia tylko wtedy, gdy zarejestrowałeś trening w danym dniu",
+    "@needsLogsToAdvanceHelp": {},
+    "routineDays": "Dni w danym planie",
+    "@routineDays": {},
+    "resultingRoutine": "Rezultaty planu",
+    "@resultingRoutine": {},
+    "yourCurrentNutritionPlanHasNoMealsDefinedYet": "Twój obecny plan żywieniowy nie zawiera żadnych posiłków",
+    "@yourCurrentNutritionPlanHasNoMealsDefinedYet": {
+        "description": "Message shown when a nutrition plan doesn't have any meals"
+    },
+    "toAddMealsToThePlanGoToNutritionalPlanDetails": "Aby dodać posiłki do planu, przejdź do szczegółów planu żywieniowego",
+    "@toAddMealsToThePlanGoToNutritionalPlanDetails": {
+        "description": "Message shown to guide users to the nutritional plan details page to add meals"
+    },
+    "chartDuringPlanTitle": "{chartName} w planie żywieniowym {planName}",
+    "@chartDuringPlanTitle": {
+        "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
+        "type": "text",
+        "placeholders": {
+            "chartName": {
+                "type": "String"
+            },
+            "planName": {
+                "type": "String"
+            }
+        }
+    },
+    "aboutContributeTitle": "Współtwórz",
+    "@aboutContributeTitle": {},
+    "aboutContributeText": "Zachęcamy do wszelkiego rodzaju wkładu. Niezależnie od tego, czy jesteś programistą, tłumaczem, czy po prostu pasjonatem fitnessu, każda forma wsparcia jest mile widziana!",
+    "@aboutContributeText": {},
+    "aboutBugsListTitle": "Zgłoś problem lub zaproponuj funkcję",
+    "@aboutBugsListTitle": {},
+    "aboutTranslationListTitle": "Przetłumacz aplikację",
+    "@aboutTranslationListTitle": {},
+    "aboutSourceListTitle": "Wyświetl kod źródłowy",
+    "@aboutSourceListTitle": {},
+    "aboutJoinCommunityTitle": "Dołącz do społeczności",
+    "@aboutJoinCommunityTitle": {},
+    "aboutDiscordTitle": "Discord",
+    "@aboutDiscordTitle": {},
+    "others": "Inne",
+    "@others": {},
+    "fitInWeekHelp": "Jeśli opcja jest włączona, dni będą się powtarzać w cyklu tygodniowym, w przeciwnym razie dni będą następować po sobie sekwencyjnie, bez względu na początek nowego tygodnia.",
+    "@fitInWeekHelp": {},
+    "addSuperset": "Dodaj superset",
+    "@addSuperset": {},
+    "setHasProgression": "Set ma progresję",
+    "@setHasProgression": {},
+    "setHasProgressionWarning": "Należy pamiętać, że obecnie nie ma możliwości edycji wszystkich ustawień zestawu w aplikacji mobilnej ani skonfigurowania automatycznego postępu. Na razie prosimy korzystać z aplikacji internetowej.",
+    "@setHasProgressionWarning": {},
+    "setHasNoExercises": "Ten zestaw nie zawiera jeszcze żadnych ćwiczeń!",
+    "@setHasNoExercises": {},
+    "settingsIngredientCacheDescription": "Pamięć podręczna składników",
+    "@settingsIngredientCacheDescription": {},
+    "simpleMode": "Tryb prosty",
+    "@simpleMode": {},
+    "simpleModeHelp": "Ukryj niektóre z bardziej zaawansowanych ustawień podczas edycji ćwiczeń",
+    "@simpleModeHelp": {},
+    "progressionRules": "To ćwiczenie ma zasady progresji i nie można go edytować w aplikacji mobilnej. Aby edytować to ćwiczenie, należy skorzystać z aplikacji internetowej.",
+    "@progressionRules": {},
+    "overallChangeWeight": "Zmiana wagi",
+    "@overallChangeWeight": {
+        "description": "Overall change in weight, added for localization"
+    },
+    "goalTypeMeals": "Z posiłków",
+    "@goalTypeMeals": {
+        "description": "added for localization of Class GoalType's filed meals"
+    },
+    "goalTypeBasic": "Proste",
+    "@goalTypeBasic": {
+        "description": "added for localization of Class GoalType's filed basic"
+    },
+    "goalTypeAdvanced": "Zaawansowane",
+    "@goalTypeAdvanced": {
+        "description": "added for localization of Class GoalType's filed advanced"
+    },
+    "indicatorRaw": "surowe",
+    "@indicatorRaw": {
+        "description": "added for localization of Class Indicator's field text"
+    },
+    "indicatorAvg": "średnio",
+    "@indicatorAvg": {
+        "description": "added for localization of Class Indicator's field text"
+    },
+    "themeMode": "Tryb tematyczny",
+    "@themeMode": {},
+    "darkMode": "Zawsze używaj trybu ciemnego",
+    "@darkMode": {},
+    "lightMode": "Zawsze używaj trybu jasnego",
+    "@lightMode": {},
+    "systemMode": "Ustawienia systemu",
+    "@systemMode": {},
+    "fitInWeek": "Dopasuj w tygodniu",
+    "@fitInWeek": {}
 }
diff --git a/lib/l10n/app_pt.arb b/lib/l10n/app_pt.arb
index 0658c4d2..26297cb3 100644
--- a/lib/l10n/app_pt.arb
+++ b/lib/l10n/app_pt.arb
@@ -1,787 +1,1014 @@
 {
-  "logout": "Sair",
-  "@logout": {
-    "description": "Text for logout button"
-  },
-  "usernameValidChars": "Um nome de usuário pode conter apenas letras, dígitos e os caracteres @, +, ., - e _",
-  "@usernameValidChars": {
-    "description": "Error message when the user tries to register a username with forbidden characters"
-  },
-  "passwordsDontMatch": "As senhas não correspondem",
-  "@passwordsDontMatch": {
-    "description": "Error message when the user enters two different passwords during registration"
-  },
-  "passwordTooShort": "A senha é muito curta",
-  "@passwordTooShort": {
-    "description": "Error message when the user a password that is too short"
-  },
-  "password": "Senha",
-  "@password": {},
-  "confirmPassword": "Confirmar senha",
-  "@confirmPassword": {},
-  "invalidEmail": "Por favor insira um endereço de e-mail válido",
-  "@invalidEmail": {
-    "description": "Error message when the user enters an invalid email"
-  },
-  "email": "Endereço de e-mail",
-  "@email": {},
-  "invalidUsername": "Insira um nome de usuário válido",
-  "@invalidUsername": {
-    "description": "Error message when the user enters an invalid username"
-  },
-  "customServerHint": "Digite o endereço do seu próprio servidor, ou então o padrão será usado",
-  "@customServerHint": {
-    "description": "Hint text for the form where the users can enter their own wger instance"
-  },
-  "loginInstead": "Já tem uma conta? Faça login",
-  "@loginInstead": {},
-  "labelWorkoutPlans": "Planos de treino",
-  "@labelWorkoutPlans": {
-    "description": "Title for screen workout plans"
-  },
-  "labelBottomNavWorkout": "Treino",
-  "@labelBottomNavWorkout": {
-    "description": "Label used in bottom navigation, use a short word"
-  },
-  "labelBottomNavNutrition": "Nutrição",
-  "@labelBottomNavNutrition": {
-    "description": "Label used in bottom navigation, use a short word"
-  },
-  "labelWorkoutLogs": "Registros de treinamento",
-  "@labelWorkoutLogs": {
-    "description": "(Workout) logs"
-  },
-  "labelWorkoutPlan": "Plano de treino",
-  "@labelWorkoutPlan": {
-    "description": "Title for screen workout plan"
-  },
-  "labelDashboard": "Painel",
-  "@labelDashboard": {
-    "description": "Title for screen dashboard"
-  },
-  "successfullyDeleted": "Excluído",
-  "@successfullyDeleted": {
-    "description": "Message when an item was successfully deleted"
-  },
-  "exercise": "Exercício",
-  "@exercise": {
-    "description": "An exercise for a workout"
-  },
-  "supersetWith": "conjunto com",
-  "@supersetWith": {
-    "description": "Text used between exercise cards when adding a new set. Translate as something like 'in a superset with'"
-  },
-  "equipment": "Equipamento",
-  "@equipment": {
-    "description": "Equipment needed to perform an exercise"
-  },
-  "muscles": "Músculos",
-  "@muscles": {
-    "description": "(main) muscles trained by an exercise"
-  },
-  "category": "Categoria",
-  "@category": {
-    "description": "Category for an exercise, ingredient, etc."
-  },
-  "noWorkoutPlans": "Você não tem planos de treino",
-  "@noWorkoutPlans": {
-    "description": "Message shown when the user has no workout plans"
-  },
-  "repetitions": "Repetições",
-  "@repetitions": {
-    "description": "Repetitions for an exercise set"
-  },
-  "rir": "ReR",
-  "@rir": {
-    "description": "Shorthand for Repetitions In Reserve"
-  },
-  "rirNotUsed": "ReR não utilizado",
-  "@rirNotUsed": {
-    "description": "Label used in RiR slider when the RiR value is not used/saved for the current setting or log"
-  },
-  "set": "Set",
-  "@set": {
-    "description": "A set in a workout plan"
-  },
-  "comment": "Comentário",
-  "@comment": {
-    "description": "Comment, additional information"
-  },
-  "newDay": "Novo dia",
-  "@newDay": {},
-  "newSet": "Novo set",
-  "@newSet": {
-    "description": "Header when adding a new set to a workout day"
-  },
-  "selectExercises": "Se você quiser fazer um conjunto, você pode procurar vários exercícios, eles serão agrupados",
-  "@selectExercises": {},
-  "todaysWorkout": "Seu treino hoje",
-  "@todaysWorkout": {},
-  "addSet": "Adicionar set",
-  "@addSet": {
-    "description": "Label for the button that adds a set (to a workout day)"
-  },
-  "addMeal": "Adicionar refeição",
-  "@addMeal": {},
-  "addIngredient": "Adicionar ingrediente",
-  "@addIngredient": {},
-  "logIngredient": "Salvar no gráfico de nutrição",
-  "@logIngredient": {},
-  "nutritionalDiary": "Gráfico nutricional",
-  "@nutritionalDiary": {},
-  "nutritionalPlans": "Planos nutricionais",
-  "@nutritionalPlans": {},
-  "weight": "Peso",
-  "@weight": {
-    "description": "The weight of a workout log or body weight entry"
-  },
-  "measurement": "Medição",
-  "@measurement": {},
-  "date": "Data",
-  "@date": {
-    "description": "The date of a workout log or body weight entry"
-  },
-  "value": "Valor",
-  "@value": {
-    "description": "The value of a measurement entry"
-  },
-  "timeStart": "Hora de início",
-  "@timeStart": {
-    "description": "The starting time of a workout"
-  },
-  "timeEnd": "Hora do final",
-  "@timeEnd": {
-    "description": "The end time of a workout"
-  },
-  "timeStartAhead": "A hora de início não pode ser anterior à hora de término",
-  "@timeStartAhead": {},
-  "energy": "Energia",
-  "@energy": {
-    "description": "Energy in a meal, ingredient etc. e.g. in kJ"
-  },
-  "macronutrients": "Macronutrientes",
-  "@macronutrients": {},
-  "planned": "Planejado",
-  "@planned": {
-    "description": "Header for the column of 'planned' nutritional values, i.e. what should be eaten"
-  },
-  "weekAverage": "média dos 7 dias",
-  "@weekAverage": {
-    "description": "Header for the column of '7 day average' nutritional values, i.e. what was logged last week"
-  },
-  "gPerBodyKg": "g por kg",
-  "@gPerBodyKg": {
-    "description": "Label used for total sums of e.g. calories or similar in grams per Kg of body weight"
-  },
-  "carbohydrates": "Carboidratos",
-  "@carbohydrates": {},
-  "carbohydratesShort": "C",
-  "@carbohydratesShort": {
-    "description": "The first letter or short name of the word 'Carbohydrates', used in overviews"
-  },
-  "fiber": "Fibra",
-  "@fiber": {},
-  "sodium": "Sódio",
-  "@sodium": {},
-  "amount": "Quantidade",
-  "@amount": {
-    "description": "The amount (e.g. in grams) of an ingredient in a meal"
-  },
-  "unit": "Unidade",
-  "@unit": {
-    "description": "The unit used for a repetition (kg, time, etc.)"
-  },
-  "newEntry": "Nova entrada",
-  "@newEntry": {
-    "description": "Title when adding a new entry such as a weight or log entry"
-  },
-  "loadingText": "Carregando...",
-  "@loadingText": {
-    "description": "Text to show when entries are being loaded in the background: Loading..."
-  },
-  "delete": "Deletar",
-  "@delete": {},
-  "newNutritionalPlan": "Novo plano nutricional",
-  "@newNutritionalPlan": {},
-  "toggleDetails": "Alternar detalhes",
-  "@toggleDetails": {
-    "description": "Switch to toggle detail / overview"
-  },
-  "aboutDescription": "Obrigado por usar o wger! wger é um projeto colaborativo de código aberto, feito por entusiastas do fitness de todo o mundo.",
-  "@aboutDescription": {
-    "description": "Text in the about dialog"
-  },
-  "aboutSourceTitle": "Código fonte",
-  "@aboutSourceTitle": {
-    "description": "Title for source code section in the about dialog"
-  },
-  "aboutBugsTitle": "Tem um problema ou ideia?",
-  "@aboutBugsTitle": {
-    "description": "Title for bugs section in the about dialog"
-  },
-  "aboutContactUsTitle": "Diga oi!",
-  "@aboutContactUsTitle": {
-    "description": "Title for contact us section in the about dialog"
-  },
-  "aboutTranslationText": "Este aplicativo é traduzido em weblate. Se você também quiser ajudar, clique no link e comece a traduzir",
-  "@aboutTranslationText": {
-    "description": "Text for translation section in the about dialog"
-  },
-  "calendar": "Calendário",
-  "@calendar": {},
-  "goToToday": "Voltar para hoje",
-  "@goToToday": {
-    "description": "Label on button to jump back to 'today' in the calendar widget"
-  },
-  "enterValue": "por favor insira um valor",
-  "@enterValue": {
-    "description": "Error message when the user hasn't entered a value on a required field"
-  },
-  "nrOfSets": "Séries por exercício: {nrOfSets}",
-  "@nrOfSets": {
-    "description": "Label shown on the slider where the user selects the nr of sets",
-    "type": "text",
-    "placeholders": {
-      "nrOfSets": {}
-    }
-  },
-  "recentlyUsedIngredients": "Ingredientes adicionados recentemente",
-  "@recentlyUsedIngredients": {
-    "description": "A message when a user adds a new ingredient to a meal."
-  },
-  "selectImage": "Selecione uma imagem",
-  "@selectImage": {
-    "description": "Label and error message when the user hasn't selected an image to save"
-  },
-  "addImage": "Adicionar imagem",
-  "@addImage": {},
-  "dataCopied": "Dados copiados para nova entrada",
-  "@dataCopied": {
-    "description": "Snackbar message to show on copying data to a new log entry"
-  },
-  "appUpdateTitle": "Atualização necessária",
-  "@appUpdateTitle": {},
-  "appUpdateContent": "Esta versão do aplicativo não é compatível com o servidor, atualize seu aplicativo.",
-  "@appUpdateContent": {},
-  "login": "Entrar",
-  "@login": {
-    "description": "Text for login button"
-  },
-  "useCustomServer": "Usar servidor personalizado",
-  "@useCustomServer": {
-    "description": "Toggle button allowing users to switch between the default and a custom wger server"
-  },
-  "productNotFound": "Produto não encontrado",
-  "@productNotFound": {
-    "description": "Header label for dialog when product is not found with barcode"
-  },
-  "scanBarcode": "Digitalizar código de barras",
-  "@scanBarcode": {
-    "description": "Label for scan barcode button"
-  },
-  "register": "Registrar",
-  "@register": {
-    "description": "Text for registration button"
-  },
-  "useDefaultServer": "Usar servidor padrão",
-  "@useDefaultServer": {
-    "description": "Toggle button allowing users to switch between the default and a custom wger server"
-  },
-  "invalidUrl": "Por favor, insira um URL válido",
-  "@invalidUrl": {
-    "description": "Error message when the user enters an invalid URL, e.g. in the login form"
-  },
-  "username": "Nome do usuário",
-  "@username": {},
-  "notes": "Notas",
-  "@notes": {
-    "description": "Personal notes, e.g. for a workout session"
-  },
-  "customServerUrl": "URL da instância wger",
-  "@customServerUrl": {
-    "description": "Label in the form where the users can enter their own wger instance"
-  },
-  "reset": "Redefinir",
-  "@reset": {
-    "description": "Button text allowing the user to reset the entered values to the default"
-  },
-  "successfullySaved": "Salvou",
-  "@successfullySaved": {
-    "description": "Message when an item was successfully saved"
-  },
-  "registerInstead": "Não tem uma conta? Registre agora",
-  "@registerInstead": {},
-  "weightUnit": "Unidade de peso",
-  "@weightUnit": {},
-  "searchExercise": "Procurar exercício",
-  "@searchExercise": {
-    "description": "Label on set form. Selected exercises are added to the set"
-  },
-  "newWorkout": "Novo plano de treino",
-  "@newWorkout": {
-    "description": "Header when adding a new workout"
-  },
-  "plateCalculator": "Pratos",
-  "@plateCalculator": {
-    "description": "Label used for the plate calculator in the gym mode"
-  },
-  "musclesSecondary": "Músculos secundários",
-  "@musclesSecondary": {
-    "description": "secondary muscles trained by an exercise"
-  },
-  "reps": "Reps",
-  "@reps": {
-    "description": "Shorthand for repetitions, used when space constraints are tighter"
-  },
-  "impression": "Impressão",
-  "@impression": {
-    "description": "General impression (e.g. for a workout session) such as good, bad, etc."
-  },
-  "repetitionUnit": "Unidade de repetição",
-  "@repetitionUnit": {},
-  "dayDescriptionHelp": "Uma descrição do que é feito neste dia (por exemplo, 'dia de treino') ou quais partes do corpo são treinadas (por exemplo, 'peito e ombros')",
-  "@dayDescriptionHelp": {},
-  "setNr": "Set {nr}",
-  "@setNr": {
-    "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.",
-    "type": "text",
-    "placeholders": {
-      "nr": {}
-    }
-  },
-  "sameRepetitions": "Se você fizer as mesmas repetições e peso para todos os conjuntos, você pode preencher apenas uma linha. Por exemplo, para 4 séries, basta digitar 10 para as repetições, isso se torna automaticamente \"4 x 10\".",
-  "@sameRepetitions": {},
-  "gymMode": "Modo treino",
-  "@gymMode": {
-    "description": "Label when starting the gym mode"
-  },
-  "logHelpEntries": "Se em um mesmo dia houver mais de uma entrada com o mesmo número de repetições, mas com pesos diferentes, apenas a entrada com maior peso é mostrada no gráfico.",
-  "@logHelpEntries": {},
-  "description": "Descrição",
-  "@description": {},
-  "workoutSession": "Sessão de treino",
-  "@workoutSession": {
-    "description": "A (logged) workout session"
-  },
-  "measurements": "Medidas",
-  "@measurements": {
-    "description": "Categories for the measurements such as biceps size, body fat, etc."
-  },
-  "energyShort": "E",
-  "@energyShort": {
-    "description": "The first letter or short name of the word 'Energy', used in overviews"
-  },
-  "plateCalculatorNotDivisible": "Não é possível atingir o peso com as placas disponíveis",
-  "@plateCalculatorNotDivisible": {
-    "description": "Error message when the current weight is not reachable with plates (e.g. 33.1 kg)"
-  },
-  "pause": "Pausar",
-  "@pause": {
-    "description": "Noun, not an imperative! Label used for the pause when using the gym mode"
-  },
-  "saturatedFat": "Gordura saturada",
-  "@saturatedFat": {},
-  "aboutContactUsText": "Se você quiser conversar conosco, entre no servidor Discord e entre em contato",
-  "@aboutContactUsText": {
-    "description": "Text for contact us section in the about dialog"
-  },
-  "jumpTo": "Pular",
-  "@jumpTo": {
-    "description": "Imperative. Label used in popup allowing the user to jump to a specific exercise while in the gym mode"
-  },
-  "logMeal": "Registrar esta refeição",
-  "@logMeal": {},
-  "measurementCategoriesHelpText": "Categoria de medição, como 'bíceps' ou 'gordura corporal'",
-  "@measurementCategoriesHelpText": {},
-  "logHelpEntriesUnits": "Observe que apenas as entradas com uma unidade de peso (kg ou lb) e repetições são registradas, outras combinações como tempo ou até falha são ignoradas aqui.",
-  "@logHelpEntriesUnits": {},
-  "searchIngredient": "Procurar ingrediente",
-  "@searchIngredient": {
-    "description": "Label on ingredient search form"
-  },
-  "nutritionalPlan": "Plano nutricional",
-  "@nutritionalPlan": {},
-  "name": "Nome",
-  "@name": {
-    "description": "Name for a workout or nutritional plan"
-  },
-  "save": "Salvar",
-  "@save": {},
-  "mealLogged": "Refeição registrada no gráfico",
-  "@mealLogged": {},
-  "noNutritionalPlans": "Você não tem planos nutricionais",
-  "@noNutritionalPlans": {
-    "description": "Message shown when the user has no nutritional plans"
-  },
-  "goToDetailPage": "Ir para a página de detalhes",
-  "@goToDetailPage": {},
-  "aboutTranslationTitle": "Tradução",
-  "@aboutTranslationTitle": {
-    "description": "Title for translation section in the about dialog"
-  },
-  "anErrorOccurred": "Um erro ocorreu!",
-  "@anErrorOccurred": {},
-  "start": "Iniciar",
-  "@start": {
-    "description": "Label on button to start the gym mode (i.e., an imperative)"
-  },
-  "measurementEntriesHelpText": "A unidade usada para medir a categoria, como 'cm' ou '%'",
-  "@measurementEntriesHelpText": {},
-  "time": "Tempo",
-  "@time": {
-    "description": "The time of a meal or workout"
-  },
-  "ingredient": "Ingrediente",
-  "@ingredient": {},
-  "percentEnergy": "Porcentagem de energia",
-  "@percentEnergy": {},
-  "kcal": "kcal",
-  "@kcal": {
-    "description": "Energy in a meal in kilocalories, kcal"
-  },
-  "logged": "Registrado",
-  "@logged": {
-    "description": "Header for the column of 'logged' nutritional values, i.e. what was eaten"
-  },
-  "difference": "Diferença",
-  "@difference": {},
-  "total": "Total",
-  "@total": {
-    "description": "Label used for total sums of e.g. calories or similar"
-  },
-  "proteinShort": "p",
-  "@proteinShort": {
-    "description": "The first letter or short name of the word 'Protein', used in overviews"
-  },
-  "kJ": "kJ",
-  "@kJ": {
-    "description": "Energy in a meal in kilo joules, kJ"
-  },
-  "g": "g",
-  "@g": {
-    "description": "Abbreviation for gram"
-  },
-  "protein": "Proteína",
-  "@protein": {},
-  "sugars": "Açúcares",
-  "@sugars": {},
-  "fat": "Gordura",
-  "@fat": {},
-  "fatShort": "G",
-  "@fatShort": {
-    "description": "The first letter or short name of the word 'Fat', used in overviews"
-  },
-  "noWeightEntries": "Você não tem entradas de peso",
-  "@noWeightEntries": {
-    "description": "Message shown when the user has no logged weight entries"
-  },
-  "aboutBugsText": "Entre em contato se algo não se comportar conforme o esperado ou se houver um recurso que você sente que está faltando.",
-  "@aboutBugsText": {
-    "description": "Text for bugs section in the about dialog"
-  },
-  "enterValidNumber": "Por favor insira um número válido",
-  "@enterValidNumber": {
-    "description": "Error message when the user has submitted an invalid number (e.g. '3,.,.,.')"
-  },
-  "selectIngredient": "Selecione um ingrediente",
-  "@selectIngredient": {
-    "description": "Error message when the user hasn't selected an ingredient from the autocompleter"
-  },
-  "edit": "Editar",
-  "@edit": {},
-  "confirmDelete": "Tem certeza que deseja excluir '{toDelete}'?",
-  "@confirmDelete": {
-    "description": "Confirmation text before the user deletes an object",
-    "type": "text",
-    "placeholders": {
-      "toDelete": {}
-    }
-  },
-  "aboutSourceText": "Obtenha o código fonte deste aplicativo e seu servidor no github",
-  "@aboutSourceText": {
-    "description": "Text for source code section in the about dialog"
-  },
-  "enterRepetitionsOrWeight": "Por favor, preencha as repetições ou o peso para pelo menos um dos conjuntos",
-  "@enterRepetitionsOrWeight": {
-    "description": "Error message when the user hasn't filled in the forms for exercise sets"
-  },
-  "setUnitsAndRir": "Definir unidades e ReR",
-  "@setUnitsAndRir": {
-    "description": "Label shown on the slider where the user can toggle showing units and RiR",
-    "type": "text"
-  },
-  "productFound": "Produto encontrado",
-  "@productFound": {
-    "description": "Header label for dialog when product is found with barcode"
-  },
-  "productNotFoundDescription": "O produto com o código de barras digitalizado {barcode} não foi encontrado no banco de dados",
-  "@productNotFoundDescription": {
-    "description": "Dialog info when product is not found with barcode",
-    "type": "text",
-    "placeholders": {
-      "barcode": {}
-    }
-  },
-  "selectExercise": "Selecione um exercício",
-  "@selectExercise": {
-    "description": "Error message when the user hasn't selected an exercise in the form"
-  },
-  "enterCharacters": "Insira entre {min} e {max} caracteres",
-  "@enterCharacters": {
-    "description": "Error message when the user hasn't entered the correct number of characters in a form",
-    "type": "text",
-    "placeholders": {
-      "min": {},
-      "max": {}
-    }
-  },
-  "optionsLabel": "Opções",
-  "@optionsLabel": {
-    "description": "Label for the popup with general app options"
-  },
-  "productFoundDescription": "O código de barras corresponde a este produto: {productName}. Você quer continuar?",
-  "@productFoundDescription": {
-    "description": "Dialog info when product is found with barcode",
-    "type": "text",
-    "placeholders": {
-      "productName": {}
-    }
-  },
-  "alsoKnownAs": "Também chamado de: {aliases}",
-  "@alsoKnownAs": {
-    "placeholders": {
-      "aliases": {}
+    "logout": "Sair",
+    "@logout": {
+        "description": "Text for logout button"
     },
-    "description": "List of alternative names for an exercise"
-  },
-  "verifiedEmail": "Email verificado",
-  "@verifiedEmail": {},
-  "unVerifiedEmail": "Verificação pendente",
-  "@unVerifiedEmail": {},
-  "verifiedEmailReason": "É necessário verificar seu email para contribuir com exercícios",
-  "@verifiedEmailReason": {},
-  "verifiedEmailInfo": "Um email de verificação foi enviado para {email}",
-  "@verifiedEmailInfo": {
-    "placeholders": {
-      "email": {}
-    }
-  },
-  "close": "Fechar",
-  "@close": {
-    "description": "Translation for close"
-  },
-  "variations": "Variações",
-  "@variations": {
-    "description": "Variations of one exercise (e.g. benchpress and benchpress narrow)"
-  },
-  "oneNamePerLine": "Somente um nome por linha",
-  "@oneNamePerLine": {},
-  "whatVariationsExist": "Se houver alguma, quais as possíveis variações para esse exercício?",
-  "@whatVariationsExist": {},
-  "takePicture": "Tirar uma foto",
-  "@takePicture": {},
-  "chooseFromLibrary": "Escolher da galeria",
-  "@chooseFromLibrary": {},
-  "gallery": "Galeria de fotos",
-  "@gallery": {},
-  "addExercise": "Adicionar exercício",
-  "@addExercise": {},
-  "translation": "Tradução",
-  "@translation": {},
-  "translateExercise": "Traduzir este exercício",
-  "@translateExercise": {},
-  "alternativeNames": "Outros nomes",
-  "@alternativeNames": {},
-  "images": "Imagens",
-  "@images": {},
-  "language": "Idioma",
-  "@language": {},
-  "previous": "Anterior",
-  "@previous": {},
-  "next": "Próximo",
-  "@next": {},
-  "minutes": "Minutos",
-  "@minutes": {},
-  "seconds": "Segundos",
-  "@seconds": {},
-  "until_failure": "Até a falha",
-  "@until_failure": {},
-  "kilometers": "Quilômetros",
-  "@kilometers": {},
-  "glutes": "Glúteos",
-  "@glutes": {},
-  "bench": "Supino",
-  "@bench": {},
-  "barbell": "Barra",
-  "@barbell": {},
-  "triceps": "Tríceps",
-  "@triceps": {},
-  "biceps": "Bíceps",
-  "@biceps": {},
-  "dumbbell": "Haltere",
-  "@dumbbell": {},
-  "abs": "Abdominal",
-  "@abs": {},
-  "chest": "Peito",
-  "@chest": {},
-  "shoulders": "Ombro",
-  "@shoulders": {},
-  "gym_mat": "Colchonete",
-  "@gym_mat": {},
-  "incline_bench": "Supino inclinado",
-  "@incline_bench": {},
-  "calves": "Panturrilha",
-  "@calves": {},
-  "legs": "Pernas",
-  "@legs": {},
-  "lats": "Dorsal",
-  "@lats": {},
-  "quads": "Quadríceps",
-  "@quads": {},
-  "hamstrings": "Posterior de coxa",
-  "@hamstrings": {},
-  "arms": "Braços",
-  "@arms": {},
-  "pull_up_bar": "Barra fixa",
-  "@pull_up_bar": {},
-  "lower_back": "Lombar",
-  "@lower_back": {},
-  "swiss_ball": "Bola suíça",
-  "@swiss_ball": {},
-  "kettlebell": "Kettlebell",
-  "@kettlebell": {},
-  "none__bodyweight_exercise_": "nenhum (somente peso do corpo)",
-  "@none__bodyweight_exercise_": {},
-  "aboutPageTitle": "Sobre Wger",
-  "@aboutPageTitle": {},
-  "enterMinCharacters": "Por favor, selecione ao menos {min} de caracteres",
-  "@enterMinCharacters": {
-    "description": "Error message when the user hasn't entered the minimum amount characters in a form",
-    "type": "text",
-    "placeholders": {
-      "min": {}
-    }
-  },
-  "baseNameEnglish": "Todos os exercícios precisam de um nome base em inglês",
-  "@baseNameEnglish": {},
-  "miles": "Milhas",
-  "@miles": {},
-  "noMeasurementEntries": "Você não tem entradas de medição",
-  "@noMeasurementEntries": {},
-  "moreMeasurementEntries": "Adicionar nova medição",
-  "@moreMeasurementEntries": {
-    "description": "Message shown when the user wants to add new measurement"
-  },
-  "contributeExercise": "Contribua um exercício",
-  "@contributeExercise": {},
-  "baseData": "Básico em inglês",
-  "@baseData": {
-    "description": "The base data for an exercise such as category, trained muscles, etc."
-  },
-  "sz_bar": "Barra SZ",
-  "@sz_bar": {},
-  "back": "Costas",
-  "@back": {},
-  "userProfile": "Seu perfil",
-  "@userProfile": {},
-  "exercises": "Exercícios",
-  "@exercises": {
-    "description": "Multiple exercises for a workout"
-  },
-  "exerciseList": "Lista de Exercício",
-  "@exerciseList": {},
-  "exerciseName": "Nome do exercício",
-  "@exerciseName": {
-    "description": "Label for the name of a workout exercise"
-  },
-  "add_exercise_image_license": "As imagens devem ser compatíveis com a licença CC BY SA. Em caso de dúvida, carregue apenas fotos que você mesmo tirou.",
-  "@add_exercise_image_license": {},
-  "selectEntry": "Por favor selecione uma entrada",
-  "@selectEntry": {},
-  "cacheWarning": "Devido ao caching, pode levar algum tempo até que as alterações sejam visíveis em todo o aplicativo.",
-  "@cacheWarning": {},
-  "success": "Sucesso",
-  "@success": {
-    "description": "Message when an action completed successfully, usually used as a heading"
-  },
-  "contributeExerciseWarning": "Você só pode contribuir com exercícios se sua conta tiver mais de {days} dias e tiver verificado seu e-mail",
-  "@contributeExerciseWarning": {
-    "description": "Number of days before which a person can add exercise",
-    "placeholders": {
-      "days": {
-        "type": "String",
-        "example": "14"
-      }
-    }
-  },
-  "cardio": "Cardio",
-  "@cardio": {},
-  "textPromptTitle": "Podemos começar?",
-  "@textPromptTitle": {},
-  "textPromptSubheading": "Aperte o botão de ação para começar",
-  "@textPromptSubheading": {},
-  "body_weight": "Peso Corporal",
-  "@body_weight": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "kilometers_per_hour": "Quilômetros Por Hora",
-  "@kilometers_per_hour": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "miles_per_hour": "Milhas por Hora",
-  "@miles_per_hour": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "plates": "Pratos",
-  "@plates": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "kg": "kg",
-  "@kg": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "lb": "lb",
-  "@lb": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "searchNamesInEnglish": "Também buscar nomes em inglês",
-  "@searchNamesInEnglish": {},
-  "verify": "Verificar",
-  "@verify": {},
-  "max_reps": "Repetição Máxima",
-  "@max_reps": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "settingsCacheTitle": "Cache",
-  "@settingsCacheTitle": {},
-  "settingsExerciseCacheDescription": "Cache do exercício",
-  "@settingsExerciseCacheDescription": {},
-  "useMetric": "Use unidades métricas para o peso corpora",
-  "@useMetric": {},
-  "settingsTitle": "Configurações",
-  "@settingsTitle": {},
-  "settingsCacheDeletedSnackbar": "Cache limpo com sucesso",
-  "@settingsCacheDeletedSnackbar": {},
-  "log": "Log",
-  "@log": {
-    "description": "Log a specific meal (imperative form)"
-  },
-  "done": "Feito",
-  "@done": {},
-  "noMatchingExerciseFound": "Nenhum exercício correspondente encontrado",
-  "@noMatchingExerciseFound": {
-    "description": "Message returned if no exercises match the searched string"
-  },
-  "aboutMastodonTitle": "Mastodon",
-  "@aboutMastodonTitle": {
-    "description": "Title for mastodon section in the about dialog"
-  },
-  "aboutMastodonText": "Siga-nos no Mastodon para atualizações e notícias sobre o projeto",
-  "@aboutMastodonText": {
-    "description": "Text for the mastodon section in the about dialog"
-  },
-  "aboutDonateTitle": "Doar",
-  "@aboutDonateTitle": {},
-  "aboutDonateText": "Nos compre um café para ajudar o projeto, pagar os custos do servidor e nos manter energizados",
-  "@aboutDonateText": {}
+    "usernameValidChars": "Um nome de usuário pode conter apenas letras, dígitos e os caracteres @, +, ., - e _",
+    "@usernameValidChars": {
+        "description": "Error message when the user tries to register a username with forbidden characters"
+    },
+    "passwordsDontMatch": "As senhas não correspondem",
+    "@passwordsDontMatch": {
+        "description": "Error message when the user enters two different passwords during registration"
+    },
+    "passwordTooShort": "A senha é muito curta",
+    "@passwordTooShort": {
+        "description": "Error message when the user a password that is too short"
+    },
+    "password": "Senha",
+    "@password": {},
+    "confirmPassword": "Confirmar senha",
+    "@confirmPassword": {},
+    "invalidEmail": "Por favor insira um endereço de e-mail válido",
+    "@invalidEmail": {
+        "description": "Error message when the user enters an invalid email"
+    },
+    "email": "Endereço de e-mail",
+    "@email": {},
+    "invalidUsername": "Insira um nome de usuário válido",
+    "@invalidUsername": {
+        "description": "Error message when the user enters an invalid username"
+    },
+    "customServerHint": "Digite o endereço do seu próprio servidor, ou então o padrão será usado",
+    "@customServerHint": {
+        "description": "Hint text for the form where the users can enter their own wger instance"
+    },
+    "loginInstead": "Já tem uma conta? Faça login",
+    "@loginInstead": {},
+    "labelBottomNavWorkout": "Treino",
+    "@labelBottomNavWorkout": {
+        "description": "Label used in bottom navigation, use a short word"
+    },
+    "labelBottomNavNutrition": "Nutrição",
+    "@labelBottomNavNutrition": {
+        "description": "Label used in bottom navigation, use a short word"
+    },
+    "labelWorkoutLogs": "Registros de treinamento",
+    "@labelWorkoutLogs": {
+        "description": "(Workout) logs"
+    },
+    "labelWorkoutPlan": "Plano de treino",
+    "@labelWorkoutPlan": {
+        "description": "Title for screen workout plan"
+    },
+    "labelDashboard": "Painel",
+    "@labelDashboard": {
+        "description": "Title for screen dashboard"
+    },
+    "successfullyDeleted": "Excluído",
+    "@successfullyDeleted": {
+        "description": "Message when an item was successfully deleted"
+    },
+    "exercise": "Exercício",
+    "@exercise": {
+        "description": "An exercise for a workout"
+    },
+    "equipment": "Equipamento",
+    "@equipment": {
+        "description": "Equipment needed to perform an exercise"
+    },
+    "muscles": "Músculos",
+    "@muscles": {
+        "description": "(main) muscles trained by an exercise"
+    },
+    "category": "Categoria",
+    "@category": {
+        "description": "Category for an exercise, ingredient, etc."
+    },
+    "repetitions": "Repetições",
+    "@repetitions": {
+        "description": "Repetitions for an exercise set"
+    },
+    "rir": "ReR",
+    "@rir": {
+        "description": "Shorthand for Repetitions In Reserve"
+    },
+    "rirNotUsed": "ReR não utilizado",
+    "@rirNotUsed": {
+        "description": "Label used in RiR slider when the RiR value is not used/saved for the current setting or log"
+    },
+    "set": "Set",
+    "@set": {
+        "description": "A set in a workout plan"
+    },
+    "comment": "Comentário",
+    "@comment": {
+        "description": "Comment, additional information"
+    },
+    "newDay": "Novo dia",
+    "@newDay": {},
+    "newSet": "Novo set",
+    "@newSet": {
+        "description": "Header when adding a new set to a workout day"
+    },
+    "selectExercises": "Se você quiser fazer um conjunto, você pode procurar vários exercícios, eles serão agrupados",
+    "@selectExercises": {},
+    "todaysWorkout": "Seu treino hoje",
+    "@todaysWorkout": {},
+    "addSet": "Adicionar set",
+    "@addSet": {
+        "description": "Label for the button that adds a set (to a workout day)"
+    },
+    "addMeal": "Adicionar refeição",
+    "@addMeal": {},
+    "addIngredient": "Adicionar ingrediente",
+    "@addIngredient": {},
+    "logIngredient": "Registar ingrediente no diário de nutrição",
+    "@logIngredient": {},
+    "nutritionalDiary": "Gráfico nutricional",
+    "@nutritionalDiary": {},
+    "nutritionalPlans": "Planos nutricionais",
+    "@nutritionalPlans": {},
+    "weight": "Peso",
+    "@weight": {
+        "description": "The weight of a workout log or body weight entry"
+    },
+    "measurement": "Medição",
+    "@measurement": {},
+    "date": "Data",
+    "@date": {
+        "description": "The date of a workout log or body weight entry"
+    },
+    "value": "Valor",
+    "@value": {
+        "description": "The value of a measurement entry"
+    },
+    "timeStart": "Hora de início",
+    "@timeStart": {
+        "description": "The starting time of a workout"
+    },
+    "timeEnd": "Hora do final",
+    "@timeEnd": {
+        "description": "The end time of a workout"
+    },
+    "timeStartAhead": "A hora de início não pode ser anterior à hora de término",
+    "@timeStartAhead": {},
+    "energy": "Energia",
+    "@energy": {
+        "description": "Energy in a meal, ingredient etc. e.g. in kJ"
+    },
+    "macronutrients": "Macronutrientes",
+    "@macronutrients": {},
+    "planned": "Planejado",
+    "@planned": {
+        "description": "Header for the column of 'planned' nutritional values, i.e. what should be eaten"
+    },
+    "weekAverage": "Média dos 7 dias",
+    "@weekAverage": {
+        "description": "Header for the column of '7 day average' nutritional values, i.e. what was logged last week"
+    },
+    "gPerBodyKg": "g por kg",
+    "@gPerBodyKg": {
+        "description": "Label used for total sums of e.g. calories or similar in grams per Kg of body weight"
+    },
+    "carbohydrates": "Carboidratos",
+    "@carbohydrates": {},
+    "carbohydratesShort": "C",
+    "@carbohydratesShort": {
+        "description": "The first letter or short name of the word 'Carbohydrates', used in overviews"
+    },
+    "fiber": "Fibra",
+    "@fiber": {},
+    "sodium": "Sódio",
+    "@sodium": {},
+    "amount": "Quantidade",
+    "@amount": {
+        "description": "The amount (e.g. in grams) of an ingredient in a meal"
+    },
+    "unit": "Unidade",
+    "@unit": {
+        "description": "The unit used for a repetition (kg, time, etc.)"
+    },
+    "newEntry": "Nova entrada",
+    "@newEntry": {
+        "description": "Title when adding a new entry such as a weight or log entry"
+    },
+    "loadingText": "Carregando...",
+    "@loadingText": {
+        "description": "Text to show when entries are being loaded in the background: Loading..."
+    },
+    "delete": "Deletar",
+    "@delete": {},
+    "newNutritionalPlan": "Novo plano nutricional",
+    "@newNutritionalPlan": {},
+    "toggleDetails": "Alternar detalhes",
+    "@toggleDetails": {
+        "description": "Switch to toggle detail / overview"
+    },
+    "aboutDescription": "Obrigado por usar o wger! wger é um projeto colaborativo de código aberto, feito por entusiastas do fitness de todo o mundo.",
+    "@aboutDescription": {
+        "description": "Text in the about dialog"
+    },
+    "calendar": "Calendário",
+    "@calendar": {},
+    "goToToday": "Voltar para hoje",
+    "@goToToday": {
+        "description": "Label on button to jump back to 'today' in the calendar widget"
+    },
+    "enterValue": "por favor insira um valor",
+    "@enterValue": {
+        "description": "Error message when the user hasn't entered a value on a required field"
+    },
+    "nrOfSets": "Séries por exercício: {nrOfSets}",
+    "@nrOfSets": {
+        "description": "Label shown on the slider where the user selects the nr of sets",
+        "type": "text",
+        "placeholders": {
+            "nrOfSets": {
+                "type": "String"
+            }
+        }
+    },
+    "recentlyUsedIngredients": "Ingredientes adicionados recentemente",
+    "@recentlyUsedIngredients": {
+        "description": "A message when a user adds a new ingredient to a meal."
+    },
+    "selectImage": "Selecione uma imagem",
+    "@selectImage": {
+        "description": "Label and error message when the user hasn't selected an image to save"
+    },
+    "addImage": "Adicionar imagem",
+    "@addImage": {},
+    "dataCopied": "Dados copiados para nova entrada",
+    "@dataCopied": {
+        "description": "Snackbar message to show on copying data to a new log entry"
+    },
+    "appUpdateTitle": "Atualização necessária",
+    "@appUpdateTitle": {},
+    "appUpdateContent": "Esta versão do aplicativo não é compatível com o servidor, atualize seu aplicativo.",
+    "@appUpdateContent": {},
+    "login": "Entrar",
+    "@login": {
+        "description": "Text for login button"
+    },
+    "useCustomServer": "Usar servidor personalizado",
+    "@useCustomServer": {
+        "description": "Toggle button allowing users to switch between the default and a custom wger server"
+    },
+    "productNotFound": "Produto não encontrado",
+    "@productNotFound": {
+        "description": "Header label for dialog when product is not found with barcode"
+    },
+    "scanBarcode": "Digitalizar código de barras",
+    "@scanBarcode": {
+        "description": "Label for scan barcode button"
+    },
+    "register": "Registrar",
+    "@register": {
+        "description": "Text for registration button"
+    },
+    "useDefaultServer": "Usar servidor padrão",
+    "@useDefaultServer": {
+        "description": "Toggle button allowing users to switch between the default and a custom wger server"
+    },
+    "invalidUrl": "Por favor, insira um URL válido",
+    "@invalidUrl": {
+        "description": "Error message when the user enters an invalid URL, e.g. in the login form"
+    },
+    "username": "Nome do usuário",
+    "@username": {},
+    "notes": "Notas",
+    "@notes": {
+        "description": "Personal notes, e.g. for a workout session"
+    },
+    "customServerUrl": "URL da instância wger",
+    "@customServerUrl": {
+        "description": "Label in the form where the users can enter their own wger instance"
+    },
+    "reset": "Redefinir",
+    "@reset": {
+        "description": "Button text allowing the user to reset the entered values to the default"
+    },
+    "successfullySaved": "Salvou",
+    "@successfullySaved": {
+        "description": "Message when an item was successfully saved"
+    },
+    "registerInstead": "Não tem uma conta? Registre agora",
+    "@registerInstead": {},
+    "weightUnit": "Unidade de peso",
+    "@weightUnit": {},
+    "searchExercise": "Procurar exercício",
+    "@searchExercise": {
+        "description": "Label on set form. Selected exercises are added to the set"
+    },
+    "plateCalculator": "Pratos",
+    "@plateCalculator": {
+        "description": "Label used for the plate calculator in the gym mode"
+    },
+    "musclesSecondary": "Músculos secundários",
+    "@musclesSecondary": {
+        "description": "secondary muscles trained by an exercise"
+    },
+    "reps": "Reps",
+    "@reps": {
+        "description": "Shorthand for repetitions, used when space constraints are tighter"
+    },
+    "impression": "Impressão",
+    "@impression": {
+        "description": "General impression (e.g. for a workout session) such as good, bad, etc."
+    },
+    "repetitionUnit": "Unidade de repetição",
+    "@repetitionUnit": {},
+    "dayDescriptionHelp": "Uma descrição do que é feito neste dia (por exemplo, 'dia de treino') ou quais partes do corpo são treinadas (por exemplo, 'peito e ombros')",
+    "@dayDescriptionHelp": {},
+    "setNr": "Set {nr}",
+    "@setNr": {
+        "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.",
+        "type": "text",
+        "placeholders": {
+            "nr": {
+                "type": "String"
+            }
+        }
+    },
+    "sameRepetitions": "Se você fizer as mesmas repetições e peso para todos os conjuntos, você pode preencher apenas uma linha. Por exemplo, para 4 séries, basta digitar 10 para as repetições, isso se torna automaticamente \"4 x 10\".",
+    "@sameRepetitions": {},
+    "gymMode": "Modo treino",
+    "@gymMode": {
+        "description": "Label when starting the gym mode"
+    },
+    "logHelpEntries": "Se em um mesmo dia houver mais de uma entrada com o mesmo número de repetições, mas com pesos diferentes, apenas a entrada com maior peso é mostrada no gráfico.",
+    "@logHelpEntries": {},
+    "description": "Descrição",
+    "@description": {},
+    "workoutSession": "Sessão de treino",
+    "@workoutSession": {
+        "description": "A (logged) workout session"
+    },
+    "measurements": "Medidas",
+    "@measurements": {
+        "description": "Categories for the measurements such as biceps size, body fat, etc."
+    },
+    "energyShort": "E",
+    "@energyShort": {
+        "description": "The first letter or short name of the word 'Energy', used in overviews"
+    },
+    "plateCalculatorNotDivisible": "Não é possível atingir o peso com as placas disponíveis",
+    "@plateCalculatorNotDivisible": {
+        "description": "Error message when the current weight is not reachable with plates (e.g. 33.1 kg)"
+    },
+    "pause": "Pausar",
+    "@pause": {
+        "description": "Noun, not an imperative! Label used for the pause when using the gym mode"
+    },
+    "saturatedFat": "Gordura saturada",
+    "@saturatedFat": {},
+    "jumpTo": "Pular",
+    "@jumpTo": {
+        "description": "Imperative. Label used in popup allowing the user to jump to a specific exercise while in the gym mode"
+    },
+    "logMeal": "Registar esta refeição no diário de nutrição",
+    "@logMeal": {},
+    "measurementCategoriesHelpText": "Categoria de medição, como 'bíceps' ou 'gordura corporal'",
+    "@measurementCategoriesHelpText": {},
+    "logHelpEntriesUnits": "Observe que apenas as entradas com uma unidade de peso (kg ou lb) e repetições são registradas, outras combinações como tempo ou até falha são ignoradas aqui.",
+    "@logHelpEntriesUnits": {},
+    "searchIngredient": "Procurar ingrediente",
+    "@searchIngredient": {
+        "description": "Label on ingredient search form"
+    },
+    "nutritionalPlan": "Plano nutricional",
+    "@nutritionalPlan": {},
+    "name": "Nome",
+    "@name": {
+        "description": "Name for a workout or nutritional plan"
+    },
+    "save": "Salvar",
+    "@save": {},
+    "mealLogged": "Refeição registrada no gráfico",
+    "@mealLogged": {},
+    "noNutritionalPlans": "Você não tem planos nutricionais",
+    "@noNutritionalPlans": {
+        "description": "Message shown when the user has no nutritional plans"
+    },
+    "goToDetailPage": "Ir para a página de detalhes",
+    "@goToDetailPage": {},
+    "anErrorOccurred": "Um erro ocorreu!",
+    "@anErrorOccurred": {},
+    "start": "Iniciar",
+    "@start": {
+        "description": "Label on button to start the gym mode (i.e., an imperative)"
+    },
+    "measurementEntriesHelpText": "A unidade usada para medir a categoria, como 'cm' ou '%'",
+    "@measurementEntriesHelpText": {},
+    "time": "Tempo",
+    "@time": {
+        "description": "The time of a meal or workout"
+    },
+    "ingredient": "Ingrediente",
+    "@ingredient": {},
+    "percentEnergy": "Porcentagem de energia",
+    "@percentEnergy": {},
+    "kcal": "kcal",
+    "@kcal": {
+        "description": "Energy in a meal in kilocalories, kcal"
+    },
+    "logged": "Registrado",
+    "@logged": {
+        "description": "Header for the column of 'logged' nutritional values, i.e. what was eaten"
+    },
+    "difference": "Diferença",
+    "@difference": {},
+    "total": "Total",
+    "@total": {
+        "description": "Label used for total sums of e.g. calories or similar"
+    },
+    "proteinShort": "p",
+    "@proteinShort": {
+        "description": "The first letter or short name of the word 'Protein', used in overviews"
+    },
+    "kJ": "kJ",
+    "@kJ": {
+        "description": "Energy in a meal in kilo joules, kJ"
+    },
+    "g": "g",
+    "@g": {
+        "description": "Abbreviation for gram"
+    },
+    "protein": "Proteína",
+    "@protein": {},
+    "sugars": "Açúcares",
+    "@sugars": {},
+    "fat": "Gordura",
+    "@fat": {},
+    "fatShort": "G",
+    "@fatShort": {
+        "description": "The first letter or short name of the word 'Fat', used in overviews"
+    },
+    "noWeightEntries": "Você não tem entradas de peso",
+    "@noWeightEntries": {
+        "description": "Message shown when the user has no logged weight entries"
+    },
+    "enterValidNumber": "Por favor insira um número válido",
+    "@enterValidNumber": {
+        "description": "Error message when the user has submitted an invalid number (e.g. '3,.,.,.')"
+    },
+    "selectIngredient": "Selecione um ingrediente",
+    "@selectIngredient": {
+        "description": "Error message when the user hasn't selected an ingredient from the autocompleter"
+    },
+    "edit": "Editar",
+    "@edit": {},
+    "confirmDelete": "Tem certeza que deseja excluir '{toDelete}'?",
+    "@confirmDelete": {
+        "description": "Confirmation text before the user deletes an object",
+        "type": "text",
+        "placeholders": {
+            "toDelete": {
+                "type": "String"
+            }
+        }
+    },
+    "setUnitsAndRir": "Definir unidades e ReR",
+    "@setUnitsAndRir": {
+        "description": "Label shown on the slider where the user can toggle showing units and RiR",
+        "type": "text"
+    },
+    "productFound": "Produto encontrado",
+    "@productFound": {
+        "description": "Header label for dialog when product is found with barcode"
+    },
+    "productNotFoundDescription": "O produto com o código de barras digitalizado {barcode} não foi encontrado no banco de dados",
+    "@productNotFoundDescription": {
+        "description": "Dialog info when product is not found with barcode",
+        "type": "text",
+        "placeholders": {
+            "barcode": {
+                "type": "String"
+            }
+        }
+    },
+    "selectExercise": "Selecione um exercício",
+    "@selectExercise": {
+        "description": "Error message when the user hasn't selected an exercise in the form"
+    },
+    "enterCharacters": "Insira entre {min} e {max} caracteres",
+    "@enterCharacters": {
+        "description": "Error message when the user hasn't entered the correct number of characters in a form",
+        "type": "text",
+        "placeholders": {
+            "min": {
+                "type": "String"
+            },
+            "max": {
+                "type": "String"
+            }
+        }
+    },
+    "optionsLabel": "Opções",
+    "@optionsLabel": {
+        "description": "Label for the popup with general app options"
+    },
+    "productFoundDescription": "O código de barras corresponde a este produto: {productName}. Você quer continuar?",
+    "@productFoundDescription": {
+        "description": "Dialog info when product is found with barcode",
+        "type": "text",
+        "placeholders": {
+            "productName": {
+                "type": "String"
+            }
+        }
+    },
+    "alsoKnownAs": "Também chamado de: {aliases}",
+    "@alsoKnownAs": {
+        "placeholders": {
+            "aliases": {
+                "type": "String"
+            }
+        },
+        "description": "List of alternative names for an exercise"
+    },
+    "verifiedEmail": "Email verificado",
+    "@verifiedEmail": {},
+    "unVerifiedEmail": "Verificação pendente",
+    "@unVerifiedEmail": {},
+    "verifiedEmailReason": "É necessário verificar seu email para contribuir com exercícios",
+    "@verifiedEmailReason": {},
+    "verifiedEmailInfo": "Um email de verificação foi enviado para {email}",
+    "@verifiedEmailInfo": {
+        "placeholders": {
+            "email": {
+                "type": "String"
+            }
+        }
+    },
+    "close": "Fechar",
+    "@close": {
+        "description": "Translation for close"
+    },
+    "variations": "Variações",
+    "@variations": {
+        "description": "Variations of one exercise (e.g. benchpress and benchpress narrow)"
+    },
+    "oneNamePerLine": "Somente um nome por linha",
+    "@oneNamePerLine": {},
+    "whatVariationsExist": "Se houver alguma, quais as possíveis variações para esse exercício?",
+    "@whatVariationsExist": {},
+    "takePicture": "Tirar uma foto",
+    "@takePicture": {},
+    "chooseFromLibrary": "Escolher da galeria",
+    "@chooseFromLibrary": {},
+    "gallery": "Galeria de fotos",
+    "@gallery": {},
+    "addExercise": "Adicionar exercício",
+    "@addExercise": {},
+    "translation": "Tradução",
+    "@translation": {},
+    "translateExercise": "Traduzir este exercício",
+    "@translateExercise": {},
+    "alternativeNames": "Outros nomes",
+    "@alternativeNames": {},
+    "images": "Imagens",
+    "@images": {},
+    "language": "Idioma",
+    "@language": {},
+    "previous": "Anterior",
+    "@previous": {},
+    "next": "Próximo",
+    "@next": {},
+    "minutes": "Minutos",
+    "@minutes": {},
+    "seconds": "Segundos",
+    "@seconds": {},
+    "until_failure": "Até a falha",
+    "@until_failure": {},
+    "kilometers": "Quilômetros",
+    "@kilometers": {},
+    "glutes": "Glúteos",
+    "@glutes": {},
+    "bench": "Supino",
+    "@bench": {},
+    "barbell": "Barra",
+    "@barbell": {},
+    "triceps": "Tríceps",
+    "@triceps": {},
+    "biceps": "Bíceps",
+    "@biceps": {},
+    "dumbbell": "Haltere",
+    "@dumbbell": {},
+    "abs": "Abdominal",
+    "@abs": {},
+    "chest": "Peito",
+    "@chest": {},
+    "shoulders": "Ombro",
+    "@shoulders": {},
+    "gym_mat": "Colchonete",
+    "@gym_mat": {},
+    "incline_bench": "Supino inclinado",
+    "@incline_bench": {},
+    "calves": "Panturrilha",
+    "@calves": {},
+    "legs": "Pernas",
+    "@legs": {},
+    "lats": "Dorsal",
+    "@lats": {},
+    "quads": "Quadríceps",
+    "@quads": {},
+    "hamstrings": "Posterior de coxa",
+    "@hamstrings": {},
+    "arms": "Braços",
+    "@arms": {},
+    "pull_up_bar": "Barra fixa",
+    "@pull_up_bar": {},
+    "lower_back": "Lombar",
+    "@lower_back": {},
+    "swiss_ball": "Bola suíça",
+    "@swiss_ball": {},
+    "kettlebell": "Kettlebell",
+    "@kettlebell": {},
+    "none__bodyweight_exercise_": "nenhum (somente peso do corpo)",
+    "@none__bodyweight_exercise_": {},
+    "aboutPageTitle": "Sobre nós & suporte",
+    "@aboutPageTitle": {},
+    "enterMinCharacters": "Por favor, selecione ao menos {min} de caracteres",
+    "@enterMinCharacters": {
+        "description": "Error message when the user hasn't entered the minimum amount characters in a form",
+        "type": "text",
+        "placeholders": {
+            "min": {
+                "type": "String"
+            }
+        }
+    },
+    "baseNameEnglish": "Todos os exercícios precisam de um nome base em inglês",
+    "@baseNameEnglish": {},
+    "miles": "Milhas",
+    "@miles": {},
+    "noMeasurementEntries": "Você não tem entradas de medição",
+    "@noMeasurementEntries": {},
+    "moreMeasurementEntries": "Adicionar nova medição",
+    "@moreMeasurementEntries": {
+        "description": "Message shown when the user wants to add new measurement"
+    },
+    "contributeExercise": "Contribua um exercício",
+    "@contributeExercise": {},
+    "baseData": "Básico em inglês",
+    "@baseData": {
+        "description": "The base data for an exercise such as category, trained muscles, etc."
+    },
+    "sz_bar": "Barra SZ",
+    "@sz_bar": {},
+    "back": "Costas",
+    "@back": {},
+    "userProfile": "Seu perfil",
+    "@userProfile": {},
+    "exercises": "Exercícios",
+    "@exercises": {
+        "description": "Multiple exercises for a workout"
+    },
+    "exerciseList": "Lista de Exercício",
+    "@exerciseList": {},
+    "exerciseName": "Nome do exercício",
+    "@exerciseName": {
+        "description": "Label for the name of a workout exercise"
+    },
+    "add_exercise_image_license": "As imagens devem ser compatíveis com a licença CC BY SA. Em caso de dúvida, carregue apenas fotos que você mesmo tirou.",
+    "@add_exercise_image_license": {},
+    "selectEntry": "Por favor selecione uma entrada",
+    "@selectEntry": {},
+    "cacheWarning": "Devido ao caching, pode levar algum tempo até que as alterações sejam visíveis em todo o aplicativo.",
+    "@cacheWarning": {},
+    "success": "Sucesso",
+    "@success": {
+        "description": "Message when an action completed successfully, usually used as a heading"
+    },
+    "contributeExerciseWarning": "Você só pode contribuir com exercícios se sua conta tiver mais de {days} dias e tiver verificado seu e-mail",
+    "@contributeExerciseWarning": {
+        "description": "Number of days before which a person can add exercise",
+        "placeholders": {
+            "days": {
+                "type": "String",
+                "example": "14"
+            }
+        }
+    },
+    "cardio": "Cardio",
+    "@cardio": {},
+    "textPromptTitle": "Podemos começar?",
+    "@textPromptTitle": {},
+    "textPromptSubheading": "Aperte o botão de ação para começar",
+    "@textPromptSubheading": {},
+    "body_weight": "Peso Corporal",
+    "@body_weight": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "kilometers_per_hour": "Quilômetros Por Hora",
+    "@kilometers_per_hour": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "miles_per_hour": "Milhas por Hora",
+    "@miles_per_hour": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "plates": "Pratos",
+    "@plates": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "kg": "kg",
+    "@kg": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "lb": "lb",
+    "@lb": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "searchNamesInEnglish": "Também buscar nomes em inglês",
+    "@searchNamesInEnglish": {},
+    "verify": "Verificar",
+    "@verify": {},
+    "max_reps": "Repetição Máxima",
+    "@max_reps": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "settingsCacheTitle": "Cache",
+    "@settingsCacheTitle": {},
+    "settingsExerciseCacheDescription": "Cache do exercício",
+    "@settingsExerciseCacheDescription": {},
+    "useMetric": "Use unidades métricas para o peso corpora",
+    "@useMetric": {},
+    "settingsTitle": "Configurações",
+    "@settingsTitle": {},
+    "settingsCacheDeletedSnackbar": "Cache limpo com sucesso",
+    "@settingsCacheDeletedSnackbar": {},
+    "log": "Log",
+    "@log": {
+        "description": "Log a specific meal (imperative form)"
+    },
+    "done": "Feito",
+    "@done": {},
+    "noMatchingExerciseFound": "Nenhum exercício correspondente encontrado",
+    "@noMatchingExerciseFound": {
+        "description": "Message returned if no exercises match the searched string"
+    },
+    "aboutMastodonTitle": "Mastodon",
+    "@aboutMastodonTitle": {},
+    "aboutDonateTitle": "Faz uma doação",
+    "@aboutDonateTitle": {},
+    "aboutDonateText": "Embora o projeto seja, e será sempre, gratuito, manter o servidor não o é! O desenvolvimento também leva bastante do tempo dos voluntários. O teu contributo suporta diretamente estes custos ajudando a manter o serviço constante.",
+    "@aboutDonateText": {},
+    "onlyLogging": "Só controlar calorias",
+    "@onlyLogging": {},
+    "goalEnergy": "Meta energética",
+    "@goalEnergy": {},
+    "goalProtein": "Meta proteica",
+    "@goalProtein": {},
+    "goalCarbohydrates": "Meta de carboidratos",
+    "@goalCarbohydrates": {},
+    "goalFat": "Meta de gordura",
+    "@goalFat": {},
+    "today": "Hoje",
+    "@today": {},
+    "kcalValue": "{value} kcal",
+    "@kcalValue": {
+        "description": "A value in kcal, e.g. 500 kcal",
+        "type": "text",
+        "placeholders": {
+            "value": {
+                "type": "String"
+            }
+        }
+    },
+    "gValue": "{value} g",
+    "@gValue": {
+        "description": "A value in grams, e.g. 5 g",
+        "type": "text",
+        "placeholders": {
+            "value": {
+                "type": "String"
+            }
+        }
+    },
+    "percentValue": "{value} %",
+    "@percentValue": {
+        "description": "A value in percent, e.g. 10 %",
+        "type": "text",
+        "placeholders": {
+            "value": {
+                "type": "String"
+            }
+        }
+    },
+    "noIngredientsDefined": "Sem ingredientes definido ainda",
+    "@noIngredientsDefined": {},
+    "ingredientLogged": "Ingrediente ativo registrado diariamente",
+    "@ingredientLogged": {},
+    "onlyLoggingHelpText": "Marque a caixa se você desejar apenas o seu registo de calorias e não quer a configuração de um detalhado plano nutricional com refeições",
+    "@onlyLoggingHelpText": {},
+    "goalMacro": "Macro objetivos",
+    "@goalMacro": {
+        "description": "The goal for macronutrients"
+    },
+    "selectMealToLog": "Selecione uma refeição para entrar no diário",
+    "@selectMealToLog": {},
+    "goalFiber": "Meta de fibra",
+    "@goalFiber": {},
+    "deficit": "Défice",
+    "@deficit": {
+        "description": "Caloric deficit (either planned or unplanned)"
+    },
+    "surplus": "Excedente",
+    "@surplus": {
+        "description": "Caloric surplus (either planned or unplanned)"
+    },
+    "chart30DaysTitle": "{name} Ultimos 30 dias",
+    "@chart30DaysTitle": {
+        "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
+        "type": "text",
+        "placeholders": {
+            "name": {
+                "type": "String"
+            }
+        }
+    },
+    "chartDuringPlanTitle": "{chartName} Durante o plano nutricional {planName}",
+    "@chartDuringPlanTitle": {
+        "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
+        "type": "text",
+        "placeholders": {
+            "chartName": {
+                "type": "String"
+            },
+            "planName": {
+                "type": "String"
+            }
+        }
+    },
+    "loggedToday": "Registrado hoje",
+    "@loggedToday": {},
+    "chartAllTimeTitle": "{name} de todo o tempo",
+    "@chartAllTimeTitle": {
+        "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
+        "type": "text",
+        "placeholders": {
+            "name": {
+                "type": "String"
+            }
+        }
+    },
+    "overallChangeWeight": "Mudança geral",
+    "@overallChangeWeight": {
+        "description": "Overall change in weight, added for localization"
+    },
+    "goalTypeMeals": "A partir de refeições",
+    "@goalTypeMeals": {
+        "description": "added for localization of Class GoalType's filed meals"
+    },
+    "goalTypeBasic": "Básico",
+    "@goalTypeBasic": {
+        "description": "added for localization of Class GoalType's filed basic"
+    },
+    "goalTypeAdvanced": "Avançado",
+    "@goalTypeAdvanced": {
+        "description": "added for localization of Class GoalType's filed advanced"
+    },
+    "indicatorRaw": "Crua",
+    "@indicatorRaw": {
+        "description": "added for localization of Class Indicator's field text"
+    },
+    "indicatorAvg": "Média",
+    "@indicatorAvg": {
+        "description": "added for localization of Class Indicator's field text"
+    },
+    "lightMode": "Modo sempre a luz de",
+    "@lightMode": {},
+    "systemMode": "Configurações do sistema",
+    "@systemMode": {},
+    "themeMode": "Tema",
+    "@themeMode": {},
+    "darkMode": "Modo sempre escuro",
+    "@darkMode": {},
+    "settingsIngredientCacheDescription": "Princípio de cache",
+    "@settingsIngredientCacheDescription": {},
+    "routines": "Rotinas",
+    "@routines": {},
+    "newRoutine": "Nova rotina",
+    "@newRoutine": {},
+    "noRoutines": "Você não tem rotinas",
+    "@noRoutines": {},
+    "sets": "Séries",
+    "@sets": {
+        "description": "The number of sets to be done for one exercise"
+    },
+    "exerciseNr": "Exercício {nr}",
+    "@exerciseNr": {
+        "description": "Header in form indicating the number of the current exercise. Can also be translated as something like 'Set Nr. xy'.",
+        "type": "text",
+        "placeholders": {
+            "nr": {
+                "type": "String"
+            }
+        }
+    },
+    "restDay": "Dia de descanso",
+    "@restDay": {},
+    "isRestDay": "É tempo de descanso",
+    "@isRestDay": {},
+    "routineDays": "Dias na rotina",
+    "@routineDays": {},
+    "restTime": "Tempo de descanso",
+    "@restTime": {},
+    "isRestDayHelp": "Favor notar que todos os sets e exercícios serão removidos quando você marcar um dia como dia de descanso.",
+    "@isRestDayHelp": {},
+    "apiToken": "Códibo API",
+    "@apiToken": {},
+    "errorInfoDescription": "Lamentamos, mas algo correu mal. Podes ajudar a corrigir isto reportando o erro no GitHub.",
+    "@errorInfoDescription": {},
+    "supersetNr": "Superset {nr}",
+    "@supersetNr": {
+        "description": "Header in form indicating the number of the current exercise. Can also be translated as something like 'Superset Nr. xy'.",
+        "type": "text",
+        "placeholders": {
+            "nr": {
+                "type": "String"
+            }
+        }
+    },
+    "needsLogsToAdvance": "Precisa de dados para avançar",
+    "@needsLogsToAdvance": {},
+    "needsLogsToAdvanceHelp": "Seleciona se queres que a rotina progrida para o dia seguinte agendado apenas se registaste um treino no dia",
+    "@needsLogsToAdvanceHelp": {},
+    "min": "Min",
+    "@min": {},
+    "max": "Máximo",
+    "@max": {},
+    "resultingRoutine": "Rotina resultante",
+    "@resultingRoutine": {},
+    "fitInWeekHelp": "Se selecionado, os dias repetir-se-ão num ciclo semanal, caso contrário, os dias seguir-se-ão sequencialmente independentemente do início de nova semana.",
+    "@fitInWeekHelp": {},
+    "fitInWeek": "Encaixa na semana",
+    "@fitInWeek": {},
+    "simpleModeHelp": "Esconde alguns dos parâmetros mais avançados quando editando exercícios",
+    "@simpleModeHelp": {},
+    "addSuperset": "Adiciona um superset",
+    "@addSuperset": {},
+    "setHasNoExercises": "Esta série ainda não tem exercícios!",
+    "@setHasNoExercises": {},
+    "resistance_band": "Banda elástica",
+    "@resistance_band": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "yourCurrentNutritionPlanHasNoMealsDefinedYet": "O teu plano nutricional atual não tem refeições definidas",
+    "@yourCurrentNutritionPlanHasNoMealsDefinedYet": {
+        "description": "Message shown when a nutrition plan doesn't have any meals"
+    },
+    "toAddMealsToThePlanGoToNutritionalPlanDetails": "Para adicionar refeições ao plano, vai aos detalhes do plano nutricional",
+    "@toAddMealsToThePlanGoToNutritionalPlanDetails": {
+        "description": "Message shown to guide users to the nutritional plan details page to add meals"
+    },
+    "errorInfoDescription2": "Podes continuar a usar a aplicação, mas algumas funções podem não funcionar.",
+    "@errorInfoDescription2": {},
+    "errorCouldNotConnectToServer": "Não foi possível ligar ao servidor",
+    "@errorCouldNotConnectToServer": {},
+    "aboutBugsListTitle": "Relata um problema ou sugere uma funcionalidade",
+    "@aboutBugsListTitle": {},
+    "aboutTranslationListTitle": "Traduz a aplicação",
+    "@aboutTranslationListTitle": {},
+    "aboutSourceListTitle": "Vê o código fonte",
+    "@aboutSourceListTitle": {},
+    "aboutWhySupportTitle": "Código aberto & livre para usar ❤️",
+    "@aboutWhySupportTitle": {},
+    "aboutContributeTitle": "Contribui",
+    "@aboutContributeTitle": {},
+    "aboutContributeText": "Todos os tipos de contribuição são bem-vindos. Quer sejas um desenvolvedor, um tradutor ou apenas um apaixonado pelo exercício, todas as migalhas de suporte são apreciadas!",
+    "@aboutContributeText": {},
+    "aboutJoinCommunityTitle": "Junta-te à comunidade",
+    "@aboutJoinCommunityTitle": {},
+    "aboutDiscordTitle": "Discord",
+    "@aboutDiscordTitle": {},
+    "others": "Outros",
+    "@others": {},
+    "setHasProgression": "A série tem progressão",
+    "@setHasProgression": {},
+    "simpleMode": "Modo simples",
+    "@simpleMode": {},
+    "progressionRules": "Este exercíco tem regras de progressão e não pode ser editado na aplicação móvel. Por favor, usa a aplicação web para editar este exercício.",
+    "@progressionRules": {},
+    "selectAvailablePlates": "Seleciona anilhas disponíveis",
+    "@selectAvailablePlates": {},
+    "useApiToken": "Usa código API",
+    "@useApiToken": {},
+    "barWeight": "Peso da barra",
+    "@barWeight": {},
+    "invalidApiToken": "Por favor, introduz uma chave API válida",
+    "@invalidApiToken": {
+        "description": "Error message when the user enters an invalid API key"
+    },
+    "useColors": "Usa cores",
+    "@useColors": {},
+    "useUsernameAndPassword": "Usa nome de utilizador e palavra passe",
+    "@useUsernameAndPassword": {},
+    "apiTokenValidChars": "Uma chave API pode apenas conter letras a-f, números 0-9 e ter exatamente 40 caracteres",
+    "@apiTokenValidChars": {
+        "description": "Error message when the user tries to input a API key with forbidden characters"
+    },
+    "errorViewDetails": "Detalhes técnicos",
+    "@errorViewDetails": {},
+    "errorCouldNotConnectToServerDetails": "A aplicação não conseguiu ligar-se ao servidor. Por favor, verifica a ligação à rede ou o URL do servidor e tenta novamente. Se o problema persistir, contacta o administrador do servidor.",
+    "@errorCouldNotConnectToServerDetails": {},
+    "copyToClipboard": "Copia para a memória",
+    "@copyToClipboard": {},
+    "setHasProgressionWarning": "Por favor, nota que, de momento, não é possível editar todos os valores para uma série na aplicação móvel ou configurar a progressão automática. Por agora, por favor, usa a aplicação web.",
+    "@setHasProgressionWarning": {},
+    "startDate": "Data de início",
+    "@startDate": {}
 }
diff --git a/lib/l10n/app_pt_BR.arb b/lib/l10n/app_pt_BR.arb
index 578c6868..cb84dcf3 100644
--- a/lib/l10n/app_pt_BR.arb
+++ b/lib/l10n/app_pt_BR.arb
@@ -1,689 +1,1072 @@
 {
-  "nutritionalPlan": "Plano nutricional",
-  "@nutritionalPlan": {},
-  "weight": "Peso",
-  "@weight": {
-    "description": "The weight of a workout log or body weight entry"
-  },
-  "date": "Data",
-  "@date": {
-    "description": "The date of a workout log or body weight entry"
-  },
-  "value": "Valor",
-  "@value": {
-    "description": "The value of a measurement entry"
-  },
-  "unit": "Unidade",
-  "@unit": {
-    "description": "The unit used for a repetition (kg, time, etc.)"
-  },
-  "edit": "Editar",
-  "@edit": {},
-  "delete": "Excluir",
-  "@delete": {},
-  "login": "Entrar",
-  "@login": {
-    "description": "Text for login button"
-  },
-  "userProfile": "Seu perfil",
-  "@userProfile": {},
-  "logout": "Sair",
-  "@logout": {
-    "description": "Text for logout button"
-  },
-  "notes": "Notas",
-  "@notes": {
-    "description": "Personal notes, e.g. for a workout session"
-  },
-  "description": "Descrição",
-  "@description": {},
-  "register": "Inscrever-se",
-  "@register": {
-    "description": "Text for registration button"
-  },
-  "useDefaultServer": "Usar servidor padrão",
-  "@useDefaultServer": {
-    "description": "Toggle button allowing users to switch between the default and a custom wger server"
-  },
-  "reset": "Redefinir",
-  "@reset": {
-    "description": "Button text allowing the user to reset the entered values to the default"
-  },
-  "password": "Senha",
-  "@password": {},
-  "invalidUsername": "Por favor insira um nome de usuário válido",
-  "@invalidUsername": {
-    "description": "Error message when the user enters an invalid username"
-  },
-  "passwordTooShort": "A senha é muito curta",
-  "@passwordTooShort": {
-    "description": "Error message when the user a password that is too short"
-  },
-  "email": "Endereço de email",
-  "@email": {},
-  "username": "Usuário",
-  "@username": {},
-  "customServerHint": "Digite o endereço do seu próprio servidor, caso contrário o padrão será usado",
-  "@customServerHint": {
-    "description": "Hint text for the form where the users can enter their own wger instance"
-  },
-  "useCustomServer": "Usar servidor customizado",
-  "@useCustomServer": {
-    "description": "Toggle button allowing users to switch between the default and a custom wger server"
-  },
-  "registerInstead": "Não tem uma conta? Registrar agora",
-  "@registerInstead": {},
-  "usernameValidChars": "Um usuário deve apenas conter letras, digitos e os caracteres @, +, ., -, ou _",
-  "@usernameValidChars": {
-    "description": "Error message when the user tries to register a username with forbidden characters"
-  },
-  "invalidUrl": "Por favor, digite uma URL válida",
-  "@invalidUrl": {
-    "description": "Error message when the user enters an invalid URL, e.g. in the login form"
-  },
-  "customServerUrl": "URL da instância wger",
-  "@customServerUrl": {
-    "description": "Label in the form where the users can enter their own wger instance"
-  },
-  "passwordsDontMatch": "As senhas não coincidem",
-  "@passwordsDontMatch": {
-    "description": "Error message when the user enters two different passwords during registration"
-  },
-  "invalidEmail": "Por favor insira um endereço de e-mail válido",
-  "@invalidEmail": {
-    "description": "Error message when the user enters an invalid email"
-  },
-  "confirmPassword": "Confirme sua senha",
-  "@confirmPassword": {},
-  "comment": "Comente",
-  "@comment": {
-    "description": "Comment, additional information"
-  },
-  "logIngredient": "Salvar no diário nutricional",
-  "@logIngredient": {},
-  "equipment": "Equipamento",
-  "@equipment": {
-    "description": "Equipment needed to perform an exercise"
-  },
-  "saturatedFat": "Gordura saturada",
-  "@saturatedFat": {},
-  "mealLogged": "Refeição registrada no diário",
-  "@mealLogged": {},
-  "images": "Imagens",
-  "@images": {},
-  "close": "Fechar",
-  "@close": {
-    "description": "Translation for close"
-  },
-  "successfullyDeleted": "Excluído",
-  "@successfullyDeleted": {
-    "description": "Message when an item was successfully deleted"
-  },
-  "save": "Salvar",
-  "@save": {},
-  "goToToday": "Vá para hoje",
-  "@goToToday": {
-    "description": "Label on button to jump back to 'today' in the calendar widget"
-  },
-  "enterRepetitionsOrWeight": "Por favor preencha as repetições ou o peso para pelo menos uma das séries",
-  "@enterRepetitionsOrWeight": {
-    "description": "Error message when the user hasn't filled in the forms for exercise sets"
-  },
-  "set": "Definir",
-  "@set": {
-    "description": "A set in a workout plan"
-  },
-  "noMeasurementEntries": "Você não tem entradas de medição",
-  "@noMeasurementEntries": {},
-  "newSet": "Novo conjunto",
-  "@newSet": {
-    "description": "Header when adding a new set to a workout day"
-  },
-  "impression": "Impressão",
-  "@impression": {
-    "description": "General impression (e.g. for a workout session) such as good, bad, etc."
-  },
-  "plateCalculator": "Pratos",
-  "@plateCalculator": {
-    "description": "Label used for the plate calculator in the gym mode"
-  },
-  "newNutritionalPlan": "Novo plano nutricional",
-  "@newNutritionalPlan": {},
-  "setNr": "Definir {nr}",
-  "@setNr": {
-    "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.",
-    "type": "text",
-    "placeholders": {
-      "nr": {}
-    }
-  },
-  "fat": "Gordura",
-  "@fat": {},
-  "timeStartAhead": "O horário de início não pode ser anterior ao horário de término",
-  "@timeStartAhead": {},
-  "carbohydrates": "Carboidratos",
-  "@carbohydrates": {},
-  "noWorkoutPlans": "Você não tem planos de treino",
-  "@noWorkoutPlans": {
-    "description": "Message shown when the user has no workout plans"
-  },
-  "aboutTranslationTitle": "Tradução",
-  "@aboutTranslationTitle": {
-    "description": "Title for translation section in the about dialog"
-  },
-  "muscles": "Músculos",
-  "@muscles": {
-    "description": "(main) muscles trained by an exercise"
-  },
-  "total": "Total",
-  "@total": {
-    "description": "Label used for total sums of e.g. calories or similar"
-  },
-  "dayDescriptionHelp": "Uma descrição do que é feito neste dia (por exemplo, 'dia de puxar') ou quais partes do corpo são treinadas (por exemplo, 'peito e ombros')",
-  "@dayDescriptionHelp": {},
-  "gymMode": "Modo Gym",
-  "@gymMode": {
-    "description": "Label when starting the gym mode"
-  },
-  "logged": "Desconectar",
-  "@logged": {
-    "description": "Header for the column of 'logged' nutritional values, i.e. what was eaten"
-  },
-  "amount": "Quantia",
-  "@amount": {
-    "description": "The amount (e.g. in grams) of an ingredient in a meal"
-  },
-  "loginInstead": "Já tem uma conta ? Entre",
-  "@loginInstead": {},
-  "pause": "Pausar",
-  "@pause": {
-    "description": "Noun, not an imperative! Label used for the pause when using the gym mode"
-  },
-  "success": "Sucesso",
-  "@success": {
-    "description": "Message when an action completed successfully, usually used as a heading"
-  },
-  "repetitionUnit": "Unidade de repetição",
-  "@repetitionUnit": {},
-  "weightUnit": "Unidade de peso",
-  "@weightUnit": {},
-  "searchIngredient": "Pesquisar Ingrediente",
-  "@searchIngredient": {
-    "description": "Label on ingredient search form"
-  },
-  "aboutBugsText": "Entre em contato se algo não se comportou conforme o esperado ou se houver algum recurso que você acha que está faltando.",
-  "@aboutBugsText": {
-    "description": "Text for bugs section in the about dialog"
-  },
-  "anErrorOccurred": "Ocorreu um erro!",
-  "@anErrorOccurred": {},
-  "aboutContactUsTitle": "Diga oi!",
-  "@aboutContactUsTitle": {
-    "description": "Title for contact us section in the about dialog"
-  },
-  "enterValue": "por favor insira um valor",
-  "@enterValue": {
-    "description": "Error message when the user hasn't entered a value on a required field"
-  },
-  "logMeal": "Registrar esta refeição",
-  "@logMeal": {},
-  "newEntry": "Nova entrada",
-  "@newEntry": {
-    "description": "Title when adding a new entry such as a weight or log entry"
-  },
-  "addSet": "Adicionar set",
-  "@addSet": {
-    "description": "Label for the button that adds a set (to a workout day)"
-  },
-  "newWorkout": "Novo plano de treino",
-  "@newWorkout": {
-    "description": "Header when adding a new workout"
-  },
-  "energyShort": "E",
-  "@energyShort": {
-    "description": "The first letter or short name of the word 'Energy', used in overviews"
-  },
-  "name": "Nome",
-  "@name": {
-    "description": "Name for a workout or nutritional plan"
-  },
-  "percentEnergy": "Porcentagem de energia",
-  "@percentEnergy": {},
-  "searchNamesInEnglish": "Pesquise também por nomes em inglês",
-  "@searchNamesInEnglish": {},
-  "exercise": "Exercício",
-  "@exercise": {
-    "description": "An exercise for a workout"
-  },
-  "addIngredient": "Adicionar ingrediente",
-  "@addIngredient": {},
-  "fatShort": "G",
-  "@fatShort": {
-    "description": "The first letter or short name of the word 'Fat', used in overviews"
-  },
-  "start": "Começar",
-  "@start": {
-    "description": "Label on button to start the gym mode (i.e., an imperative)"
-  },
-  "jumpTo": "Pule para",
-  "@jumpTo": {
-    "description": "Imperative. Label used in popup allowing the user to jump to a specific exercise while in the gym mode"
-  },
-  "difference": "Diferença",
-  "@difference": {},
-  "fiber": "Fibra",
-  "@fiber": {},
-  "aboutDescription": "Obrigado por usar o Wger! Wger é um projeto colaborativo de código aberto, feito por entusiastas do fitness de todo o mundo.",
-  "@aboutDescription": {
-    "description": "Text in the about dialog"
-  },
-  "timeStart": "Hora de início",
-  "@timeStart": {
-    "description": "The starting time of a workout"
-  },
-  "searchExercise": "Exercício de pesquisa para adicionar",
-  "@searchExercise": {
-    "description": "Label on set form. Selected exercises are added to the set"
-  },
-  "moreMeasurementEntries": "Adicionar nova medição",
-  "@moreMeasurementEntries": {
-    "description": "Message shown when the user wants to add new measurement"
-  },
-  "loadingText": "Carregando...",
-  "@loadingText": {
-    "description": "Text to show when entries are being loaded in the background: Loading..."
-  },
-  "selectExercises": "Se quiser fazer um superset você pode procurar vários exercícios, eles estarão agrupados",
-  "@selectExercises": {},
-  "nutritionalDiary": "Diário nutricional",
-  "@nutritionalDiary": {},
-  "protein": "Proteína",
-  "@protein": {},
-  "labelWorkoutPlans": "Planos de treino",
-  "@labelWorkoutPlans": {
-    "description": "Title for screen workout plans"
-  },
-  "proteinShort": "P",
-  "@proteinShort": {
-    "description": "The first letter or short name of the word 'Protein', used in overviews"
-  },
-  "noWeightEntries": "Você não tem entradas de peso",
-  "@noWeightEntries": {
-    "description": "Message shown when the user has no logged weight entries"
-  },
-  "noNutritionalPlans": "Você não tem planos nutricionais",
-  "@noNutritionalPlans": {
-    "description": "Message shown when the user has no nutritional plans"
-  },
-  "goToDetailPage": "Ir para a página de detalhes",
-  "@goToDetailPage": {},
-  "labelWorkoutLogs": "Registros de treinos",
-  "@labelWorkoutLogs": {
-    "description": "(Workout) logs"
-  },
-  "aboutTranslationText": "Este aplicativo está traduzido no weblate. Se você também quiser ajudar, clique no link e comece a traduzir",
-  "@aboutTranslationText": {
-    "description": "Text for translation section in the about dialog"
-  },
-  "ingredient": "Ingrediente",
-  "@ingredient": {},
-  "measurementCategoriesHelpText": "Categoria de medição, como 'bíceps' ou 'gordura corporal'",
-  "@measurementCategoriesHelpText": {},
-  "rirNotUsed": "RiR não usado",
-  "@rirNotUsed": {
-    "description": "Label used in RiR slider when the RiR value is not used/saved for the current setting or log"
-  },
-  "todaysWorkout": "Seu treino hoje",
-  "@todaysWorkout": {},
-  "aboutSourceText": "Obtenha o código fonte deste aplicativo e seu servidor no github",
-  "@aboutSourceText": {
-    "description": "Text for source code section in the about dialog"
-  },
-  "kJ": "kJ",
-  "@kJ": {
-    "description": "Energy in a meal in kilo joules, kJ"
-  },
-  "sodium": "Sódio",
-  "@sodium": {},
-  "translation": "Tradução",
-  "@translation": {},
-  "successfullySaved": "Salvo",
-  "@successfullySaved": {
-    "description": "Message when an item was successfully saved"
-  },
-  "exerciseList": "Lista de exercícios",
-  "@exerciseList": {},
-  "energy": "Energia",
-  "@energy": {
-    "description": "Energy in a meal, ingredient etc. e.g. in kJ"
-  },
-  "newDay": "Novo dia",
-  "@newDay": {},
-  "toggleDetails": "Alterar detalhes",
-  "@toggleDetails": {
-    "description": "Switch to toggle detail / overview"
-  },
-  "musclesSecondary": "Músculos secundários",
-  "@musclesSecondary": {
-    "description": "secondary muscles trained by an exercise"
-  },
-  "aboutContactUsText": "Se você quiser bater um papo conosco, entre no servidor Discord e entre em contato",
-  "@aboutContactUsText": {
-    "description": "Text for contact us section in the about dialog"
-  },
-  "labelDashboard": "Painel",
-  "@labelDashboard": {
-    "description": "Title for screen dashboard"
-  },
-  "timeEnd": "Fim do tempo",
-  "@timeEnd": {
-    "description": "The end time of a workout"
-  },
-  "planned": "Planejado",
-  "@planned": {
-    "description": "Header for the column of 'planned' nutritional values, i.e. what should be eaten"
-  },
-  "logHelpEntries": "Se em um mesmo dia houver mais de uma inscrição com o mesmo número de repetições, mas pesos diferentes, apenas a inscrição com maior peso será mostrada no diagrama.",
-  "@logHelpEntries": {},
-  "exerciseName": "Nome do exercício",
-  "@exerciseName": {
-    "description": "Label for the name of a workout exercise"
-  },
-  "labelBottomNavNutrition": "Nutrição",
-  "@labelBottomNavNutrition": {
-    "description": "Label used in bottom navigation, use a short word"
-  },
-  "language": "Linguagem",
-  "@language": {},
-  "nutritionalPlans": "Planos nutricionais",
-  "@nutritionalPlans": {},
-  "kcal": "kcal",
-  "@kcal": {
-    "description": "Energy in a meal in kilocalories, kcal"
-  },
-  "g": "g",
-  "@g": {
-    "description": "Abbreviation for gram"
-  },
-  "addMeal": "Adicionar refeição",
-  "@addMeal": {},
-  "sameRepetitions": "Se você fizer as mesmas repetições e peso para todas as séries, poderá preencher apenas uma linha. Por exemplo, para 4 séries basta inserir 10 para as repetições, isso automaticamente se torna \"4 x 10\".",
-  "@sameRepetitions": {},
-  "measurementEntriesHelpText": "A unidade usada para medir a categoria, como 'cm' ou '%'",
-  "@measurementEntriesHelpText": {},
-  "supersetWith": "superset com",
-  "@supersetWith": {
-    "description": "Text used between exercise cards when adding a new set. Translate as something like 'in a superset with'"
-  },
-  "sugars": "Açúcar",
-  "@sugars": {},
-  "aboutBugsTitle": "Tem um problema ou ideia?",
-  "@aboutBugsTitle": {
-    "description": "Title for bugs section in the about dialog"
-  },
-  "carbohydratesShort": "C",
-  "@carbohydratesShort": {
-    "description": "The first letter or short name of the word 'Carbohydrates', used in overviews"
-  },
-  "measurements": "Medidas",
-  "@measurements": {
-    "description": "Categories for the measurements such as biceps size, body fat, etc."
-  },
-  "macronutrients": "Macronutrientes",
-  "@macronutrients": {},
-  "plateCalculatorNotDivisible": "Não é possível atingir o peso com os pratos disponíveis",
-  "@plateCalculatorNotDivisible": {
-    "description": "Error message when the current weight is not reachable with plates (e.g. 33.1 kg)"
-  },
-  "confirmDelete": "Tem certeza de que deseja excluir '{toDelete}'?",
-  "@confirmDelete": {
-    "description": "Confirmation text before the user deletes an object",
-    "type": "text",
-    "placeholders": {
-      "toDelete": {}
-    }
-  },
-  "gPerBodyKg": "g por kg corporal",
-  "@gPerBodyKg": {
-    "description": "Label used for total sums of e.g. calories or similar in grams per Kg of body weight"
-  },
-  "weekAverage": "Média de 7 dias",
-  "@weekAverage": {
-    "description": "Header for the column of '7 day average' nutritional values, i.e. what was logged last week"
-  },
-  "labelWorkoutPlan": "Plano de treino",
-  "@labelWorkoutPlan": {
-    "description": "Title for screen workout plan"
-  },
-  "category": "Categoria",
-  "@category": {
-    "description": "Category for an exercise, ingredient, etc."
-  },
-  "exercises": "Exercícios",
-  "@exercises": {
-    "description": "Multiple exercises for a workout"
-  },
-  "time": "Tempo",
-  "@time": {
-    "description": "The time of a meal or workout"
-  },
-  "calendar": "Calendário",
-  "@calendar": {},
-  "verify": "Verificar",
-  "@verify": {},
-  "workoutSession": "Sessão de treino",
-  "@workoutSession": {
-    "description": "A (logged) workout session"
-  },
-  "logHelpEntriesUnits": "Observe que apenas as entradas com uma unidade de peso (kg ou lb) e repetições são registradas; outras combinações, como tempo ou até a falha, são ignoradas aqui.",
-  "@logHelpEntriesUnits": {},
-  "aboutSourceTitle": "Código fonte",
-  "@aboutSourceTitle": {
-    "description": "Title for source code section in the about dialog"
-  },
-  "measurement": "Medição",
-  "@measurement": {},
-  "nrOfSets": "Séries por exercício: {nrOfSets}",
-  "@nrOfSets": {
-    "description": "Label shown on the slider where the user selects the nr of sets",
-    "type": "text",
-    "placeholders": {
-      "nrOfSets": {}
-    }
-  },
-  "useMetric": "Use unidades métricas para peso corporal",
-  "@useMetric": {},
-  "aboutMastodonTitle": "Mastodon",
-  "@aboutMastodonTitle": {
-    "description": "Title for mastodon section in the about dialog"
-  },
-  "selectEntry": "Por favor, selecione uma entrada",
-  "@selectEntry": {},
-  "noMatchingExerciseFound": "Nenhum exercício correspondente encontrado",
-  "@noMatchingExerciseFound": {
-    "description": "Message returned if no exercises match the searched string"
-  },
-  "selectExercise": "Por favor, selecione um exercício",
-  "@selectExercise": {
-    "description": "Error message when the user hasn't selected an exercise in the form"
-  },
-  "enterValidNumber": "Por favor, insira um número válido",
-  "@enterValidNumber": {
-    "description": "Error message when the user has submitted an invalid number (e.g. '3,.,.,.')"
-  },
-  "baseNameEnglish": "Todos os exercícios necessitam de um nome base em inglês",
-  "@baseNameEnglish": {},
-  "aboutMastodonText": "Siga-nos no Mastodon para atualizações e novidades sobre o projeto",
-  "@aboutMastodonText": {
-    "description": "Text for the mastodon section in the about dialog"
-  },
-  "labelBottomNavWorkout": "Treino",
-  "@labelBottomNavWorkout": {
-    "description": "Label used in bottom navigation, use a short word"
-  },
-  "reps": "Reps",
-  "@reps": {
-    "description": "Shorthand for repetitions, used when space constraints are tighter"
-  },
-  "rir": "ReR",
-  "@rir": {
-    "description": "Shorthand for Repetitions In Reserve"
-  },
-  "setUnitsAndRir": "Unidades e RIR da série",
-  "@setUnitsAndRir": {
-    "description": "Label shown on the slider where the user can toggle showing units and RiR",
-    "type": "text"
-  },
-  "aboutDonateTitle": "Doações",
-  "@aboutDonateTitle": {},
-  "aboutDonateText": "Compre-nos um café para ajudar no projeto, pague pelos custos do servidor e nos mantenha abastecidos",
-  "@aboutDonateText": {},
-  "enterCharacters": "Por favor, utilize entre {min} e {max} caracteres",
-  "@enterCharacters": {
-    "description": "Error message when the user hasn't entered the correct number of characters in a form",
-    "type": "text",
-    "placeholders": {
-      "min": {},
-      "max": {}
-    }
-  },
-  "enterMinCharacters": "Por favor, utilize pelo menos {min} caracteres",
-  "@enterMinCharacters": {
-    "description": "Error message when the user hasn't entered the minimum amount characters in a form",
-    "type": "text",
-    "placeholders": {
-      "min": {}
-    }
-  },
-  "gallery": "Galeria",
-  "@gallery": {},
-  "alsoKnownAs": "Também conhecido como:{aliases}",
-  "@alsoKnownAs": {
-    "placeholders": {
-      "aliases": {}
+    "nutritionalPlan": "Plano nutricional",
+    "@nutritionalPlan": {},
+    "weight": "Peso",
+    "@weight": {
+        "description": "The weight of a workout log or body weight entry"
     },
-    "description": "List of alternative names for an exercise"
-  },
-  "recentlyUsedIngredients": "Ingredientes adicionados recentemente",
-  "@recentlyUsedIngredients": {
-    "description": "A message when a user adds a new ingredient to a meal."
-  },
-  "addImage": "Adicionar imagem",
-  "@addImage": {},
-  "scanBarcode": "Escaneie o código de barras",
-  "@scanBarcode": {
-    "description": "Label for scan barcode button"
-  },
-  "dataCopied": "Dados copiados para o novo registro",
-  "@dataCopied": {
-    "description": "Snackbar message to show on copying data to a new log entry"
-  },
-  "appUpdateContent": "Esta versão do aplicativo não é compatível com o servidor, por favor atualize o aplicativo.",
-  "@appUpdateContent": {},
-  "productFound": "Produto encontrado",
-  "@productFound": {
-    "description": "Header label for dialog when product is found with barcode"
-  },
-  "appUpdateTitle": "Atualização necessária",
-  "@appUpdateTitle": {},
-  "takePicture": "Tire uma foto",
-  "@takePicture": {},
-  "selectIngredient": "Por favor, selecione um ingrediente",
-  "@selectIngredient": {
-    "description": "Error message when the user hasn't selected an ingredient from the autocompleter"
-  },
-  "selectImage": "Por favor, selecione uma imagem",
-  "@selectImage": {
-    "description": "Label and error message when the user hasn't selected an image to save"
-  },
-  "optionsLabel": "Opções",
-  "@optionsLabel": {
-    "description": "Label for the popup with general app options"
-  },
-  "productNotFound": "Produto não encontrado",
-  "@productNotFound": {
-    "description": "Header label for dialog when product is not found with barcode"
-  },
-  "variations": "Variações",
-  "@variations": {
-    "description": "Variations of one exercise (e.g. benchpress and benchpress narrow)"
-  },
-  "verifiedEmail": "Email verificado",
-  "@verifiedEmail": {},
-  "chooseFromLibrary": "Escolher na galeria",
-  "@chooseFromLibrary": {},
-  "unVerifiedEmail": "Email não verificado",
-  "@unVerifiedEmail": {},
-  "add_exercise_image_license": "As imagens devem ser compatíveis com a licença CC BY SA. Em caso de dúvida, faça upload apenas de fotos que você mesmo tenha tirado.",
-  "@add_exercise_image_license": {},
-  "next": "Próximo",
-  "@next": {},
-  "settingsCacheTitle": "Cache",
-  "@settingsCacheTitle": {},
-  "settingsExerciseCacheDescription": "Cache do exercício",
-  "@settingsExerciseCacheDescription": {},
-  "settingsCacheDeletedSnackbar": "Cache limpa com sucesso",
-  "@settingsCacheDeletedSnackbar": {},
-  "translateExercise": "Traduza este exercício agora",
-  "@translateExercise": {},
-  "contributeExerciseWarning": "Você só pode contribuir com exercícios se sua conta tiver mais de {days} dias e se você tiver verificado seu e-mail",
-  "@contributeExerciseWarning": {
-    "description": "Number of days before which a person can add exercise",
-    "placeholders": {
-      "days": {
-        "type": "String",
-        "example": "14"
-      }
-    }
-  },
-  "whatVariationsExist": "Quais variações deste exercício existem, se houver?",
-  "@whatVariationsExist": {},
-  "previous": "Anterior",
-  "@previous": {},
-  "addExercise": "Adicionar exercício",
-  "@addExercise": {},
-  "verifiedEmailInfo": "Um e-mail foi enviado para {email}",
-  "@verifiedEmailInfo": {
-    "placeholders": {
-      "email": {}
-    }
-  },
-  "verifiedEmailReason": "Você precisa verificar seu e-mail para contribuir com exercícios",
-  "@verifiedEmailReason": {},
-  "alternativeNames": "Nomes alternativos",
-  "@alternativeNames": {},
-  "baseData": "Fundamentos em inglês",
-  "@baseData": {
-    "description": "The base data for an exercise such as category, trained muscles, etc."
-  },
-  "aboutPageTitle": "Sobre o Wger",
-  "@aboutPageTitle": {},
-  "productFoundDescription": "O código de barras corresponde a este produto: {productName}. Deseja continuar?",
-  "@productFoundDescription": {
-    "description": "Dialog info when product is found with barcode",
-    "type": "text",
-    "placeholders": {
-      "productName": {}
-    }
-  },
-  "productNotFoundDescription": "O produto com o código de barras escaneado {barcode} não foi encontrado no banco de dados da wger",
-  "@productNotFoundDescription": {
-    "description": "Dialog info when product is not found with barcode",
-    "type": "text",
-    "placeholders": {
-      "barcode": {}
-    }
-  },
-  "contributeExercise": "Contribuir com um exercício",
-  "@contributeExercise": {},
-  "oneNamePerLine": "Um nome por linha",
-  "@oneNamePerLine": {},
-  "settingsTitle": "Configurações",
-  "@settingsTitle": {},
-  "onlyLogging": "Apenas acompanhe calorias",
-  "@onlyLogging": {},
-  "ingredientLogged": "Ingrediente registrado no diário",
-  "@ingredientLogged": {},
-  "noIngredientsDefined": "Nenhum ingrediente definido ainda",
-  "@noIngredientsDefined": {}
+    "date": "Data",
+    "@date": {
+        "description": "The date of a workout log or body weight entry"
+    },
+    "value": "Valor",
+    "@value": {
+        "description": "The value of a measurement entry"
+    },
+    "unit": "Unidade",
+    "@unit": {
+        "description": "The unit used for a repetition (kg, time, etc.)"
+    },
+    "edit": "Editar",
+    "@edit": {},
+    "delete": "Excluir",
+    "@delete": {},
+    "login": "Entrar",
+    "@login": {
+        "description": "Text for login button"
+    },
+    "userProfile": "Seu perfil",
+    "@userProfile": {},
+    "logout": "Sair",
+    "@logout": {
+        "description": "Text for logout button"
+    },
+    "notes": "Comentários",
+    "@notes": {
+        "description": "Personal notes, e.g. for a workout session"
+    },
+    "description": "Descrição",
+    "@description": {},
+    "register": "Inscrever-se",
+    "@register": {
+        "description": "Text for registration button"
+    },
+    "useDefaultServer": "Usar servidor padrão",
+    "@useDefaultServer": {
+        "description": "Toggle button allowing users to switch between the default and a custom wger server"
+    },
+    "reset": "Redefinir",
+    "@reset": {
+        "description": "Button text allowing the user to reset the entered values to the default"
+    },
+    "password": "Senha",
+    "@password": {},
+    "invalidUsername": "Por favor insira um nome de usuário válido",
+    "@invalidUsername": {
+        "description": "Error message when the user enters an invalid username"
+    },
+    "passwordTooShort": "A senha é muito curta",
+    "@passwordTooShort": {
+        "description": "Error message when the user a password that is too short"
+    },
+    "email": "Endereço de email",
+    "@email": {},
+    "username": "Usuário",
+    "@username": {},
+    "customServerHint": "Digite o endereço do seu próprio servidor, caso contrário o padrão será usado",
+    "@customServerHint": {
+        "description": "Hint text for the form where the users can enter their own wger instance"
+    },
+    "useCustomServer": "Usar servidor customizado",
+    "@useCustomServer": {
+        "description": "Toggle button allowing users to switch between the default and a custom wger server"
+    },
+    "registerInstead": "Não tem uma conta? Registrar agora",
+    "@registerInstead": {},
+    "usernameValidChars": "Um usuário deve apenas conter letras, digitos e os caracteres @, +, ., -, ou _",
+    "@usernameValidChars": {
+        "description": "Error message when the user tries to register a username with forbidden characters"
+    },
+    "invalidUrl": "Por favor, digite uma URL válida",
+    "@invalidUrl": {
+        "description": "Error message when the user enters an invalid URL, e.g. in the login form"
+    },
+    "customServerUrl": "URL da instância wger",
+    "@customServerUrl": {
+        "description": "Label in the form where the users can enter their own wger instance"
+    },
+    "passwordsDontMatch": "As senhas não coincidem",
+    "@passwordsDontMatch": {
+        "description": "Error message when the user enters two different passwords during registration"
+    },
+    "invalidEmail": "Por favor insira um endereço de e-mail válido",
+    "@invalidEmail": {
+        "description": "Error message when the user enters an invalid email"
+    },
+    "confirmPassword": "Confirme sua senha",
+    "@confirmPassword": {},
+    "comment": "Comentário",
+    "@comment": {
+        "description": "Comment, additional information"
+    },
+    "logIngredient": "Salvar ingrediente no diário nutricional",
+    "@logIngredient": {},
+    "equipment": "Equipamento",
+    "@equipment": {
+        "description": "Equipment needed to perform an exercise"
+    },
+    "saturatedFat": "Gordura saturada",
+    "@saturatedFat": {},
+    "mealLogged": "Refeição registrada no diário",
+    "@mealLogged": {},
+    "images": "Imagens",
+    "@images": {},
+    "close": "Fechar",
+    "@close": {
+        "description": "Translation for close"
+    },
+    "successfullyDeleted": "Excluído",
+    "@successfullyDeleted": {
+        "description": "Message when an item was successfully deleted"
+    },
+    "save": "Salvar",
+    "@save": {},
+    "goToToday": "Vá para hoje",
+    "@goToToday": {
+        "description": "Label on button to jump back to 'today' in the calendar widget"
+    },
+    "set": "Definir",
+    "@set": {
+        "description": "A set in a workout plan"
+    },
+    "noMeasurementEntries": "Você não tem entradas de medição",
+    "@noMeasurementEntries": {},
+    "newSet": "Novo conjunto",
+    "@newSet": {
+        "description": "Header when adding a new set to a workout day"
+    },
+    "impression": "Impressão",
+    "@impression": {
+        "description": "General impression (e.g. for a workout session) such as good, bad, etc."
+    },
+    "plateCalculator": "Pratos",
+    "@plateCalculator": {
+        "description": "Label used for the plate calculator in the gym mode"
+    },
+    "newNutritionalPlan": "Novo plano nutricional",
+    "@newNutritionalPlan": {},
+    "setNr": "Definir {nr}",
+    "@setNr": {
+        "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.",
+        "type": "text",
+        "placeholders": {
+            "nr": {
+                "type": "String"
+            }
+        }
+    },
+    "fat": "Gordura",
+    "@fat": {},
+    "timeStartAhead": "O horário de início não pode ser anterior ao horário de término",
+    "@timeStartAhead": {},
+    "carbohydrates": "Carboidratos",
+    "@carbohydrates": {},
+    "muscles": "Músculos",
+    "@muscles": {
+        "description": "(main) muscles trained by an exercise"
+    },
+    "total": "Total",
+    "@total": {
+        "description": "Label used for total sums of e.g. calories or similar"
+    },
+    "dayDescriptionHelp": "Uma descrição do que é feito neste dia (por exemplo, 'dia de puxar') ou quais partes do corpo são treinadas (por exemplo, 'peito e ombros')",
+    "@dayDescriptionHelp": {},
+    "gymMode": "Modo Gym",
+    "@gymMode": {
+        "description": "Label when starting the gym mode"
+    },
+    "logged": "Desconectar",
+    "@logged": {
+        "description": "Header for the column of 'logged' nutritional values, i.e. what was eaten"
+    },
+    "amount": "Quantia",
+    "@amount": {
+        "description": "The amount (e.g. in grams) of an ingredient in a meal"
+    },
+    "loginInstead": "Já tem uma conta ? Entre",
+    "@loginInstead": {},
+    "pause": "Pausar",
+    "@pause": {
+        "description": "Noun, not an imperative! Label used for the pause when using the gym mode"
+    },
+    "success": "Sucesso",
+    "@success": {
+        "description": "Message when an action completed successfully, usually used as a heading"
+    },
+    "repetitionUnit": "Unidade de repetição",
+    "@repetitionUnit": {},
+    "weightUnit": "Unidade de peso",
+    "@weightUnit": {},
+    "searchIngredient": "Pesquisar Ingrediente",
+    "@searchIngredient": {
+        "description": "Label on ingredient search form"
+    },
+    "anErrorOccurred": "Ocorreu um erro!",
+    "@anErrorOccurred": {},
+    "enterValue": "por favor insira um valor",
+    "@enterValue": {
+        "description": "Error message when the user hasn't entered a value on a required field"
+    },
+    "logMeal": "Registrar refeição para diário de nutrição",
+    "@logMeal": {},
+    "newEntry": "Nova entrada",
+    "@newEntry": {
+        "description": "Title when adding a new entry such as a weight or log entry"
+    },
+    "addSet": "Adicionar set",
+    "@addSet": {
+        "description": "Label for the button that adds a set (to a workout day)"
+    },
+    "energyShort": "E",
+    "@energyShort": {
+        "description": "The first letter or short name of the word 'Energy', used in overviews"
+    },
+    "name": "Nome",
+    "@name": {
+        "description": "Name for a workout or nutritional plan"
+    },
+    "percentEnergy": "Porcentagem de energia",
+    "@percentEnergy": {},
+    "searchNamesInEnglish": "Procure também nomes em inglês",
+    "@searchNamesInEnglish": {},
+    "exercise": "Exercício",
+    "@exercise": {
+        "description": "An exercise for a workout"
+    },
+    "addIngredient": "Adicionar ingrediente",
+    "@addIngredient": {},
+    "fatShort": "G",
+    "@fatShort": {
+        "description": "The first letter or short name of the word 'Fat', used in overviews"
+    },
+    "start": "Começar",
+    "@start": {
+        "description": "Label on button to start the gym mode (i.e., an imperative)"
+    },
+    "jumpTo": "Pule para",
+    "@jumpTo": {
+        "description": "Imperative. Label used in popup allowing the user to jump to a specific exercise while in the gym mode"
+    },
+    "difference": "Diferença",
+    "@difference": {},
+    "fiber": "Fibra",
+    "@fiber": {},
+    "aboutDescription": "Obrigado por usar o Wger! Wger é um projeto colaborativo de código aberto, feito por entusiastas do fitness de todo o mundo.",
+    "@aboutDescription": {
+        "description": "Text in the about dialog"
+    },
+    "timeStart": "Hora de início",
+    "@timeStart": {
+        "description": "The starting time of a workout"
+    },
+    "searchExercise": "Exercício de pesquisa para adicionar",
+    "@searchExercise": {
+        "description": "Label on set form. Selected exercises are added to the set"
+    },
+    "moreMeasurementEntries": "Adicionar nova medição",
+    "@moreMeasurementEntries": {
+        "description": "Message shown when the user wants to add new measurement"
+    },
+    "loadingText": "Carregando...",
+    "@loadingText": {
+        "description": "Text to show when entries are being loaded in the background: Loading..."
+    },
+    "selectExercises": "Se quiser fazer um superset você pode procurar vários exercícios, eles estarão agrupados",
+    "@selectExercises": {},
+    "nutritionalDiary": "Diário nutricional",
+    "@nutritionalDiary": {},
+    "protein": "Proteína",
+    "@protein": {},
+    "proteinShort": "P",
+    "@proteinShort": {
+        "description": "The first letter or short name of the word 'Protein', used in overviews"
+    },
+    "noWeightEntries": "Você não tem entradas de peso",
+    "@noWeightEntries": {
+        "description": "Message shown when the user has no logged weight entries"
+    },
+    "noNutritionalPlans": "Você não tem planos nutricionais",
+    "@noNutritionalPlans": {
+        "description": "Message shown when the user has no nutritional plans"
+    },
+    "goToDetailPage": "Ir para a página de detalhes",
+    "@goToDetailPage": {},
+    "labelWorkoutLogs": "Registros de treinos",
+    "@labelWorkoutLogs": {
+        "description": "(Workout) logs"
+    },
+    "ingredient": "Ingrediente",
+    "@ingredient": {},
+    "measurementCategoriesHelpText": "Categoria de medição, como 'bíceps' ou 'gordura corporal'",
+    "@measurementCategoriesHelpText": {},
+    "rirNotUsed": "RiR não usado",
+    "@rirNotUsed": {
+        "description": "Label used in RiR slider when the RiR value is not used/saved for the current setting or log"
+    },
+    "todaysWorkout": "Seu treino hoje",
+    "@todaysWorkout": {},
+    "kJ": "kJ",
+    "@kJ": {
+        "description": "Energy in a meal in kilo joules, kJ"
+    },
+    "sodium": "Sódio",
+    "@sodium": {},
+    "translation": "Tradução",
+    "@translation": {},
+    "successfullySaved": "Salvo",
+    "@successfullySaved": {
+        "description": "Message when an item was successfully saved"
+    },
+    "exerciseList": "Lista de exercícios",
+    "@exerciseList": {},
+    "energy": "Energia",
+    "@energy": {
+        "description": "Energy in a meal, ingredient etc. e.g. in kJ"
+    },
+    "newDay": "Novo dia",
+    "@newDay": {},
+    "toggleDetails": "Alterar detalhes",
+    "@toggleDetails": {
+        "description": "Switch to toggle detail / overview"
+    },
+    "musclesSecondary": "Músculos secundários",
+    "@musclesSecondary": {
+        "description": "secondary muscles trained by an exercise"
+    },
+    "labelDashboard": "Painel",
+    "@labelDashboard": {
+        "description": "Title for screen dashboard"
+    },
+    "timeEnd": "Fim do tempo",
+    "@timeEnd": {
+        "description": "The end time of a workout"
+    },
+    "planned": "Planejado",
+    "@planned": {
+        "description": "Header for the column of 'planned' nutritional values, i.e. what should be eaten"
+    },
+    "logHelpEntries": "Se em um mesmo dia houver mais de uma inscrição com o mesmo número de repetições, mas pesos diferentes, apenas a inscrição com maior peso será mostrada no diagrama.",
+    "@logHelpEntries": {},
+    "exerciseName": "Nome do exercício",
+    "@exerciseName": {
+        "description": "Label for the name of a workout exercise"
+    },
+    "labelBottomNavNutrition": "Nutrição",
+    "@labelBottomNavNutrition": {
+        "description": "Label used in bottom navigation, use a short word"
+    },
+    "language": "Linguagem",
+    "@language": {},
+    "nutritionalPlans": "Planos nutricionais",
+    "@nutritionalPlans": {},
+    "kcal": "kcal",
+    "@kcal": {
+        "description": "Energy in a meal in kilocalories, kcal"
+    },
+    "g": "g",
+    "@g": {
+        "description": "Abbreviation for gram"
+    },
+    "addMeal": "Adicionar refeição",
+    "@addMeal": {},
+    "sameRepetitions": "Se você fizer as mesmas repetições e peso para todas as séries, poderá preencher apenas uma linha. Por exemplo, para 4 séries basta inserir 10 para as repetições, isso automaticamente se torna \"4 x 10\".",
+    "@sameRepetitions": {},
+    "measurementEntriesHelpText": "A unidade usada para medir a categoria, como 'cm' ou '%'",
+    "@measurementEntriesHelpText": {},
+    "sugars": "Açúcar",
+    "@sugars": {},
+    "carbohydratesShort": "C",
+    "@carbohydratesShort": {
+        "description": "The first letter or short name of the word 'Carbohydrates', used in overviews"
+    },
+    "measurements": "Medidas",
+    "@measurements": {
+        "description": "Categories for the measurements such as biceps size, body fat, etc."
+    },
+    "macronutrients": "Macronutrientes",
+    "@macronutrients": {},
+    "plateCalculatorNotDivisible": "Não é possível atingir o peso com os pratos disponíveis",
+    "@plateCalculatorNotDivisible": {
+        "description": "Error message when the current weight is not reachable with plates (e.g. 33.1 kg)"
+    },
+    "confirmDelete": "Tem certeza de que deseja excluir '{toDelete}'?",
+    "@confirmDelete": {
+        "description": "Confirmation text before the user deletes an object",
+        "type": "text",
+        "placeholders": {
+            "toDelete": {
+                "type": "String"
+            }
+        }
+    },
+    "gPerBodyKg": "g por kg corporal",
+    "@gPerBodyKg": {
+        "description": "Label used for total sums of e.g. calories or similar in grams per Kg of body weight"
+    },
+    "weekAverage": "Média de 7 dias",
+    "@weekAverage": {
+        "description": "Header for the column of '7 day average' nutritional values, i.e. what was logged last week"
+    },
+    "labelWorkoutPlan": "Plano de treino",
+    "@labelWorkoutPlan": {
+        "description": "Title for screen workout plan"
+    },
+    "category": "Categoria",
+    "@category": {
+        "description": "Category for an exercise, ingredient, etc."
+    },
+    "exercises": "Exercícios",
+    "@exercises": {
+        "description": "Multiple exercises for a workout"
+    },
+    "time": "Tempo",
+    "@time": {
+        "description": "The time of a meal or workout"
+    },
+    "calendar": "Calendário",
+    "@calendar": {},
+    "verify": "Verificar",
+    "@verify": {},
+    "workoutSession": "Sessão de treino",
+    "@workoutSession": {
+        "description": "A (logged) workout session"
+    },
+    "logHelpEntriesUnits": "Observe que apenas as entradas com uma unidade de peso (kg ou lb) e repetições são registradas; outras combinações, como tempo ou até a falha, são ignoradas aqui.",
+    "@logHelpEntriesUnits": {},
+    "measurement": "Medição",
+    "@measurement": {},
+    "nrOfSets": "Séries por exercício: {nrOfSets}",
+    "@nrOfSets": {
+        "description": "Label shown on the slider where the user selects the nr of sets",
+        "type": "text",
+        "placeholders": {
+            "nrOfSets": {
+                "type": "String"
+            }
+        }
+    },
+    "useMetric": "Use unidades métricas para peso corporal",
+    "@useMetric": {},
+    "aboutMastodonTitle": "Mastodon",
+    "@aboutMastodonTitle": {},
+    "selectEntry": "Por favor, selecione uma entrada",
+    "@selectEntry": {},
+    "noMatchingExerciseFound": "Sem exercícios correspondentes encontrados",
+    "@noMatchingExerciseFound": {
+        "description": "Message returned if no exercises match the searched string"
+    },
+    "selectExercise": "Por favor, selecione um exercício",
+    "@selectExercise": {
+        "description": "Error message when the user hasn't selected an exercise in the form"
+    },
+    "enterValidNumber": "Por favor, insira um número válido",
+    "@enterValidNumber": {
+        "description": "Error message when the user has submitted an invalid number (e.g. '3,.,.,.')"
+    },
+    "baseNameEnglish": "Todos os exercícios necessitam de um nome base em inglês",
+    "@baseNameEnglish": {},
+    "labelBottomNavWorkout": "Treino",
+    "@labelBottomNavWorkout": {
+        "description": "Label used in bottom navigation, use a short word"
+    },
+    "reps": "Repetições",
+    "@reps": {
+        "description": "Shorthand for repetitions, used when space constraints are tighter"
+    },
+    "rir": "ReR",
+    "@rir": {
+        "description": "Shorthand for Repetitions In Reserve"
+    },
+    "setUnitsAndRir": "Unidades e RIR da série",
+    "@setUnitsAndRir": {
+        "description": "Label shown on the slider where the user can toggle showing units and RiR",
+        "type": "text"
+    },
+    "aboutDonateTitle": "Faça uma doação",
+    "@aboutDonateTitle": {},
+    "aboutDonateText": "Enquanto o aplicativo e serviço é de graça, desenvolvê-lo não é. O desenvolvimento tomar tempo e recursos de voluntários. Sua contribuição pode ajudar a tornar o aplicativo melhor e a manter o serviço rodando por mais tempo.",
+    "@aboutDonateText": {},
+    "enterCharacters": "Por favor, utilize entre {min} e {max} caracteres",
+    "@enterCharacters": {
+        "description": "Error message when the user hasn't entered the correct number of characters in a form",
+        "type": "text",
+        "placeholders": {
+            "min": {
+                "type": "String"
+            },
+            "max": {
+                "type": "String"
+            }
+        }
+    },
+    "enterMinCharacters": "Por favor, utilize pelo menos {min} caracteres",
+    "@enterMinCharacters": {
+        "description": "Error message when the user hasn't entered the minimum amount characters in a form",
+        "type": "text",
+        "placeholders": {
+            "min": {
+                "type": "String"
+            }
+        }
+    },
+    "gallery": "Galeria",
+    "@gallery": {},
+    "alsoKnownAs": "Também conhecido como:{aliases}",
+    "@alsoKnownAs": {
+        "placeholders": {
+            "aliases": {
+                "type": "String"
+            }
+        },
+        "description": "List of alternative names for an exercise"
+    },
+    "recentlyUsedIngredients": "Ingredientes adicionados recentemente",
+    "@recentlyUsedIngredients": {
+        "description": "A message when a user adds a new ingredient to a meal."
+    },
+    "addImage": "Adicionar imagem",
+    "@addImage": {},
+    "scanBarcode": "Escaneie o código de barras",
+    "@scanBarcode": {
+        "description": "Label for scan barcode button"
+    },
+    "dataCopied": "Dados copiados para o novo registro",
+    "@dataCopied": {
+        "description": "Snackbar message to show on copying data to a new log entry"
+    },
+    "appUpdateContent": "Esta versão do aplicativo não é compatível com o servidor, por favor atualize o aplicativo.",
+    "@appUpdateContent": {},
+    "productFound": "Produto encontrado",
+    "@productFound": {
+        "description": "Header label for dialog when product is found with barcode"
+    },
+    "appUpdateTitle": "Atualização necessária",
+    "@appUpdateTitle": {},
+    "takePicture": "Tire uma foto",
+    "@takePicture": {},
+    "selectIngredient": "Por favor, selecione um ingrediente",
+    "@selectIngredient": {
+        "description": "Error message when the user hasn't selected an ingredient from the autocompleter"
+    },
+    "selectImage": "Por favor, selecione uma imagem",
+    "@selectImage": {
+        "description": "Label and error message when the user hasn't selected an image to save"
+    },
+    "optionsLabel": "Opções",
+    "@optionsLabel": {
+        "description": "Label for the popup with general app options"
+    },
+    "productNotFound": "Produto não encontrado",
+    "@productNotFound": {
+        "description": "Header label for dialog when product is not found with barcode"
+    },
+    "variations": "Variações",
+    "@variations": {
+        "description": "Variations of one exercise (e.g. benchpress and benchpress narrow)"
+    },
+    "verifiedEmail": "Email verificado",
+    "@verifiedEmail": {},
+    "chooseFromLibrary": "Escolher na galeria",
+    "@chooseFromLibrary": {},
+    "unVerifiedEmail": "Email não verificado",
+    "@unVerifiedEmail": {},
+    "add_exercise_image_license": "As imagens devem ser compatíveis com a licença CC BY SA. Em caso de dúvida, faça upload apenas de fotos que você mesmo tenha tirado.",
+    "@add_exercise_image_license": {},
+    "next": "Próximo",
+    "@next": {},
+    "settingsCacheTitle": "Cache",
+    "@settingsCacheTitle": {},
+    "settingsExerciseCacheDescription": "Cache do exercício",
+    "@settingsExerciseCacheDescription": {},
+    "settingsCacheDeletedSnackbar": "Cache limpa com sucesso",
+    "@settingsCacheDeletedSnackbar": {},
+    "translateExercise": "Traduza este exercício agora",
+    "@translateExercise": {},
+    "contributeExerciseWarning": "Você só pode contribuir com exercícios se sua conta tiver mais de {days} dias e se você tiver verificado seu e-mail",
+    "@contributeExerciseWarning": {
+        "description": "Number of days before which a person can add exercise",
+        "placeholders": {
+            "days": {
+                "type": "String",
+                "example": "14"
+            }
+        }
+    },
+    "whatVariationsExist": "Quais variações deste exercício existem, se houver?",
+    "@whatVariationsExist": {},
+    "previous": "Anterior",
+    "@previous": {},
+    "addExercise": "Adicionar exercício",
+    "@addExercise": {},
+    "verifiedEmailInfo": "Um e-mail foi enviado para {email}",
+    "@verifiedEmailInfo": {
+        "placeholders": {
+            "email": {
+                "type": "String"
+            }
+        }
+    },
+    "verifiedEmailReason": "Você precisa verificar seu e-mail para contribuir com exercícios",
+    "@verifiedEmailReason": {},
+    "alternativeNames": "Nomes alternativos",
+    "@alternativeNames": {},
+    "baseData": "Fundamentos em inglês",
+    "@baseData": {
+        "description": "The base data for an exercise such as category, trained muscles, etc."
+    },
+    "aboutPageTitle": "Sobre o nós & Suporte",
+    "@aboutPageTitle": {},
+    "productFoundDescription": "O código de barras corresponde a este produto: {productName}. Deseja continuar?",
+    "@productFoundDescription": {
+        "description": "Dialog info when product is found with barcode",
+        "type": "text",
+        "placeholders": {
+            "productName": {
+                "type": "String"
+            }
+        }
+    },
+    "productNotFoundDescription": "O produto com o código de barras escaneado {barcode} não foi encontrado no banco de dados da wger",
+    "@productNotFoundDescription": {
+        "description": "Dialog info when product is not found with barcode",
+        "type": "text",
+        "placeholders": {
+            "barcode": {
+                "type": "String"
+            }
+        }
+    },
+    "contributeExercise": "Contribuir com um exercício",
+    "@contributeExercise": {},
+    "oneNamePerLine": "Um nome por linha",
+    "@oneNamePerLine": {},
+    "settingsTitle": "Configurações",
+    "@settingsTitle": {},
+    "onlyLogging": "Apenas acompanhe calorias",
+    "@onlyLogging": {},
+    "ingredientLogged": "Ingrediente registrado no diário",
+    "@ingredientLogged": {},
+    "noIngredientsDefined": "Nenhum ingrediente definido ainda",
+    "@noIngredientsDefined": {},
+    "bench": "Banco",
+    "@bench": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "goalFiber": "Meta de fibras",
+    "@goalFiber": {},
+    "overallChangeWeight": "Mudança geral",
+    "@overallChangeWeight": {
+        "description": "Overall change in weight, added for localization"
+    },
+    "goalTypeMeals": "De refeições",
+    "@goalTypeMeals": {
+        "description": "added for localization of Class GoalType's filed meals"
+    },
+    "goalTypeBasic": "Básico",
+    "@goalTypeBasic": {
+        "description": "added for localization of Class GoalType's filed basic"
+    },
+    "goalTypeAdvanced": "Avançado",
+    "@goalTypeAdvanced": {
+        "description": "added for localization of Class GoalType's filed advanced"
+    },
+    "indicatorRaw": "bruto",
+    "@indicatorRaw": {
+        "description": "added for localization of Class Indicator's field text"
+    },
+    "indicatorAvg": "média",
+    "@indicatorAvg": {
+        "description": "added for localization of Class Indicator's field text"
+    },
+    "seconds": "Segundos",
+    "@seconds": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "textPromptTitle": "Pronto para iniciar?",
+    "@textPromptTitle": {},
+    "textPromptSubheading": "Aperte o botão de ação para começar",
+    "@textPromptSubheading": {},
+    "chest": "Peito",
+    "@chest": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "max_reps": "Repetições Máximas",
+    "@max_reps": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "pull_up_bar": "Barra de Pull-up",
+    "@pull_up_bar": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "quads": "Quadríceps",
+    "@quads": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "goalFat": "Meta de gordura",
+    "@goalFat": {},
+    "body_weight": "Peso Corporal",
+    "@body_weight": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "kilometers": "Quilômetros",
+    "@kilometers": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "kilometers_per_hour": "Quilômetros por hora",
+    "@kilometers_per_hour": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "miles_per_hour": "Milhas por hora",
+    "@miles_per_hour": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "minutes": "Minutos",
+    "@minutes": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "sz_bar": "Barra Curvada",
+    "@sz_bar": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "goalProtein": "Meta de proteína",
+    "@goalProtein": {},
+    "goalEnergy": "Meta energética",
+    "@goalEnergy": {},
+    "today": "Hoje",
+    "@today": {},
+    "arms": "Braços",
+    "@arms": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "calves": "Panturrilha",
+    "@calves": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "triceps": "Tríceps",
+    "@triceps": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "goalCarbohydrates": "Meta de carbohidratos",
+    "@goalCarbohydrates": {},
+    "onlyLoggingHelpText": "Marque a caixa se você apenas quiser registrar suas calorias e não quer configurar um plano nutricional detalhado com refeições específicas",
+    "@onlyLoggingHelpText": {},
+    "kcalValue": "{value} kcal",
+    "@kcalValue": {
+        "description": "A value in kcal, e.g. 500 kcal",
+        "type": "text",
+        "placeholders": {
+            "value": {
+                "type": "String"
+            }
+        }
+    },
+    "percentValue": "{value} %",
+    "@percentValue": {
+        "description": "A value in percent, e.g. 10 %",
+        "type": "text",
+        "placeholders": {
+            "value": {
+                "type": "String"
+            }
+        }
+    },
+    "goalMacro": "Macro Objetivos",
+    "@goalMacro": {
+        "description": "The goal for macronutrients"
+    },
+    "selectMealToLog": "Selecione uma refeição para registrar no diário",
+    "@selectMealToLog": {},
+    "loggedToday": "Registrado hoje",
+    "@loggedToday": {},
+    "surplus": "excedente",
+    "@surplus": {
+        "description": "Caloric surplus (either planned or unplanned)"
+    },
+    "deficit": "déficit",
+    "@deficit": {
+        "description": "Caloric deficit (either planned or unplanned)"
+    },
+    "gValue": "{value} g",
+    "@gValue": {
+        "description": "A value in grams, e.g. 5 g",
+        "type": "text",
+        "placeholders": {
+            "value": {
+                "type": "String"
+            }
+        }
+    },
+    "abs": "Abdômen",
+    "@abs": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "back": "Costas",
+    "@back": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "barbell": "Barra",
+    "@barbell": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "cardio": "Cardio",
+    "@cardio": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "dumbbell": "Haltere",
+    "@dumbbell": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "glutes": "Glúteos",
+    "@glutes": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "gym_mat": "Tapete",
+    "@gym_mat": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "hamstrings": "Tendões",
+    "@hamstrings": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "kettlebell": "Kettlebell",
+    "@kettlebell": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "lats": "Dorsal",
+    "@lats": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "legs": "Pernas",
+    "@legs": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "lower_back": "Lombar",
+    "@lower_back": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "plates": "Anilhas",
+    "@plates": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "repetitions": "Repetições",
+    "@repetitions": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "shoulders": "Ombros",
+    "@shoulders": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "until_failure": "Até a falha",
+    "@until_failure": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "kg": "kg",
+    "@kg": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "none__bodyweight_exercise_": "nenhum (exercício com peso corporal)",
+    "@none__bodyweight_exercise_": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "lb": "lb",
+    "@lb": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "chartAllTimeTitle": "{name} total",
+    "@chartAllTimeTitle": {
+        "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
+        "type": "text",
+        "placeholders": {
+            "name": {
+                "type": "String"
+            }
+        }
+    },
+    "chart30DaysTitle": "{name} últimos 30 dias",
+    "@chart30DaysTitle": {
+        "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
+        "type": "text",
+        "placeholders": {
+            "name": {
+                "type": "String"
+            }
+        }
+    },
+    "chartDuringPlanTitle": "{chartName} durante plano nutricional {planName}",
+    "@chartDuringPlanTitle": {
+        "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
+        "type": "text",
+        "placeholders": {
+            "chartName": {
+                "type": "String"
+            },
+            "planName": {
+                "type": "String"
+            }
+        }
+    },
+    "settingsIngredientCacheDescription": "Cache de Ingredientes",
+    "@settingsIngredientCacheDescription": {},
+    "cacheWarning": "Devido ao cache pode demorar algum tempo até que mudanças estejam visíveis na aplicação.",
+    "@cacheWarning": {},
+    "swiss_ball": "Bola Suíça",
+    "@swiss_ball": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "log": "Registro",
+    "@log": {
+        "description": "Log a specific meal (imperative form)"
+    },
+    "done": "Feito",
+    "@done": {},
+    "incline_bench": "Banco inclinado",
+    "@incline_bench": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "miles": "Milhas",
+    "@miles": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "biceps": "Bíceps",
+    "@biceps": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "useApiToken": "Usar Token API",
+    "@useApiToken": {},
+    "useUsernameAndPassword": "Usar usuário e senha",
+    "@useUsernameAndPassword": {},
+    "apiToken": "Token API",
+    "@apiToken": {},
+    "invalidApiToken": "Por favor, entre com a API key válida",
+    "@invalidApiToken": {
+        "description": "Error message when the user enters an invalid API key"
+    },
+    "apiTokenValidChars": "A chave API deve ter apenas letras a-f, números 0-9 e ter exatamente 40 caracteres",
+    "@apiTokenValidChars": {
+        "description": "Error message when the user tries to input a API key with forbidden characters"
+    },
+    "routines": "Rotinas",
+    "@routines": {},
+    "newRoutine": "Nova rotina",
+    "@newRoutine": {},
+    "noRoutines": "Não tens rotinas",
+    "@noRoutines": {},
+    "restTime": "Tempo de descanso",
+    "@restTime": {},
+    "sets": "Conjuntos",
+    "@sets": {
+        "description": "The number of sets to be done for one exercise"
+    },
+    "exerciseNr": "Exercício {nr}",
+    "@exerciseNr": {
+        "description": "Header in form indicating the number of the current exercise. Can also be translated as something like 'Set Nr. xy'.",
+        "type": "text",
+        "placeholders": {
+            "nr": {
+                "type": "String"
+            }
+        }
+    },
+    "supersetNr": "Superset {nr}",
+    "@supersetNr": {
+        "description": "Header in form indicating the number of the current exercise. Can also be translated as something like 'Superset Nr. xy'.",
+        "type": "text",
+        "placeholders": {
+            "nr": {
+                "type": "String"
+            }
+        }
+    },
+    "restDay": "Dia de descanso",
+    "@restDay": {},
+    "isRestDay": "É dia de descanso",
+    "@isRestDay": {},
+    "isRestDayHelp": "Por favor, note que todos os conjuntos e exercícios serão removidos quando marcar um dia como um dia de descanso.",
+    "@isRestDayHelp": {},
+    "needsLogsToAdvance": "Precisa de logs para avançar",
+    "@needsLogsToAdvance": {},
+    "selectAvailablePlates": "Selecione os pesos disponíveis",
+    "@selectAvailablePlates": {},
+    "barWeight": "Peso da barra",
+    "@barWeight": {},
+    "useColors": "Use cores",
+    "@useColors": {},
+    "needsLogsToAdvanceHelp": "Selecione se deseja que a rotina de treino avance para o próximo dia agendado somente se você cadastrou o dia de treino",
+    "@needsLogsToAdvanceHelp": {},
+    "routineDays": "Dias de treino",
+    "@routineDays": {},
+    "resultingRoutine": "Treino resultante",
+    "@resultingRoutine": {},
+    "yourCurrentNutritionPlanHasNoMealsDefinedYet": "Seu plano nutricional não tem refeições definidas",
+    "@yourCurrentNutritionPlanHasNoMealsDefinedYet": {
+        "description": "Message shown when a nutrition plan doesn't have any meals"
+    },
+    "toAddMealsToThePlanGoToNutritionalPlanDetails": "Para adicionar refeições para o planejamento, vá para Detalhes de Plano Nutricional",
+    "@toAddMealsToThePlanGoToNutritionalPlanDetails": {
+        "description": "Message shown to guide users to the nutritional plan details page to add meals"
+    },
+    "errorInfoDescription": "Algo de errado aconteceu. Você pode nos ajudar a concertar esse problema reportando o problema no Github",
+    "@errorInfoDescription": {},
+    "errorInfoDescription2": "Você pode continuar usando o applicativo, mas algumas funcionalidades não estarão disponíveis.",
+    "@errorInfoDescription2": {},
+    "errorViewDetails": "Detalhes técnicos",
+    "@errorViewDetails": {},
+    "errorCouldNotConnectToServer": "Não foi possível conectar ao servidor",
+    "@errorCouldNotConnectToServer": {},
+    "errorCouldNotConnectToServerDetails": "O aplicativo não conseguiu conectar ao servidor. Verifique sua conexão de internet ou a URL do servidor e tente novamente. Se o problema persistir, contact o administrador.",
+    "@errorCouldNotConnectToServerDetails": {},
+    "copyToClipboard": "Copiar ao clipboard",
+    "@copyToClipboard": {},
+    "min": "Min",
+    "@min": {},
+    "max": "Max",
+    "@max": {},
+    "aboutWhySupportTitle": "Open Source & free to use ❤️",
+    "@aboutWhySupportTitle": {},
+    "aboutContributeTitle": "Contribua",
+    "@aboutContributeTitle": {},
+    "aboutContributeText": "Todos os tipos de contribuidores são bem vindos. Se você é um desenvolvedor, tradutor ou alguém apaixonado pelo fitness, toda ajuda é bem vinda!",
+    "@aboutContributeText": {},
+    "aboutBugsListTitle": "Reportar um problema ou sugerir uma funcionalidade",
+    "@aboutBugsListTitle": {},
+    "aboutTranslationListTitle": "Traduzir a aplicação",
+    "@aboutTranslationListTitle": {},
+    "aboutSourceListTitle": "Ver o código fonte",
+    "@aboutSourceListTitle": {},
+    "aboutJoinCommunityTitle": "Entre para a comunidade",
+    "@aboutJoinCommunityTitle": {},
+    "aboutDiscordTitle": "Discord",
+    "@aboutDiscordTitle": {},
+    "others": "Outros",
+    "@others": {},
+    "fitInWeek": "Treino na semana",
+    "@fitInWeek": {},
+    "fitInWeekHelp": "Se ligado, os dias vão se repetir semanalmente, caso contrário os dias seguirão sequencialmente se considerar o começo de uma nova semana.",
+    "@fitInWeekHelp": {},
+    "addSuperset": "Adicionar superset",
+    "@addSuperset": {},
+    "setHasProgression": "Treino tem prograssão",
+    "@setHasProgression": {},
+    "setHasProgressionWarning": "Observe que, no momento, não é possível editar todas as configurações de um conjunto no aplicativo móvel nem configurar a progressão automática. Por enquanto, use o aplicativo web.",
+    "@setHasProgressionWarning": {},
+    "setHasNoExercises": "Este treino ainda não tem exercícios!",
+    "@setHasNoExercises": {},
+    "simpleMode": "Modo simples",
+    "@simpleMode": {},
+    "simpleModeHelp": "Esconder informações avançadas enquanto estiver editando exercicio",
+    "@simpleModeHelp": {},
+    "progressionRules": "Este exercício tem regras de progressão e não pode ser editado no aplicativo móvel. Use o aplicativo web para editá-lo.",
+    "@progressionRules": {},
+    "resistance_band": "Resistance band",
+    "@resistance_band": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "themeMode": "Tema",
+    "@themeMode": {},
+    "darkMode": "Sempre modo escuro",
+    "@darkMode": {},
+    "lightMode": "Sempre modo claro",
+    "@lightMode": {},
+    "systemMode": "Configurações do sistema",
+    "@systemMode": {}
 }
diff --git a/lib/l10n/app_pt_PT.arb b/lib/l10n/app_pt_PT.arb
new file mode 100644
index 00000000..a5a7c90e
--- /dev/null
+++ b/lib/l10n/app_pt_PT.arb
@@ -0,0 +1,1062 @@
+{
+  "login": "Iniciar sessão",
+  "@login": {
+    "description": "Text for login button"
+  },
+  "success": "Sucesso",
+  "@success": {
+    "description": "Message when an action completed successfully, usually used as a heading"
+  },
+  "noMatchingExerciseFound": "Não foram encontrados exercícios",
+  "@noMatchingExerciseFound": {
+    "description": "Message returned if no exercises match the searched string"
+  },
+  "labelDashboard": "Painel",
+  "@labelDashboard": {
+    "description": "Title for screen dashboard"
+  },
+  "exercise": "Exercício",
+  "@exercise": {
+    "description": "An exercise for a workout"
+  },
+  "usernameValidChars": "O nome de utilizador só pode conter letras, números e os caracteres @, +, ., - e _",
+  "@usernameValidChars": {
+    "description": "Error message when the user tries to register a username with forbidden characters"
+  },
+  "searchNamesInEnglish": "Também procurar nomes em inglês",
+  "@searchNamesInEnglish": {},
+  "useCustomServer": "Usar servidor personalizado",
+  "@useCustomServer": {
+    "description": "Toggle button allowing users to switch between the default and a custom wger server"
+  },
+  "equipment": "Equipamento",
+  "@equipment": {
+    "description": "Equipment needed to perform an exercise"
+  },
+  "userProfile": "O teu perfil",
+  "@userProfile": {},
+  "register": "Registar",
+  "@register": {
+    "description": "Text for registration button"
+  },
+  "comment": "Comentário",
+  "@comment": {
+    "description": "Comment, additional information"
+  },
+  "customServerHint": "Introduz o endereço do teu próprio servidor, senão será usado o predefinido",
+  "@customServerHint": {
+    "description": "Hint text for the form where the users can enter their own wger instance"
+  },
+  "useDefaultServer": "Usar servidor predefinido",
+  "@useDefaultServer": {
+    "description": "Toggle button allowing users to switch between the default and a custom wger server"
+  },
+  "invalidUrl": "Introduz um URL válido",
+  "@invalidUrl": {
+    "description": "Error message when the user enters an invalid URL, e.g. in the login form"
+  },
+  "passwordsDontMatch": "As palavras-passe não coincidem",
+  "@passwordsDontMatch": {
+    "description": "Error message when the user enters two different passwords during registration"
+  },
+  "passwordTooShort": "A palavra-passe é demasiado curta",
+  "@passwordTooShort": {
+    "description": "Error message when the user a password that is too short"
+  },
+  "selectAvailablePlates": "Selecionar discos disponíveis",
+  "@selectAvailablePlates": {},
+  "barWeight": "Peso da barra",
+  "@barWeight": {},
+  "useColors": "Usar cores",
+  "@useColors": {},
+  "password": "Palavra-passe",
+  "@password": {},
+  "confirmPassword": "Confirmar palavra-passe",
+  "@confirmPassword": {},
+  "invalidEmail": "Introduz um e-mail válido",
+  "@invalidEmail": {
+    "description": "Error message when the user enters an invalid email"
+  },
+  "email": "Endereço de e-mail",
+  "@email": {},
+  "username": "Nome de utilizador",
+  "@username": {},
+  "invalidUsername": "Introduz um nome de utilizador válido",
+  "@invalidUsername": {
+    "description": "Error message when the user enters an invalid username"
+  },
+  "useApiToken": "Usar Token da API",
+  "@useApiToken": {},
+  "useUsernameAndPassword": "Usar nome de utilizador e palavra-passe",
+  "@useUsernameAndPassword": {},
+  "apiToken": "Token da API",
+  "@apiToken": {},
+  "invalidApiToken": "Introduz uma chave API válida",
+  "@invalidApiToken": {
+    "description": "Error message when the user enters an invalid API key"
+  },
+  "apiTokenValidChars": "Uma chave API só pode conter letras de a-f, números de 0-9 e ter exatamente 40 caracteres",
+  "@apiTokenValidChars": {
+    "description": "Error message when the user tries to input a API key with forbidden characters"
+  },
+  "customServerUrl": "URL da instância wger",
+  "@customServerUrl": {
+    "description": "Label in the form where the users can enter their own wger instance"
+  },
+  "reset": "Repor",
+  "@reset": {
+    "description": "Button text allowing the user to reset the entered values to the default"
+  },
+  "registerInstead": "Ainda não tens conta? Regista-te agora",
+  "@registerInstead": {},
+  "loginInstead": "Já tens conta? Inicia sessão",
+  "@loginInstead": {},
+  "labelBottomNavWorkout": "Treino",
+  "@labelBottomNavWorkout": {
+    "description": "Label used in bottom navigation, use a short word"
+  },
+  "labelBottomNavNutrition": "Nutrição",
+  "@labelBottomNavNutrition": {
+    "description": "Label used in bottom navigation, use a short word"
+  },
+  "labelWorkoutLogs": "Registos de treino",
+  "@labelWorkoutLogs": {
+    "description": "(Workout) logs"
+  },
+  "labelWorkoutPlan": "Plano de treino",
+  "@labelWorkoutPlan": {
+    "description": "Title for screen workout plan"
+  },
+  "successfullyDeleted": "Eliminado",
+  "@successfullyDeleted": {
+    "description": "Message when an item was successfully deleted"
+  },
+  "successfullySaved": "Guardado",
+  "@successfullySaved": {
+    "description": "Message when an item was successfully saved"
+  },
+  "exerciseList": "Lista de exercícios",
+  "@exerciseList": {},
+  "exercises": "Exercícios",
+  "@exercises": {
+    "description": "Multiple exercises for a workout"
+  },
+  "exerciseName": "Nome do exercício",
+  "@exerciseName": {
+    "description": "Label for the name of a workout exercise"
+  },
+  "searchExercise": "Procura um exercício para adicionar",
+  "@searchExercise": {
+    "description": "Label on set form. Selected exercises are added to the set"
+  },
+  "muscles": "Músculos",
+  "@muscles": {
+    "description": "(main) muscles trained by an exercise"
+  },
+  "musclesSecondary": "Músculos secundários",
+  "@musclesSecondary": {
+    "description": "secondary muscles trained by an exercise"
+  },
+  "category": "Categoria",
+  "@category": {
+    "description": "Category for an exercise, ingredient, etc."
+  },
+  "routines": "Rotinas",
+  "@routines": {},
+  "newRoutine": "Nova rotina",
+  "@newRoutine": {},
+  "noRoutines": "Ainda não tens rotinas",
+  "@noRoutines": {},
+  "reps": "Repetições",
+  "@reps": {
+    "description": "Shorthand for repetitions, used when space constraints are tighter"
+  },
+  "sets": "Séries",
+  "@sets": {
+    "description": "The number of sets to be done for one exercise"
+  },
+  "rir": "Repetições em Reserva",
+  "@rir": {
+    "description": "Shorthand for Repetitions In Reserve"
+  },
+  "restTime": "Tempo de descanso",
+  "@restTime": {},
+  "rirNotUsed": "ReR não utilizado",
+  "@rirNotUsed": {
+    "description": "Label used in RiR slider when the RiR value is not used/saved for the current setting or log"
+  },
+  "useMetric": "Usar unidades métricas para peso corporal",
+  "@useMetric": {},
+  "weightUnit": "Unidade de peso",
+  "@weightUnit": {},
+  "set": "Série",
+  "@set": {
+    "description": "A set in a workout plan"
+  },
+  "needsLogsToAdvance": "Precisa de registos para avançar",
+  "@needsLogsToAdvance": {},
+  "repetitionUnit": "Unidade de repetição",
+  "@repetitionUnit": {},
+  "dayDescriptionHelp": "Descrição do que é feito neste dia (ex.: \"dia de puxar\") ou que músculos são treinados (ex.: \"peito e ombros\")",
+  "@dayDescriptionHelp": {},
+  "exerciseNr": "Exercício {nr}",
+  "@exerciseNr": {
+    "description": "Header in form indicating the number of the current exercise. Can also be translated as something like 'Set Nr. xy'.",
+    "type": "text",
+    "placeholders": {
+      "nr": {
+        "type": "String"
+      }
+    }
+  },
+  "supersetNr": "Superset {nr}",
+  "@supersetNr": {
+    "description": "Header in form indicating the number of the current exercise. Can also be translated as something like 'Superset Nr. xy'.",
+    "type": "text",
+    "placeholders": {
+      "nr": {
+        "type": "String"
+      }
+    }
+  },
+  "sameRepetitions": "Se fizeres o mesmo número de repetições e peso em todas as séries, basta preencher uma linha. Por exemplo: para 4 séries de 10, escreve \"10\" e fica automaticamente \"4 x 10\".",
+  "@sameRepetitions": {},
+  "impression": "Impressão",
+  "@impression": {
+    "description": "General impression (e.g. for a workout session) such as good, bad, etc."
+  },
+  "notes": "Notas",
+  "@notes": {
+    "description": "Personal notes, e.g. for a workout session"
+  },
+  "workoutSession": "Sessão de treino",
+  "@workoutSession": {
+    "description": "A (logged) workout session"
+  },
+  "isRestDayHelp": "Nota que todas as séries e exercícios serão removidos se marcares o dia como descanso.",
+  "@isRestDayHelp": {},
+  "restDay": "Dia de descanso",
+  "@restDay": {},
+  "isRestDay": "É dia de descanso",
+  "@isRestDay": {},
+  "selectExercises": "Se quiseres fazer um superset, podes procurar vários exercícios - eles serão agrupados",
+  "@selectExercises": {},
+  "gymMode": "Modo ginásio",
+  "@gymMode": {
+    "description": "Label when starting the gym mode"
+  },
+  "plateCalculator": "Discos",
+  "@plateCalculator": {
+    "description": "Label used for the plate calculator in the gym mode"
+  },
+  "plateCalculatorNotDivisible": "Não é possível atingir o peso com os discos disponíveis",
+  "@plateCalculatorNotDivisible": {
+    "description": "Error message when the current weight is not reachable with plates (e.g. 33.1 kg)"
+  },
+  "pause": "Pausa",
+  "@pause": {
+    "description": "Noun, not an imperative! Label used for the pause when using the gym mode"
+  },
+  "jumpTo": "Ir para",
+  "@jumpTo": {
+    "description": "Imperative. Label used in popup allowing the user to jump to a specific exercise while in the gym mode"
+  },
+  "todaysWorkout": "O teu treino de hoje",
+  "@todaysWorkout": {},
+  "logHelpEntries": "Se houver várias entradas no mesmo dia com o mesmo número de repetições mas pesos diferentes, só aparece no gráfico a de maior peso.",
+  "@logHelpEntries": {},
+  "logHelpEntriesUnits": "Apenas são mostradas entradas com unidade de peso (kg ou lb) e repetições, outras como tempo ou até falhar são ignoradas.",
+  "@logHelpEntriesUnits": {},
+  "description": "Descrição",
+  "@description": {},
+  "name": "Nome",
+  "@name": {
+    "description": "Name for a workout or nutritional plan"
+  },
+  "save": "Guardar",
+  "@save": {},
+  "verify": "Verificar",
+  "@verify": {},
+  "addSet": "Adicionar série",
+  "@addSet": {
+    "description": "Label for the button that adds a set (to a workout day)"
+  },
+  "addMeal": "Adicionar refeição",
+  "@addMeal": {},
+  "mealLogged": "Refeição registada no diário",
+  "@mealLogged": {},
+  "ingredientLogged": "Ingrediente registado no diário",
+  "@ingredientLogged": {},
+  "logMeal": "Registar refeição no diário nutricional",
+  "@logMeal": {},
+  "addIngredient": "Adicionar ingrediente",
+  "@addIngredient": {},
+  "logIngredient": "Registar ingrediente no diário nutricional",
+  "@logIngredient": {},
+  "searchIngredient": "Procurar ingrediente",
+  "@searchIngredient": {
+    "description": "Label on ingredient search form"
+  },
+  "nutritionalPlan": "Plano nutricional",
+  "@nutritionalPlan": {},
+  "nutritionalDiary": "Diário nutricional",
+  "@nutritionalDiary": {},
+  "nutritionalPlans": "Planos nutricionais",
+  "@nutritionalPlans": {},
+  "noNutritionalPlans": "Ainda não tens planos nutricionais",
+  "@noNutritionalPlans": {
+    "description": "Message shown when the user has no nutritional plans"
+  },
+  "onlyLogging": "Registar apenas calorias",
+  "@onlyLogging": {},
+  "onlyLoggingHelpText": "Marca esta opção se quiseres registar só as calorias, sem plano nutricional detalhado",
+  "@onlyLoggingHelpText": {},
+  "goalMacro": "Objetivos de macronutrientes",
+  "@goalMacro": {
+    "description": "The goal for macronutrients"
+  },
+  "selectMealToLog": "Seleciona uma refeição para registar no diário",
+  "@selectMealToLog": {},
+  "yourCurrentNutritionPlanHasNoMealsDefinedYet": "O teu plano nutricional atual não tem refeições definidas",
+  "@yourCurrentNutritionPlanHasNoMealsDefinedYet": {
+    "description": "Message shown when a nutrition plan doesn't have any meals"
+  },
+  "toAddMealsToThePlanGoToNutritionalPlanDetails": "Para adicionar refeições ao plano, vai aos detalhes do plano nutricional",
+  "@toAddMealsToThePlanGoToNutritionalPlanDetails": {
+    "description": "Message shown to guide users to the nutritional plan details page to add meals"
+  },
+  "goalEnergy": "Objetivo energético",
+  "@goalEnergy": {},
+  "goalProtein": "Objetivo de proteína",
+  "@goalProtein": {},
+  "goalCarbohydrates": "Objetivo de hidratos de carbono",
+  "@goalCarbohydrates": {},
+  "goalFat": "Objetivo de gordura",
+  "@goalFat": {},
+  "goalFiber": "Objetivo de fibra",
+  "@goalFiber": {},
+  "anErrorOccurred": "Ocorreu um erro!",
+  "@anErrorOccurred": {},
+  "errorInfoDescription": "Lamentamos, algo correu mal. Podes ajudar a corrigir isto ao reportar o problema no GitHub.",
+  "@errorInfoDescription": {},
+  "errorInfoDescription2": "Podes continuar a usar a app, mas algumas funcionalidades podem não funcionar.",
+  "@errorInfoDescription2": {},
+  "errorViewDetails": "Detalhes técnicos",
+  "@errorViewDetails": {},
+  "errorCouldNotConnectToServer": "Não foi possível ligar ao servidor",
+  "@errorCouldNotConnectToServer": {},
+  "copyToClipboard": "Copiar para a área de transferência",
+  "@copyToClipboard": {},
+  "weight": "Peso",
+  "@weight": {
+    "description": "The weight of a workout log or body weight entry"
+  },
+  "min": "Mín",
+  "@min": {},
+  "max": "Máx",
+  "@max": {},
+  "chartAllTimeTitle": "{name} total",
+  "@chartAllTimeTitle": {
+    "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
+    "type": "text",
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "chart30DaysTitle": "{name} últimos 30 dias",
+  "@chart30DaysTitle": {
+    "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
+    "type": "text",
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "chartDuringPlanTitle": "{chartName} durante o plano nutricional {planName}",
+  "@chartDuringPlanTitle": {
+    "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
+    "type": "text",
+    "placeholders": {
+      "chartName": {
+        "type": "String"
+      },
+      "planName": {
+        "type": "String"
+      }
+    }
+  },
+  "measurement": "Medição",
+  "@measurement": {},
+  "measurementCategoriesHelpText": "Categoria de medição, como 'bíceps' ou 'gordura corporal'",
+  "@measurementCategoriesHelpText": {},
+  "measurementEntriesHelpText": "Unidade usada para medir, como 'cm' ou '%'",
+  "@measurementEntriesHelpText": {},
+  "date": "Data",
+  "@date": {
+    "description": "The date of a workout log or body weight entry"
+  },
+  "value": "Valor",
+  "@value": {
+    "description": "The value of a measurement entry"
+  },
+  "time": "Hora",
+  "@time": {
+    "description": "The time of a meal or workout"
+  },
+  "timeStart": "Hora de início",
+  "@timeStart": {
+    "description": "The starting time of a workout"
+  },
+  "timeEnd": "Hora de fim",
+  "@timeEnd": {
+    "description": "The end time of a workout"
+  },
+  "timeStartAhead": "Hora de início não pode ser depois da hora de fim",
+  "@timeStartAhead": {},
+  "ingredient": "Ingrediente",
+  "@ingredient": {},
+  "energy": "Energia",
+  "@energy": {
+    "description": "Energy in a meal, ingredient etc. e.g. in kJ"
+  },
+  "planned": "Planeado",
+  "@planned": {
+    "description": "Header for the column of 'planned' nutritional values, i.e. what should be eaten"
+  },
+  "logged": "Registado",
+  "@logged": {
+    "description": "Header for the column of 'logged' nutritional values, i.e. what was eaten"
+  },
+  "today": "Hoje",
+  "@today": {},
+  "loggedToday": "Registado hoje",
+  "@loggedToday": {},
+  "weekAverage": "Média de 7 dias",
+  "@weekAverage": {
+    "description": "Header for the column of '7 day average' nutritional values, i.e. what was logged last week"
+  },
+  "surplus": "excedente",
+  "@surplus": {
+    "description": "Caloric surplus (either planned or unplanned)"
+  },
+  "deficit": "défice",
+  "@deficit": {
+    "description": "Caloric deficit (either planned or unplanned)"
+  },
+  "difference": "Diferença",
+  "@difference": {},
+  "percentEnergy": "Percentagem da energia",
+  "@percentEnergy": {},
+  "gPerBodyKg": "g por kg de corpo",
+  "@gPerBodyKg": {
+    "description": "Label used for total sums of e.g. calories or similar in grams per Kg of body weight"
+  },
+  "total": "Total",
+  "@total": {
+    "description": "Label used for total sums of e.g. calories or similar"
+  },
+  "kcal": "kcal",
+  "@kcal": {
+    "description": "Energy in a meal in kilocalories, kcal"
+  },
+  "kJ": "kJ",
+  "@kJ": {
+    "description": "Energy in a meal in kilo joules, kJ"
+  },
+  "g": "g",
+  "@g": {
+    "description": "Abbreviation for gram"
+  },
+  "gValue": "{value} g",
+  "@gValue": {
+    "description": "A value in grams, e.g. 5 g",
+    "type": "text",
+    "placeholders": {
+      "value": {
+        "type": "String"
+      }
+    }
+  },
+  "logout": "Terminar sessão",
+  "@logout": {
+    "description": "Text for logout button"
+  },
+  "noIngredientsDefined": "Ainda não há ingredientes definidos",
+  "@noIngredientsDefined": {},
+  "routineDays": "Dias na rotina",
+  "@routineDays": {},
+  "newDay": "Novo dia",
+  "@newDay": {},
+  "newSet": "Nova série",
+  "@newSet": {
+    "description": "Header when adding a new set to a workout day"
+  },
+  "kcalValue": "{value} kcal",
+  "@kcalValue": {
+    "description": "A value in kcal, e.g. 500 kcal",
+    "type": "text",
+    "placeholders": {
+      "value": {
+        "type": "String"
+      }
+    }
+  },
+  "protein": "Proteína",
+  "@protein": {},
+  "resultingRoutine": "Rotina resultante",
+  "@resultingRoutine": {},
+  "errorCouldNotConnectToServerDetails": "A aplicação não conseguiu ligar ao servidor. Verifica a ligação à internet ou o URL do servidor e tenta outra vez. Se continuar, contacta o administrador do servidor.",
+  "@errorCouldNotConnectToServerDetails": {},
+  "needsLogsToAdvanceHelp": "Seleciona se queres que a rotina avance para o próximo dia apenas se registares um treino",
+  "@needsLogsToAdvanceHelp": {},
+  "start": "Início",
+  "@start": {
+    "description": "Label on button to start the gym mode (i.e., an imperative)"
+  },
+  "energyShort": "E",
+  "@energyShort": {
+    "description": "The first letter or short name of the word 'Energy', used in overviews"
+  },
+  "macronutrients": "Macronutrientes",
+  "@macronutrients": {},
+  "proteinShort": "P",
+  "@proteinShort": {
+    "description": "The first letter or short name of the word 'Protein', used in overviews"
+  },
+  "measurements": "Medições",
+  "@measurements": {
+    "description": "Categories for the measurements such as biceps size, body fat, etc."
+  },
+  "percentValue": "{value} %",
+  "@percentValue": {
+    "description": "A value in percent, e.g. 10 %",
+    "type": "text",
+    "placeholders": {
+      "value": {
+        "type": "String"
+      }
+    }
+  },
+  "carbohydrates": "Hidratos de carbono",
+  "@carbohydrates": {},
+  "carbohydratesShort": "C",
+  "@carbohydratesShort": {
+    "description": "The first letter or short name of the word 'Carbohydrates', used in overviews"
+  },
+  "sugars": "Açúcares",
+  "@sugars": {},
+  "fat": "Gordura",
+  "@fat": {},
+  "fatShort": "F",
+  "@fatShort": {
+    "description": "The first letter or short name of the word 'Fat', used in overviews"
+  },
+  "fiber": "Fibras",
+  "@fiber": {},
+  "sodium": "Sódio",
+  "@sodium": {},
+  "amount": "Quantidade",
+  "@amount": {
+    "description": "The amount (e.g. in grams) of an ingredient in a meal"
+  },
+  "unit": "Unidade",
+  "@unit": {
+    "description": "The unit used for a repetition (kg, time, etc.)"
+  },
+  "newEntry": "Nova entrada",
+  "@newEntry": {
+    "description": "Title when adding a new entry such as a weight or log entry"
+  },
+  "noMeasurementEntries": "Ainda não tens registos de medições",
+  "@noMeasurementEntries": {},
+  "aboutDescription": "Obrigado por usares o wger! O wger é um projeto colaborativo de código aberto, feito por fãs de fitness de todo o mundo.",
+  "@aboutDescription": {
+    "description": "Text in the about dialog"
+  },
+  "aboutDonateTitle": "Fazer um donativo",
+  "@aboutDonateTitle": {},
+  "aboutDonateText": "Apesar de gratuito e assim continuará, manter o servidor tem custos! O desenvolvimento também exige muito tempo dos voluntários. A tua ajuda apoia diretamente estes custos.",
+  "@aboutDonateText": {},
+  "aboutContributeTitle": "Contribuir",
+  "@aboutContributeTitle": {},
+  "aboutContributeText": "Todos os tipos de contribuição são bem-vindos. Sejas programador, tradutor ou apenas apaixonado por fitness, toda a ajuda conta!",
+  "@aboutContributeText": {},
+  "aboutBugsListTitle": "Reportar um problema ou sugerir uma funcionalidade",
+  "@aboutBugsListTitle": {},
+  "aboutTranslationListTitle": "Traduzir a aplicação",
+  "@aboutTranslationListTitle": {},
+  "aboutSourceListTitle": "Ver código-fonte",
+  "@aboutSourceListTitle": {},
+  "aboutJoinCommunityTitle": "Junta-te à comunidade",
+  "@aboutJoinCommunityTitle": {},
+  "aboutMastodonTitle": "Mastodon",
+  "@aboutMastodonTitle": {},
+  "aboutDiscordTitle": "Discord",
+  "@aboutDiscordTitle": {},
+  "others": "Outros",
+  "@others": {},
+  "calendar": "Calendário",
+  "@calendar": {},
+  "goToToday": "Ir para hoje",
+  "@goToToday": {
+    "description": "Label on button to jump back to 'today' in the calendar widget"
+  },
+  "enterValue": "Introduz um valor",
+  "@enterValue": {
+    "description": "Error message when the user hasn't entered a value on a required field"
+  },
+  "selectEntry": "Seleciona uma entrada",
+  "@selectEntry": {},
+  "selectExercise": "Seleciona um exercício",
+  "@selectExercise": {
+    "description": "Error message when the user hasn't selected an exercise in the form"
+  },
+  "enterCharacters": "Escreve entre {min} e {max} caracteres",
+  "@enterCharacters": {
+    "description": "Error message when the user hasn't entered the correct number of characters in a form",
+    "type": "text",
+    "placeholders": {
+      "min": {
+        "type": "String"
+      },
+      "max": {
+        "type": "String"
+      }
+    }
+  },
+  "enterMinCharacters": "Escreve pelo menos {min} caracteres",
+  "@enterMinCharacters": {
+    "description": "Error message when the user hasn't entered the minimum amount characters in a form",
+    "type": "text",
+    "placeholders": {
+      "min": {
+        "type": "String"
+      }
+    }
+  },
+  "baseNameEnglish": "Todos os exercícios precisam de nome base em inglês",
+  "@baseNameEnglish": {},
+  "nrOfSets": "Séries por exercício: {nrOfSets}",
+  "@nrOfSets": {
+    "description": "Label shown on the slider where the user selects the nr of sets",
+    "type": "text",
+    "placeholders": {
+      "nrOfSets": {
+        "type": "String"
+      }
+    }
+  },
+  "optionsLabel": "Opções",
+  "@optionsLabel": {
+    "description": "Label for the popup with general app options"
+  },
+  "takePicture": "Tirar foto",
+  "@takePicture": {},
+  "chooseFromLibrary": "Escolher da galeria",
+  "@chooseFromLibrary": {},
+  "gallery": "Galeria",
+  "@gallery": {},
+  "addImage": "Adicionar imagem",
+  "@addImage": {},
+  "appUpdateContent": "Esta versão da aplicação não é compatível com o servidor. Por favor, atualiza a aplicação.",
+  "@appUpdateContent": {},
+  "productNotFoundDescription": "O produto com o código {barcode} não foi encontrado na base de dados wger",
+  "@productNotFoundDescription": {
+    "description": "Dialog info when product is not found with barcode",
+    "type": "text",
+    "placeholders": {
+      "barcode": {
+        "type": "String"
+      }
+    }
+  },
+  "scanBarcode": "Ler código de barras",
+  "@scanBarcode": {
+    "description": "Label for scan barcode button"
+  },
+  "close": "Fechar",
+  "@close": {
+    "description": "Translation for close"
+  },
+  "add_exercise_image_license": "Imagens têm de ser compatíveis com a licença CC BY SA. Se tiveres dúvidas, usa apenas fotos tiradas por ti.",
+  "@add_exercise_image_license": {},
+  "variations": "Variações",
+  "@variations": {
+    "description": "Variations of one exercise (e.g. benchpress and benchpress narrow)"
+  },
+  "verifiedEmail": "E-mail verificado",
+  "@verifiedEmail": {},
+  "verifiedEmailReason": "Tens de verificar o e-mail para poderes contribuir com exercícios",
+  "@verifiedEmailReason": {},
+  "verifiedEmailInfo": "Foi enviado um e-mail de verificação para {email}",
+  "@verifiedEmailInfo": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "alternativeNames": "Nomes alternativos",
+  "@alternativeNames": {},
+  "oneNamePerLine": "Um nome por linha",
+  "@oneNamePerLine": {},
+  "whatVariationsExist": "Que variações deste exercício existem (se houver)?",
+  "@whatVariationsExist": {},
+  "previous": "Anterior",
+  "@previous": {},
+  "next": "Seguinte",
+  "@next": {},
+  "images": "Imagens",
+  "@images": {},
+  "language": "Idioma",
+  "@language": {},
+  "addExercise": "Adicionar exercício",
+  "@addExercise": {},
+  "fitInWeek": "Ajustar à semana",
+  "@fitInWeek": {},
+  "toggleDetails": "Mostrar detalhes",
+  "@toggleDetails": {
+    "description": "Switch to toggle detail / overview"
+  },
+  "edit": "Editar",
+  "@edit": {},
+  "aboutWhySupportTitle": "Código aberto e gratuito ❤️",
+  "@aboutWhySupportTitle": {},
+  "goToDetailPage": "Ir para a página de detalhes",
+  "@goToDetailPage": {},
+  "productFound": "Produto encontrado",
+  "@productFound": {
+    "description": "Header label for dialog when product is found with barcode"
+  },
+  "unVerifiedEmail": "E-mail não verificado",
+  "@unVerifiedEmail": {},
+  "moreMeasurementEntries": "Adicionar nova medição",
+  "@moreMeasurementEntries": {
+    "description": "Message shown when the user wants to add new measurement"
+  },
+  "selectIngredient": "Seleciona um ingrediente",
+  "@selectIngredient": {
+    "description": "Error message when the user hasn't selected an ingredient from the autocompleter"
+  },
+  "newNutritionalPlan": "Novo plano nutricional",
+  "@newNutritionalPlan": {},
+  "setUnitsAndRir": "Unidades de série e ReR",
+  "@setUnitsAndRir": {
+    "description": "Label shown on the slider where the user can toggle showing units and RiR",
+    "type": "text"
+  },
+  "saturatedFat": "Gordura saturada",
+  "@saturatedFat": {},
+  "selectImage": "Seleciona uma imagem",
+  "@selectImage": {
+    "description": "Label and error message when the user hasn't selected an image to save"
+  },
+  "appUpdateTitle": "Atualização necessária",
+  "@appUpdateTitle": {},
+  "noWeightEntries": "Ainda não tens registos de peso",
+  "@noWeightEntries": {
+    "description": "Message shown when the user has no logged weight entries"
+  },
+  "confirmDelete": "Tens a certeza que queres eliminar '{toDelete}'?",
+  "@confirmDelete": {
+    "description": "Confirmation text before the user deletes an object",
+    "type": "text",
+    "placeholders": {
+      "toDelete": {
+        "type": "String"
+      }
+    }
+  },
+  "recentlyUsedIngredients": "Ingredientes adicionados recentemente",
+  "@recentlyUsedIngredients": {
+    "description": "A message when a user adds a new ingredient to a meal."
+  },
+  "loadingText": "A carregar...",
+  "@loadingText": {
+    "description": "Text to show when entries are being loaded in the background: Loading..."
+  },
+  "delete": "Eliminar",
+  "@delete": {},
+  "productNotFound": "Produto não encontrado",
+  "@productNotFound": {
+    "description": "Header label for dialog when product is not found with barcode"
+  },
+  "enterValidNumber": "Introduz um número válido",
+  "@enterValidNumber": {
+    "description": "Error message when the user has submitted an invalid number (e.g. '3,.,.,.')"
+  },
+  "dataCopied": "Dados copiados para nova entrada",
+  "@dataCopied": {
+    "description": "Snackbar message to show on copying data to a new log entry"
+  },
+  "productFoundDescription": "O código de barras corresponde a este produto: {productName}. Queres continuar?",
+  "@productFoundDescription": {
+    "description": "Dialog info when product is found with barcode",
+    "type": "text",
+    "placeholders": {
+      "productName": {
+        "type": "String"
+      }
+    }
+  },
+  "alsoKnownAs": "Também conhecido como: {aliases}",
+  "@alsoKnownAs": {
+    "placeholders": {
+      "aliases": {
+        "type": "String"
+      }
+    },
+    "description": "List of alternative names for an exercise"
+  },
+  "fitInWeekHelp": "Se ativado, os dias repetem-se semanalmente. Caso contrário, seguem-se em sequência sem respeitar o início da semana.",
+  "@fitInWeekHelp": {},
+  "addSuperset": "Adicionar Superset",
+  "@addSuperset": {},
+  "setHasProgression": "Série com progressão",
+  "@setHasProgression": {},
+  "setHasProgressionWarning": "De momento não é possível editar todas as definições de uma série na app móvel ou configurar progressões automáticas. Usa a versão web.",
+  "@setHasProgressionWarning": {},
+  "setHasNoExercises": "Esta série ainda não tem exercícios!",
+  "@setHasNoExercises": {},
+  "contributeExercise": "Contribuir com um exercício",
+  "@contributeExercise": {},
+  "translation": "Tradução",
+  "@translation": {},
+  "translateExercise": "Traduz este exercício agora",
+  "@translateExercise": {},
+  "baseData": "Básico em inglês",
+  "@baseData": {
+    "description": "The base data for an exercise such as category, trained muscles, etc."
+  },
+  "settingsTitle": "Definições",
+  "@settingsTitle": {},
+  "settingsCacheTitle": "Cache",
+  "@settingsCacheTitle": {},
+  "settingsExerciseCacheDescription": "Cache de exercícios",
+  "@settingsExerciseCacheDescription": {},
+  "settingsIngredientCacheDescription": "Cache de ingredientes",
+  "@settingsIngredientCacheDescription": {},
+  "settingsCacheDeletedSnackbar": "Cache limpo com sucesso",
+  "@settingsCacheDeletedSnackbar": {},
+  "aboutPageTitle": "Sobre nós & Apoio",
+  "@aboutPageTitle": {},
+  "contributeExerciseWarning": "Só podes contribuir com exercícios se a tua conta tiver mais de {days} dias e e-mail verificado",
+  "@contributeExerciseWarning": {
+    "description": "Number of days before which a person can add exercise",
+    "placeholders": {
+      "days": {
+        "type": "String",
+        "example": "14"
+      }
+    }
+  },
+  "simpleMode": "Modo simples",
+  "@simpleMode": {},
+  "simpleModeHelp": "Esconder opções mais avançadas ao editar exercícios",
+  "@simpleModeHelp": {},
+  "progressionRules": "Este exercício tem regras de progressão e não pode ser editado na app. Usa a versão web para o editar.",
+  "@progressionRules": {},
+  "cacheWarning": "Por causa da cache, pode demorar um pouco até veres as alterações na app.",
+  "@cacheWarning": {},
+  "textPromptTitle": "Pronto para começar?",
+  "@textPromptTitle": {},
+  "textPromptSubheading": "Clica no botão de ação para começar",
+  "@textPromptSubheading": {},
+  "abs": "Abdominais",
+  "@abs": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "arms": "Braços",
+  "@arms": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "back": "Costas",
+  "@back": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "barbell": "Barra olímpica",
+  "@barbell": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "bench": "Banco",
+  "@bench": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "biceps": "Bíceps",
+  "@biceps": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "body_weight": "Peso corporal",
+  "@body_weight": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "calves": "Gémeos",
+  "@calves": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "cardio": "Cardio",
+  "@cardio": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "chest": "Peito",
+  "@chest": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "dumbbell": "Halteres",
+  "@dumbbell": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "glutes": "Glúteos",
+  "@glutes": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "gym_mat": "Tapete de ginásio",
+  "@gym_mat": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "hamstrings": "Isquiotibiais",
+  "@hamstrings": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "incline_bench": "Banco inclinado",
+  "@incline_bench": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "kettlebell": "Kettlebell",
+  "@kettlebell": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "kilometers": "Quilómetros",
+  "@kilometers": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "kilometers_per_hour": "Km/h",
+  "@kilometers_per_hour": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "lats": "Dorsais",
+  "@lats": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "legs": "Pernas",
+  "@legs": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "lower_back": "Zona lombar",
+  "@lower_back": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "max_reps": "Repetições máximas",
+  "@max_reps": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "miles": "Milhas",
+  "@miles": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "miles_per_hour": "Mi/h",
+  "@miles_per_hour": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "minutes": "Minutos",
+  "@minutes": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "plates": "Discos",
+  "@plates": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "pull_up_bar": "Barra de elevações",
+  "@pull_up_bar": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "quads": "Quadríceps",
+  "@quads": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "repetitions": "Repetições",
+  "@repetitions": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "resistance_band": "Banda de resistência",
+  "@resistance_band": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "sz_bar": "Barra SZ",
+  "@sz_bar": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "seconds": "Segundos",
+  "@seconds": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "shoulders": "Ombros",
+  "@shoulders": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "swiss_ball": "Bola suíça",
+  "@swiss_ball": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "triceps": "Tríceps",
+  "@triceps": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "until_failure": "Até falhar",
+  "@until_failure": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "kg": "kg",
+  "@kg": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "lb": "lb",
+  "@lb": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "none__bodyweight_exercise_": "nenhum (exercício com peso corporal)",
+  "@none__bodyweight_exercise_": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "log": "Registar",
+  "@log": {
+    "description": "Log a specific meal (imperative form)"
+  },
+  "done": "Concluído",
+  "@done": {},
+  "overallChangeWeight": "Alteração total",
+  "@overallChangeWeight": {
+    "description": "Overall change in weight, added for localization"
+  },
+  "goalTypeMeals": "Das refeições",
+  "@goalTypeMeals": {
+    "description": "added for localization of Class GoalType's filed meals"
+  },
+  "goalTypeBasic": "Básico",
+  "@goalTypeBasic": {
+    "description": "added for localization of Class GoalType's filed basic"
+  },
+  "goalTypeAdvanced": "Avançado",
+  "@goalTypeAdvanced": {
+    "description": "added for localization of Class GoalType's filed advanced"
+  },
+  "indicatorRaw": "cru",
+  "@indicatorRaw": {
+    "description": "added for localization of Class Indicator's field text"
+  },
+  "indicatorAvg": "média",
+  "@indicatorAvg": {
+    "description": "added for localization of Class Indicator's field text"
+  },
+  "themeMode": "Modo de tema",
+  "@themeMode": {},
+  "darkMode": "Modo escuro sempre",
+  "@darkMode": {},
+  "lightMode": "Modo claro sempre",
+  "@lightMode": {},
+  "systemMode": "Usar definições do sistema",
+  "@systemMode": {}
+}
diff --git a/lib/l10n/app_ro.arb b/lib/l10n/app_ro.arb
index e66c153d..d22c04b3 100644
--- a/lib/l10n/app_ro.arb
+++ b/lib/l10n/app_ro.arb
@@ -1,328 +1,330 @@
 {
-  "comment": "Comentariu",
-  "@comment": {
-    "description": "Comment, additional information"
-  },
-  "equipment": "Echipament",
-  "@equipment": {
-    "description": "Equipment needed to perform an exercise"
-  },
-  "useDefaultServer": "Folosește serverul implicit",
-  "@useDefaultServer": {
-    "description": "Toggle button allowing users to switch between the default and a custom wger server"
-  },
-  "successfullyDeleted": "S-a șters",
-  "@successfullyDeleted": {
-    "description": "Message when an item was successfully deleted"
-  },
-  "set": "Serie",
-  "@set": {
-    "description": "A set in a workout plan"
-  },
-  "labelBottomNavWorkout": "Antrenament",
-  "@labelBottomNavWorkout": {
-    "description": "Label used in bottom navigation, use a short word"
-  },
-  "reset": "Resetare",
-  "@reset": {
-    "description": "Button text allowing the user to reset the entered values to the default"
-  },
-  "password": "Parolă",
-  "@password": {},
-  "invalidUsername": "Introdu, te rugăm, un nume de utilizator valid",
-  "@invalidUsername": {
-    "description": "Error message when the user enters an invalid username"
-  },
-  "impression": "Impresie",
-  "@impression": {
-    "description": "General impression (e.g. for a workout session) such as good, bad, etc."
-  },
-  "setNr": "Seria {nr}",
-  "@setNr": {
-    "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.",
-    "type": "text",
-    "placeholders": {
-      "nr": {}
-    }
-  },
-  "noWorkoutPlans": "Nu ai niciun de antrenament",
-  "@noWorkoutPlans": {
-    "description": "Message shown when the user has no workout plans"
-  },
-  "muscles": "Mușchi",
-  "@muscles": {
-    "description": "(main) muscles trained by an exercise"
-  },
-  "dayDescriptionHelp": "O descriere a ceea ce se face în această zi (de exemplu, „zi de tragere”) sau ce părți ale corpului sunt antrenate (de ex.: „piept și umeri”)",
-  "@dayDescriptionHelp": {},
-  "loginInstead": "Ai deja un cont? Log in",
-  "@loginInstead": {},
-  "success": "Succes",
-  "@success": {
-    "description": "Message when an action completed successfully, usually used as a heading"
-  },
-  "passwordTooShort": "Parola e prea scurtă",
-  "@passwordTooShort": {
-    "description": "Error message when the user a password that is too short"
-  },
-  "repetitionUnit": "Unitatea de repetiții",
-  "@repetitionUnit": {},
-  "weightUnit": "Unitate de greutate",
-  "@weightUnit": {},
-  "email": "Adresă de e-mail",
-  "@email": {},
-  "newWorkout": "Plan de antrenament nou",
-  "@newWorkout": {
-    "description": "Header when adding a new workout"
-  },
-  "searchNamesInEnglish": "Caută nume și în engleză",
-  "@searchNamesInEnglish": {},
-  "username": "Nume de utilizator",
-  "@username": {},
-  "exercise": "Exercițiu",
-  "@exercise": {
-    "description": "An exercise for a workout"
-  },
-  "customServerHint": "Introdu adresa propriului server, altfel va fi folosită cea implicită",
-  "@customServerHint": {
-    "description": "Hint text for the form where the users can enter their own wger instance"
-  },
-  "useCustomServer": "Folosește un server personalizat",
-  "@useCustomServer": {
-    "description": "Toggle button allowing users to switch between the default and a custom wger server"
-  },
-  "notes": "Notițe",
-  "@notes": {
-    "description": "Personal notes, e.g. for a workout session"
-  },
-  "register": "Înregistrează-te",
-  "@register": {
-    "description": "Text for registration button"
-  },
-  "searchExercise": "Caută un exercițiu pentru a-l adăuga",
-  "@searchExercise": {
-    "description": "Label on set form. Selected exercises are added to the set"
-  },
-  "registerInstead": "Nu ai un cont? Înregistrează-te acum",
-  "@registerInstead": {},
-  "usernameValidChars": "Un nume de utilizator poate conține numai litere, cifre și caracterele @, +, ., - și _",
-  "@usernameValidChars": {
-    "description": "Error message when the user tries to register a username with forbidden characters"
-  },
-  "labelWorkoutPlans": "Planuri de antrenament",
-  "@labelWorkoutPlans": {
-    "description": "Title for screen workout plans"
-  },
-  "proteinShort": "P",
-  "@proteinShort": {
-    "description": "The first letter or short name of the word 'Protein', used in overviews"
-  },
-  "userProfile": "Profilul tău",
-  "@userProfile": {},
-  "labelWorkoutLogs": "Jurnale de antrenament",
-  "@labelWorkoutLogs": {
-    "description": "(Workout) logs"
-  },
-  "rirNotUsed": "RîR nu e folosit",
-  "@rirNotUsed": {
-    "description": "Label used in RiR slider when the RiR value is not used/saved for the current setting or log"
-  },
-  "successfullySaved": "S-a salvat",
-  "@successfullySaved": {
-    "description": "Message when an item was successfully saved"
-  },
-  "exerciseList": "Lista exercițiilor",
-  "@exerciseList": {},
-  "musclesSecondary": "Mușchi ajutători",
-  "@musclesSecondary": {
-    "description": "secondary muscles trained by an exercise"
-  },
-  "labelDashboard": "Tablou de bord",
-  "@labelDashboard": {
-    "description": "Title for screen dashboard"
-  },
-  "exerciseName": "Numele exercițiului",
-  "@exerciseName": {
-    "description": "Label for the name of a workout exercise"
-  },
-  "labelBottomNavNutrition": "Nutriție",
-  "@labelBottomNavNutrition": {
-    "description": "Label used in bottom navigation, use a short word"
-  },
-  "invalidUrl": "Te rugăm să introduci o adresă URL validă",
-  "@invalidUrl": {
-    "description": "Error message when the user enters an invalid URL, e.g. in the login form"
-  },
-  "sameRepetitions": "Dacă faci n.r de repetări și greutatea la fel pentru toate seriile, poți completa doar un rând. De exemplu, pentru 4 serii, introdu 10 la repetări și devine automat „4 x 10”.",
-  "@sameRepetitions": {},
-  "logout": "Deconectează-te",
-  "@logout": {
-    "description": "Text for logout button"
-  },
-  "supersetWith": "superset cu",
-  "@supersetWith": {
-    "description": "Text used between exercise cards when adding a new set. Translate as something like 'in a superset with'"
-  },
-  "customServerUrl": "URL-ul instanței wger",
-  "@customServerUrl": {
-    "description": "Label in the form where the users can enter their own wger instance"
-  },
-  "login": "Log in",
-  "@login": {
-    "description": "Text for login button"
-  },
-  "reps": "Repetiții",
-  "@reps": {
-    "description": "Shorthand for repetitions, used when space constraints are tighter"
-  },
-  "passwordsDontMatch": "Parolele nu se potrivesc",
-  "@passwordsDontMatch": {
-    "description": "Error message when the user enters two different passwords during registration"
-  },
-  "invalidEmail": "Te rugăm să introduci o adresă de email validă",
-  "@invalidEmail": {
-    "description": "Error message when the user enters an invalid email"
-  },
-  "labelWorkoutPlan": "Plan de antrenament",
-  "@labelWorkoutPlan": {
-    "description": "Title for screen workout plan"
-  },
-  "category": "Catogorie",
-  "@category": {
-    "description": "Category for an exercise, ingredient, etc."
-  },
-  "rir": "RîR",
-  "@rir": {
-    "description": "Shorthand for Repetitions In Reserve"
-  },
-  "exercises": "Exerciții",
-  "@exercises": {
-    "description": "Multiple exercises for a workout"
-  },
-  "workoutSession": "Sesiune de antrenament",
-  "@workoutSession": {
-    "description": "A (logged) workout session"
-  },
-  "confirmPassword": "Confirmă parola",
-  "@confirmPassword": {},
-  "newDay": "Zi nouă",
-  "@newDay": {},
-  "selectExercises": "Dacă vrei să faci un superset poți căuta mai multe exerciții, acestea vor fi grupate împreună",
-  "@selectExercises": {},
-  "logHelpEntries": "Dacă într-o singură zi există mai multe înregistrări cu același număr de repetări, dar greutăți diferite, în diagramă este prezentată doar intrarea cu greutatea mai mare.",
-  "@logHelpEntries": {},
-  "description": "Descriere",
-  "@description": {},
-  "name": "Nume",
-  "@name": {
-    "description": "Name for a workout or nutritional plan"
-  },
-  "measurements": "Măsurători",
-  "@measurements": {
-    "description": "Categories for the measurements such as biceps size, body fat, etc."
-  },
-  "measurementEntriesHelpText": "Unitatea utilizată pentru măsurarea categoriei, cum ar fi „cm” sau „%”",
-  "@measurementEntriesHelpText": {},
-  "useMetric": "Utilizați unități metrice pentru greutatea corporală",
-  "@useMetric": {},
-  "plateCalculator": "Discuri",
-  "@plateCalculator": {
-    "description": "Label used for the plate calculator in the gym mode"
-  },
-  "jumpTo": "Sari la",
-  "@jumpTo": {
-    "description": "Imperative. Label used in popup allowing the user to jump to a specific exercise while in the gym mode"
-  },
-  "logHelpEntriesUnits": "Rețineți că numai intrările cu o unitate de greutate (kg sau lb) și repetări sunt grafice, alte combinații precum timpul sau până la eșec sunt ignorate aici.",
-  "@logHelpEntriesUnits": {},
-  "save": "Salvează",
-  "@save": {},
-  "verify": "Verifică",
-  "@verify": {},
-  "addIngredient": "Adaugă ingredient",
-  "@addIngredient": {},
-  "logIngredient": "Salvează în jurnalul de nutriție",
-  "@logIngredient": {},
-  "nutritionalDiary": "Jurnal de nutriție",
-  "@nutritionalDiary": {},
-  "nutritionalPlans": "Planuri nutriționale",
-  "@nutritionalPlans": {},
-  "weight": "Greutate",
-  "@weight": {
-    "description": "The weight of a workout log or body weight entry"
-  },
-  "timeStart": "Timpul de începere",
-  "@timeStart": {
-    "description": "The starting time of a workout"
-  },
-  "timeEnd": "Sfârșitul timpului",
-  "@timeEnd": {
-    "description": "The end time of a workout"
-  },
-  "noMatchingExerciseFound": "Nu s-au găsit exerciții potrivite",
-  "@noMatchingExerciseFound": {
-    "description": "Message returned if no exercises match the searched string"
-  },
-  "gymMode": "Modul sală",
-  "@gymMode": {
-    "description": "Label when starting the gym mode"
-  },
-  "plateCalculatorNotDivisible": "Nu se poate atinge greutatea cu plăcile disponibile",
-  "@plateCalculatorNotDivisible": {
-    "description": "Error message when the current weight is not reachable with plates (e.g. 33.1 kg)"
-  },
-  "pause": "Pauză",
-  "@pause": {
-    "description": "Noun, not an imperative! Label used for the pause when using the gym mode"
-  },
-  "todaysWorkout": "Antrenamentul tău de astăzi",
-  "@todaysWorkout": {},
-  "addSet": "Adaugă set",
-  "@addSet": {
-    "description": "Label for the button that adds a set (to a workout day)"
-  },
-  "addMeal": "Adaugă masa",
-  "@addMeal": {},
-  "mealLogged": "Masa înregistrată în jurnal",
-  "@mealLogged": {},
-  "logMeal": "Înregistrează această masă",
-  "@logMeal": {},
-  "searchIngredient": "Caută ingredient",
-  "@searchIngredient": {
-    "description": "Label on ingredient search form"
-  },
-  "nutritionalPlan": "Planul nutrițional",
-  "@nutritionalPlan": {},
-  "noNutritionalPlans": "Nu ai planuri nutriționale",
-  "@noNutritionalPlans": {
-    "description": "Message shown when the user has no nutritional plans"
-  },
-  "anErrorOccurred": "A aparut o eroare!",
-  "@anErrorOccurred": {},
-  "timeStartAhead": "Ora de început nu poate fi înaintea orei de încheiere",
-  "@timeStartAhead": {},
-  "newSet": "Set nou",
-  "@newSet": {
-    "description": "Header when adding a new set to a workout day"
-  },
-  "measurement": "Măsurare",
-  "@measurement": {},
-  "measurementCategoriesHelpText": "Categoria de măsurare, cum ar fi „biceps” sau „grăsimi corporale”",
-  "@measurementCategoriesHelpText": {},
-  "date": "Data",
-  "@date": {
-    "description": "The date of a workout log or body weight entry"
-  },
-  "value": "Valoare",
-  "@value": {
-    "description": "The value of a measurement entry"
-  },
-  "start": "Start",
-  "@start": {
-    "description": "Label on button to start the gym mode (i.e., an imperative)"
-  },
-  "time": "Timp",
-  "@time": {
-    "description": "The time of a meal or workout"
-  }
+    "comment": "Comentariu",
+    "@comment": {
+        "description": "Comment, additional information"
+    },
+    "equipment": "Echipament",
+    "@equipment": {
+        "description": "Equipment needed to perform an exercise"
+    },
+    "useDefaultServer": "Folosește serverul implicit",
+    "@useDefaultServer": {
+        "description": "Toggle button allowing users to switch between the default and a custom wger server"
+    },
+    "successfullyDeleted": "S-a șters",
+    "@successfullyDeleted": {
+        "description": "Message when an item was successfully deleted"
+    },
+    "set": "Serie",
+    "@set": {
+        "description": "A set in a workout plan"
+    },
+    "labelBottomNavWorkout": "Antrenament",
+    "@labelBottomNavWorkout": {
+        "description": "Label used in bottom navigation, use a short word"
+    },
+    "reset": "Resetare",
+    "@reset": {
+        "description": "Button text allowing the user to reset the entered values to the default"
+    },
+    "password": "Parolă",
+    "@password": {},
+    "invalidUsername": "Introdu, te rugăm, un nume de utilizator valid",
+    "@invalidUsername": {
+        "description": "Error message when the user enters an invalid username"
+    },
+    "impression": "Impresie",
+    "@impression": {
+        "description": "General impression (e.g. for a workout session) such as good, bad, etc."
+    },
+    "setNr": "Seria {nr}",
+    "@setNr": {
+        "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.",
+        "type": "text",
+        "placeholders": {
+            "nr": {
+                "type": "String"
+            }
+        }
+    },
+    "muscles": "Mușchi",
+    "@muscles": {
+        "description": "(main) muscles trained by an exercise"
+    },
+    "dayDescriptionHelp": "O descriere a ceea ce se face în această zi (de exemplu, „zi de tragere”) sau ce părți ale corpului sunt antrenate (de ex.: „piept și umeri”)",
+    "@dayDescriptionHelp": {},
+    "loginInstead": "Ai deja un cont? Log in",
+    "@loginInstead": {},
+    "success": "Succes",
+    "@success": {
+        "description": "Message when an action completed successfully, usually used as a heading"
+    },
+    "passwordTooShort": "Parola e prea scurtă",
+    "@passwordTooShort": {
+        "description": "Error message when the user a password that is too short"
+    },
+    "repetitionUnit": "Unitatea de repetiții",
+    "@repetitionUnit": {},
+    "weightUnit": "Unitate de greutate",
+    "@weightUnit": {},
+    "email": "Adresă de e-mail",
+    "@email": {},
+    "searchNamesInEnglish": "Caută nume și în engleză",
+    "@searchNamesInEnglish": {},
+    "username": "Nume de utilizator",
+    "@username": {},
+    "exercise": "Exercițiu",
+    "@exercise": {
+        "description": "An exercise for a workout"
+    },
+    "customServerHint": "Introdu adresa propriului server, altfel va fi folosită cea implicită",
+    "@customServerHint": {
+        "description": "Hint text for the form where the users can enter their own wger instance"
+    },
+    "useCustomServer": "Folosește un server personalizat",
+    "@useCustomServer": {
+        "description": "Toggle button allowing users to switch between the default and a custom wger server"
+    },
+    "notes": "Notițe",
+    "@notes": {
+        "description": "Personal notes, e.g. for a workout session"
+    },
+    "register": "Înregistrează-te",
+    "@register": {
+        "description": "Text for registration button"
+    },
+    "searchExercise": "Caută un exercițiu pentru a-l adăuga",
+    "@searchExercise": {
+        "description": "Label on set form. Selected exercises are added to the set"
+    },
+    "registerInstead": "Nu ai un cont? Înregistrează-te acum",
+    "@registerInstead": {},
+    "usernameValidChars": "Un nume de utilizator poate conține numai litere, cifre și caracterele @, +, ., - și _",
+    "@usernameValidChars": {
+        "description": "Error message when the user tries to register a username with forbidden characters"
+    },
+    "proteinShort": "P",
+    "@proteinShort": {
+        "description": "The first letter or short name of the word 'Protein', used in overviews"
+    },
+    "userProfile": "Profilul tău",
+    "@userProfile": {},
+    "labelWorkoutLogs": "Jurnale de antrenament",
+    "@labelWorkoutLogs": {
+        "description": "(Workout) logs"
+    },
+    "rirNotUsed": "RîR nu e folosit",
+    "@rirNotUsed": {
+        "description": "Label used in RiR slider when the RiR value is not used/saved for the current setting or log"
+    },
+    "successfullySaved": "S-a salvat",
+    "@successfullySaved": {
+        "description": "Message when an item was successfully saved"
+    },
+    "exerciseList": "Lista exercițiilor",
+    "@exerciseList": {},
+    "musclesSecondary": "Mușchi ajutători",
+    "@musclesSecondary": {
+        "description": "secondary muscles trained by an exercise"
+    },
+    "labelDashboard": "Tablou de bord",
+    "@labelDashboard": {
+        "description": "Title for screen dashboard"
+    },
+    "exerciseName": "Numele exercițiului",
+    "@exerciseName": {
+        "description": "Label for the name of a workout exercise"
+    },
+    "labelBottomNavNutrition": "Nutriție",
+    "@labelBottomNavNutrition": {
+        "description": "Label used in bottom navigation, use a short word"
+    },
+    "invalidUrl": "Te rugăm să introduci o adresă URL validă",
+    "@invalidUrl": {
+        "description": "Error message when the user enters an invalid URL, e.g. in the login form"
+    },
+    "sameRepetitions": "Dacă faci n.r de repetări și greutatea la fel pentru toate seriile, poți completa doar un rând. De exemplu, pentru 4 serii, introdu 10 la repetări și devine automat „4 x 10”.",
+    "@sameRepetitions": {},
+    "logout": "Deconectează-te",
+    "@logout": {
+        "description": "Text for logout button"
+    },
+    "customServerUrl": "URL-ul instanței wger",
+    "@customServerUrl": {
+        "description": "Label in the form where the users can enter their own wger instance"
+    },
+    "login": "Log in",
+    "@login": {
+        "description": "Text for login button"
+    },
+    "reps": "Repetiții",
+    "@reps": {
+        "description": "Shorthand for repetitions, used when space constraints are tighter"
+    },
+    "passwordsDontMatch": "Parolele nu se potrivesc",
+    "@passwordsDontMatch": {
+        "description": "Error message when the user enters two different passwords during registration"
+    },
+    "invalidEmail": "Te rugăm să introduci o adresă de email validă",
+    "@invalidEmail": {
+        "description": "Error message when the user enters an invalid email"
+    },
+    "labelWorkoutPlan": "Plan de antrenament",
+    "@labelWorkoutPlan": {
+        "description": "Title for screen workout plan"
+    },
+    "category": "Catogorie",
+    "@category": {
+        "description": "Category for an exercise, ingredient, etc."
+    },
+    "rir": "RîR",
+    "@rir": {
+        "description": "Shorthand for Repetitions In Reserve"
+    },
+    "exercises": "Exerciții",
+    "@exercises": {
+        "description": "Multiple exercises for a workout"
+    },
+    "workoutSession": "Sesiune de antrenament",
+    "@workoutSession": {
+        "description": "A (logged) workout session"
+    },
+    "confirmPassword": "Confirmă parola",
+    "@confirmPassword": {},
+    "newDay": "Zi nouă",
+    "@newDay": {},
+    "selectExercises": "Dacă vrei să faci un superset poți căuta mai multe exerciții, acestea vor fi grupate împreună",
+    "@selectExercises": {},
+    "logHelpEntries": "Dacă într-o singură zi există mai multe înregistrări cu același număr de repetări, dar greutăți diferite, în diagramă este prezentată doar intrarea cu greutatea mai mare.",
+    "@logHelpEntries": {},
+    "description": "Descriere",
+    "@description": {},
+    "name": "Nume",
+    "@name": {
+        "description": "Name for a workout or nutritional plan"
+    },
+    "measurements": "Măsurători",
+    "@measurements": {
+        "description": "Categories for the measurements such as biceps size, body fat, etc."
+    },
+    "measurementEntriesHelpText": "Unitatea utilizată pentru măsurarea categoriei, cum ar fi „cm” sau „%”",
+    "@measurementEntriesHelpText": {},
+    "useMetric": "Utilizați unități metrice pentru greutatea corporală",
+    "@useMetric": {},
+    "plateCalculator": "Discuri",
+    "@plateCalculator": {
+        "description": "Label used for the plate calculator in the gym mode"
+    },
+    "jumpTo": "Sari la",
+    "@jumpTo": {
+        "description": "Imperative. Label used in popup allowing the user to jump to a specific exercise while in the gym mode"
+    },
+    "logHelpEntriesUnits": "Rețineți că numai intrările cu o unitate de greutate (kg sau lb) și repetări sunt grafice, alte combinații precum timpul sau până la eșec sunt ignorate aici.",
+    "@logHelpEntriesUnits": {},
+    "save": "Salvează",
+    "@save": {},
+    "verify": "Verifică",
+    "@verify": {},
+    "addIngredient": "Adaugă ingredient",
+    "@addIngredient": {},
+    "logIngredient": "Salvează în jurnalul de nutriție",
+    "@logIngredient": {},
+    "nutritionalDiary": "Jurnal de nutriție",
+    "@nutritionalDiary": {},
+    "nutritionalPlans": "Planuri nutriționale",
+    "@nutritionalPlans": {},
+    "weight": "Greutate",
+    "@weight": {
+        "description": "The weight of a workout log or body weight entry"
+    },
+    "timeStart": "Timpul de începere",
+    "@timeStart": {
+        "description": "The starting time of a workout"
+    },
+    "timeEnd": "Sfârșitul timpului",
+    "@timeEnd": {
+        "description": "The end time of a workout"
+    },
+    "noMatchingExerciseFound": "Nu s-au găsit exerciții potrivite",
+    "@noMatchingExerciseFound": {
+        "description": "Message returned if no exercises match the searched string"
+    },
+    "gymMode": "Modul sală",
+    "@gymMode": {
+        "description": "Label when starting the gym mode"
+    },
+    "plateCalculatorNotDivisible": "Nu se poate atinge greutatea cu plăcile disponibile",
+    "@plateCalculatorNotDivisible": {
+        "description": "Error message when the current weight is not reachable with plates (e.g. 33.1 kg)"
+    },
+    "pause": "Pauză",
+    "@pause": {
+        "description": "Noun, not an imperative! Label used for the pause when using the gym mode"
+    },
+    "todaysWorkout": "Antrenamentul tău de astăzi",
+    "@todaysWorkout": {},
+    "addSet": "Adaugă set",
+    "@addSet": {
+        "description": "Label for the button that adds a set (to a workout day)"
+    },
+    "addMeal": "Adaugă masa",
+    "@addMeal": {},
+    "mealLogged": "Masa înregistrată în jurnal",
+    "@mealLogged": {},
+    "logMeal": "Înregistrează această masă",
+    "@logMeal": {},
+    "searchIngredient": "Caută ingredient",
+    "@searchIngredient": {
+        "description": "Label on ingredient search form"
+    },
+    "nutritionalPlan": "Planul nutrițional",
+    "@nutritionalPlan": {},
+    "noNutritionalPlans": "Nu ai planuri nutriționale",
+    "@noNutritionalPlans": {
+        "description": "Message shown when the user has no nutritional plans"
+    },
+    "anErrorOccurred": "A aparut o eroare!",
+    "@anErrorOccurred": {},
+    "timeStartAhead": "Ora de început nu poate fi înaintea orei de încheiere",
+    "@timeStartAhead": {},
+    "newSet": "Set nou",
+    "@newSet": {
+        "description": "Header when adding a new set to a workout day"
+    },
+    "measurement": "Măsurare",
+    "@measurement": {},
+    "measurementCategoriesHelpText": "Categoria de măsurare, cum ar fi „biceps” sau „grăsimi corporale”",
+    "@measurementCategoriesHelpText": {},
+    "date": "Data",
+    "@date": {
+        "description": "The date of a workout log or body weight entry"
+    },
+    "value": "Valoare",
+    "@value": {
+        "description": "The value of a measurement entry"
+    },
+    "start": "Start",
+    "@start": {
+        "description": "Label on button to start the gym mode (i.e., an imperative)"
+    },
+    "time": "Timp",
+    "@time": {
+        "description": "The time of a meal or workout"
+    },
+    "useApiToken": "Folosește Token-ul API",
+    "@useApiToken": {},
+    "useUsernameAndPassword": "Folosește numele de utilizator și parola",
+    "@useUsernameAndPassword": {},
+    "apiToken": "Token API",
+    "@apiToken": {},
+    "invalidApiToken": "Te rugăm să introduci o cheie API validă",
+    "@invalidApiToken": {
+        "description": "Error message when the user enters an invalid API key"
+    },
+    "apiTokenValidChars": "Cheia API poate conține doar litere a-f, numere 0-9 și trebuie să aibă exact 40 de caractere",
+    "@apiTokenValidChars": {
+        "description": "Error message when the user tries to input a API key with forbidden characters"
+    },
+    "noIngredientsDefined": "Nici un ingredient definit",
+    "@noIngredientsDefined": {}
 }
diff --git a/lib/l10n/app_ru.arb b/lib/l10n/app_ru.arb
index cb886914..52e7c955 100644
--- a/lib/l10n/app_ru.arb
+++ b/lib/l10n/app_ru.arb
@@ -1,901 +1,1008 @@
 {
-  "useCustomServer": "Использовать пользовательский сервер",
-  "@useCustomServer": {
-    "description": "Toggle button allowing users to switch between the default and a custom wger server"
-  },
-  "email": "Адрес электронной почты",
-  "@email": {},
-  "labelWorkoutPlans": "Планы тренировок",
-  "@labelWorkoutPlans": {
-    "description": "Title for screen workout plans"
-  },
-  "registerInstead": "У вас нет аккаунта? Зарегистрируйтесь сейчас",
-  "@registerInstead": {},
-  "loginInstead": "Уже есть аккаунт? Войти",
-  "@loginInstead": {},
-  "labelDashboard": "Панель управления",
-  "@labelDashboard": {
-    "description": "Title for screen dashboard"
-  },
-  "muscles": "Мышцы",
-  "@muscles": {
-    "description": "(main) muscles trained by an exercise"
-  },
-  "reps": "Повтор",
-  "@reps": {
-    "description": "Shorthand for repetitions, used when space constraints are tighter"
-  },
-  "rir": "ПвЗ",
-  "@rir": {
-    "description": "Shorthand for Repetitions In Reserve"
-  },
-  "rirNotUsed": "ПвЗ не используется",
-  "@rirNotUsed": {
-    "description": "Label used in RiR slider when the RiR value is not used/saved for the current setting or log"
-  },
-  "notes": "Заметки",
-  "@notes": {
-    "description": "Personal notes, e.g. for a workout session"
-  },
-  "workoutSession": "Тренировка",
-  "@workoutSession": {
-    "description": "A (logged) workout session"
-  },
-  "newDay": "Новый день",
-  "@newDay": {},
-  "selectExercises": "Если вы хотите сделать суперсет, вы можете найти несколько упражнений, они будут сгруппированы вместе",
-  "@selectExercises": {},
-  "plateCalculator": "Пластины",
-  "@plateCalculator": {
-    "description": "Label used for the plate calculator in the gym mode"
-  },
-  "save": "Сохранить",
-  "@save": {},
-  "logMeal": "Записать это блюдо",
-  "@logMeal": {},
-  "nutritionalPlan": "План питания",
-  "@nutritionalPlan": {},
-  "noNutritionalPlans": "У вас нет планов питания",
-  "@noNutritionalPlans": {
-    "description": "Message shown when the user has no nutritional plans"
-  },
-  "measurementEntriesHelpText": "Единица, используемая для измерения в категории, например 'см' или '%'",
-  "@measurementEntriesHelpText": {},
-  "value": "Значение",
-  "@value": {
-    "description": "The value of a measurement entry"
-  },
-  "time": "Время",
-  "@time": {
-    "description": "The time of a meal or workout"
-  },
-  "timeStart": "Время начала",
-  "@timeStart": {
-    "description": "The starting time of a workout"
-  },
-  "ingredient": "Ингредиент",
-  "@ingredient": {},
-  "energy": "Энергия",
-  "@energy": {
-    "description": "Energy in a meal, ingredient etc. e.g. in kJ"
-  },
-  "energyShort": "Э",
-  "@energyShort": {
-    "description": "The first letter or short name of the word 'Energy', used in overviews"
-  },
-  "macronutrients": "Макроэлементы",
-  "@macronutrients": {},
-  "logged": "Записано",
-  "@logged": {
-    "description": "Header for the column of 'logged' nutritional values, i.e. what was eaten"
-  },
-  "difference": "Разница",
-  "@difference": {},
-  "kJ": "кДж",
-  "@kJ": {
-    "description": "Energy in a meal in kilo joules, kJ"
-  },
-  "g": "г",
-  "@g": {
-    "description": "Abbreviation for gram"
-  },
-  "goToDetailPage": "Перейти на страницу сведений",
-  "@goToDetailPage": {},
-  "aboutSourceTitle": "Исходный код",
-  "@aboutSourceTitle": {
-    "description": "Title for source code section in the about dialog"
-  },
-  "aboutContactUsTitle": "Скажите привет!",
-  "@aboutContactUsTitle": {
-    "description": "Title for contact us section in the about dialog"
-  },
-  "aboutTranslationTitle": "Перевод",
-  "@aboutTranslationTitle": {
-    "description": "Title for translation section in the about dialog"
-  },
-  "calendar": "Календарь",
-  "@calendar": {},
-  "enterValue": "Пожалуйста, введите значение",
-  "@enterValue": {
-    "description": "Error message when the user hasn't entered a value on a required field"
-  },
-  "selectExercise": "Пожалуйста, выберите упражнение",
-  "@selectExercise": {
-    "description": "Error message when the user hasn't selected an exercise in the form"
-  },
-  "enterCharacters": "Пожалуйста, введите между {min} и {max} символами",
-  "@enterCharacters": {
-    "description": "Error message when the user hasn't entered the correct number of characters in a form",
-    "type": "text",
-    "placeholders": {
-      "min": {},
-      "max": {}
-    }
-  },
-  "nrOfSets": "Количество сетов на упражнение: {nrOfSets}",
-  "@nrOfSets": {
-    "description": "Label shown on the slider where the user selects the nr of sets",
-    "type": "text",
-    "placeholders": {
-      "nrOfSets": {}
-    }
-  },
-  "selectIngredient": "Пожалуйста, выберите ингредиент",
-  "@selectIngredient": {
-    "description": "Error message when the user hasn't selected an ingredient from the autocompleter"
-  },
-  "recentlyUsedIngredients": "Недавно добавленные ингредиенты",
-  "@recentlyUsedIngredients": {
-    "description": "A message when a user adds a new ingredient to a meal."
-  },
-  "selectImage": "Пожалуйста, выберите изображение",
-  "@selectImage": {
-    "description": "Label and error message when the user hasn't selected an image to save"
-  },
-  "takePicture": "Сфотографировать",
-  "@takePicture": {},
-  "chooseFromLibrary": "Выбрать из библиотеки фотографий",
-  "@chooseFromLibrary": {},
-  "gallery": "Галерея",
-  "@gallery": {},
-  "addImage": "Добавить изображение",
-  "@addImage": {},
-  "appUpdateTitle": "Требуется обновление",
-  "@appUpdateTitle": {},
-  "passwordTooShort": "Пароль слишком короткий",
-  "@passwordTooShort": {
-    "description": "Error message when the user a password that is too short"
-  },
-  "category": "Категория",
-  "@category": {
-    "description": "Category for an exercise, ingredient, etc."
-  },
-  "noWorkoutPlans": "У вас нет планов тренировок",
-  "@noWorkoutPlans": {
-    "description": "Message shown when the user has no workout plans"
-  },
-  "login": "Войти",
-  "@login": {
-    "description": "Text for login button"
-  },
-  "register": "Зарегистрироваться",
-  "@register": {
-    "description": "Text for registration button"
-  },
-  "password": "Пароль",
-  "@password": {},
-  "logout": "Выйти",
-  "@logout": {
-    "description": "Text for logout button"
-  },
-  "useDefaultServer": "Использовать сервер по умолчанию",
-  "@useDefaultServer": {
-    "description": "Toggle button allowing users to switch between the default and a custom wger server"
-  },
-  "invalidUrl": "Пожалуйста, введите действительный URL",
-  "@invalidUrl": {
-    "description": "Error message when the user enters an invalid URL, e.g. in the login form"
-  },
-  "usernameValidChars": "Имя пользователя может содержать только буквы, цифры и символы @, +, ., - и _",
-  "@usernameValidChars": {
-    "description": "Error message when the user tries to register a username with forbidden characters"
-  },
-  "passwordsDontMatch": "Пароли не совпадают",
-  "@passwordsDontMatch": {
-    "description": "Error message when the user enters two different passwords during registration"
-  },
-  "confirmPassword": "Подтверждение пароля",
-  "@confirmPassword": {},
-  "invalidEmail": "Пожалуйста, введите действительный адрес электронной почты",
-  "@invalidEmail": {
-    "description": "Error message when the user enters an invalid email"
-  },
-  "username": "Имя пользователя",
-  "@username": {},
-  "invalidUsername": "Пожалуйста, введите действительное имя пользователя",
-  "@invalidUsername": {
-    "description": "Error message when the user enters an invalid username"
-  },
-  "customServerHint": "Введите адрес вашего собственного сервера, иначе будет использован адрес по умолчанию",
-  "@customServerHint": {
-    "description": "Hint text for the form where the users can enter their own wger instance"
-  },
-  "reset": "Сброс",
-  "@reset": {
-    "description": "Button text allowing the user to reset the entered values to the default"
-  },
-  "labelBottomNavWorkout": "Тренировка",
-  "@labelBottomNavWorkout": {
-    "description": "Label used in bottom navigation, use a short word"
-  },
-  "customServerUrl": "URL-адрес экземпляра wger",
-  "@customServerUrl": {
-    "description": "Label in the form where the users can enter their own wger instance"
-  },
-  "labelBottomNavNutrition": "Питание",
-  "@labelBottomNavNutrition": {
-    "description": "Label used in bottom navigation, use a short word"
-  },
-  "labelWorkoutPlan": "План тренировки",
-  "@labelWorkoutPlan": {
-    "description": "Title for screen workout plan"
-  },
-  "labelWorkoutLogs": "Журналы тренировок",
-  "@labelWorkoutLogs": {
-    "description": "(Workout) logs"
-  },
-  "exercise": "Упражнение",
-  "@exercise": {
-    "description": "An exercise for a workout"
-  },
-  "successfullySaved": "Сохранено",
-  "@successfullySaved": {
-    "description": "Message when an item was successfully saved"
-  },
-  "successfullyDeleted": "Удалено",
-  "@successfullyDeleted": {
-    "description": "Message when an item was successfully deleted"
-  },
-  "searchExercise": "Найдите упражнение, которое нужно добавить",
-  "@searchExercise": {
-    "description": "Label on set form. Selected exercises are added to the set"
-  },
-  "equipment": "Оборудование",
-  "@equipment": {
-    "description": "Equipment needed to perform an exercise"
-  },
-  "musclesSecondary": "Вторичные мышцы",
-  "@musclesSecondary": {
-    "description": "secondary muscles trained by an exercise"
-  },
-  "newWorkout": "Новый план тренировок",
-  "@newWorkout": {
-    "description": "Header when adding a new workout"
-  },
-  "dayDescriptionHelp": "Описание того, что делается в этот день (например, 'день подтягиваний') или какие части тела тренируются (например, 'грудь и плечи')",
-  "@dayDescriptionHelp": {},
-  "weightUnit": "Единица веса",
-  "@weightUnit": {},
-  "repetitionUnit": "Единица повторения",
-  "@repetitionUnit": {},
-  "repetitions": "Повторений",
-  "@repetitions": {
-    "description": "Repetitions for an exercise set"
-  },
-  "comment": "Комментарий",
-  "@comment": {
-    "description": "Comment, additional information"
-  },
-  "impression": "Впечатление",
-  "@impression": {
-    "description": "General impression (e.g. for a workout session) such as good, bad, etc."
-  },
-  "set": "Сет",
-  "@set": {
-    "description": "A set in a workout plan"
-  },
-  "gymMode": "Режим тренажерного зала",
-  "@gymMode": {
-    "description": "Label when starting the gym mode"
-  },
-  "jumpTo": "Перейти к",
-  "@jumpTo": {
-    "description": "Imperative. Label used in popup allowing the user to jump to a specific exercise while in the gym mode"
-  },
-  "logHelpEntriesUnits": "Обратите внимание, что в таблицу заносятся только записи с единицей веса (кг или фунты) и повторениями, другие комбинации, такие как время или до отказа, здесь не учитываются.",
-  "@logHelpEntriesUnits": {},
-  "pause": "Пауза",
-  "@pause": {
-    "description": "Noun, not an imperative! Label used for the pause when using the gym mode"
-  },
-  "plateCalculatorNotDivisible": "Невозможно достичь веса с имеющимися пластинами",
-  "@plateCalculatorNotDivisible": {
-    "description": "Error message when the current weight is not reachable with plates (e.g. 33.1 kg)"
-  },
-  "todaysWorkout": "Ваша тренировка сегодня",
-  "@todaysWorkout": {},
-  "logHelpEntries": "Если в один день есть несколько записей с одинаковым количеством повторений, но разными весами, то на диаграмме отображается только запись с большим весом.",
-  "@logHelpEntries": {},
-  "description": "Описание",
-  "@description": {},
-  "weight": "Вес",
-  "@weight": {
-    "description": "The weight of a workout log or body weight entry"
-  },
-  "name": "Имя",
-  "@name": {
-    "description": "Name for a workout or nutritional plan"
-  },
-  "addIngredient": "Добавить ингредиент",
-  "@addIngredient": {},
-  "nutritionalPlans": "Планы питания",
-  "@nutritionalPlans": {},
-  "timeStartAhead": "Время начала не может быть раньше времени окончания",
-  "@timeStartAhead": {},
-  "logIngredient": "Сохранить в дневнике питания",
-  "@logIngredient": {},
-  "searchIngredient": "Поиск ингредиента",
-  "@searchIngredient": {
-    "description": "Label on ingredient search form"
-  },
-  "nutritionalDiary": "Дневник питания",
-  "@nutritionalDiary": {},
-  "measurements": "Измерения",
-  "@measurements": {
-    "description": "Categories for the measurements such as biceps size, body fat, etc."
-  },
-  "anErrorOccurred": "Произошла ошибка!",
-  "@anErrorOccurred": {},
-  "measurement": "Измерение",
-  "@measurement": {},
-  "measurementCategoriesHelpText": "Категория измерения, например 'бицепс' или 'жир'",
-  "@measurementCategoriesHelpText": {},
-  "date": "Дата",
-  "@date": {
-    "description": "The date of a workout log or body weight entry"
-  },
-  "start": "Начать",
-  "@start": {
-    "description": "Label on button to start the gym mode (i.e., an imperative)"
-  },
-  "timeEnd": "Время окончания",
-  "@timeEnd": {
-    "description": "The end time of a workout"
-  },
-  "kcal": "ккал",
-  "@kcal": {
-    "description": "Energy in a meal in kilocalories, kcal"
-  },
-  "edit": "Редактировать",
-  "@edit": {},
-  "delete": "Удалить",
-  "@delete": {},
-  "confirmDelete": "Вы уверены, что хотите удалить '{toDelete}'?",
-  "@confirmDelete": {
-    "description": "Confirmation text before the user deletes an object",
-    "type": "text",
-    "placeholders": {
-      "toDelete": {}
-    }
-  },
-  "setUnitsAndRir": "Установите единицы измерения и ПвЗ",
-  "@setUnitsAndRir": {
-    "description": "Label shown on the slider where the user can toggle showing units and RiR",
-    "type": "text"
-  },
-  "planned": "Запланировано",
-  "@planned": {
-    "description": "Header for the column of 'planned' nutritional values, i.e. what should be eaten"
-  },
-  "fatShort": "Ж",
-  "@fatShort": {
-    "description": "The first letter or short name of the word 'Fat', used in overviews"
-  },
-  "gPerBodyKg": "г на кг тела",
-  "@gPerBodyKg": {
-    "description": "Label used for total sums of e.g. calories or similar in grams per Kg of body weight"
-  },
-  "total": "Всего",
-  "@total": {
-    "description": "Label used for total sums of e.g. calories or similar"
-  },
-  "fiber": "Клетчатка",
-  "@fiber": {},
-  "percentEnergy": "Процент энергии",
-  "@percentEnergy": {},
-  "proteinShort": "Б",
-  "@proteinShort": {
-    "description": "The first letter or short name of the word 'Protein', used in overviews"
-  },
-  "carbohydratesShort": "У",
-  "@carbohydratesShort": {
-    "description": "The first letter or short name of the word 'Carbohydrates', used in overviews"
-  },
-  "sugars": "Сахар",
-  "@sugars": {},
-  "saturatedFat": "Насыщенные жиры",
-  "@saturatedFat": {},
-  "sodium": "Натрий",
-  "@sodium": {},
-  "amount": "Количество",
-  "@amount": {
-    "description": "The amount (e.g. in grams) of an ingredient in a meal"
-  },
-  "unit": "Единица",
-  "@unit": {
-    "description": "The unit used for a repetition (kg, time, etc.)"
-  },
-  "noWeightEntries": "У вас нет записей о весе",
-  "@noWeightEntries": {
-    "description": "Message shown when the user has no logged weight entries"
-  },
-  "supersetWith": "суперсет с",
-  "@supersetWith": {
-    "description": "Text used between exercise cards when adding a new set. Translate as something like 'in a superset with'"
-  },
-  "newEntry": "Новая запись",
-  "@newEntry": {
-    "description": "Title when adding a new entry such as a weight or log entry"
-  },
-  "loadingText": "Загрузка…",
-  "@loadingText": {
-    "description": "Text to show when entries are being loaded in the background: Loading..."
-  },
-  "newNutritionalPlan": "Новый план питания",
-  "@newNutritionalPlan": {},
-  "toggleDetails": "Переключить сведения",
-  "@toggleDetails": {
-    "description": "Switch to toggle detail / overview"
-  },
-  "aboutDescription": "Спасибо за использование wger! wger - это совместный проект с открытым исходным кодом, созданный фитнес энтузиастами со всего мира.",
-  "@aboutDescription": {
-    "description": "Text in the about dialog"
-  },
-  "aboutContactUsText": "Если вы хотите пообщаться с нами, зайдите на сервер Discord и свяжитесь с нами",
-  "@aboutContactUsText": {
-    "description": "Text for contact us section in the about dialog"
-  },
-  "aboutTranslationText": "Это приложение переведено на weblate. Если вы тоже хотите помочь, нажмите на ссылку и начните переводить",
-  "@aboutTranslationText": {
-    "description": "Text for translation section in the about dialog"
-  },
-  "aboutSourceText": "Получите исходный код этого приложения и его сервера на github",
-  "@aboutSourceText": {
-    "description": "Text for source code section in the about dialog"
-  },
-  "aboutBugsTitle": "Есть проблема или идея?",
-  "@aboutBugsTitle": {
-    "description": "Title for bugs section in the about dialog"
-  },
-  "enterValidNumber": "Пожалуйста, введите правильное число",
-  "@enterValidNumber": {
-    "description": "Error message when the user has submitted an invalid number (e.g. '3,.,.,.')"
-  },
-  "aboutBugsText": "Свяжитесь с нами, если что-то пошло не так или если вам кажется, что какой-то функции не хватает.",
-  "@aboutBugsText": {
-    "description": "Text for bugs section in the about dialog"
-  },
-  "goToToday": "Перейти на сегодня",
-  "@goToToday": {
-    "description": "Label on button to jump back to 'today' in the calendar widget"
-  },
-  "enterRepetitionsOrWeight": "Пожалуйста, укажите количество повторений или вес хотя бы для одного из сетов",
-  "@enterRepetitionsOrWeight": {
-    "description": "Error message when the user hasn't filled in the forms for exercise sets"
-  },
-  "optionsLabel": "Опции",
-  "@optionsLabel": {
-    "description": "Label for the popup with general app options"
-  },
-  "sameRepetitions": "Если вы делаете одинаковые повторения и вес для всех сетов, вы можете просто заполнить одну строку. Например, для 4 сетов просто введите 10 повторений, это автоматически превратится в \"4 x 10\".",
-  "@sameRepetitions": {},
-  "newSet": "Новый сет",
-  "@newSet": {
-    "description": "Header when adding a new set to a workout day"
-  },
-  "dataCopied": "Данные копируются в новую запись",
-  "@dataCopied": {
-    "description": "Snackbar message to show on copying data to a new log entry"
-  },
-  "appUpdateContent": "Эта версия приложения не совместима с сервером, пожалуйста, обновите ваше приложение.",
-  "@appUpdateContent": {},
-  "setNr": "Сет {nr}",
-  "@setNr": {
-    "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.",
-    "type": "text",
-    "placeholders": {
-      "nr": {}
-    }
-  },
-  "addSet": "Добавить сет",
-  "@addSet": {
-    "description": "Label for the button that adds a set (to a workout day)"
-  },
-  "addMeal": "Добавить блюдо",
-  "@addMeal": {},
-  "mealLogged": "Блюдо записано в дневник",
-  "@mealLogged": {},
-  "protein": "Белки",
-  "@protein": {},
-  "carbohydrates": "Углеводы",
-  "@carbohydrates": {},
-  "fat": "Жиры",
-  "@fat": {},
-  "productNotFound": "Продукт не найден",
-  "@productNotFound": {
-    "description": "Header label for dialog when product is not found with barcode"
-  },
-  "productNotFoundDescription": "Продукт со отсканированным штрихкодом {barcode} не найден в базе данных wger",
-  "@productNotFoundDescription": {
-    "description": "Dialog info when product is not found with barcode",
-    "type": "text",
-    "placeholders": {
-      "barcode": {}
-    }
-  },
-  "scanBarcode": "Сканировать штрихкод",
-  "@scanBarcode": {
-    "description": "Label for scan barcode button"
-  },
-  "close": "Закрыть",
-  "@close": {
-    "description": "Translation for close"
-  },
-  "weekAverage": "В среднем за 7 дней",
-  "@weekAverage": {
-    "description": "Header for the column of '7 day average' nutritional values, i.e. what was logged last week"
-  },
-  "productFound": "Продукт найден",
-  "@productFound": {
-    "description": "Header label for dialog when product is found with barcode"
-  },
-  "productFoundDescription": "Штрихкод соответствует этому продукту: {productName}. Вы хотите продолжить?",
-  "@productFoundDescription": {
-    "description": "Dialog info when product is found with barcode",
-    "type": "text",
-    "placeholders": {
-      "productName": {}
-    }
-  },
-  "enterMinCharacters": "Пожалуйста, введите как минимум {min} символов",
-  "@enterMinCharacters": {
-    "description": "Error message when the user hasn't entered the minimum amount characters in a form",
-    "type": "text",
-    "placeholders": {
-      "min": {}
-    }
-  },
-  "noMeasurementEntries": "У вас нет записей измерений",
-  "@noMeasurementEntries": {},
-  "moreMeasurementEntries": "Добавить новое измерение",
-  "@moreMeasurementEntries": {
-    "description": "Message shown when the user wants to add new measurement"
-  },
-  "userProfile": "Ваш профиль",
-  "@userProfile": {},
-  "exerciseList": "Список упражнений",
-  "@exerciseList": {},
-  "baseNameEnglish": "Для всех упражнений необходимо базовое название на английском языке",
-  "@baseNameEnglish": {},
-  "verifiedEmail": "Подтвержденный адрес электронной почты",
-  "@verifiedEmail": {},
-  "swiss_ball": "Гимнастический мяч",
-  "@swiss_ball": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "chest": "Грудь",
-  "@chest": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "kettlebell": "Гиря",
-  "@kettlebell": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "calves": "Икры",
-  "@calves": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "success": "Успешно",
-  "@success": {
-    "description": "Message when an action completed successfully, usually used as a heading"
-  },
-  "exerciseName": "Название упражнения",
-  "@exerciseName": {
-    "description": "Label for the name of a workout exercise"
-  },
-  "textPromptTitle": "Готовы начать?",
-  "@textPromptTitle": {},
-  "body_weight": "Вес тела",
-  "@body_weight": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "cardio": "Кардио",
-  "@cardio": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "dumbbell": "Гантели",
-  "@dumbbell": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "gym_mat": "Спортивный коврик",
-  "@gym_mat": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "incline_bench": "Наклонная скамья",
-  "@incline_bench": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "kilometers_per_hour": "км/ч",
-  "@kilometers_per_hour": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "lats": "Широчайшие",
-  "@lats": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "miles": "Мили",
-  "@miles": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "miles_per_hour": "миль/ч",
-  "@miles_per_hour": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "plates": "Блины",
-  "@plates": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "quads": "Четырехглавые",
-  "@quads": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "sz_bar": "SZ-гриф",
-  "@sz_bar": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "kg": "кг",
-  "@kg": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "lb": "фунт",
-  "@lb": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "images": "Изображения",
-  "@images": {},
-  "language": "Язык",
-  "@language": {},
-  "abs": "Пресс",
-  "@abs": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "arms": "Руки",
-  "@arms": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "back": "Спина",
-  "@back": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "biceps": "Бицепсы",
-  "@biceps": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "translation": "Перевод",
-  "@translation": {},
-  "baseData": "Основы на английском",
-  "@baseData": {
-    "description": "The base data for an exercise such as category, trained muscles, etc."
-  },
-  "glutes": "Ягодицы",
-  "@glutes": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "kilometers": "Километры",
-  "@kilometers": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "seconds": "Секунд",
-  "@seconds": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "until_failure": "До отказа",
-  "@until_failure": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "bench": "Скамья",
-  "@bench": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "barbell": "Штанга",
-  "@barbell": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "none__bodyweight_exercise_": "без (с собственным весом)",
-  "@none__bodyweight_exercise_": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "shoulders": "Плечи",
-  "@shoulders": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "next": "Следующее",
-  "@next": {},
-  "pull_up_bar": "Турник",
-  "@pull_up_bar": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "exercises": "Упражнения",
-  "@exercises": {
-    "description": "Multiple exercises for a workout"
-  },
-  "add_exercise_image_license": "Изображения должны быть совместимы с CC BY SA лицензией. Если вы сомневаетесь, загружайте только те фотографии, которые вы сделали сами",
-  "@add_exercise_image_license": {},
-  "unVerifiedEmail": "Неподтвержденный адрес электронной почты",
-  "@unVerifiedEmail": {},
-  "contributeExercise": "Добавить упражнение",
-  "@contributeExercise": {},
-  "addExercise": "Добавить упражнение",
-  "@addExercise": {},
-  "translateExercise": "Перевести это упражнение",
-  "@translateExercise": {},
-  "contributeExerciseWarning": "Вы можете добавлять упражнения только в том случае, если ваша учетная запись старше {days} дней и вы подтвердили свою электронную почту",
-  "@contributeExerciseWarning": {
-    "description": "Number of days before which a person can add exercise",
-    "placeholders": {
-      "days": {
-        "type": "String",
-        "example": "14"
-      }
-    }
-  },
-  "textPromptSubheading": "Нажмите кнопку действия, чтобы начать",
-  "@textPromptSubheading": {},
-  "minutes": "Минут",
-  "@minutes": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "triceps": "Трицепс",
-  "@triceps": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "searchNamesInEnglish": "Также ищите названия на английском",
-  "@searchNamesInEnglish": {},
-  "selectEntry": "Пожалуйста, выберите запись",
-  "@selectEntry": {},
-  "variations": "Варианты",
-  "@variations": {
-    "description": "Variations of one exercise (e.g. benchpress and benchpress narrow)"
-  },
-  "alsoKnownAs": "Также известно как: {aliases}",
-  "@alsoKnownAs": {
-    "placeholders": {
-      "aliases": {}
+    "useCustomServer": "Использовать пользовательский сервер",
+    "@useCustomServer": {
+        "description": "Toggle button allowing users to switch between the default and a custom wger server"
     },
-    "description": "List of alternative names for an exercise"
-  },
-  "verifiedEmailReason": "Вам необходимо подтвердить свой адрес электронной почты, чтобы добавлять упражнения",
-  "@verifiedEmailReason": {},
-  "verifiedEmailInfo": "Письмо с подтверждением отправлено на {email}",
-  "@verifiedEmailInfo": {
-    "placeholders": {
-      "email": {}
-    }
-  },
-  "alternativeNames": "Альтернативные названия",
-  "@alternativeNames": {},
-  "oneNamePerLine": "Одно название на строку",
-  "@oneNamePerLine": {},
-  "whatVariationsExist": "Какие варианты этого упражнения существуют, если таковые имеются?",
-  "@whatVariationsExist": {},
-  "previous": "Предыдущее",
-  "@previous": {},
-  "aboutPageTitle": "О Wger",
-  "@aboutPageTitle": {},
-  "cacheWarning": "Из-за кэширования может пройти некоторое время, прежде чем изменения станут видны во всем приложении.",
-  "@cacheWarning": {},
-  "legs": "Ноги",
-  "@legs": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "goalMacro": "Цели по макронутриентам",
-  "@goalMacro": {
-    "description": "The goal for macronutrients"
-  },
-  "goalFiber": "Цель по волокну",
-  "@goalFiber": {},
-  "kcalValue": "{value} калорий",
-  "@kcalValue": {
-    "description": "A value in kcal, e.g. 500 kcal",
-    "type": "text",
-    "placeholders": {
-      "value": {}
-    }
-  },
-  "aboutMastodonText": "Подписывайтесь на нас в Mastodon, чтобы получать обновления и новости о проекте",
-  "@aboutMastodonText": {
-    "description": "Text for the mastodon section in the about dialog"
-  },
-  "useMetric": "Использовать метрические единицы измерения для веса тела.",
-  "@useMetric": {},
-  "verify": "Подтвердить",
-  "@verify": {},
-  "settingsCacheTitle": "Кэш",
-  "@settingsCacheTitle": {},
-  "settingsExerciseCacheDescription": "Кэш упражнений",
-  "@settingsExerciseCacheDescription": {},
-  "noMatchingExerciseFound": "Не выбрано упражнение для замены",
-  "@noMatchingExerciseFound": {
-    "description": "Message returned if no exercises match the searched string"
-  },
-  "hamstrings": "Бёдра",
-  "@hamstrings": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "max_reps": "Максимальное количество повторений",
-  "@max_reps": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "onlyLogging": "Только отслеживать калории",
-  "@onlyLogging": {},
-  "onlyLoggingHelpText": "Поставьте флажок, если вы хотите отслеживать только потребление калорий и не хотите создавать подробный план питания с конкретными блюдами",
-  "@onlyLoggingHelpText": {},
-  "goalEnergy": "Цель по энергии",
-  "@goalEnergy": {},
-  "goalProtein": "Цель по белкам",
-  "@goalProtein": {},
-  "goalCarbohydrates": "Цель по углеводам",
-  "@goalCarbohydrates": {},
-  "goalFat": "Цель по жирам",
-  "@goalFat": {},
-  "today": "Сегодня",
-  "@today": {},
-  "loggedToday": "Записано на сегодня",
-  "@loggedToday": {},
-  "gValue": "{value} гр",
-  "@gValue": {
-    "description": "A value in grams, e.g. 5 g",
-    "type": "text",
-    "placeholders": {
-      "value": {}
-    }
-  },
-  "percentValue": "{value} %",
-  "@percentValue": {
-    "description": "A value in percent, e.g. 10 %",
-    "type": "text",
-    "placeholders": {
-      "value": {}
-    }
-  },
-  "aboutDonateTitle": "Пожертвовать",
-  "@aboutDonateTitle": {},
-  "aboutDonateText": "Купите нам кофе, чтобы помочь проекту, оплатить затраты на сервер и поддерживать нас в тонусе",
-  "@aboutDonateText": {},
-  "settingsTitle": "Настройки",
-  "@settingsTitle": {},
-  "lower_back": "Нижняя часть спины",
-  "@lower_back": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "aboutMastodonTitle": "Мастодонт",
-  "@aboutMastodonTitle": {
-    "description": "Title for mastodon section in the about dialog"
-  },
-  "surplus": "превышение",
-  "@surplus": {
-    "description": "Caloric surplus (either planned or unplanned)"
-  },
-  "deficit": "дефицит",
-  "@deficit": {
-    "description": "Caloric deficit (either planned or unplanned)"
-  },
-  "settingsCacheDeletedSnackbar": "Кэш успешно очищен",
-  "@settingsCacheDeletedSnackbar": {},
-  "log": "Журнал",
-  "@log": {
-    "description": "Log a specific meal (imperative form)"
-  },
-  "done": "Завершить",
-  "@done": {}
+    "email": "Адрес электронной почты",
+    "@email": {},
+    "registerInstead": "У вас нет аккаунта? Зарегистрируйтесь сейчас",
+    "@registerInstead": {},
+    "loginInstead": "Уже есть аккаунт? Войти",
+    "@loginInstead": {},
+    "labelDashboard": "Панель управления",
+    "@labelDashboard": {
+        "description": "Title for screen dashboard"
+    },
+    "muscles": "Мышцы",
+    "@muscles": {
+        "description": "(main) muscles trained by an exercise"
+    },
+    "reps": "Повтор",
+    "@reps": {
+        "description": "Shorthand for repetitions, used when space constraints are tighter"
+    },
+    "rir": "ПвЗ",
+    "@rir": {
+        "description": "Shorthand for Repetitions In Reserve"
+    },
+    "rirNotUsed": "ПвЗ не используется",
+    "@rirNotUsed": {
+        "description": "Label used in RiR slider when the RiR value is not used/saved for the current setting or log"
+    },
+    "notes": "Заметки",
+    "@notes": {
+        "description": "Personal notes, e.g. for a workout session"
+    },
+    "workoutSession": "Записанная тренировка",
+    "@workoutSession": {
+        "description": "A (logged) workout session"
+    },
+    "newDay": "Новый день",
+    "@newDay": {},
+    "selectExercises": "Если вы хотите сделать супер подход (сет), вы можете найти несколько упражнений, они будут сгруппированы вместе",
+    "@selectExercises": {},
+    "plateCalculator": "Пластины (блины)",
+    "@plateCalculator": {
+        "description": "Label used for the plate calculator in the gym mode"
+    },
+    "save": "Сохранить",
+    "@save": {},
+    "logMeal": "Запишите прием пищи в дневник питания",
+    "@logMeal": {},
+    "nutritionalPlan": "План питания",
+    "@nutritionalPlan": {},
+    "noNutritionalPlans": "У вас нет планов питания",
+    "@noNutritionalPlans": {
+        "description": "Message shown when the user has no nutritional plans"
+    },
+    "measurementEntriesHelpText": "Единица, используемая для измерения в категории, например 'см' или '%'",
+    "@measurementEntriesHelpText": {},
+    "value": "Значение",
+    "@value": {
+        "description": "The value of a measurement entry"
+    },
+    "time": "Время",
+    "@time": {
+        "description": "The time of a meal or workout"
+    },
+    "timeStart": "Время начала",
+    "@timeStart": {
+        "description": "The starting time of a workout"
+    },
+    "ingredient": "Ингредиент",
+    "@ingredient": {},
+    "energy": "Энергия",
+    "@energy": {
+        "description": "Energy in a meal, ingredient etc. e.g. in kJ"
+    },
+    "energyShort": "Э",
+    "@energyShort": {
+        "description": "The first letter or short name of the word 'Energy', used in overviews"
+    },
+    "macronutrients": "Макроэлементы",
+    "@macronutrients": {},
+    "logged": "Записано",
+    "@logged": {
+        "description": "Header for the column of 'logged' nutritional values, i.e. what was eaten"
+    },
+    "difference": "Разница",
+    "@difference": {},
+    "kJ": "кДж",
+    "@kJ": {
+        "description": "Energy in a meal in kilo joules, kJ"
+    },
+    "g": "г",
+    "@g": {
+        "description": "Abbreviation for gram"
+    },
+    "goToDetailPage": "Перейти на страницу сведений",
+    "@goToDetailPage": {},
+    "calendar": "Календарь",
+    "@calendar": {},
+    "enterValue": "Пожалуйста, введите значение",
+    "@enterValue": {
+        "description": "Error message when the user hasn't entered a value on a required field"
+    },
+    "selectExercise": "Пожалуйста, выберите упражнение",
+    "@selectExercise": {
+        "description": "Error message when the user hasn't selected an exercise in the form"
+    },
+    "enterCharacters": "Пожалуйста, введите между {min} и {max} символами",
+    "@enterCharacters": {
+        "description": "Error message when the user hasn't entered the correct number of characters in a form",
+        "type": "text",
+        "placeholders": {
+            "min": {
+                "type": "String"
+            },
+            "max": {
+                "type": "String"
+            }
+        }
+    },
+    "nrOfSets": "Количество сетов на упражнение: {nrOfSets}",
+    "@nrOfSets": {
+        "description": "Label shown on the slider where the user selects the nr of sets",
+        "type": "text",
+        "placeholders": {
+            "nrOfSets": {
+                "type": "String"
+            }
+        }
+    },
+    "selectIngredient": "Пожалуйста, выберите ингредиент",
+    "@selectIngredient": {
+        "description": "Error message when the user hasn't selected an ingredient from the autocompleter"
+    },
+    "recentlyUsedIngredients": "Недавно добавленные ингредиенты",
+    "@recentlyUsedIngredients": {
+        "description": "A message when a user adds a new ingredient to a meal."
+    },
+    "selectImage": "Пожалуйста, выберите изображение",
+    "@selectImage": {
+        "description": "Label and error message when the user hasn't selected an image to save"
+    },
+    "takePicture": "Сфотографировать",
+    "@takePicture": {},
+    "chooseFromLibrary": "Выбрать из библиотеки фотографий",
+    "@chooseFromLibrary": {},
+    "gallery": "Галерея",
+    "@gallery": {},
+    "addImage": "Добавить изображение",
+    "@addImage": {},
+    "appUpdateTitle": "Требуется обновление",
+    "@appUpdateTitle": {},
+    "passwordTooShort": "Пароль слишком короткий",
+    "@passwordTooShort": {
+        "description": "Error message when the user a password that is too short"
+    },
+    "category": "Категория",
+    "@category": {
+        "description": "Category for an exercise, ingredient, etc."
+    },
+    "login": "Войти",
+    "@login": {
+        "description": "Text for login button"
+    },
+    "register": "Зарегистрироваться",
+    "@register": {
+        "description": "Text for registration button"
+    },
+    "password": "Пароль",
+    "@password": {},
+    "logout": "Выйти",
+    "@logout": {
+        "description": "Text for logout button"
+    },
+    "useDefaultServer": "Использовать сервер по умолчанию",
+    "@useDefaultServer": {
+        "description": "Toggle button allowing users to switch between the default and a custom wger server"
+    },
+    "invalidUrl": "Пожалуйста, введите действительный URL",
+    "@invalidUrl": {
+        "description": "Error message when the user enters an invalid URL, e.g. in the login form"
+    },
+    "usernameValidChars": "Имя пользователя может содержать только буквы, цифры и символы @, +, ., - и _",
+    "@usernameValidChars": {
+        "description": "Error message when the user tries to register a username with forbidden characters"
+    },
+    "passwordsDontMatch": "Пароли не совпадают",
+    "@passwordsDontMatch": {
+        "description": "Error message when the user enters two different passwords during registration"
+    },
+    "confirmPassword": "Подтверждение пароля",
+    "@confirmPassword": {},
+    "invalidEmail": "Пожалуйста, введите действительный адрес электронной почты",
+    "@invalidEmail": {
+        "description": "Error message when the user enters an invalid email"
+    },
+    "username": "Имя пользователя",
+    "@username": {},
+    "invalidUsername": "Пожалуйста, введите действительное имя пользователя",
+    "@invalidUsername": {
+        "description": "Error message when the user enters an invalid username"
+    },
+    "customServerHint": "Введите адрес вашего собственного сервера, иначе будет использован адрес по умолчанию",
+    "@customServerHint": {
+        "description": "Hint text for the form where the users can enter their own wger instance"
+    },
+    "reset": "Сброс",
+    "@reset": {
+        "description": "Button text allowing the user to reset the entered values to the default"
+    },
+    "labelBottomNavWorkout": "Тренировка",
+    "@labelBottomNavWorkout": {
+        "description": "Label used in bottom navigation, use a short word"
+    },
+    "customServerUrl": "URL-адрес экземпляра wger",
+    "@customServerUrl": {
+        "description": "Label in the form where the users can enter their own wger instance"
+    },
+    "labelBottomNavNutrition": "Питание",
+    "@labelBottomNavNutrition": {
+        "description": "Label used in bottom navigation, use a short word"
+    },
+    "labelWorkoutPlan": "План тренировки",
+    "@labelWorkoutPlan": {
+        "description": "Title for screen workout plan"
+    },
+    "labelWorkoutLogs": "Журналы тренировок",
+    "@labelWorkoutLogs": {
+        "description": "(Workout) logs"
+    },
+    "exercise": "Упражнение",
+    "@exercise": {
+        "description": "An exercise for a workout"
+    },
+    "successfullySaved": "Сохранено",
+    "@successfullySaved": {
+        "description": "Message when an item was successfully saved"
+    },
+    "successfullyDeleted": "Удалено",
+    "@successfullyDeleted": {
+        "description": "Message when an item was successfully deleted"
+    },
+    "searchExercise": "Найдите упражнение, которое нужно добавить",
+    "@searchExercise": {
+        "description": "Label on set form. Selected exercises are added to the set"
+    },
+    "equipment": "Оборудование",
+    "@equipment": {
+        "description": "Equipment needed to perform an exercise"
+    },
+    "musclesSecondary": "Вторичные мышцы",
+    "@musclesSecondary": {
+        "description": "secondary muscles trained by an exercise"
+    },
+    "dayDescriptionHelp": "Описание того, что делается в этот день (например, 'день подтягиваний') или какие части тела тренируются (например, 'грудь и плечи')",
+    "@dayDescriptionHelp": {},
+    "weightUnit": "Единица веса",
+    "@weightUnit": {},
+    "repetitionUnit": "Единица повторения",
+    "@repetitionUnit": {},
+    "repetitions": "Повторений",
+    "@repetitions": {
+        "description": "Repetitions for an exercise set"
+    },
+    "comment": "Комментарий",
+    "@comment": {
+        "description": "Comment, additional information"
+    },
+    "impression": "Впечатление",
+    "@impression": {
+        "description": "General impression (e.g. for a workout session) such as good, bad, etc."
+    },
+    "set": "Подход",
+    "@set": {
+        "description": "A set in a workout plan"
+    },
+    "gymMode": "Режим тренажерного зала",
+    "@gymMode": {
+        "description": "Label when starting the gym mode"
+    },
+    "jumpTo": "Перейти к",
+    "@jumpTo": {
+        "description": "Imperative. Label used in popup allowing the user to jump to a specific exercise while in the gym mode"
+    },
+    "logHelpEntriesUnits": "Обратите внимание, что на графиках отображаются только записи с указанием веса (кг или фунты) и повторений. Другие комбинации, такие как время или \"до отказа\", здесь игнорируются.",
+    "@logHelpEntriesUnits": {},
+    "pause": "Пауза",
+    "@pause": {
+        "description": "Noun, not an imperative! Label used for the pause when using the gym mode"
+    },
+    "plateCalculatorNotDivisible": "Невозможно достичь веса с имеющимися пластинами (весами)",
+    "@plateCalculatorNotDivisible": {
+        "description": "Error message when the current weight is not reachable with plates (e.g. 33.1 kg)"
+    },
+    "todaysWorkout": "Ваша сегодняшняя тренировка",
+    "@todaysWorkout": {},
+    "logHelpEntries": "Если в один день есть несколько записей с одинаковым количеством повторений, но разными весами, то на диаграмме отображается только запись с большим весом.",
+    "@logHelpEntries": {},
+    "description": "Описание",
+    "@description": {},
+    "weight": "Вес",
+    "@weight": {
+        "description": "The weight of a workout log or body weight entry"
+    },
+    "name": "Имя",
+    "@name": {
+        "description": "Name for a workout or nutritional plan"
+    },
+    "addIngredient": "Добавить ингредиент",
+    "@addIngredient": {},
+    "nutritionalPlans": "Планы питания",
+    "@nutritionalPlans": {},
+    "timeStartAhead": "Время начала не может быть раньше времени окончания",
+    "@timeStartAhead": {},
+    "logIngredient": "Записать в дневнике питания",
+    "@logIngredient": {},
+    "searchIngredient": "Поиск ингредиента",
+    "@searchIngredient": {
+        "description": "Label on ingredient search form"
+    },
+    "nutritionalDiary": "Дневник питания",
+    "@nutritionalDiary": {},
+    "measurements": "Измерения",
+    "@measurements": {
+        "description": "Categories for the measurements such as biceps size, body fat, etc."
+    },
+    "anErrorOccurred": "Произошла ошибка!",
+    "@anErrorOccurred": {},
+    "measurement": "Измерение",
+    "@measurement": {},
+    "measurementCategoriesHelpText": "Категория измерения, например 'бицепс' или 'жир'",
+    "@measurementCategoriesHelpText": {},
+    "date": "Дата",
+    "@date": {
+        "description": "The date of a workout log or body weight entry"
+    },
+    "start": "Старт",
+    "@start": {
+        "description": "Label on button to start the gym mode (i.e., an imperative)"
+    },
+    "timeEnd": "Время окончания",
+    "@timeEnd": {
+        "description": "The end time of a workout"
+    },
+    "kcal": "ккал",
+    "@kcal": {
+        "description": "Energy in a meal in kilocalories, kcal"
+    },
+    "edit": "Редактировать",
+    "@edit": {},
+    "delete": "Удалить",
+    "@delete": {},
+    "confirmDelete": "Вы уверены, что хотите удалить '{toDelete}'?",
+    "@confirmDelete": {
+        "description": "Confirmation text before the user deletes an object",
+        "type": "text",
+        "placeholders": {
+            "toDelete": {
+                "type": "String"
+            }
+        }
+    },
+    "setUnitsAndRir": "Установите единицы измерения и ПвЗ",
+    "@setUnitsAndRir": {
+        "description": "Label shown on the slider where the user can toggle showing units and RiR",
+        "type": "text"
+    },
+    "planned": "Запланировано",
+    "@planned": {
+        "description": "Header for the column of 'planned' nutritional values, i.e. what should be eaten"
+    },
+    "fatShort": "Ж",
+    "@fatShort": {
+        "description": "The first letter or short name of the word 'Fat', used in overviews"
+    },
+    "gPerBodyKg": "г на кг тела",
+    "@gPerBodyKg": {
+        "description": "Label used for total sums of e.g. calories or similar in grams per Kg of body weight"
+    },
+    "total": "Всего",
+    "@total": {
+        "description": "Label used for total sums of e.g. calories or similar"
+    },
+    "fiber": "Клетчатка",
+    "@fiber": {},
+    "percentEnergy": "Процент энергии",
+    "@percentEnergy": {},
+    "proteinShort": "Б",
+    "@proteinShort": {
+        "description": "The first letter or short name of the word 'Protein', used in overviews"
+    },
+    "carbohydratesShort": "У",
+    "@carbohydratesShort": {
+        "description": "The first letter or short name of the word 'Carbohydrates', used in overviews"
+    },
+    "sugars": "Сахар",
+    "@sugars": {},
+    "saturatedFat": "Насыщенные жиры",
+    "@saturatedFat": {},
+    "sodium": "Натрий",
+    "@sodium": {},
+    "amount": "Количество",
+    "@amount": {
+        "description": "The amount (e.g. in grams) of an ingredient in a meal"
+    },
+    "unit": "Единица",
+    "@unit": {
+        "description": "The unit used for a repetition (kg, time, etc.)"
+    },
+    "noWeightEntries": "У вас нет записей о весе",
+    "@noWeightEntries": {
+        "description": "Message shown when the user has no logged weight entries"
+    },
+    "newEntry": "Новая запись",
+    "@newEntry": {
+        "description": "Title when adding a new entry such as a weight or log entry"
+    },
+    "loadingText": "Загрузка…",
+    "@loadingText": {
+        "description": "Text to show when entries are being loaded in the background: Loading..."
+    },
+    "newNutritionalPlan": "Новый план питания",
+    "@newNutritionalPlan": {},
+    "toggleDetails": "Переключить сведения",
+    "@toggleDetails": {
+        "description": "Switch to toggle detail / overview"
+    },
+    "aboutDescription": "Спасибо за использование wger! wger - это совместный проект с открытым исходным кодом, созданный фитнес энтузиастами со всего мира.",
+    "@aboutDescription": {
+        "description": "Text in the about dialog"
+    },
+    "enterValidNumber": "Пожалуйста, введите правильное число",
+    "@enterValidNumber": {
+        "description": "Error message when the user has submitted an invalid number (e.g. '3,.,.,.')"
+    },
+    "goToToday": "Перейти на сегодня",
+    "@goToToday": {
+        "description": "Label on button to jump back to 'today' in the calendar widget"
+    },
+    "optionsLabel": "Опции",
+    "@optionsLabel": {
+        "description": "Label for the popup with general app options"
+    },
+    "sameRepetitions": "Если количество повторений и вес не меняются от подхода к подходу, достаточно указать данные один раз. Например, для 4 подходов введите 10 повторений, и это автоматически преобразуется в '4 x 10'.",
+    "@sameRepetitions": {},
+    "newSet": "Новый подход (сет)",
+    "@newSet": {
+        "description": "Header when adding a new set to a workout day"
+    },
+    "dataCopied": "Данные копируются в новую запись",
+    "@dataCopied": {
+        "description": "Snackbar message to show on copying data to a new log entry"
+    },
+    "appUpdateContent": "Эта версия приложения не совместима с сервером, пожалуйста, обновите ваше приложение.",
+    "@appUpdateContent": {},
+    "setNr": "Сет {nr}",
+    "@setNr": {
+        "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.",
+        "type": "text",
+        "placeholders": {
+            "nr": {
+                "type": "String"
+            }
+        }
+    },
+    "addSet": "Добавить сет",
+    "@addSet": {
+        "description": "Label for the button that adds a set (to a workout day)"
+    },
+    "addMeal": "Добавить блюдо",
+    "@addMeal": {},
+    "mealLogged": "Блюдо записано в дневник",
+    "@mealLogged": {},
+    "protein": "Белки",
+    "@protein": {},
+    "carbohydrates": "Углеводы",
+    "@carbohydrates": {},
+    "fat": "Жиры",
+    "@fat": {},
+    "productNotFound": "Продукт не найден",
+    "@productNotFound": {
+        "description": "Header label for dialog when product is not found with barcode"
+    },
+    "productNotFoundDescription": "Продукт со отсканированным штрихкодом {barcode} не найден в базе данных wger",
+    "@productNotFoundDescription": {
+        "description": "Dialog info when product is not found with barcode",
+        "type": "text",
+        "placeholders": {
+            "barcode": {
+                "type": "String"
+            }
+        }
+    },
+    "scanBarcode": "Сканировать штрихкод",
+    "@scanBarcode": {
+        "description": "Label for scan barcode button"
+    },
+    "close": "Закрыть",
+    "@close": {
+        "description": "Translation for close"
+    },
+    "weekAverage": "В среднем за 7 дней",
+    "@weekAverage": {
+        "description": "Header for the column of '7 day average' nutritional values, i.e. what was logged last week"
+    },
+    "productFound": "Продукт найден",
+    "@productFound": {
+        "description": "Header label for dialog when product is found with barcode"
+    },
+    "productFoundDescription": "Штрихкод соответствует этому продукту: {productName}. Вы хотите продолжить?",
+    "@productFoundDescription": {
+        "description": "Dialog info when product is found with barcode",
+        "type": "text",
+        "placeholders": {
+            "productName": {
+                "type": "String"
+            }
+        }
+    },
+    "enterMinCharacters": "Пожалуйста, введите как минимум {min} символов",
+    "@enterMinCharacters": {
+        "description": "Error message when the user hasn't entered the minimum amount characters in a form",
+        "type": "text",
+        "placeholders": {
+            "min": {
+                "type": "String"
+            }
+        }
+    },
+    "noMeasurementEntries": "У вас нет записей измерений",
+    "@noMeasurementEntries": {},
+    "moreMeasurementEntries": "Добавить новое измерение",
+    "@moreMeasurementEntries": {
+        "description": "Message shown when the user wants to add new measurement"
+    },
+    "userProfile": "Ваш профиль",
+    "@userProfile": {},
+    "exerciseList": "Список упражнений",
+    "@exerciseList": {},
+    "baseNameEnglish": "Для всех упражнений необходимо базовое название на английском языке",
+    "@baseNameEnglish": {},
+    "verifiedEmail": "Подтвержденный адрес электронной почты",
+    "@verifiedEmail": {},
+    "swiss_ball": "Гимнастический мяч",
+    "@swiss_ball": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "chest": "Грудь",
+    "@chest": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "kettlebell": "Гиря",
+    "@kettlebell": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "calves": "Икры",
+    "@calves": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "success": "Успешно",
+    "@success": {
+        "description": "Message when an action completed successfully, usually used as a heading"
+    },
+    "exerciseName": "Название упражнения",
+    "@exerciseName": {
+        "description": "Label for the name of a workout exercise"
+    },
+    "textPromptTitle": "Готовы начать?",
+    "@textPromptTitle": {},
+    "body_weight": "Вес тела",
+    "@body_weight": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "cardio": "Кардио",
+    "@cardio": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "dumbbell": "Гантели",
+    "@dumbbell": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "gym_mat": "Спортивный коврик",
+    "@gym_mat": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "incline_bench": "Наклонная скамья",
+    "@incline_bench": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "kilometers_per_hour": "км/ч",
+    "@kilometers_per_hour": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "lats": "Широчайшие",
+    "@lats": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "miles": "Мили",
+    "@miles": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "miles_per_hour": "миль/ч",
+    "@miles_per_hour": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "plates": "Блины",
+    "@plates": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "quads": "Четырехглавые",
+    "@quads": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "sz_bar": "SZ-гриф",
+    "@sz_bar": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "kg": "кг",
+    "@kg": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "lb": "фунт",
+    "@lb": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "images": "Изображения",
+    "@images": {},
+    "language": "Язык",
+    "@language": {},
+    "abs": "Пресс",
+    "@abs": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "arms": "Руки",
+    "@arms": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "back": "Спина",
+    "@back": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "biceps": "Бицепсы",
+    "@biceps": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "translation": "Перевод",
+    "@translation": {},
+    "baseData": "Основы на английском",
+    "@baseData": {
+        "description": "The base data for an exercise such as category, trained muscles, etc."
+    },
+    "glutes": "Ягодицы",
+    "@glutes": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "kilometers": "Километры",
+    "@kilometers": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "seconds": "Секунд",
+    "@seconds": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "until_failure": "До отказа",
+    "@until_failure": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "bench": "Скамья",
+    "@bench": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "barbell": "Штанга",
+    "@barbell": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "none__bodyweight_exercise_": "без (с собственным весом)",
+    "@none__bodyweight_exercise_": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "shoulders": "Плечи",
+    "@shoulders": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "next": "Следующее",
+    "@next": {},
+    "pull_up_bar": "Турник",
+    "@pull_up_bar": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "exercises": "Упражнения",
+    "@exercises": {
+        "description": "Multiple exercises for a workout"
+    },
+    "add_exercise_image_license": "Изображения должны быть совместимы с CC BY SA лицензией. Если вы сомневаетесь, загружайте только те фотографии, которые вы сделали сами",
+    "@add_exercise_image_license": {},
+    "unVerifiedEmail": "Неподтвержденный адрес электронной почты",
+    "@unVerifiedEmail": {},
+    "contributeExercise": "Добавить упражнение",
+    "@contributeExercise": {},
+    "addExercise": "Добавить упражнение",
+    "@addExercise": {},
+    "translateExercise": "Перевести это упражнение",
+    "@translateExercise": {},
+    "contributeExerciseWarning": "Вы можете добавлять упражнения только в том случае, если ваша учетная запись старше {days} дней и вы подтвердили свою электронную почту",
+    "@contributeExerciseWarning": {
+        "description": "Number of days before which a person can add exercise",
+        "placeholders": {
+            "days": {
+                "type": "String",
+                "example": "14"
+            }
+        }
+    },
+    "textPromptSubheading": "Нажмите кнопку действия, чтобы начать",
+    "@textPromptSubheading": {},
+    "minutes": "Минут",
+    "@minutes": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "triceps": "Трицепс",
+    "@triceps": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "searchNamesInEnglish": "Также ищите названия на английском",
+    "@searchNamesInEnglish": {},
+    "selectEntry": "Пожалуйста, выберите запись",
+    "@selectEntry": {},
+    "variations": "Варианты",
+    "@variations": {
+        "description": "Variations of one exercise (e.g. benchpress and benchpress narrow)"
+    },
+    "alsoKnownAs": "Также известно как: {aliases}",
+    "@alsoKnownAs": {
+        "placeholders": {
+            "aliases": {
+                "type": "String"
+            }
+        },
+        "description": "List of alternative names for an exercise"
+    },
+    "verifiedEmailReason": "Вам необходимо подтвердить свой адрес электронной почты, чтобы добавлять упражнения",
+    "@verifiedEmailReason": {},
+    "verifiedEmailInfo": "Письмо с подтверждением отправлено на {email}",
+    "@verifiedEmailInfo": {
+        "placeholders": {
+            "email": {
+                "type": "String"
+            }
+        }
+    },
+    "alternativeNames": "Альтернативные названия",
+    "@alternativeNames": {},
+    "oneNamePerLine": "Одно название на строку",
+    "@oneNamePerLine": {},
+    "whatVariationsExist": "Какие варианты этого упражнения существуют, если таковые имеются?",
+    "@whatVariationsExist": {},
+    "previous": "Предыдущее",
+    "@previous": {},
+    "aboutPageTitle": "О Wger",
+    "@aboutPageTitle": {},
+    "cacheWarning": "Из-за кэширования может пройти некоторое время, прежде чем изменения станут видны во всем приложении.",
+    "@cacheWarning": {},
+    "legs": "Ноги",
+    "@legs": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "goalMacro": "Цели по макронутриентам",
+    "@goalMacro": {
+        "description": "The goal for macronutrients"
+    },
+    "goalFiber": "Цель по волокну",
+    "@goalFiber": {},
+    "kcalValue": "{value} калорий",
+    "@kcalValue": {
+        "description": "A value in kcal, e.g. 500 kcal",
+        "type": "text",
+        "placeholders": {
+            "value": {
+                "type": "String"
+            }
+        }
+    },
+    "useMetric": "Использовать метрические единицы измерения для веса тела.",
+    "@useMetric": {},
+    "verify": "Подтвердить",
+    "@verify": {},
+    "settingsCacheTitle": "Кэш",
+    "@settingsCacheTitle": {},
+    "settingsExerciseCacheDescription": "Кэш упражнений",
+    "@settingsExerciseCacheDescription": {},
+    "noMatchingExerciseFound": "Не выбрано упражнение для замены",
+    "@noMatchingExerciseFound": {
+        "description": "Message returned if no exercises match the searched string"
+    },
+    "hamstrings": "Бёдра",
+    "@hamstrings": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "max_reps": "Максимальное количество повторений",
+    "@max_reps": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "onlyLogging": "Только отслеживать калории",
+    "@onlyLogging": {},
+    "onlyLoggingHelpText": "Поставьте флажок, если вы хотите отслеживать только потребление калорий и не хотите создавать подробный план питания с конкретными блюдами",
+    "@onlyLoggingHelpText": {},
+    "goalEnergy": "Цель по энергии",
+    "@goalEnergy": {},
+    "goalProtein": "Цель по белкам",
+    "@goalProtein": {},
+    "goalCarbohydrates": "Цель по углеводам",
+    "@goalCarbohydrates": {},
+    "goalFat": "Цель по жирам",
+    "@goalFat": {},
+    "today": "Сегодня",
+    "@today": {},
+    "loggedToday": "Записано на сегодня",
+    "@loggedToday": {},
+    "gValue": "{value} гр",
+    "@gValue": {
+        "description": "A value in grams, e.g. 5 g",
+        "type": "text",
+        "placeholders": {
+            "value": {
+                "type": "String"
+            }
+        }
+    },
+    "percentValue": "{value} %",
+    "@percentValue": {
+        "description": "A value in percent, e.g. 10 %",
+        "type": "text",
+        "placeholders": {
+            "value": {
+                "type": "String"
+            }
+        }
+    },
+    "aboutDonateTitle": "Пожертвовать",
+    "@aboutDonateTitle": {},
+    "aboutDonateText": "Купите нам кофе, чтобы помочь проекту, оплатить затраты на сервер и поддерживать нас в тонусе",
+    "@aboutDonateText": {},
+    "settingsTitle": "Настройки",
+    "@settingsTitle": {},
+    "lower_back": "Нижняя часть спины",
+    "@lower_back": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "aboutMastodonTitle": "Мастодонт",
+    "@aboutMastodonTitle": {},
+    "surplus": "превышение",
+    "@surplus": {
+        "description": "Caloric surplus (either planned or unplanned)"
+    },
+    "deficit": "дефицит",
+    "@deficit": {
+        "description": "Caloric deficit (either planned or unplanned)"
+    },
+    "settingsCacheDeletedSnackbar": "Кэш успешно очищен",
+    "@settingsCacheDeletedSnackbar": {},
+    "log": "Журнал",
+    "@log": {
+        "description": "Log a specific meal (imperative form)"
+    },
+    "done": "Завершить",
+    "@done": {},
+    "overallChangeWeight": "Общее изменение",
+    "@overallChangeWeight": {
+        "description": "Overall change in weight, added for localization"
+    },
+    "goalTypeMeals": "Из еды",
+    "@goalTypeMeals": {
+        "description": "added for localization of Class GoalType's filed meals"
+    },
+    "goalTypeBasic": "Базовый",
+    "@goalTypeBasic": {
+        "description": "added for localization of Class GoalType's filed basic"
+    },
+    "goalTypeAdvanced": "Расширенный",
+    "@goalTypeAdvanced": {
+        "description": "added for localization of Class GoalType's filed advanced"
+    },
+    "indicatorAvg": "в среднем",
+    "@indicatorAvg": {
+        "description": "added for localization of Class Indicator's field text"
+    },
+    "themeMode": "Режим темы",
+    "@themeMode": {},
+    "darkMode": "Всегда темный режим",
+    "@darkMode": {},
+    "lightMode": "Всегда светлый режим",
+    "@lightMode": {},
+    "systemMode": "Системные настройки",
+    "@systemMode": {},
+    "noIngredientsDefined": "Ингредиенты пока не определены",
+    "@noIngredientsDefined": {},
+    "ingredientLogged": "Ингредиент занесен в дневник",
+    "@ingredientLogged": {},
+    "selectMealToLog": "Выберите прием пищи для записи в дневник",
+    "@selectMealToLog": {},
+    "chartAllTimeTitle": "{name} за все время",
+    "@chartAllTimeTitle": {
+        "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
+        "type": "text",
+        "placeholders": {
+            "name": {
+                "type": "String"
+            }
+        }
+    },
+    "chart30DaysTitle": "{name} последние 30 дней",
+    "@chart30DaysTitle": {
+        "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
+        "type": "text",
+        "placeholders": {
+            "name": {
+                "type": "String"
+            }
+        }
+    },
+    "chartDuringPlanTitle": "{chartName} во время плана питания {planName}",
+    "@chartDuringPlanTitle": {
+        "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
+        "type": "text",
+        "placeholders": {
+            "chartName": {
+                "type": "String"
+            },
+            "planName": {
+                "type": "String"
+            }
+        }
+    },
+    "settingsIngredientCacheDescription": "Кэш ингредиентов",
+    "@settingsIngredientCacheDescription": {},
+    "isRestDayHelp": "Пожалуйста, имейте в виду, что если вы отметите этот день как день отдыха, все подходы и упражнения будут удалены.",
+    "@isRestDayHelp": {},
+    "routines": "Тренировки",
+    "@routines": {},
+    "needsLogsToAdvanceHelp": "Выберите, если вы хотите, чтобы программа переходила к следующему запланированному дню только после того, как вы записали тренировку за текущий день.",
+    "@needsLogsToAdvanceHelp": {},
+    "routineDays": "Дней в тренировке",
+    "@routineDays": {},
+    "resultingRoutine": "Итоговая тренировка",
+    "@resultingRoutine": {},
+    "useApiToken": "Использовать токен API",
+    "@useApiToken": {},
+    "useUsernameAndPassword": "Использовать имя пользователя и пароль",
+    "@useUsernameAndPassword": {},
+    "apiToken": "API токен",
+    "@apiToken": {},
+    "invalidApiToken": "Пожалуйста, введите действительный ключ API",
+    "@invalidApiToken": {
+        "description": "Error message when the user enters an invalid API key"
+    },
+    "apiTokenValidChars": "API-ключ может содержать только буквы a–f, цифры 0–9 и иметь длину ровно 40 символов",
+    "@apiTokenValidChars": {
+        "description": "Error message when the user tries to input a API key with forbidden characters"
+    },
+    "newRoutine": "Новая тренировка",
+    "@newRoutine": {},
+    "noRoutines": "У вас нет тренировок",
+    "@noRoutines": {},
+    "restTime": "Время отдыха",
+    "@restTime": {},
+    "sets": "Подходы",
+    "@sets": {
+        "description": "The number of sets to be done for one exercise"
+    },
+    "exerciseNr": "Упражнение {nr}",
+    "@exerciseNr": {
+        "description": "Header in form indicating the number of the current exercise. Can also be translated as something like 'Set Nr. xy'.",
+        "type": "text",
+        "placeholders": {
+            "nr": {
+                "type": "String"
+            }
+        }
+    },
+    "supersetNr": "Супер подход",
+    "@supersetNr": {
+        "description": "Header in form indicating the number of the current exercise. Can also be translated as something like 'Superset Nr. xy'.",
+        "type": "text",
+        "placeholders": {
+            "nr": {
+                "type": "String"
+            }
+        }
+    },
+    "restDay": "День отдыха",
+    "@restDay": {},
+    "isRestDay": "Выходной день",
+    "@isRestDay": {},
+    "needsLogsToAdvance": "Требуются записи для прогресса",
+    "@needsLogsToAdvance": {},
+    "barWeight": "Вес штанги",
+    "@barWeight": {},
+    "useColors": "Использовать цвета",
+    "@useColors": {},
+    "endDate": "Дата окончания",
+    "@endDate": {},
+    "startDate": "Дата начала",
+    "@startDate": {},
+    "selectAvailablePlates": "Выберите подходящие блины",
+    "@selectAvailablePlates": {}
 }
diff --git a/lib/l10n/app_sk.arb b/lib/l10n/app_sk.arb
new file mode 100644
index 00000000..87cb90e4
--- /dev/null
+++ b/lib/l10n/app_sk.arb
@@ -0,0 +1,322 @@
+{
+    "userProfile": "Váš profil",
+    "@userProfile": {},
+    "login": "Prihlásiť sa",
+    "@login": {
+        "description": "Text for login button"
+    },
+    "logout": "Odhlásiť sa",
+    "@logout": {
+        "description": "Text for logout button"
+    },
+    "register": "Registrovať sa",
+    "@register": {
+        "description": "Text for registration button"
+    },
+    "useDefaultServer": "Použiť predvolený server",
+    "@useDefaultServer": {
+        "description": "Toggle button allowing users to switch between the default and a custom wger server"
+    },
+    "useCustomServer": "Použiť vlastný server",
+    "@useCustomServer": {
+        "description": "Toggle button allowing users to switch between the default and a custom wger server"
+    },
+    "invalidUrl": "Zadajte platnú URL adresu",
+    "@invalidUrl": {
+        "description": "Error message when the user enters an invalid URL, e.g. in the login form"
+    },
+    "usernameValidChars": "Používateľské meno môže obsahovať iba písmená, číslice a znaky @, +, ., -, a _",
+    "@usernameValidChars": {
+        "description": "Error message when the user tries to register a username with forbidden characters"
+    },
+    "passwordsDontMatch": "Heslá sa nezhodujú",
+    "@passwordsDontMatch": {
+        "description": "Error message when the user enters two different passwords during registration"
+    },
+    "passwordTooShort": "Heslo je príliš krátke",
+    "@passwordTooShort": {
+        "description": "Error message when the user a password that is too short"
+    },
+    "selectAvailablePlates": "Vyberte dostupné platne",
+    "@selectAvailablePlates": {},
+    "barWeight": "Hmotnosť tyče",
+    "@barWeight": {},
+    "useColors": "Používajte farby",
+    "@useColors": {},
+    "password": "Heslo",
+    "@password": {},
+    "confirmPassword": "Potvrďte heslo",
+    "@confirmPassword": {},
+    "invalidEmail": "Zadajte platnú e-mailovú adresu",
+    "@invalidEmail": {
+        "description": "Error message when the user enters an invalid email"
+    },
+    "email": "E-mailová adresa",
+    "@email": {},
+    "username": "Používateľské meno",
+    "@username": {},
+    "invalidUsername": "Zadajte platné používateľské meno",
+    "@invalidUsername": {
+        "description": "Error message when the user enters an invalid username"
+    },
+    "useApiToken": "Použite token API",
+    "@useApiToken": {},
+    "useUsernameAndPassword": "Použite používateľské meno a heslo",
+    "@useUsernameAndPassword": {},
+    "apiToken": "API token",
+    "@apiToken": {},
+    "invalidApiToken": "Zadajte platný kľúč API",
+    "@invalidApiToken": {
+        "description": "Error message when the user enters an invalid API key"
+    },
+    "apiTokenValidChars": "Kľúč API môže obsahovať iba písmená a-f, číslice 0-9 a musí mať presne 40 znakov",
+    "@apiTokenValidChars": {
+        "description": "Error message when the user tries to input a API key with forbidden characters"
+    },
+    "customServerUrl": "URL inštancie wger",
+    "@customServerUrl": {
+        "description": "Label in the form where the users can enter their own wger instance"
+    },
+    "customServerHint": "Zadajte adresu svojho vlastného servera, inak sa použije predvolená adresa",
+    "@customServerHint": {
+        "description": "Hint text for the form where the users can enter their own wger instance"
+    },
+    "reset": "Reset",
+    "@reset": {
+        "description": "Button text allowing the user to reset the entered values to the default"
+    },
+    "registerInstead": "Nemáte účet? Zaregistrujte sa teraz",
+    "@registerInstead": {},
+    "loginInstead": "Už máte účet? Prihláste sa",
+    "@loginInstead": {},
+    "labelBottomNavWorkout": "Tréning",
+    "@labelBottomNavWorkout": {
+        "description": "Label used in bottom navigation, use a short word"
+    },
+    "labelBottomNavNutrition": "Výživa",
+    "@labelBottomNavNutrition": {
+        "description": "Label used in bottom navigation, use a short word"
+    },
+    "labelWorkoutLogs": "Tréninkové denníky",
+    "@labelWorkoutLogs": {
+        "description": "(Workout) logs"
+    },
+    "labelWorkoutPlan": "Plán tréningu",
+    "@labelWorkoutPlan": {
+        "description": "Title for screen workout plan"
+    },
+    "labelDashboard": "Ovládací panel",
+    "@labelDashboard": {
+        "description": "Title for screen dashboard"
+    },
+    "success": "Úspech",
+    "@success": {
+        "description": "Message when an action completed successfully, usually used as a heading"
+    },
+    "successfullyDeleted": "Odstránené",
+    "@successfullyDeleted": {
+        "description": "Message when an item was successfully deleted"
+    },
+    "successfullySaved": "Uložené",
+    "@successfullySaved": {
+        "description": "Message when an item was successfully saved"
+    },
+    "exerciseList": "Zoznam cvičení",
+    "@exerciseList": {},
+    "exercise": "Cvičenie",
+    "@exercise": {
+        "description": "An exercise for a workout"
+    },
+    "exercises": "Cvičenia",
+    "@exercises": {
+        "description": "Multiple exercises for a workout"
+    },
+    "exerciseName": "Názov cvičenia",
+    "@exerciseName": {
+        "description": "Label for the name of a workout exercise"
+    },
+    "searchExercise": "Vyhľadávacie cvičenie na pridanie",
+    "@searchExercise": {
+        "description": "Label on set form. Selected exercises are added to the set"
+    },
+    "noIngredientsDefined": "Žiadne ingrediencie zatiaľ neboli definované",
+    "@noIngredientsDefined": {},
+    "noMatchingExerciseFound": "Nenašli sa žiadne zodpovedajúce cvičenia",
+    "@noMatchingExerciseFound": {
+        "description": "Message returned if no exercises match the searched string"
+    },
+    "searchNamesInEnglish": "Hľadať aj mená v angličtine",
+    "@searchNamesInEnglish": {},
+    "equipment": "Vybavenie",
+    "@equipment": {
+        "description": "Equipment needed to perform an exercise"
+    },
+    "muscles": "Svaly",
+    "@muscles": {
+        "description": "(main) muscles trained by an exercise"
+    },
+    "musclesSecondary": "Sekundárne svaly",
+    "@musclesSecondary": {
+        "description": "secondary muscles trained by an exercise"
+    },
+    "category": "Kategória",
+    "@category": {
+        "description": "Category for an exercise, ingredient, etc."
+    },
+    "endDate": "Dátum ukončenia",
+    "@endDate": {},
+    "startDate": "Dátum začatia",
+    "@startDate": {},
+    "routines": "Rutiny",
+    "@routines": {},
+    "newRoutine": "Nová rutina",
+    "@newRoutine": {},
+    "noRoutines": "Nemáte žiadne rutiny",
+    "@noRoutines": {},
+    "restTime": "Čas odpočinku",
+    "@restTime": {},
+    "sets": "Sety",
+    "@sets": {
+        "description": "The number of sets to be done for one exercise"
+    },
+    "rir": "RiR",
+    "@rir": {
+        "description": "Shorthand for Repetitions In Reserve"
+    },
+    "rirNotUsed": "RiR sa nepoužíva",
+    "@rirNotUsed": {
+        "description": "Label used in RiR slider when the RiR value is not used/saved for the current setting or log"
+    },
+    "useMetric": "Používať metrické jednotky pre telesnú hmotnosť",
+    "@useMetric": {},
+    "weightUnit": "Jednotka hmotnosti",
+    "@weightUnit": {},
+    "repetitionUnit": "Opakovacie jednotky",
+    "@repetitionUnit": {},
+    "dayDescriptionHelp": "Popis toho, čo sa v tento deň robí (napr. „ťahací deň“) alebo ktoré časti tela sa trénujú (napr. „hrudník a ramená“)",
+    "@dayDescriptionHelp": {},
+    "sameRepetitions": "",
+    "@sameRepetitions": {},
+    "comment": "Komentár",
+    "@comment": {
+        "description": "Comment, additional information"
+    },
+    "impression": "Dojem",
+    "@impression": {
+        "description": "General impression (e.g. for a workout session) such as good, bad, etc."
+    },
+    "notes": "Poznámky",
+    "@notes": {
+        "description": "Personal notes, e.g. for a workout session"
+    },
+    "restDay": "Deň odpočinku",
+    "@restDay": {},
+    "isRestDay": "Je deň odpočinku",
+    "@isRestDay": {},
+    "isRestDayHelp": "Upozorňujeme, že všetky sady a cvičenia budú odstránené, keď označíte deň ako deň odpočinku.",
+    "@isRestDayHelp": {},
+    "needsLogsToAdvance": "Na postup sú potrebné protokoly",
+    "@needsLogsToAdvance": {},
+    "needsLogsToAdvanceHelp": "Vyberte, či chcete, aby rutina pokračovala do nasledujúceho naplánovaného dňa len v prípade, že ste zaznamenali tréning za daný deň",
+    "@needsLogsToAdvanceHelp": {},
+    "routineDays": "Dni v rutine",
+    "@routineDays": {},
+    "resultingRoutine": "Výsledná rutina",
+    "@resultingRoutine": {},
+    "newDay": "Nový deň",
+    "@newDay": {},
+    "newSet": "Nová séria",
+    "@newSet": {
+        "description": "Header when adding a new set to a workout day"
+    },
+    "selectExercises": "Ak chcete urobiť superset, môžete vyhľadať niekoľko cvikov, ktoré budú zoskupené dohromady",
+    "@selectExercises": {},
+    "gymMode": "Režim posilňovňa",
+    "@gymMode": {
+        "description": "Label when starting the gym mode"
+    },
+    "plateCalculator": "Kotúče",
+    "@plateCalculator": {
+        "description": "Label used for the plate calculator in the gym mode"
+    },
+    "plateCalculatorNotDivisible": "Nie je možné dosiahnuť hmotnosť s dostupnými platňami",
+    "@plateCalculatorNotDivisible": {
+        "description": "Error message when the current weight is not reachable with plates (e.g. 33.1 kg)"
+    },
+    "pause": "Pauza",
+    "@pause": {
+        "description": "Noun, not an imperative! Label used for the pause when using the gym mode"
+    },
+    "jumpTo": "Preskočiť na",
+    "@jumpTo": {
+        "description": "Imperative. Label used in popup allowing the user to jump to a specific exercise while in the gym mode"
+    },
+    "todaysWorkout": "Tvoj dnešný tréning",
+    "@todaysWorkout": {},
+    "logHelpEntries": "Ak je v jeden deň viac ako jeden záznam s rovnakým počtom opakovaní, ale s rôznymi váhami, v grafe sa zobrazí len záznam s vyššou váhou.",
+    "@logHelpEntries": {},
+    "logHelpEntriesUnits": "Upozorňujeme, že zaznamenávajú sa iba záznamy s jednotkou hmotnosti (kg alebo lb) a opakovaním, ostatné kombinácie, ako napríklad čas alebo do zlyhania, sa tu ignorujú.",
+    "@logHelpEntriesUnits": {},
+    "description": "Popis",
+    "@description": {},
+    "name": "Názov",
+    "@name": {
+        "description": "Name for a workout or nutritional plan"
+    },
+    "save": "Uložiť",
+    "@save": {},
+    "verify": "Overiť",
+    "@verify": {},
+    "addSet": "Pridať sériu",
+    "@addSet": {
+        "description": "Label for the button that adds a set (to a workout day)"
+    },
+    "addMeal": "Pridať jedlo",
+    "@addMeal": {},
+    "mealLogged": "Jedlo zaznamenané do denníka",
+    "@mealLogged": {},
+    "ingredientLogged": "Ingrediencia zaznamenaná do denníka",
+    "@ingredientLogged": {},
+    "logMeal": "Zapíšte si jedlo do denníka výživy",
+    "@logMeal": {},
+    "addIngredient": "Pridať ingredienciu",
+    "@addIngredient": {},
+    "logIngredient": "Zapíšte zložku do výživového denníka",
+    "@logIngredient": {},
+    "searchIngredient": "Vyhľadávanie ingrediencie",
+    "@searchIngredient": {
+        "description": "Label on ingredient search form"
+    },
+    "nutritionalPlan": "Výživový plán",
+    "@nutritionalPlan": {},
+    "nutritionalDiary": "Deník stravovania",
+    "@nutritionalDiary": {},
+    "nutritionalPlans": "Výživové plány",
+    "@nutritionalPlans": {},
+    "noNutritionalPlans": "Nemáte žiadne výživové plány",
+    "@noNutritionalPlans": {
+        "description": "Message shown when the user has no nutritional plans"
+    },
+    "onlyLogging": "Sledujte iba kalórie",
+    "@onlyLogging": {},
+    "onlyLoggingHelpText": "Zaškrtnite políčko, ak chcete zaznamenávať len kalórie a nechcete vytvárať podrobný výživový plán s konkrétnymi jedlami",
+    "@onlyLoggingHelpText": {},
+    "goalMacro": "Makro ciele",
+    "@goalMacro": {
+        "description": "The goal for macronutrients"
+    },
+    "selectMealToLog": "Vyberte jedlo, ktoré chcete zaznamenať do denníka",
+    "@selectMealToLog": {},
+    "yourCurrentNutritionPlanHasNoMealsDefinedYet": "Váš aktuálny výživový plán neobsahuje žiadne definované jedlá",
+    "@yourCurrentNutritionPlanHasNoMealsDefinedYet": {
+        "description": "Message shown when a nutrition plan doesn't have any meals"
+    },
+    "toAddMealsToThePlanGoToNutritionalPlanDetails": "Ak chcete pridať jedlá do plánu, prejdite do podrobností výživového plánu",
+    "@toAddMealsToThePlanGoToNutritionalPlanDetails": {
+        "description": "Message shown to guide users to the nutritional plan details page to add meals"
+    },
+    "goalEnergy": "Energetický cieľ",
+    "@goalEnergy": {},
+    "goalProtein": "Cieľ bielkovín",
+    "@goalProtein": {}
+}
diff --git a/lib/l10n/app_ta.arb b/lib/l10n/app_ta.arb
new file mode 100644
index 00000000..836cd9b2
--- /dev/null
+++ b/lib/l10n/app_ta.arb
@@ -0,0 +1,1010 @@
+{
+  "userProfile": "உங்கள் சுயவிவரம்",
+  "@userProfile": {},
+  "weightUnit": "எடை அலகு",
+  "@weightUnit": {},
+  "setNr": "{nr} அமை",
+  "@setNr": {
+    "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.",
+    "type": "text",
+    "placeholders": {
+      "nr": {
+        "type": "String"
+      }
+    }
+  },
+  "newSet": "புதிய தொகுப்பு",
+  "@newSet": {
+    "description": "Header when adding a new set to a workout day"
+  },
+  "gymMode": "சிம் பயன்முறை",
+  "@gymMode": {
+    "description": "Label when starting the gym mode"
+  },
+  "goalFat": "கொழுப்பு இலக்கு",
+  "@goalFat": {},
+  "measurement": "அளவீட்டு",
+  "@measurement": {},
+  "measurements": "அளவீடுகள்",
+  "@measurements": {
+    "description": "Categories for the measurements such as biceps size, body fat, etc."
+  },
+  "start": "தொடங்கு",
+  "@start": {
+    "description": "Label on button to start the gym mode (i.e., an imperative)"
+  },
+  "percentEnergy": "ஆற்றலின் விழுக்காடு",
+  "@percentEnergy": {},
+  "gPerBodyKg": "g க்கு kg",
+  "@gPerBodyKg": {
+    "description": "Label used for total sums of e.g. calories or similar in grams per Kg of body weight"
+  },
+  "fatShort": "F",
+  "@fatShort": {
+    "description": "The first letter or short name of the word 'Fat', used in overviews"
+  },
+  "noMeasurementEntries": "உங்களிடம் அளவீட்டு உள்ளீடுகள் இல்லை",
+  "@noMeasurementEntries": {},
+  "delete": "அழி",
+  "@delete": {},
+  "gallery": "கேலரி",
+  "@gallery": {},
+  "whatVariationsExist": "இந்த பயிற்சியின் என்ன மாறுபாடுகள் உள்ளன, ஏதேனும் இருந்தால்?",
+  "@whatVariationsExist": {},
+  "edit": "தொகு",
+  "@edit": {},
+  "close": "மூடு",
+  "@close": {
+    "description": "Translation for close"
+  },
+  "difference": "வேறுபாடு",
+  "@difference": {},
+  "notes": "குறிப்புகள்",
+  "@notes": {
+    "description": "Personal notes, e.g. for a workout session"
+  },
+  "value": "மதிப்பு",
+  "@value": {
+    "description": "The value of a measurement entry"
+  },
+  "unit": "அலகு",
+  "@unit": {
+    "description": "The unit used for a repetition (kg, time, etc.)"
+  },
+  "total": "மொத்தம்",
+  "@total": {
+    "description": "Label used for total sums of e.g. calories or similar"
+  },
+  "description": "விவரம்",
+  "@description": {},
+  "translation": "மொழிபெயர்ப்பு",
+  "@translation": {},
+  "images": "படங்கள்",
+  "@images": {},
+  "language": "மொழி",
+  "@language": {},
+  "name": "பெயர்",
+  "@name": {
+    "description": "Name for a workout or nutritional plan"
+  },
+  "category": "வகை",
+  "@category": {
+    "description": "Category for an exercise, ingredient, etc."
+  },
+  "save": "சேமி",
+  "@save": {},
+  "login": "புகுபதிகை",
+  "@login": {
+    "description": "Text for login button"
+  },
+  "logout": "விடுபதிகை",
+  "@logout": {
+    "description": "Text for logout button"
+  },
+  "register": "பதிவு செய்யுங்கள்",
+  "@register": {
+    "description": "Text for registration button"
+  },
+  "useDefaultServer": "இயல்புநிலை சேவையகத்தைப் பயன்படுத்தவும்",
+  "@useDefaultServer": {
+    "description": "Toggle button allowing users to switch between the default and a custom wger server"
+  },
+  "useCustomServer": "தனிப்பயன் சேவையகத்தைப் பயன்படுத்தவும்",
+  "@useCustomServer": {
+    "description": "Toggle button allowing users to switch between the default and a custom wger server"
+  },
+  "invalidUrl": "செல்லுபடியாகும் முகவரி ஐ உள்ளிடவும்",
+  "@invalidUrl": {
+    "description": "Error message when the user enters an invalid URL, e.g. in the login form"
+  },
+  "usernameValidChars": "ஒரு பயனர்பெயரில் கடிதங்கள், இலக்கங்கள் மற்றும் எழுத்துக்கள் @, +,., -, மற்றும் _ எழுத்துக்கள் மட்டுமே இருக்கலாம்",
+  "@usernameValidChars": {
+    "description": "Error message when the user tries to register a username with forbidden characters"
+  },
+  "passwordsDontMatch": "கடவுச்சொற்கள் பொருந்தவில்லை",
+  "@passwordsDontMatch": {
+    "description": "Error message when the user enters two different passwords during registration"
+  },
+  "passwordTooShort": "கடவுச்சொல் மிகக் குறைவு",
+  "@passwordTooShort": {
+    "description": "Error message when the user a password that is too short"
+  },
+  "password": "கடவுச்சொல்",
+  "@password": {},
+  "confirmPassword": "கடவுச்சொல்லை உறுதிப்படுத்தவும்",
+  "@confirmPassword": {},
+  "invalidEmail": "செல்லுபடியாகும் மின்னஞ்சல் முகவரியை உள்ளிடவும்",
+  "@invalidEmail": {
+    "description": "Error message when the user enters an invalid email"
+  },
+  "email": "மின்னஞ்சல் முகவரி",
+  "@email": {},
+  "username": "பயனர்பெயர்",
+  "@username": {},
+  "invalidUsername": "செல்லுபடியாகும் பயனர்பெயரை உள்ளிடவும்",
+  "@invalidUsername": {
+    "description": "Error message when the user enters an invalid username"
+  },
+  "customServerUrl": "Wger உதாரணத்தின் முகவரி",
+  "@customServerUrl": {
+    "description": "Label in the form where the users can enter their own wger instance"
+  },
+  "customServerHint": "உங்கள் சொந்த சேவையகத்தின் முகவரியை உள்ளிடவும், இல்லையெனில் இயல்புநிலை பயன்படுத்தப்படும்",
+  "@customServerHint": {
+    "description": "Hint text for the form where the users can enter their own wger instance"
+  },
+  "reset": "மீட்டமை",
+  "@reset": {
+    "description": "Button text allowing the user to reset the entered values to the default"
+  },
+  "registerInstead": "கணக்கு இல்லையா? இப்போது பதிவு செய்யுங்கள்",
+  "@registerInstead": {},
+  "loginInstead": "ஏற்கனவே ஒரு கணக்கு இருக்கிறதா? உள்நுழைவு",
+  "@loginInstead": {},
+  "labelBottomNavWorkout": "பயிற்சி",
+  "@labelBottomNavWorkout": {
+    "description": "Label used in bottom navigation, use a short word"
+  },
+  "labelBottomNavNutrition": "ஊட்டம்",
+  "@labelBottomNavNutrition": {
+    "description": "Label used in bottom navigation, use a short word"
+  },
+  "labelWorkoutLogs": "பயிற்சி பதிவுகள்",
+  "@labelWorkoutLogs": {
+    "description": "(Workout) logs"
+  },
+  "labelWorkoutPlan": "வொர்க்அவுட் திட்டம்",
+  "@labelWorkoutPlan": {
+    "description": "Title for screen workout plan"
+  },
+  "labelDashboard": "முகப்புப்பெட்டி",
+  "@labelDashboard": {
+    "description": "Title for screen dashboard"
+  },
+  "success": "வெற்றி",
+  "@success": {
+    "description": "Message when an action completed successfully, usually used as a heading"
+  },
+  "successfullyDeleted": "நீக்கப்பட்டது",
+  "@successfullyDeleted": {
+    "description": "Message when an item was successfully deleted"
+  },
+  "successfullySaved": "சேமிக்கப்பட்டது",
+  "@successfullySaved": {
+    "description": "Message when an item was successfully saved"
+  },
+  "exerciseList": "உடற்பயிற்சி பட்டியல்",
+  "@exerciseList": {},
+  "exercise": "உடற்பயிற்சி",
+  "@exercise": {
+    "description": "An exercise for a workout"
+  },
+  "exercises": "பயிற்சிகள்",
+  "@exercises": {
+    "description": "Multiple exercises for a workout"
+  },
+  "exerciseName": "உடற்பயிற்சி பெயர்",
+  "@exerciseName": {
+    "description": "Label for the name of a workout exercise"
+  },
+  "searchExercise": "சேர்க்க பயிற்சியைத் தேடுங்கள்",
+  "@searchExercise": {
+    "description": "Label on set form. Selected exercises are added to the set"
+  },
+  "noIngredientsDefined": "இதுவரை எந்த பொருட்களும் வரையறுக்கப்படவில்லை",
+  "@noIngredientsDefined": {},
+  "noMatchingExerciseFound": "பொருந்தக்கூடிய பயிற்சிகள் எதுவும் கிடைக்கவில்லை",
+  "@noMatchingExerciseFound": {
+    "description": "Message returned if no exercises match the searched string"
+  },
+  "searchNamesInEnglish": "ஆங்கிலத்தில் பெயர்களையும் தேடுங்கள்",
+  "@searchNamesInEnglish": {},
+  "equipment": "உபகரணங்கள்",
+  "@equipment": {
+    "description": "Equipment needed to perform an exercise"
+  },
+  "muscles": "தசைகள்",
+  "@muscles": {
+    "description": "(main) muscles trained by an exercise"
+  },
+  "musclesSecondary": "இரண்டாம் நிலை தசைகள்",
+  "@musclesSecondary": {
+    "description": "secondary muscles trained by an exercise"
+  },
+  "reps": "பிரதிநிதிகள்",
+  "@reps": {
+    "description": "Shorthand for repetitions, used when space constraints are tighter"
+  },
+  "rir": "ஆர்.ஐ.ஆர்",
+  "@rir": {
+    "description": "Shorthand for Repetitions In Reserve"
+  },
+  "rirNotUsed": "ஆர்.ஐ.ஆர் பயன்படுத்தப்படவில்லை",
+  "@rirNotUsed": {
+    "description": "Label used in RiR slider when the RiR value is not used/saved for the current setting or log"
+  },
+  "useMetric": "உடல் எடைக்கு மெட்ரிக் அலகுகளைப் பயன்படுத்துங்கள்",
+  "@useMetric": {},
+  "repetitionUnit": "மீண்டும் அலகு",
+  "@repetitionUnit": {},
+  "set": "கணம்",
+  "@set": {
+    "description": "A set in a workout plan"
+  },
+  "dayDescriptionHelp": "இந்த நாளில் என்ன செய்யப்படுகிறது என்பதற்கான விளக்கம் (எ.கா. 'இழுக்க நாள்') அல்லது என்ன உடல் பாகங்கள் பயிற்சி அளிக்கப்படுகின்றன (எ.கா. 'மார்பு மற்றும் தோள்கள்')",
+  "@dayDescriptionHelp": {},
+  "sameRepetitions": "எல்லா தொகுப்புகளுக்கும் நீங்கள் அதே மறுபடியும் எடையும் செய்தால், நீங்கள் ஒரு வரிசையை நிரப்பலாம். எடுத்துக்காட்டாக, 4 செட்களுக்கு மறுபடியும் 10 ஐ உள்ளிடவும், இது தானாகவே \"4 ஃச் 10\" ஆகிறது.",
+  "@sameRepetitions": {},
+  "comment": "கருத்து",
+  "@comment": {
+    "description": "Comment, additional information"
+  },
+  "impression": "எண்ணம்",
+  "@impression": {
+    "description": "General impression (e.g. for a workout session) such as good, bad, etc."
+  },
+  "workoutSession": "வொர்க்அவுட் அமர்வு",
+  "@workoutSession": {
+    "description": "A (logged) workout session"
+  },
+  "newDay": "புதிய நாள்",
+  "@newDay": {},
+  "selectExercises": "நீங்கள் ஒரு சூப்பர்செட் செய்ய விரும்பினால், நீங்கள் பல பயிற்சிகளைத் தேடலாம், அவை ஒன்றாக தொகுக்கப்படும்",
+  "@selectExercises": {},
+  "plateCalculator": "தட்டுகள்",
+  "@plateCalculator": {
+    "description": "Label used for the plate calculator in the gym mode"
+  },
+  "plateCalculatorNotDivisible": "கிடைக்கக்கூடிய தட்டுகளுடன் எடையை அடைய முடியாது",
+  "@plateCalculatorNotDivisible": {
+    "description": "Error message when the current weight is not reachable with plates (e.g. 33.1 kg)"
+  },
+  "pause": "இடைநிறுத்தம்",
+  "@pause": {
+    "description": "Noun, not an imperative! Label used for the pause when using the gym mode"
+  },
+  "jumpTo": "குதிக்கவும்",
+  "@jumpTo": {
+    "description": "Imperative. Label used in popup allowing the user to jump to a specific exercise while in the gym mode"
+  },
+  "todaysWorkout": "இன்று உங்கள் பயிற்சி",
+  "@todaysWorkout": {},
+  "logHelpEntries": "ஒரு நாளில் ஒரே எண்ணிக்கையிலான மறுபடியும் ஒன்றுக்கு மேற்பட்ட நுழைவு இருந்தால், ஆனால் வெவ்வேறு எடைகள் இருந்தால், அதிக எடையுடன் நுழைவு மட்டுமே வரைபடத்தில் காட்டப்பட்டுள்ளது.",
+  "@logHelpEntries": {},
+  "logHelpEntriesUnits": "ஒரு எடை அலகு (கிலோ அல்லது எல்பி) மற்றும் மறுபடியும் உள்ளீடுகள் மட்டுமே பட்டியலிடப்பட்டுள்ளன என்பதை நினைவில் கொள்க, நேரம் போன்ற பிற சேர்க்கைகள் அல்லது தோல்வி வரை இங்கே புறக்கணிக்கப்படும்.",
+  "@logHelpEntriesUnits": {},
+  "verify": "சரிபார்க்கவும்",
+  "@verify": {},
+  "addSet": "செட் சேர்",
+  "@addSet": {
+    "description": "Label for the button that adds a set (to a workout day)"
+  },
+  "addMeal": "உணவு சேர்க்கவும்",
+  "@addMeal": {},
+  "mealLogged": "உணவு நாட்குறிப்புக்கு உள்நுழைந்துள்ளது",
+  "@mealLogged": {},
+  "ingredientLogged": "மூலப்பொருள் நாட்குறிப்புக்கு உள்நுழைந்துள்ளது",
+  "@ingredientLogged": {},
+  "logMeal": "ஊட்டச்சத்து நாட்குறிப்புக்கு உணவை பதிவு செய்யுங்கள்",
+  "@logMeal": {},
+  "addIngredient": "மூலப்பொருள் சேர்க்கவும்",
+  "@addIngredient": {},
+  "logIngredient": "ஊட்டச்சத்து நாட்குறிப்புக்கு பதிவு மூலப்பொருள்",
+  "@logIngredient": {},
+  "searchIngredient": "மூலப்பொருளைத் தேடுங்கள்",
+  "@searchIngredient": {
+    "description": "Label on ingredient search form"
+  },
+  "nutritionalPlan": "ஊட்டச்சத்து திட்டம்",
+  "@nutritionalPlan": {},
+  "nutritionalDiary": "ஊட்டச்சத்து நாட்குறிப்பு",
+  "@nutritionalDiary": {},
+  "nutritionalPlans": "ஊட்டச்சத்து திட்டங்கள்",
+  "@nutritionalPlans": {},
+  "noNutritionalPlans": "உங்களிடம் ஊட்டச்சத்து திட்டங்கள் இல்லை",
+  "@noNutritionalPlans": {
+    "description": "Message shown when the user has no nutritional plans"
+  },
+  "onlyLogging": "கலோரிகளை மட்டுமே கண்காணிக்கவும்",
+  "@onlyLogging": {},
+  "onlyLoggingHelpText": "உங்கள் கலோரிகளை மட்டுமே உள்நுழைய விரும்பினால், குறிப்பிட்ட உணவுடன் விரிவான ஊட்டச்சத்து திட்டத்தை அமைக்க விரும்பவில்லை என்றால் பெட்டியை சரிபார்க்கவும்",
+  "@onlyLoggingHelpText": {},
+  "goalMacro": "ரோ இலக்குகள்",
+  "@goalMacro": {
+    "description": "The goal for macronutrients"
+  },
+  "selectMealToLog": "நாட்குறிப்புக்கு உள்நுழைய ஒரு உணவைத் தேர்ந்தெடுக்கவும்",
+  "@selectMealToLog": {},
+  "goalEnergy": "ஆற்றல் இலக்கு",
+  "@goalEnergy": {},
+  "goalProtein": "புரத இலக்கு",
+  "@goalProtein": {},
+  "goalCarbohydrates": "கார்போஐட்ரேட் இலக்கு",
+  "@goalCarbohydrates": {},
+  "goalFiber": "ஃபைபர் இலக்கு",
+  "@goalFiber": {},
+  "anErrorOccurred": "பிழை ஏற்பட்டது!",
+  "@anErrorOccurred": {},
+  "weight": "எடை",
+  "@weight": {
+    "description": "The weight of a workout log or body weight entry"
+  },
+  "chartAllTimeTitle": "{name} எல்லா நேரத்திலும்",
+  "@chartAllTimeTitle": {
+    "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
+    "type": "text",
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "chart30DaysTitle": "{name} கடைசி 30 நாட்கள்",
+  "@chart30DaysTitle": {
+    "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
+    "type": "text",
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "chartDuringPlanTitle": "{chartName}ஊட்டச்சத்து திட்டத்தின்போது {planName}",
+  "@chartDuringPlanTitle": {
+    "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
+    "type": "text",
+    "placeholders": {
+      "chartName": {
+        "type": "String"
+      },
+      "planName": {
+        "type": "String"
+      }
+    }
+  },
+  "measurementCategoriesHelpText": "'பைசெப்ச்' அல்லது 'உடல் கொழுப்பு' போன்ற அளவீட்டு வகை",
+  "@measurementCategoriesHelpText": {},
+  "measurementEntriesHelpText": "'செ.மீ' அல்லது '%' போன்ற வகையை அளவிட பயன்படுத்தப்படும் அலகு",
+  "@measurementEntriesHelpText": {},
+  "date": "திகதி",
+  "@date": {
+    "description": "The date of a workout log or body weight entry"
+  },
+  "time": "நேரம்",
+  "@time": {
+    "description": "The time of a meal or workout"
+  },
+  "timeStart": "தொடக்க நேரம்",
+  "@timeStart": {
+    "description": "The starting time of a workout"
+  },
+  "timeEnd": "இறுதி நேரம்",
+  "@timeEnd": {
+    "description": "The end time of a workout"
+  },
+  "timeStartAhead": "தொடக்க நேரம் இறுதி நேரத்திற்கு முன்னால் இருக்க முடியாது",
+  "@timeStartAhead": {},
+  "ingredient": "மூலப்பொருள்",
+  "@ingredient": {},
+  "energy": "ஆற்றல்",
+  "@energy": {
+    "description": "Energy in a meal, ingredient etc. e.g. in kJ"
+  },
+  "energyShort": "இ",
+  "@energyShort": {
+    "description": "The first letter or short name of the word 'Energy', used in overviews"
+  },
+  "macronutrients": "மக்ரோனூட்ரியண்ட்ச்",
+  "@macronutrients": {},
+  "planned": "திட்டமிடப்பட்டது",
+  "@planned": {
+    "description": "Header for the column of 'planned' nutritional values, i.e. what should be eaten"
+  },
+  "logged": "உள்நுழைந்த",
+  "@logged": {
+    "description": "Header for the column of 'logged' nutritional values, i.e. what was eaten"
+  },
+  "today": "இன்று",
+  "@today": {},
+  "loggedToday": "இன்று உள்நுழைந்துள்ளது",
+  "@loggedToday": {},
+  "weekAverage": "7 நாள் சராசரி",
+  "@weekAverage": {
+    "description": "Header for the column of '7 day average' nutritional values, i.e. what was logged last week"
+  },
+  "surplus": "உபரி",
+  "@surplus": {
+    "description": "Caloric surplus (either planned or unplanned)"
+  },
+  "deficit": "பற்றாக்குறை",
+  "@deficit": {
+    "description": "Caloric deficit (either planned or unplanned)"
+  },
+  "kcal": "கிலோகலோரி",
+  "@kcal": {
+    "description": "Energy in a meal in kilocalories, kcal"
+  },
+  "kcalValue": "{value} கிலோகலோரி",
+  "@kcalValue": {
+    "description": "A value in kcal, e.g. 500 kcal",
+    "type": "text",
+    "placeholders": {
+      "value": {
+        "type": "String"
+      }
+    }
+  },
+  "kJ": "கேசே",
+  "@kJ": {
+    "description": "Energy in a meal in kilo joules, kJ"
+  },
+  "g": "g",
+  "@g": {
+    "description": "Abbreviation for gram"
+  },
+  "gValue": "{value} g",
+  "@gValue": {
+    "description": "A value in grams, e.g. 5 g",
+    "type": "text",
+    "placeholders": {
+      "value": {
+        "type": "String"
+      }
+    }
+  },
+  "percentValue": "{value} %",
+  "@percentValue": {
+    "description": "A value in percent, e.g. 10 %",
+    "type": "text",
+    "placeholders": {
+      "value": {
+        "type": "String"
+      }
+    }
+  },
+  "protein": "புரதம்",
+  "@protein": {},
+  "proteinShort": "ப",
+  "@proteinShort": {
+    "description": "The first letter or short name of the word 'Protein', used in overviews"
+  },
+  "carbohydrates": "கார்போஐட்ரேட்டுகள்",
+  "@carbohydrates": {},
+  "carbohydratesShort": "C",
+  "@carbohydratesShort": {
+    "description": "The first letter or short name of the word 'Carbohydrates', used in overviews"
+  },
+  "sugars": "சர்க்கரைகள்",
+  "@sugars": {},
+  "fat": "கொழுப்பு",
+  "@fat": {},
+  "saturatedFat": "பூரிதக் கொழுப்பு",
+  "@saturatedFat": {},
+  "fiber": "இழைகள்",
+  "@fiber": {},
+  "sodium": "உவர்மம்",
+  "@sodium": {},
+  "amount": "தொகை",
+  "@amount": {
+    "description": "The amount (e.g. in grams) of an ingredient in a meal"
+  },
+  "newEntry": "புதிய நுழைவு",
+  "@newEntry": {
+    "description": "Title when adding a new entry such as a weight or log entry"
+  },
+  "noWeightEntries": "உங்களிடம் எடை உள்ளீடுகள் இல்லை",
+  "@noWeightEntries": {
+    "description": "Message shown when the user has no logged weight entries"
+  },
+  "moreMeasurementEntries": "புதிய அளவீட்டைச் சேர்க்கவும்",
+  "@moreMeasurementEntries": {
+    "description": "Message shown when the user wants to add new measurement"
+  },
+  "loadingText": "ஏற்றுகிறது ...",
+  "@loadingText": {
+    "description": "Text to show when entries are being loaded in the background: Loading..."
+  },
+  "confirmDelete": "நீங்கள் நிச்சயமாக '{toDelete}' நீக்க விரும்புகிறீர்களா?",
+  "@confirmDelete": {
+    "description": "Confirmation text before the user deletes an object",
+    "type": "text",
+    "placeholders": {
+      "toDelete": {
+        "type": "String"
+      }
+    }
+  },
+  "newNutritionalPlan": "புதிய ஊட்டச்சத்து திட்டம்",
+  "@newNutritionalPlan": {},
+  "toggleDetails": "விவரங்களை மாற்றவும்",
+  "@toggleDetails": {
+    "description": "Switch to toggle detail / overview"
+  },
+  "goToDetailPage": "விவரம் பக்கத்திற்குச் செல்லவும்",
+  "@goToDetailPage": {},
+  "aboutDescription": "Wger ஐப் பயன்படுத்தியதற்கு நன்றி! WGER என்பது ஒரு கூட்டு திறந்த மூல திட்டமாகும், இது உலகெங்கிலும் உள்ள உடற்பயிற்சி ஆர்வலர்களால் உருவாக்கப்பட்டது.",
+  "@aboutDescription": {
+    "description": "Text in the about dialog"
+  },
+  "aboutMastodonTitle": "மாச்டோடன்",
+  "@aboutMastodonTitle": {},
+  "aboutDonateTitle": "நன்கொடை",
+  "@aboutDonateTitle": {},
+  "aboutDonateText": "திட்டத்திற்கு உதவ எங்களுக்கு ஒரு காபி வாங்கவும், சேவையக செலவினங்களுக்கு பணம் செலுத்தவும், எங்களை எரிபொருளாக வைத்திருக்கவும்",
+  "@aboutDonateText": {},
+  "calendar": "நாட்காட்டி",
+  "@calendar": {},
+  "goToToday": "இன்று செல்லுங்கள்",
+  "@goToToday": {
+    "description": "Label on button to jump back to 'today' in the calendar widget"
+  },
+  "enterValue": "தயவுசெய்து ஒரு மதிப்பை உள்ளிடவும்",
+  "@enterValue": {
+    "description": "Error message when the user hasn't entered a value on a required field"
+  },
+  "selectEntry": "உள்ளீட்டைத் தேர்ந்தெடுக்கவும்",
+  "@selectEntry": {},
+  "selectExercise": "ஒரு பயிற்சியைத் தேர்ந்தெடுக்கவும்",
+  "@selectExercise": {
+    "description": "Error message when the user hasn't selected an exercise in the form"
+  },
+  "enterCharacters": "தயவுசெய்து {min} மற்றும் {max} எழுத்துக்களுக்கு இடையில் உள்ளிடவும்",
+  "@enterCharacters": {
+    "description": "Error message when the user hasn't entered the correct number of characters in a form",
+    "type": "text",
+    "placeholders": {
+      "min": {
+        "type": "String"
+      },
+      "max": {
+        "type": "String"
+      }
+    }
+  },
+  "enterMinCharacters": "தயவுசெய்து குறைந்தது {min} எழுத்துக்களை உள்ளிடவும்",
+  "@enterMinCharacters": {
+    "description": "Error message when the user hasn't entered the minimum amount characters in a form",
+    "type": "text",
+    "placeholders": {
+      "min": {
+        "type": "String"
+      }
+    }
+  },
+  "baseNameEnglish": "அனைத்து பயிற்சிகளுக்கும் ஆங்கிலத்தில் அடிப்படை பெயர் தேவை",
+  "@baseNameEnglish": {},
+  "nrOfSets": "ஒரு பயிற்சிக்கு அமைக்கிறது: {nrOfSets}",
+  "@nrOfSets": {
+    "description": "Label shown on the slider where the user selects the nr of sets",
+    "type": "text",
+    "placeholders": {
+      "nrOfSets": {
+        "type": "String"
+      }
+    }
+  },
+  "setUnitsAndRir": "அலகுகள் மற்றும் ஆர்.ஐ.ஆர்",
+  "@setUnitsAndRir": {
+    "description": "Label shown on the slider where the user can toggle showing units and RiR",
+    "type": "text"
+  },
+  "enterValidNumber": "செல்லுபடியாகும் எண்ணை உள்ளிடவும்",
+  "@enterValidNumber": {
+    "description": "Error message when the user has submitted an invalid number (e.g. '3,.,.,.')"
+  },
+  "selectIngredient": "தயவுசெய்து ஒரு மூலப்பொருளைத் தேர்ந்தெடுக்கவும்",
+  "@selectIngredient": {
+    "description": "Error message when the user hasn't selected an ingredient from the autocompleter"
+  },
+  "recentlyUsedIngredients": "அண்மைக் காலத்தில் சேர்க்கப்பட்ட பொருட்கள்",
+  "@recentlyUsedIngredients": {
+    "description": "A message when a user adds a new ingredient to a meal."
+  },
+  "selectImage": "ஒரு படத்தைத் தேர்ந்தெடுக்கவும்",
+  "@selectImage": {
+    "description": "Label and error message when the user hasn't selected an image to save"
+  },
+  "optionsLabel": "விருப்பங்கள்",
+  "@optionsLabel": {
+    "description": "Label for the popup with general app options"
+  },
+  "takePicture": "படம் எடுக்கவும்",
+  "@takePicture": {},
+  "chooseFromLibrary": "புகைப்பட நூலகத்திலிருந்து தேர்வு செய்யவும்",
+  "@chooseFromLibrary": {},
+  "addImage": "படத்தைச் சேர்க்கவும்",
+  "@addImage": {},
+  "dataCopied": "தரவு புதிய நுழைவுக்கு நகலெடுக்கப்பட்டது",
+  "@dataCopied": {
+    "description": "Snackbar message to show on copying data to a new log entry"
+  },
+  "appUpdateTitle": "புதுப்பிப்பு தேவை",
+  "@appUpdateTitle": {},
+  "appUpdateContent": "பயன்பாட்டின் இந்த பதிப்பு சேவையகத்துடன் பொருந்தாது, தயவுசெய்து உங்கள் பயன்பாட்டைப் புதுப்பிக்கவும்.",
+  "@appUpdateContent": {},
+  "productFound": "தயாரிப்பு காணப்பட்டது",
+  "@productFound": {
+    "description": "Header label for dialog when product is found with barcode"
+  },
+  "productFoundDescription": "பார்கோடு இந்தத் தயாரிப்புக்கு ஒத்திருக்கிறது: {productName}. நீங்கள் தொடர விரும்புகிறீர்களா?",
+  "@productFoundDescription": {
+    "description": "Dialog info when product is found with barcode",
+    "type": "text",
+    "placeholders": {
+      "productName": {
+        "type": "String"
+      }
+    }
+  },
+  "productNotFound": "தயாரிப்பு கிடைக்கவில்லை",
+  "@productNotFound": {
+    "description": "Header label for dialog when product is not found with barcode"
+  },
+  "productNotFoundDescription": "ச்கேன் செய்யப்பட்ட பார்கோடு {barcode} with உடன் தயாரிப்பு WGER தரவுத்தளத்தில் காணப்படவில்லை",
+  "@productNotFoundDescription": {
+    "description": "Dialog info when product is not found with barcode",
+    "type": "text",
+    "placeholders": {
+      "barcode": {
+        "type": "String"
+      }
+    }
+  },
+  "scanBarcode": "ச்கேன் பார்கோடு",
+  "@scanBarcode": {
+    "description": "Label for scan barcode button"
+  },
+  "add_exercise_image_license": "எச்.ஏ. உரிமம் மூலம் சி.சி உடன் படங்கள் இணக்கமாக இருக்க வேண்டும். ஐயம் இருந்தால், நீங்கள் எடுத்த புகைப்படங்களை மட்டுமே பதிவேற்றவும்.",
+  "@add_exercise_image_license": {},
+  "variations": "மாறுபாடுகள்",
+  "@variations": {
+    "description": "Variations of one exercise (e.g. benchpress and benchpress narrow)"
+  },
+  "alsoKnownAs": "என்றும் அழைக்கப்படுகிறது: {aliases}",
+  "@alsoKnownAs": {
+    "placeholders": {
+      "aliases": {
+        "type": "String"
+      }
+    },
+    "description": "List of alternative names for an exercise"
+  },
+  "verifiedEmail": "சரிபார்க்கப்பட்ட மின்னஞ்சல்",
+  "@verifiedEmail": {},
+  "unVerifiedEmail": "சரிபார்க்கப்படாத மின்னஞ்சல்",
+  "@unVerifiedEmail": {},
+  "verifiedEmailReason": "பயிற்சிகள் பங்களிக்க உங்கள் மின்னஞ்சலை சரிபார்க்க வேண்டும்",
+  "@verifiedEmailReason": {},
+  "verifiedEmailInfo": "சரிபார்ப்பு மின்னஞ்சல் {email} க்கு அனுப்பப்பட்டது",
+  "@verifiedEmailInfo": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "alternativeNames": "மாற்று பெயர்கள்",
+  "@alternativeNames": {},
+  "oneNamePerLine": "ஒரு வரிக்கு ஒரு பெயர்",
+  "@oneNamePerLine": {},
+  "previous": "முந்தைய",
+  "@previous": {},
+  "next": "அடுத்தது",
+  "@next": {},
+  "addExercise": "உடற்பயிற்சியைச் சேர்க்கவும்",
+  "@addExercise": {},
+  "contributeExercise": "ஒரு உடற்பயிற்சியை பங்களிக்கவும்",
+  "@contributeExercise": {},
+  "translateExercise": "இந்த பயிற்சியை இப்போது மொழிபெயர்க்கவும்",
+  "@translateExercise": {},
+  "baseData": "ஆங்கிலத்தில் அடிப்படைகள்",
+  "@baseData": {
+    "description": "The base data for an exercise such as category, trained muscles, etc."
+  },
+  "settingsTitle": "அமைப்புகள்",
+  "@settingsTitle": {},
+  "settingsCacheTitle": "கேச்",
+  "@settingsCacheTitle": {},
+  "settingsExerciseCacheDescription": "கேச் உடற்பயிற்சி",
+  "@settingsExerciseCacheDescription": {},
+  "settingsIngredientCacheDescription": "மூலப்பொருள் தற்காலிக சேமிப்பு",
+  "@settingsIngredientCacheDescription": {},
+  "settingsCacheDeletedSnackbar": "கேச் வெற்றிகரமாக அழிக்கப்பட்டது",
+  "@settingsCacheDeletedSnackbar": {},
+  "aboutPageTitle": "Wger பற்றி",
+  "@aboutPageTitle": {},
+  "contributeExerciseWarning": "உங்கள் கணக்கு {days} நாட்களைவிடப் பழையதாக இருந்தால் மட்டுமே நீங்கள் பயிற்சிகளைப் பங்களிக்க முடியும், மேலும் உங்கள் மின்னஞ்சலைச் சரிபார்த்துள்ளீர்கள்",
+  "@contributeExerciseWarning": {
+    "description": "Number of days before which a person can add exercise",
+    "placeholders": {
+      "days": {
+        "type": "String",
+        "example": "14"
+      }
+    }
+  },
+  "cacheWarning": "கேச்சிங் காரணமாக விண்ணப்பம் முழுவதும் மாற்றங்கள் தெரியும் வரை சிறிது நேரம் ஆகலாம்.",
+  "@cacheWarning": {},
+  "textPromptTitle": "தொடங்க தயாரா?",
+  "@textPromptTitle": {},
+  "textPromptSubheading": "தொடங்க செயல் பொத்தானை அழுத்தவும்",
+  "@textPromptSubheading": {},
+  "abs": "ஏபிஎச்",
+  "@abs": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "arms": "ஆயுதங்கள்",
+  "@arms": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "back": "பின்",
+  "@back": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "barbell": "பார்பெல்",
+  "@barbell": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "bench": "பென்ச்",
+  "@bench": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "biceps": "கயிறுகள்",
+  "@biceps": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "body_weight": "உடல் எடை",
+  "@body_weight": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "calves": "கன்றுகள்",
+  "@calves": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "cardio": "கார்டியோ",
+  "@cardio": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "chest": "மார்பு",
+  "@chest": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "dumbbell": "டம்பல்",
+  "@dumbbell": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "glutes": "க்ளூட்டுகள்",
+  "@glutes": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "gym_mat": "சிம் பாய்",
+  "@gym_mat": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "hamstrings": "தொடை எலும்புகள்",
+  "@hamstrings": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "incline_bench": "சாய்வு பெஞ்ச்",
+  "@incline_bench": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "kettlebell": "கெட்டில் பெல்",
+  "@kettlebell": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "kilometers": "கிலோமீட்டர்",
+  "@kilometers": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "kilometers_per_hour": "ஒரு மணி நேரத்திற்கு கிலோமீட்டர்",
+  "@kilometers_per_hour": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "lats": "லாட்ச்",
+  "@lats": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "legs": "கால்கள்",
+  "@legs": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "lower_back": "கீழ் முதுகு",
+  "@lower_back": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "max_reps": "அதிகபட்ச பிரதிநிதிகள்",
+  "@max_reps": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "miles": "மைல்கள்",
+  "@miles": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "miles_per_hour": "ஒரு மணி நேரத்திற்கு மைல்கள்",
+  "@miles_per_hour": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "minutes": "நிமிடங்கள்",
+  "@minutes": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "plates": "தட்டுகள்",
+  "@plates": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "pull_up_bar": "புல்-அப் பார்",
+  "@pull_up_bar": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "quads": "குவாட்ச்",
+  "@quads": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "repetitions": "மறுபடியும்",
+  "@repetitions": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "sz_bar": "பட்டி",
+  "@sz_bar": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "seconds": "நொடிகள்",
+  "@seconds": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "shoulders": "தோள்கள்",
+  "@shoulders": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "swiss_ball": "சுவிச் பந்து",
+  "@swiss_ball": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "triceps": "ட்ரைசெப்ச்",
+  "@triceps": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "until_failure": "தோல்வி வரை",
+  "@until_failure": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "kg": "கிலோ",
+  "@kg": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "lb": "எல்.பி.",
+  "@lb": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "none__bodyweight_exercise_": "எதுவுமில்லை (உடல் எடை உடற்பயிற்சி)",
+  "@none__bodyweight_exercise_": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "log": "பதிவு",
+  "@log": {
+    "description": "Log a specific meal (imperative form)"
+  },
+  "done": "முடிந்தது",
+  "@done": {},
+  "overallChangeWeight": "ஒட்டுமொத்த மாற்றம்",
+  "@overallChangeWeight": {
+    "description": "Overall change in weight, added for localization"
+  },
+  "goalTypeMeals": "உணவில் இருந்து",
+  "@goalTypeMeals": {
+    "description": "added for localization of Class GoalType's filed meals"
+  },
+  "goalTypeBasic": "அடிப்படை",
+  "@goalTypeBasic": {
+    "description": "added for localization of Class GoalType's filed basic"
+  },
+  "goalTypeAdvanced": "மேம்பட்ட",
+  "@goalTypeAdvanced": {
+    "description": "added for localization of Class GoalType's filed advanced"
+  },
+  "indicatorRaw": "மூல",
+  "@indicatorRaw": {
+    "description": "added for localization of Class Indicator's field text"
+  },
+  "indicatorAvg": "ஏ.வி.சி",
+  "@indicatorAvg": {
+    "description": "added for localization of Class Indicator's field text"
+  },
+  "noRoutines": "உங்களுக்கு எந்த நடைமுறைகளும் இல்லை",
+  "@noRoutines": {},
+  "restTime": "ஓய்வு நேரம்",
+  "@restTime": {},
+  "sets": "செட்",
+  "@sets": {
+    "description": "The number of sets to be done for one exercise"
+  },
+  "isRestDay": "ஓய்வு நாள்",
+  "@isRestDay": {},
+  "min": "மணித்துளி",
+  "@min": {},
+  "max": "அதிகபட்சம்",
+  "@max": {},
+  "fitInWeek": "வாரத்தில் பொருத்தம்",
+  "@fitInWeek": {},
+  "fitInWeekHelp": "இயக்கப்பட்டிருந்தால், வாரங்கள் வாராந்திர சுழற்சியில் மீண்டும் மீண்டும் வரும், இல்லையெனில் நாட்கள் ஒரு புதிய வாரத்தின் தொடக்கத்தில் இல்லாமல் தொடர்ச்சியாக பின்பற்றப்படும்.",
+  "@fitInWeekHelp": {},
+  "simpleMode": "எளிய முறை",
+  "@simpleMode": {},
+  "simpleModeHelp": "பயிற்சிகளைத் திருத்தும்போது சில மேம்பட்ட அமைப்புகளை மறைக்கவும்",
+  "@simpleModeHelp": {},
+  "themeMode": "கருப்பொருள் பயன்முறை",
+  "@themeMode": {},
+  "darkMode": "எப்போதும் இருண்ட பயன்முறை",
+  "@darkMode": {},
+  "systemMode": "கணினி அமைப்புகள்",
+  "@systemMode": {},
+  "routines": "நடைமுறைகள்",
+  "@routines": {},
+  "newRoutine": "புதிய வழக்கமான",
+  "@newRoutine": {},
+  "exerciseNr": "உடற்பயிற்சி {nr}",
+  "@exerciseNr": {
+    "description": "Header in form indicating the number of the current exercise. Can also be translated as something like 'Set Nr. xy'.",
+    "type": "text",
+    "placeholders": {
+      "nr": {
+        "type": "String"
+      }
+    }
+  },
+  "supersetNr": "சூப்பர்செட் {nr}",
+  "@supersetNr": {
+    "description": "Header in form indicating the number of the current exercise. Can also be translated as something like 'Superset Nr. xy'.",
+    "type": "text",
+    "placeholders": {
+      "nr": {
+        "type": "String"
+      }
+    }
+  },
+  "restDay": "ஓய்வு நாள்",
+  "@restDay": {},
+  "isRestDayHelp": "ஒரு நாள் ஓய்வு நாளாக நீங்கள் குறிக்கும்போது அனைத்து தொகுப்புகளும் பயிற்சிகளும் அகற்றப்படும் என்பதை நினைவில் கொள்க.",
+  "@isRestDayHelp": {},
+  "needsLogsToAdvance": "முன்னேற பதிவுகள் தேவை",
+  "@needsLogsToAdvance": {},
+  "needsLogsToAdvanceHelp": "நீங்கள் ஒரு வொர்க்அவுட்டை பதிவு செய்திருந்தால் மட்டுமே அடுத்த திட்டமிடப்பட்ட நாளுக்கு வழக்கம் முன்னேற வேண்டுமா என்பதைத் தேர்ந்தெடுக்கவும்",
+  "@needsLogsToAdvanceHelp": {},
+  "routineDays": "வழக்கமான நாட்கள்",
+  "@routineDays": {},
+  "resultingRoutine": "இதன் விளைவாக வழக்கமான",
+  "@resultingRoutine": {},
+  "addSuperset": "சூப்பர்செட் சேர்க்கவும்",
+  "@addSuperset": {},
+  "setHasProgression": "செட் முன்னேற்றத்தைக் கொண்டுள்ளது",
+  "@setHasProgression": {},
+  "setHasProgressionWarning": "மொபைல் பயன்பாட்டில் ஒரு தொகுப்பிற்கான அனைத்து அமைப்புகளையும் திருத்தவோ அல்லது தானியங்கி முன்னேற்றத்தை உள்ளமைக்கவோ இந்த நேரத்தில் சாத்தியமில்லை என்பதை நினைவில் கொள்க. இப்போதைக்கு, வலை பயன்பாட்டைப் பயன்படுத்தவும்.",
+  "@setHasProgressionWarning": {},
+  "setHasNoExercises": "இந்த தொகுப்பில் இதுவரை எந்த பயிற்சிகளும் இல்லை!",
+  "@setHasNoExercises": {},
+  "progressionRules": "இந்த பயிற்சி முன்னேற்ற விதிகளைக் கொண்டுள்ளது மற்றும் மொபைல் பயன்பாட்டில் திருத்த முடியாது. இந்த பயிற்சியைத் திருத்த வலை பயன்பாட்டைப் பயன்படுத்தவும்.",
+  "@progressionRules": {},
+  "lightMode": "எப்போதும் ஒளி பயன்முறை",
+  "@lightMode": {}
+}
diff --git a/lib/l10n/app_th.arb b/lib/l10n/app_th.arb
new file mode 100644
index 00000000..0967ef42
--- /dev/null
+++ b/lib/l10n/app_th.arb
@@ -0,0 +1 @@
+{}
diff --git a/lib/l10n/app_tr.arb b/lib/l10n/app_tr.arb
index 87ae0b1b..b798b35a 100644
--- a/lib/l10n/app_tr.arb
+++ b/lib/l10n/app_tr.arb
@@ -47,10 +47,6 @@
   "@labelBottomNavNutrition": {
     "description": "Label used in bottom navigation, use a short word"
   },
-  "labelWorkoutPlans": "Antrenman planları",
-  "@labelWorkoutPlans": {
-    "description": "Title for screen workout plans"
-  },
   "labelBottomNavWorkout": "Antrenman",
   "@labelBottomNavWorkout": {
     "description": "Label used in bottom navigation, use a short word"
@@ -123,10 +119,6 @@
   "@login": {
     "description": "Text for login button"
   },
-  "noWorkoutPlans": "Antrenman planınız yok",
-  "@noWorkoutPlans": {
-    "description": "Message shown when the user has no workout plans"
-  },
   "repetitions": "Tekrarlar",
   "@repetitions": {
     "description": "Repetitions for an exercise set"
@@ -141,14 +133,6 @@
   "@set": {
     "description": "A set in a workout plan"
   },
-  "supersetWith": "süper set ile",
-  "@supersetWith": {
-    "description": "Text used between exercise cards when adding a new set. Translate as something like 'in a superset with'"
-  },
-  "newWorkout": "Yeni antrenman planı",
-  "@newWorkout": {
-    "description": "Header when adding a new workout"
-  },
   "rirNotUsed": "RiR kullanılmadı",
   "@rirNotUsed": {
     "description": "Label used in RiR slider when the RiR value is not used/saved for the current setting or log"
@@ -162,7 +146,9 @@
     "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.",
     "type": "text",
     "placeholders": {
-      "nr": {}
+      "nr": {
+        "type": "String"
+      }
     }
   },
   "sameRepetitions": "Eğer tüm setler için aynı ağırlıklarla aynı setleri yapıyorsanız, sadece bir satır doldurabilirsiniz. Örneğin, 4 set için sadece 10 girin, bu otomatik olarak \"4 x 10\"a dönüşüyor.",
@@ -367,14 +353,6 @@
   "@aboutDescription": {
     "description": "Text in the about dialog"
   },
-  "aboutSourceText": "Bu uygulamanın ve sunucusunun kaynak kodlarını github'dan edinin",
-  "@aboutSourceText": {
-    "description": "Text for source code section in the about dialog"
-  },
-  "aboutBugsTitle": "Bir sorununuz veya fikriniz mi var?",
-  "@aboutBugsTitle": {
-    "description": "Title for bugs section in the about dialog"
-  },
   "enterValidNumber": "Lütfen geçerli bir sayı girin",
   "@enterValidNumber": {
     "description": "Error message when the user has submitted an invalid number (e.g. '3,.,.,.')"
@@ -392,17 +370,11 @@
     "description": "Label shown on the slider where the user selects the nr of sets",
     "type": "text",
     "placeholders": {
-      "nrOfSets": {}
+      "nrOfSets": {
+        "type": "String"
+      }
     }
   },
-  "aboutContactUsTitle": "Merhaba deyin!",
-  "@aboutContactUsTitle": {
-    "description": "Title for contact us section in the about dialog"
-  },
-  "aboutContactUsText": "Bizimle sohbet etmek istiyorsanız, Discord sunucusuna gelin ve iletişime geçin",
-  "@aboutContactUsText": {
-    "description": "Text for contact us section in the about dialog"
-  },
   "goToToday": "Bugüne git",
   "@goToToday": {
     "description": "Label on button to jump back to 'today' in the calendar widget"
@@ -418,7 +390,9 @@
     "description": "Dialog info when product is found with barcode",
     "type": "text",
     "placeholders": {
-      "productName": {}
+      "productName": {
+        "type": "String"
+      }
     }
   },
   "rir": "RiR",
@@ -448,33 +422,15 @@
     "description": "Confirmation text before the user deletes an object",
     "type": "text",
     "placeholders": {
-      "toDelete": {}
+      "toDelete": {
+        "type": "String"
+      }
     }
   },
   "toggleDetails": "Ayrıntıları aç/kapat",
   "@toggleDetails": {
     "description": "Switch to toggle detail / overview"
   },
-  "aboutSourceTitle": "Kaynak kodları",
-  "@aboutSourceTitle": {
-    "description": "Title for source code section in the about dialog"
-  },
-  "aboutBugsText": "Bir şey beklendiği gibi davranmazsa veya eksik olduğunu düşündüğünüz bir özellik varsa iletişime geçin.",
-  "@aboutBugsText": {
-    "description": "Text for bugs section in the about dialog"
-  },
-  "aboutTranslationTitle": "Çeviri",
-  "@aboutTranslationTitle": {
-    "description": "Title for translation section in the about dialog"
-  },
-  "aboutTranslationText": "Bu uygulama Weblate üzerinde çevrilmektedir. Yardım etmek istiyorsanız bağlantıya tıklayın ve çevirmeye başlayın",
-  "@aboutTranslationText": {
-    "description": "Text for translation section in the about dialog"
-  },
-  "enterRepetitionsOrWeight": "Lütfen setlerden en az birinin tekrarlarını veya ağırlığını doldurun",
-  "@enterRepetitionsOrWeight": {
-    "description": "Error message when the user hasn't filled in the forms for exercise sets"
-  },
   "selectExercise": "Lütfen bir egzersiz seçin",
   "@selectExercise": {
     "description": "Error message when the user hasn't selected an exercise in the form"
@@ -484,8 +440,12 @@
     "description": "Error message when the user hasn't entered the correct number of characters in a form",
     "type": "text",
     "placeholders": {
-      "min": {},
-      "max": {}
+      "min": {
+        "type": "String"
+      },
+      "max": {
+        "type": "String"
+      }
     }
   },
   "setUnitsAndRir": "RiR ve birimleri ayarla",
@@ -522,7 +482,9 @@
     "description": "Dialog info when product is not found with barcode",
     "type": "text",
     "placeholders": {
-      "barcode": {}
+      "barcode": {
+        "type": "String"
+      }
     }
   },
   "close": "Kapat",
@@ -560,7 +522,9 @@
   "alsoKnownAs": "{aliases} olarak da bilinir",
   "@alsoKnownAs": {
     "placeholders": {
-      "aliases": {}
+      "aliases": {
+        "type": "String"
+      }
     },
     "description": "List of alternative names for an exercise"
   },
@@ -577,7 +541,9 @@
     "description": "Error message when the user hasn't entered the minimum amount characters in a form",
     "type": "text",
     "placeholders": {
-      "min": {}
+      "min": {
+        "type": "String"
+      }
     }
   },
   "add_exercise_image_license": "Görseller CC BY SA lisansı ile uyumlu olmalıdır. Emin değilseniz, yalnızca kendi çektiğiniz fotoğrafları yükleyin.",
@@ -593,7 +559,9 @@
   "verifiedEmailInfo": "{email} adresine bir doğrulama e-postası gönderildi",
   "@verifiedEmailInfo": {
     "placeholders": {
-      "email": {}
+      "email": {
+        "type": "String"
+      }
     }
   },
   "previous": "Önceki",
@@ -753,13 +721,7 @@
     "description": "Generated entry for translation for server strings"
   },
   "aboutMastodonTitle": "Mastodon",
-  "@aboutMastodonTitle": {
-    "description": "Title for mastodon section in the about dialog"
-  },
-  "aboutMastodonText": "Projeyle ilgili güncellemeler ve haberler için bizi Mastodon'da takip edin",
-  "@aboutMastodonText": {
-    "description": "Text for the mastodon section in the about dialog"
-  },
+  "@aboutMastodonTitle": {},
   "settingsTitle": "Ayarlar",
   "@settingsTitle": {},
   "settingsCacheTitle": "Önbellek",
@@ -789,11 +751,11 @@
     "description": "A value in grams, e.g. 5 g",
     "type": "text",
     "placeholders": {
-      "value": {}
+      "value": {
+        "type": "String"
+      }
     }
   },
-  "addGoalsToPlan": "Bu plana hedefler ekle",
-  "@addGoalsToPlan": {},
   "goalEnergy": "Enerji hedefi",
   "@goalEnergy": {},
   "goalProtein": "Protein hedefi",
@@ -802,8 +764,6 @@
   "@onlyLogging": {},
   "onlyLoggingHelpText": "Yalnızca kalorilerinizi kaydetmek istiyorsanız ve belirli öğünler için ayrıntılı bir beslenme planı oluşturmak istemiyorsanız kutuyu işaretleyin",
   "@onlyLoggingHelpText": {},
-  "addGoalsToPlanHelpText": "Bu, plan için enerji, protein, karbonhidrat veya yağ için genel hedefler belirlemenize olanak tanır. Ayrıntılı bir yemek planı ayarlarsanız, bu değerlerin öncelikli olacağını unutmayın.",
-  "@addGoalsToPlanHelpText": {},
   "loggedToday": "Bugün kaydedildi",
   "@loggedToday": {},
   "kcalValue": "{value} kcal",
@@ -811,7 +771,9 @@
     "description": "A value in kcal, e.g. 500 kcal",
     "type": "text",
     "placeholders": {
-      "value": {}
+      "value": {
+        "type": "String"
+      }
     }
   },
   "goalCarbohydrates": "Karbonhidrat hedefi",
@@ -825,7 +787,9 @@
     "description": "A value in percent, e.g. 10 %",
     "type": "text",
     "placeholders": {
-      "value": {}
+      "value": {
+        "type": "String"
+      }
     }
   },
   "goalMacro": "Makro hedefleri",
@@ -855,7 +819,9 @@
     "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
     "type": "text",
     "placeholders": {
-      "name": {}
+      "name": {
+        "type": "String"
+      }
     }
   },
   "chart30DaysTitle": "son 30 gün {name}",
@@ -863,7 +829,9 @@
     "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
     "type": "text",
     "placeholders": {
-      "name": {}
+      "name": {
+        "type": "String"
+      }
     }
   },
   "chartDuringPlanTitle": "{planName} beslenme planı boyunca {chartName}",
@@ -871,8 +839,12 @@
     "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
     "type": "text",
     "placeholders": {
-      "chartName": {},
-      "planName": {}
+      "chartName": {
+        "type": "String"
+      },
+      "planName": {
+        "type": "String"
+      }
     }
   }
 }
diff --git a/lib/l10n/app_uk.arb b/lib/l10n/app_uk.arb
index def766b3..ca28df05 100644
--- a/lib/l10n/app_uk.arb
+++ b/lib/l10n/app_uk.arb
@@ -1,755 +1,1038 @@
 {
-  "weight": "Вага",
-  "@weight": {
-    "description": "The weight of a workout log or body weight entry"
-  },
-  "login": "Увійти",
-  "@login": {
-    "description": "Text for login button"
-  },
-  "logout": "Вийти",
-  "@logout": {
-    "description": "Text for logout button"
-  },
-  "register": "Реєстрація",
-  "@register": {
-    "description": "Text for registration button"
-  },
-  "useDefaultServer": "Використати сервер за замовчуванням",
-  "@useDefaultServer": {
-    "description": "Toggle button allowing users to switch between the default and a custom wger server"
-  },
-  "useCustomServer": "Використати користувацький сервер",
-  "@useCustomServer": {
-    "description": "Toggle button allowing users to switch between the default and a custom wger server"
-  },
-  "invalidUrl": "Будь ласка, введіть прийнятну URL-адресу",
-  "@invalidUrl": {
-    "description": "Error message when the user enters an invalid URL, e.g. in the login form"
-  },
-  "nutritionalPlan": "План харчування",
-  "@nutritionalPlan": {},
-  "difference": "Різниця",
-  "@difference": {},
-  "edit": "Змінити",
-  "@edit": {},
-  "delete": "Видалити",
-  "@delete": {},
-  "date": "Дата",
-  "@date": {
-    "description": "The date of a workout log or body weight entry"
-  },
-  "usernameValidChars": "Ім'я користувача може містити лише літери, цифри й символи @, +, ., - та _",
-  "@usernameValidChars": {
-    "description": "Error message when the user tries to register a username with forbidden characters"
-  },
-  "passwordsDontMatch": "Паролі не збігаються",
-  "@passwordsDontMatch": {
-    "description": "Error message when the user enters two different passwords during registration"
-  },
-  "confirmPassword": "Підтвердьте пароль",
-  "@confirmPassword": {},
-  "email": "Адреса електронної пошти",
-  "@email": {},
-  "invalidUsername": "Будь ласка, введіть припустиме ім'я користувача",
-  "@invalidUsername": {
-    "description": "Error message when the user enters an invalid username"
-  },
-  "username": "Ім'я користувача",
-  "@username": {},
-  "customServerHint": "Введіть адресу власного сервера, інакше буде використовуватися за замовчуванням",
-  "@customServerHint": {
-    "description": "Hint text for the form where the users can enter their own wger instance"
-  },
-  "reset": "Скинути",
-  "@reset": {
-    "description": "Button text allowing the user to reset the entered values to the default"
-  },
-  "loginInstead": "Вже маєте обліковий запис? Увійти",
-  "@loginInstead": {},
-  "labelWorkoutPlans": "Плани тренувань",
-  "@labelWorkoutPlans": {
-    "description": "Title for screen workout plans"
-  },
-  "labelBottomNavWorkout": "Тренування",
-  "@labelBottomNavWorkout": {
-    "description": "Label used in bottom navigation, use a short word"
-  },
-  "labelWorkoutLogs": "Журнали тренувань",
-  "@labelWorkoutLogs": {
-    "description": "(Workout) logs"
-  },
-  "labelWorkoutPlan": "План тренування",
-  "@labelWorkoutPlan": {
-    "description": "Title for screen workout plan"
-  },
-  "labelDashboard": "Панель керування",
-  "@labelDashboard": {
-    "description": "Title for screen dashboard"
-  },
-  "successfullyDeleted": "Видалено",
-  "@successfullyDeleted": {
-    "description": "Message when an item was successfully deleted"
-  },
-  "exercise": "Вправа",
-  "@exercise": {
-    "description": "An exercise for a workout"
-  },
-  "searchExercise": "Пошук вправ для додавання",
-  "@searchExercise": {
-    "description": "Label on set form. Selected exercises are added to the set"
-  },
-  "supersetWith": "супер-набір з",
-  "@supersetWith": {
-    "description": "Text used between exercise cards when adding a new set. Translate as something like 'in a superset with'"
-  },
-  "equipment": "Обладнання",
-  "@equipment": {
-    "description": "Equipment needed to perform an exercise"
-  },
-  "muscles": "М'язи",
-  "@muscles": {
-    "description": "(main) muscles trained by an exercise"
-  },
-  "musclesSecondary": "Вторинні м'язи",
-  "@musclesSecondary": {
-    "description": "secondary muscles trained by an exercise"
-  },
-  "category": "Категорія",
-  "@category": {
-    "description": "Category for an exercise, ingredient, etc."
-  },
-  "newWorkout": "Новий план тренувань",
-  "@newWorkout": {
-    "description": "Header when adding a new workout"
-  },
-  "repetitions": "Повторень",
-  "@repetitions": {
-    "description": "Repetitions for an exercise set"
-  },
-  "reps": "Повтор",
-  "@reps": {
-    "description": "Shorthand for repetitions, used when space constraints are tighter"
-  },
-  "rirNotUsed": "RiR не використовується",
-  "@rirNotUsed": {
-    "description": "Label used in RiR slider when the RiR value is not used/saved for the current setting or log"
-  },
-  "repetitionUnit": "Одиниця повторень",
-  "@repetitionUnit": {},
-  "set": "Набір",
-  "@set": {
-    "description": "A set in a workout plan"
-  },
-  "setNr": "Набір {nr}",
-  "@setNr": {
-    "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.",
-    "type": "text",
-    "placeholders": {
-      "nr": {}
-    }
-  },
-  "sameRepetitions": "Якщо ви робите однакові повторення та вагу для всіх наборів, то ви можете просто заповнити один рядок. Наприклад, для 4 наборів просто введіть 10 для повторень, це автоматично стане «4 x 10».",
-  "@sameRepetitions": {},
-  "comment": "Коментар",
-  "@comment": {
-    "description": "Comment, additional information"
-  },
-  "impression": "Враження",
-  "@impression": {
-    "description": "General impression (e.g. for a workout session) such as good, bad, etc."
-  },
-  "newDay": "Новий день",
-  "@newDay": {},
-  "selectExercises": "Якщо ви хочете зробити супер-набір, ви можете пошукати декілька вправ, вони будуть згруповані разом",
-  "@selectExercises": {},
-  "gymMode": "Режим тренажерного залу",
-  "@gymMode": {
-    "description": "Label when starting the gym mode"
-  },
-  "plateCalculator": "Пластини",
-  "@plateCalculator": {
-    "description": "Label used for the plate calculator in the gym mode"
-  },
-  "plateCalculatorNotDivisible": "Неможливо досягти ваги з наявними пластинами",
-  "@plateCalculatorNotDivisible": {
-    "description": "Error message when the current weight is not reachable with plates (e.g. 33.1 kg)"
-  },
-  "pause": "Пауза",
-  "@pause": {
-    "description": "Noun, not an imperative! Label used for the pause when using the gym mode"
-  },
-  "jumpTo": "Перейти до",
-  "@jumpTo": {
-    "description": "Imperative. Label used in popup allowing the user to jump to a specific exercise while in the gym mode"
-  },
-  "todaysWorkout": "Ваше сьогоднішнє тренування",
-  "@todaysWorkout": {},
-  "password": "Пароль",
-  "@password": {},
-  "passwordTooShort": "Пароль занадто короткий",
-  "@passwordTooShort": {
-    "description": "Error message when the user a password that is too short"
-  },
-  "invalidEmail": "Будь ласка, введіть прийнятну адресу електронної пошти",
-  "@invalidEmail": {
-    "description": "Error message when the user enters an invalid email"
-  },
-  "customServerUrl": "URL-адреса екземпляра wger",
-  "@customServerUrl": {
-    "description": "Label in the form where the users can enter their own wger instance"
-  },
-  "successfullySaved": "Збережено",
-  "@successfullySaved": {
-    "description": "Message when an item was successfully saved"
-  },
-  "registerInstead": "У вас немає облікового запису? Зареєструйтесь зараз",
-  "@registerInstead": {},
-  "labelBottomNavNutrition": "Харчування",
-  "@labelBottomNavNutrition": {
-    "description": "Label used in bottom navigation, use a short word"
-  },
-  "weightUnit": "Одиниця ваги",
-  "@weightUnit": {},
-  "noWorkoutPlans": "У вас немає планів тренувань",
-  "@noWorkoutPlans": {
-    "description": "Message shown when the user has no workout plans"
-  },
-  "dayDescriptionHelp": "Опис того, що робиться в цей день (наприклад, «день підтягування») або які частини тіла тренуються (наприклад, «груди та плечі»)",
-  "@dayDescriptionHelp": {},
-  "workoutSession": "Сеанс тренування",
-  "@workoutSession": {
-    "description": "A (logged) workout session"
-  },
-  "notes": "Нотатки",
-  "@notes": {
-    "description": "Personal notes, e.g. for a workout session"
-  },
-  "newSet": "Новий набір",
-  "@newSet": {
-    "description": "Header when adding a new set to a workout day"
-  },
-  "measurementCategoriesHelpText": "Категорія вимірювання, така як \"біцепс\" або \"жир тіла\"",
-  "@measurementCategoriesHelpText": {},
-  "time": "Час",
-  "@time": {
-    "description": "The time of a meal or workout"
-  },
-  "value": "Значення",
-  "@value": {
-    "description": "The value of a measurement entry"
-  },
-  "timeStart": "Час початку",
-  "@timeStart": {
-    "description": "The starting time of a workout"
-  },
-  "timeEnd": "Час закінчення",
-  "@timeEnd": {
-    "description": "The end time of a workout"
-  },
-  "kcal": "ккал",
-  "@kcal": {
-    "description": "Energy in a meal in kilocalories, kcal"
-  },
-  "fat": "Жири",
-  "@fat": {},
-  "newNutritionalPlan": "Новий план харчування",
-  "@newNutritionalPlan": {},
-  "sugars": "Цукри",
-  "@sugars": {},
-  "aboutDescription": "Дякуємо за використання wger! wger - це спільний проєкт з відкритим кодом, створений ентузіастами фітнесу з усього світу.",
-  "@aboutDescription": {
-    "description": "Text in the about dialog"
-  },
-  "aboutBugsText": "Зв'яжіться з нами, якщо щось відбувається не так, як очікувалося, або якщо є функція, яка, на вашу думку, відсутня.",
-  "@aboutBugsText": {
-    "description": "Text for bugs section in the about dialog"
-  },
-  "selectExercise": "Будь ласка, виберіть вправу",
-  "@selectExercise": {
-    "description": "Error message when the user hasn't selected an exercise in the form"
-  },
-  "calendar": "Календар",
-  "@calendar": {},
-  "enterValue": "Будь ласка, введіть значення",
-  "@enterValue": {
-    "description": "Error message when the user hasn't entered a value on a required field"
-  },
-  "selectIngredient": "Будь ласка, оберіть інгредієнт",
-  "@selectIngredient": {
-    "description": "Error message when the user hasn't selected an ingredient from the autocompleter"
-  },
-  "productFoundDescription": "Штрих-код відповідає цьому виробу: {productName}. Бажаєте продовжити?",
-  "@productFoundDescription": {
-    "description": "Dialog info when product is found with barcode",
-    "type": "text",
-    "placeholders": {
-      "productName": {}
-    }
-  },
-  "description": "Опис",
-  "@description": {},
-  "name": "Ім'я",
-  "@name": {
-    "description": "Name for a workout or nutritional plan"
-  },
-  "save": "Зберегти",
-  "@save": {},
-  "addSet": "Додати набір",
-  "@addSet": {
-    "description": "Label for the button that adds a set (to a workout day)"
-  },
-  "addMeal": "Додати страву",
-  "@addMeal": {},
-  "mealLogged": "Страву записано в щоденник",
-  "@mealLogged": {},
-  "logMeal": "Записати цю страву",
-  "@logMeal": {},
-  "addIngredient": "Додати інгредієнт",
-  "@addIngredient": {},
-  "logIngredient": "Зберегти в щоденник харчування",
-  "@logIngredient": {},
-  "searchIngredient": "Пошук інгредієнта",
-  "@searchIngredient": {
-    "description": "Label on ingredient search form"
-  },
-  "nutritionalDiary": "Щоденник харчування",
-  "@nutritionalDiary": {},
-  "nutritionalPlans": "Плани харчування",
-  "@nutritionalPlans": {},
-  "noNutritionalPlans": "Ви не маєте планів харчування",
-  "@noNutritionalPlans": {
-    "description": "Message shown when the user has no nutritional plans"
-  },
-  "anErrorOccurred": "Сталася помилка!",
-  "@anErrorOccurred": {},
-  "measurement": "Вимірювання",
-  "@measurement": {},
-  "logHelpEntries": "Якщо на один день припадає більше одного запису з однаковою кількістю повторень, але різними вагами, то на графіку буде показано тільки запис з більшою вагою.",
-  "@logHelpEntries": {},
-  "logHelpEntriesUnits": "Зверніть увагу, що на графіку відображаються тільки записи з одиницями ваги (кг або lb) і повтореннями. Інші комбінації, такі як час або \"до відмови\", тут ігноруються.",
-  "@logHelpEntriesUnits": {},
-  "measurements": "Вимірювання",
-  "@measurements": {
-    "description": "Categories for the measurements such as biceps size, body fat, etc."
-  },
-  "measurementEntriesHelpText": "Одиниця вимірювання, яка використовується для вимірювання категорії, як от \"см\" або \"%\"",
-  "@measurementEntriesHelpText": {},
-  "start": "Почати",
-  "@start": {
-    "description": "Label on button to start the gym mode (i.e., an imperative)"
-  },
-  "timeStartAhead": "Час початку не може передувати часу завершення",
-  "@timeStartAhead": {},
-  "ingredient": "Інгредієнт",
-  "@ingredient": {},
-  "energy": "Енергія",
-  "@energy": {
-    "description": "Energy in a meal, ingredient etc. e.g. in kJ"
-  },
-  "energyShort": "Е",
-  "@energyShort": {
-    "description": "The first letter or short name of the word 'Energy', used in overviews"
-  },
-  "macronutrients": "Макроелементи",
-  "@macronutrients": {},
-  "planned": "Заплановано",
-  "@planned": {
-    "description": "Header for the column of 'planned' nutritional values, i.e. what should be eaten"
-  },
-  "logged": "Записано",
-  "@logged": {
-    "description": "Header for the column of 'logged' nutritional values, i.e. what was eaten"
-  },
-  "weekAverage": "В середньому за 7 днів",
-  "@weekAverage": {
-    "description": "Header for the column of '7 day average' nutritional values, i.e. what was logged last week"
-  },
-  "percentEnergy": "Відсоток енергії",
-  "@percentEnergy": {},
-  "gPerBodyKg": "г на кг тіла",
-  "@gPerBodyKg": {
-    "description": "Label used for total sums of e.g. calories or similar in grams per Kg of body weight"
-  },
-  "total": "Усього",
-  "@total": {
-    "description": "Label used for total sums of e.g. calories or similar"
-  },
-  "kJ": "кДж",
-  "@kJ": {
-    "description": "Energy in a meal in kilo joules, kJ"
-  },
-  "g": "г",
-  "@g": {
-    "description": "Abbreviation for gram"
-  },
-  "protein": "Білок",
-  "@protein": {},
-  "proteinShort": "Б",
-  "@proteinShort": {
-    "description": "The first letter or short name of the word 'Protein', used in overviews"
-  },
-  "carbohydrates": "Вуглеводи",
-  "@carbohydrates": {},
-  "carbohydratesShort": "В",
-  "@carbohydratesShort": {
-    "description": "The first letter or short name of the word 'Carbohydrates', used in overviews"
-  },
-  "fatShort": "Ж",
-  "@fatShort": {
-    "description": "The first letter or short name of the word 'Fat', used in overviews"
-  },
-  "saturatedFat": "Насичені жири",
-  "@saturatedFat": {},
-  "fiber": "Волокна",
-  "@fiber": {},
-  "sodium": "Натрій",
-  "@sodium": {},
-  "amount": "Сума",
-  "@amount": {
-    "description": "The amount (e.g. in grams) of an ingredient in a meal"
-  },
-  "unit": "Одиниця",
-  "@unit": {
-    "description": "The unit used for a repetition (kg, time, etc.)"
-  },
-  "newEntry": "Новий запис",
-  "@newEntry": {
-    "description": "Title when adding a new entry such as a weight or log entry"
-  },
-  "noWeightEntries": "У вас немає записів ваги",
-  "@noWeightEntries": {
-    "description": "Message shown when the user has no logged weight entries"
-  },
-  "loadingText": "Завантаження...",
-  "@loadingText": {
-    "description": "Text to show when entries are being loaded in the background: Loading..."
-  },
-  "confirmDelete": "Ви впевнені, що бажаєте видалити '{toDelete}'?",
-  "@confirmDelete": {
-    "description": "Confirmation text before the user deletes an object",
-    "type": "text",
-    "placeholders": {
-      "toDelete": {}
-    }
-  },
-  "toggleDetails": "Перемкнути відомості",
-  "@toggleDetails": {
-    "description": "Switch to toggle detail / overview"
-  },
-  "goToDetailPage": "Перейти до сторінки відомостей",
-  "@goToDetailPage": {},
-  "aboutSourceTitle": "Джерельний код",
-  "@aboutSourceTitle": {
-    "description": "Title for source code section in the about dialog"
-  },
-  "aboutSourceText": "Отримайте джерельний код цього застосунку та його сервера на github",
-  "@aboutSourceText": {
-    "description": "Text for source code section in the about dialog"
-  },
-  "aboutBugsTitle": "У вас є проблема чи ідея?",
-  "@aboutBugsTitle": {
-    "description": "Title for bugs section in the about dialog"
-  },
-  "aboutContactUsTitle": "Привітайтеся!",
-  "@aboutContactUsTitle": {
-    "description": "Title for contact us section in the about dialog"
-  },
-  "aboutContactUsText": "Якщо ви хочете поспілкуватися з нами, зайдіть на сервер Discord і зв'яжіться з нами",
-  "@aboutContactUsText": {
-    "description": "Text for contact us section in the about dialog"
-  },
-  "aboutTranslationTitle": "Перекладання",
-  "@aboutTranslationTitle": {
-    "description": "Title for translation section in the about dialog"
-  },
-  "aboutTranslationText": "Цей заатосунок перекладено на Weblate. Якщо ви також хочете допомогти, клацніть на посилання та почніть переклад",
-  "@aboutTranslationText": {
-    "description": "Text for translation section in the about dialog"
-  },
-  "goToToday": "Перейти до сьогодні",
-  "@goToToday": {
-    "description": "Label on button to jump back to 'today' in the calendar widget"
-  },
-  "enterRepetitionsOrWeight": "Будь ласка, заповніть кількість повторень або вагу принаймні для одного з наборів",
-  "@enterRepetitionsOrWeight": {
-    "description": "Error message when the user hasn't filled in the forms for exercise sets"
-  },
-  "enterCharacters": "Будь ласка, введіть між{min} та {max} символами",
-  "@enterCharacters": {
-    "description": "Error message when the user hasn't entered the correct number of characters in a form",
-    "type": "text",
-    "placeholders": {
-      "min": {},
-      "max": {}
-    }
-  },
-  "nrOfSets": "Наборів на вправу: {nrOfSets}",
-  "@nrOfSets": {
-    "description": "Label shown on the slider where the user selects the nr of sets",
-    "type": "text",
-    "placeholders": {
-      "nrOfSets": {}
-    }
-  },
-  "setUnitsAndRir": "Встановіть одиниці вимірювання та RiR",
-  "@setUnitsAndRir": {
-    "description": "Label shown on the slider where the user can toggle showing units and RiR",
-    "type": "text"
-  },
-  "enterValidNumber": "Будь ласка, введіть прийнятний номер",
-  "@enterValidNumber": {
-    "description": "Error message when the user has submitted an invalid number (e.g. '3,.,.,.')"
-  },
-  "recentlyUsedIngredients": "Останні інгредієнти",
-  "@recentlyUsedIngredients": {
-    "description": "A message when a user adds a new ingredient to a meal."
-  },
-  "selectImage": "Будь ласка, оберіть зображення",
-  "@selectImage": {
-    "description": "Label and error message when the user hasn't selected an image to save"
-  },
-  "optionsLabel": "Параметри",
-  "@optionsLabel": {
-    "description": "Label for the popup with general app options"
-  },
-  "takePicture": "Зробити знімок",
-  "@takePicture": {},
-  "chooseFromLibrary": "Вибрати з бібліотеки світлин",
-  "@chooseFromLibrary": {},
-  "gallery": "Галерея",
-  "@gallery": {},
-  "addImage": "Додати зображення",
-  "@addImage": {},
-  "dataCopied": "Дані скопійовано до нового запису",
-  "@dataCopied": {
-    "description": "Snackbar message to show on copying data to a new log entry"
-  },
-  "appUpdateTitle": "Потрібне оновлення",
-  "@appUpdateTitle": {},
-  "appUpdateContent": "Ця версія застосунку несумісна з сервером, будь ласка, оновіть застосунок.",
-  "@appUpdateContent": {},
-  "productFound": "Виріб знайдено",
-  "@productFound": {
-    "description": "Header label for dialog when product is found with barcode"
-  },
-  "productNotFound": "Виріб не знайдено",
-  "@productNotFound": {
-    "description": "Header label for dialog when product is not found with barcode"
-  },
-  "productNotFoundDescription": "Виріб із відсканованим штрих-кодом {barcode} не знайдено в базі даних Wger",
-  "@productNotFoundDescription": {
-    "description": "Dialog info when product is not found with barcode",
-    "type": "text",
-    "placeholders": {
-      "barcode": {}
-    }
-  },
-  "scanBarcode": "Сканувати штрих-код",
-  "@scanBarcode": {
-    "description": "Label for scan barcode button"
-  },
-  "close": "Закрити",
-  "@close": {
-    "description": "Translation for close"
-  },
-  "rir": "RiR",
-  "@rir": {
-    "description": "Shorthand for Repetitions In Reserve"
-  },
-  "miles": "Милі",
-  "@miles": {},
-  "aboutPageTitle": "Про Wger",
-  "@aboutPageTitle": {},
-  "noMeasurementEntries": "У вас немає записів вимірювання",
-  "@noMeasurementEntries": {},
-  "moreMeasurementEntries": "Додати нове вимірювання",
-  "@moreMeasurementEntries": {
-    "description": "Message shown when the user wants to add new measurement"
-  },
-  "verifiedEmailInfo": "Повідомлення з підтвердженням електронної пошти надіслано на {email}",
-  "@verifiedEmailInfo": {
-    "placeholders": {
-      "email": {}
-    }
-  },
-  "addExercise": "Додати вправу",
-  "@addExercise": {},
-  "none__bodyweight_exercise_": "немає (вправи з власною вагою)",
-  "@none__bodyweight_exercise_": {},
-  "abs": "Живіт",
-  "@abs": {},
-  "baseData": "Основи англійської",
-  "@baseData": {
-    "description": "The base data for an exercise such as category, trained muscles, etc."
-  },
-  "minutes": "Хвилини",
-  "@minutes": {},
-  "glutes": "Сідниці",
-  "@glutes": {},
-  "kilometers": "Кілометри",
-  "@kilometers": {},
-  "seconds": "Секунди",
-  "@seconds": {},
-  "bench": "Лавка",
-  "@bench": {},
-  "barbell": "Штанга",
-  "@barbell": {},
-  "triceps": "Трицепс",
-  "@triceps": {},
-  "swiss_ball": "Швейцарський м'яч",
-  "@swiss_ball": {},
-  "lower_back": "Нижня частина спини",
-  "@lower_back": {},
-  "shoulders": "Плечі",
-  "@shoulders": {},
-  "hamstrings": "Підколінні сухожилля",
-  "@hamstrings": {},
-  "chest": "Груди",
-  "@chest": {},
-  "biceps": "Біцепс",
-  "@biceps": {},
-  "dumbbell": "Гантеля",
-  "@dumbbell": {},
-  "gym_mat": "Гімнастичний мат",
-  "@gym_mat": {},
-  "incline_bench": "Похила лавка",
-  "@incline_bench": {},
-  "lats": "Найширші м'язи спини",
-  "@lats": {},
-  "legs": "Ноги",
-  "@legs": {},
-  "back": "Спина",
-  "@back": {},
-  "quads": "Квадрицепс",
-  "@quads": {},
-  "arms": "Руки",
-  "@arms": {},
-  "sz_bar": "SZ-Штанга",
-  "@sz_bar": {},
-  "kettlebell": "Гиря",
-  "@kettlebell": {},
-  "calves": "Ікри",
-  "@calves": {},
-  "pull_up_bar": "Перекладина",
-  "@pull_up_bar": {},
-  "until_failure": "До відмови",
-  "@until_failure": {},
-  "userProfile": "Твій профіль",
-  "@userProfile": {},
-  "exerciseList": "Список вправ",
-  "@exerciseList": {},
-  "exercises": "Вправи",
-  "@exercises": {
-    "description": "Multiple exercises for a workout"
-  },
-  "exerciseName": "Назва вправи",
-  "@exerciseName": {
-    "description": "Label for the name of a workout exercise"
-  },
-  "add_exercise_image_license": "Зображення повинні бути сумісні з ліцензією CC BY SA. Якщо ви сумніваєтеся, завантажуйте лише фотографії, які ви зробили самі.",
-  "@add_exercise_image_license": {},
-  "translateExercise": "Перекладіть цю вправу зараз",
-  "@translateExercise": {},
-  "selectEntry": "Будь ласка, виберіть запис",
-  "@selectEntry": {},
-  "enterMinCharacters": "Будь ласка, введіть принаймні {min} символи",
-  "@enterMinCharacters": {
-    "description": "Error message when the user hasn't entered the minimum amount characters in a form",
-    "type": "text",
-    "placeholders": {
-      "min": {}
-    }
-  },
-  "baseNameEnglish": "Всі вправи потребують базової назви англійською",
-  "@baseNameEnglish": {},
-  "variations": "Варіації",
-  "@variations": {
-    "description": "Variations of one exercise (e.g. benchpress and benchpress narrow)"
-  },
-  "alsoKnownAs": "Також відомий як: {aliases}",
-  "@alsoKnownAs": {
-    "placeholders": {
-      "aliases": {}
+    "weight": "Вага",
+    "@weight": {
+        "description": "The weight of a workout log or body weight entry"
     },
-    "description": "List of alternative names for an exercise"
-  },
-  "verifiedEmail": "Підтверджена електронна пошта",
-  "@verifiedEmail": {},
-  "unVerifiedEmail": "Непідтверджена електронна пошта",
-  "@unVerifiedEmail": {},
-  "verifiedEmailReason": "Вам потрібно підтвердити свою електронну пошту, щоб виконувати вправи",
-  "@verifiedEmailReason": {},
-  "alternativeNames": "Альтернативні назви",
-  "@alternativeNames": {},
-  "oneNamePerLine": "Одне ім'я на рядок",
-  "@oneNamePerLine": {},
-  "whatVariationsExist": "Які варіації цієї вправи існують, якщо такі є?",
-  "@whatVariationsExist": {},
-  "previous": "Попередній",
-  "@previous": {},
-  "next": "Наступний",
-  "@next": {},
-  "images": "Зображення",
-  "@images": {},
-  "language": "Мова",
-  "@language": {},
-  "contributeExercise": "Внести вправу",
-  "@contributeExercise": {},
-  "translation": "Переклад",
-  "@translation": {},
-  "cardio": "Кардіо",
-  "@cardio": {},
-  "contributeExerciseWarning": "Ви можете брати участь у вправах, лише якщо ваш обліковий запис старший за {days} днів і підтвердив вашу електронну пошту",
-  "@contributeExerciseWarning": {
-    "description": "Number of days before which a person can add exercise",
-    "placeholders": {
-      "days": {
-        "type": "String",
-        "example": "14"
-      }
-    }
-  },
-  "success": "Успіх",
-  "@success": {
-    "description": "Message when an action completed successfully, usually used as a heading"
-  },
-  "cacheWarning": "Через кешування може знадобитися деякий час, перш ніж зміни стануть видимими у всьому застосунку.",
-  "@cacheWarning": {},
-  "searchNamesInEnglish": "Також шукайте імена англійською мовою",
-  "@searchNamesInEnglish": {},
-  "textPromptTitle": "Готові почати?",
-  "@textPromptTitle": {},
-  "textPromptSubheading": "Натисніть кнопку дії, щоб почати",
-  "@textPromptSubheading": {},
-  "body_weight": "Вага тіла",
-  "@body_weight": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "kg": "кг",
-  "@kg": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "kilometers_per_hour": "Кілометрів на годину",
-  "@kilometers_per_hour": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "miles_per_hour": "Миль на годину",
-  "@miles_per_hour": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "lb": "фунт",
-  "@lb": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "plates": "Пластини",
-  "@plates": {
-    "description": "Generated entry for translation for server strings"
-  },
-  "verify": "Підтвердити",
-  "@verify": {},
-  "max_reps": "Максимальна кількість повторень",
-  "@max_reps": {
-    "description": "Generated entry for translation for server strings"
-  }
+    "login": "Увійти",
+    "@login": {
+        "description": "Text for login button"
+    },
+    "logout": "Вийти",
+    "@logout": {
+        "description": "Text for logout button"
+    },
+    "register": "Реєстрація",
+    "@register": {
+        "description": "Text for registration button"
+    },
+    "useDefaultServer": "Використати сервер за замовчуванням",
+    "@useDefaultServer": {
+        "description": "Toggle button allowing users to switch between the default and a custom wger server"
+    },
+    "useCustomServer": "Використати користувацький сервер",
+    "@useCustomServer": {
+        "description": "Toggle button allowing users to switch between the default and a custom wger server"
+    },
+    "invalidUrl": "Будь ласка, введіть прийнятну URL-адресу",
+    "@invalidUrl": {
+        "description": "Error message when the user enters an invalid URL, e.g. in the login form"
+    },
+    "nutritionalPlan": "План харчування",
+    "@nutritionalPlan": {},
+    "difference": "Різниця",
+    "@difference": {},
+    "edit": "Змінити",
+    "@edit": {},
+    "delete": "Видалити",
+    "@delete": {},
+    "date": "Дата",
+    "@date": {
+        "description": "The date of a workout log or body weight entry"
+    },
+    "usernameValidChars": "Ім'я користувача може містити лише літери, цифри й символи @, +, ., - та _",
+    "@usernameValidChars": {
+        "description": "Error message when the user tries to register a username with forbidden characters"
+    },
+    "passwordsDontMatch": "Паролі не збігаються",
+    "@passwordsDontMatch": {
+        "description": "Error message when the user enters two different passwords during registration"
+    },
+    "confirmPassword": "Підтвердьте пароль",
+    "@confirmPassword": {},
+    "email": "Адреса електронної пошти",
+    "@email": {},
+    "invalidUsername": "Будь ласка, введіть припустиме ім'я користувача",
+    "@invalidUsername": {
+        "description": "Error message when the user enters an invalid username"
+    },
+    "username": "Ім'я користувача",
+    "@username": {},
+    "customServerHint": "Введіть адресу власного сервера, інакше буде використовуватися за замовчуванням",
+    "@customServerHint": {
+        "description": "Hint text for the form where the users can enter their own wger instance"
+    },
+    "reset": "Скинути",
+    "@reset": {
+        "description": "Button text allowing the user to reset the entered values to the default"
+    },
+    "loginInstead": "Вже маєте обліковий запис? Увійти",
+    "@loginInstead": {},
+    "labelBottomNavWorkout": "Тренування",
+    "@labelBottomNavWorkout": {
+        "description": "Label used in bottom navigation, use a short word"
+    },
+    "labelWorkoutLogs": "Журнали тренувань",
+    "@labelWorkoutLogs": {
+        "description": "(Workout) logs"
+    },
+    "labelWorkoutPlan": "План тренування",
+    "@labelWorkoutPlan": {
+        "description": "Title for screen workout plan"
+    },
+    "labelDashboard": "Панель керування",
+    "@labelDashboard": {
+        "description": "Title for screen dashboard"
+    },
+    "successfullyDeleted": "Видалено",
+    "@successfullyDeleted": {
+        "description": "Message when an item was successfully deleted"
+    },
+    "exercise": "Вправа",
+    "@exercise": {
+        "description": "An exercise for a workout"
+    },
+    "searchExercise": "Пошук вправ для додавання",
+    "@searchExercise": {
+        "description": "Label on set form. Selected exercises are added to the set"
+    },
+    "equipment": "Обладнання",
+    "@equipment": {
+        "description": "Equipment needed to perform an exercise"
+    },
+    "muscles": "М'язи",
+    "@muscles": {
+        "description": "(main) muscles trained by an exercise"
+    },
+    "musclesSecondary": "Вторинні м'язи",
+    "@musclesSecondary": {
+        "description": "secondary muscles trained by an exercise"
+    },
+    "category": "Категорія",
+    "@category": {
+        "description": "Category for an exercise, ingredient, etc."
+    },
+    "repetitions": "Повторень",
+    "@repetitions": {
+        "description": "Repetitions for an exercise set"
+    },
+    "reps": "Повтор",
+    "@reps": {
+        "description": "Shorthand for repetitions, used when space constraints are tighter"
+    },
+    "rirNotUsed": "RiR не використовується",
+    "@rirNotUsed": {
+        "description": "Label used in RiR slider when the RiR value is not used/saved for the current setting or log"
+    },
+    "repetitionUnit": "Одиниця повторень",
+    "@repetitionUnit": {},
+    "set": "Набір",
+    "@set": {
+        "description": "A set in a workout plan"
+    },
+    "setNr": "Набір {nr}",
+    "@setNr": {
+        "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.",
+        "type": "text",
+        "placeholders": {
+            "nr": {
+                "type": "String"
+            }
+        }
+    },
+    "sameRepetitions": "Якщо ви робите однакові повторення та вагу для всіх наборів, то ви можете просто заповнити один рядок. Наприклад, для 4 наборів просто введіть 10 для повторень, це автоматично стане «4 x 10».",
+    "@sameRepetitions": {},
+    "comment": "Коментар",
+    "@comment": {
+        "description": "Comment, additional information"
+    },
+    "impression": "Враження",
+    "@impression": {
+        "description": "General impression (e.g. for a workout session) such as good, bad, etc."
+    },
+    "newDay": "Новий день",
+    "@newDay": {},
+    "selectExercises": "Якщо ви хочете зробити супер-набір, ви можете пошукати декілька вправ, вони будуть згруповані разом",
+    "@selectExercises": {},
+    "gymMode": "Режим тренажерного залу",
+    "@gymMode": {
+        "description": "Label when starting the gym mode"
+    },
+    "plateCalculator": "Пластини",
+    "@plateCalculator": {
+        "description": "Label used for the plate calculator in the gym mode"
+    },
+    "plateCalculatorNotDivisible": "Неможливо досягти ваги з наявними пластинами",
+    "@plateCalculatorNotDivisible": {
+        "description": "Error message when the current weight is not reachable with plates (e.g. 33.1 kg)"
+    },
+    "pause": "Пауза",
+    "@pause": {
+        "description": "Noun, not an imperative! Label used for the pause when using the gym mode"
+    },
+    "jumpTo": "Перейти до",
+    "@jumpTo": {
+        "description": "Imperative. Label used in popup allowing the user to jump to a specific exercise while in the gym mode"
+    },
+    "todaysWorkout": "Ваше сьогоднішнє тренування",
+    "@todaysWorkout": {},
+    "password": "Пароль",
+    "@password": {},
+    "passwordTooShort": "Пароль занадто короткий",
+    "@passwordTooShort": {
+        "description": "Error message when the user a password that is too short"
+    },
+    "invalidEmail": "Будь ласка, введіть прийнятну адресу електронної пошти",
+    "@invalidEmail": {
+        "description": "Error message when the user enters an invalid email"
+    },
+    "customServerUrl": "URL-адреса екземпляра wger",
+    "@customServerUrl": {
+        "description": "Label in the form where the users can enter their own wger instance"
+    },
+    "successfullySaved": "Збережено",
+    "@successfullySaved": {
+        "description": "Message when an item was successfully saved"
+    },
+    "registerInstead": "У вас немає облікового запису? Зареєструйтесь зараз",
+    "@registerInstead": {},
+    "labelBottomNavNutrition": "Харчування",
+    "@labelBottomNavNutrition": {
+        "description": "Label used in bottom navigation, use a short word"
+    },
+    "weightUnit": "Одиниця ваги",
+    "@weightUnit": {},
+    "dayDescriptionHelp": "Опис того, що робиться в цей день (наприклад, «день підтягування») або які частини тіла тренуються (наприклад, «груди та плечі»)",
+    "@dayDescriptionHelp": {},
+    "workoutSession": "Сеанс тренування",
+    "@workoutSession": {
+        "description": "A (logged) workout session"
+    },
+    "notes": "Нотатки",
+    "@notes": {
+        "description": "Personal notes, e.g. for a workout session"
+    },
+    "newSet": "Новий набір",
+    "@newSet": {
+        "description": "Header when adding a new set to a workout day"
+    },
+    "measurementCategoriesHelpText": "Категорія вимірювання, така як \"біцепс\" або \"жир тіла\"",
+    "@measurementCategoriesHelpText": {},
+    "time": "Час",
+    "@time": {
+        "description": "The time of a meal or workout"
+    },
+    "value": "Значення",
+    "@value": {
+        "description": "The value of a measurement entry"
+    },
+    "timeStart": "Час початку",
+    "@timeStart": {
+        "description": "The starting time of a workout"
+    },
+    "timeEnd": "Час закінчення",
+    "@timeEnd": {
+        "description": "The end time of a workout"
+    },
+    "kcal": "ккал",
+    "@kcal": {
+        "description": "Energy in a meal in kilocalories, kcal"
+    },
+    "fat": "Жири",
+    "@fat": {},
+    "newNutritionalPlan": "Новий план харчування",
+    "@newNutritionalPlan": {},
+    "sugars": "Цукри",
+    "@sugars": {},
+    "aboutDescription": "Дякуємо за використання wger! wger - це спільний проєкт з відкритим кодом, створений ентузіастами фітнесу з усього світу.",
+    "@aboutDescription": {
+        "description": "Text in the about dialog"
+    },
+    "selectExercise": "Будь ласка, виберіть вправу",
+    "@selectExercise": {
+        "description": "Error message when the user hasn't selected an exercise in the form"
+    },
+    "calendar": "Календар",
+    "@calendar": {},
+    "enterValue": "Будь ласка, введіть значення",
+    "@enterValue": {
+        "description": "Error message when the user hasn't entered a value on a required field"
+    },
+    "selectIngredient": "Будь ласка, оберіть інгредієнт",
+    "@selectIngredient": {
+        "description": "Error message when the user hasn't selected an ingredient from the autocompleter"
+    },
+    "productFoundDescription": "Штрих-код відповідає цьому виробу: {productName}. Бажаєте продовжити?",
+    "@productFoundDescription": {
+        "description": "Dialog info when product is found with barcode",
+        "type": "text",
+        "placeholders": {
+            "productName": {
+                "type": "String"
+            }
+        }
+    },
+    "description": "Опис",
+    "@description": {},
+    "name": "Ім'я",
+    "@name": {
+        "description": "Name for a workout or nutritional plan"
+    },
+    "save": "Зберегти",
+    "@save": {},
+    "addSet": "Додати набір",
+    "@addSet": {
+        "description": "Label for the button that adds a set (to a workout day)"
+    },
+    "addMeal": "Додати страву",
+    "@addMeal": {},
+    "mealLogged": "Страву записано в щоденник",
+    "@mealLogged": {},
+    "logMeal": "Запис прийому їжі в щоденник харчування",
+    "@logMeal": {},
+    "addIngredient": "Додати інгредієнт",
+    "@addIngredient": {},
+    "logIngredient": "Занесіть інгредієнт до щоденника харчування",
+    "@logIngredient": {},
+    "searchIngredient": "Пошук інгредієнта",
+    "@searchIngredient": {
+        "description": "Label on ingredient search form"
+    },
+    "nutritionalDiary": "Щоденник харчування",
+    "@nutritionalDiary": {},
+    "nutritionalPlans": "Плани харчування",
+    "@nutritionalPlans": {},
+    "noNutritionalPlans": "Ви не маєте планів харчування",
+    "@noNutritionalPlans": {
+        "description": "Message shown when the user has no nutritional plans"
+    },
+    "anErrorOccurred": "Сталася помилка!",
+    "@anErrorOccurred": {},
+    "measurement": "Вимірювання",
+    "@measurement": {},
+    "logHelpEntries": "Якщо на один день припадає більше одного запису з однаковою кількістю повторень, але різними вагами, то на графіку буде показано тільки запис з більшою вагою.",
+    "@logHelpEntries": {},
+    "logHelpEntriesUnits": "Зверніть увагу, що на графіку відображаються тільки записи з одиницями ваги (кг або lb) і повтореннями. Інші комбінації, такі як час або \"до відмови\", тут ігноруються.",
+    "@logHelpEntriesUnits": {},
+    "measurements": "Вимірювання",
+    "@measurements": {
+        "description": "Categories for the measurements such as biceps size, body fat, etc."
+    },
+    "measurementEntriesHelpText": "Одиниця вимірювання, яка використовується для вимірювання категорії, як от \"см\" або \"%\"",
+    "@measurementEntriesHelpText": {},
+    "start": "Старт",
+    "@start": {
+        "description": "Label on button to start the gym mode (i.e., an imperative)"
+    },
+    "timeStartAhead": "Час початку не може передувати часу завершення",
+    "@timeStartAhead": {},
+    "ingredient": "Інгредієнт",
+    "@ingredient": {},
+    "energy": "Енергія",
+    "@energy": {
+        "description": "Energy in a meal, ingredient etc. e.g. in kJ"
+    },
+    "energyShort": "Е",
+    "@energyShort": {
+        "description": "The first letter or short name of the word 'Energy', used in overviews"
+    },
+    "macronutrients": "Макроелементи",
+    "@macronutrients": {},
+    "planned": "Заплановано",
+    "@planned": {
+        "description": "Header for the column of 'planned' nutritional values, i.e. what should be eaten"
+    },
+    "logged": "Записано",
+    "@logged": {
+        "description": "Header for the column of 'logged' nutritional values, i.e. what was eaten"
+    },
+    "weekAverage": "В середньому за 7 днів",
+    "@weekAverage": {
+        "description": "Header for the column of '7 day average' nutritional values, i.e. what was logged last week"
+    },
+    "percentEnergy": "Відсоток енергії",
+    "@percentEnergy": {},
+    "gPerBodyKg": "г на кг тіла",
+    "@gPerBodyKg": {
+        "description": "Label used for total sums of e.g. calories or similar in grams per Kg of body weight"
+    },
+    "total": "Усього",
+    "@total": {
+        "description": "Label used for total sums of e.g. calories or similar"
+    },
+    "kJ": "кДж",
+    "@kJ": {
+        "description": "Energy in a meal in kilo joules, kJ"
+    },
+    "g": "г",
+    "@g": {
+        "description": "Abbreviation for gram"
+    },
+    "protein": "Білок",
+    "@protein": {},
+    "proteinShort": "Б",
+    "@proteinShort": {
+        "description": "The first letter or short name of the word 'Protein', used in overviews"
+    },
+    "carbohydrates": "Вуглеводи",
+    "@carbohydrates": {},
+    "carbohydratesShort": "В",
+    "@carbohydratesShort": {
+        "description": "The first letter or short name of the word 'Carbohydrates', used in overviews"
+    },
+    "fatShort": "Ж",
+    "@fatShort": {
+        "description": "The first letter or short name of the word 'Fat', used in overviews"
+    },
+    "saturatedFat": "Насичені жири",
+    "@saturatedFat": {},
+    "fiber": "Волокон",
+    "@fiber": {},
+    "sodium": "Натрій",
+    "@sodium": {},
+    "amount": "Сума",
+    "@amount": {
+        "description": "The amount (e.g. in grams) of an ingredient in a meal"
+    },
+    "unit": "Одиниця",
+    "@unit": {
+        "description": "The unit used for a repetition (kg, time, etc.)"
+    },
+    "newEntry": "Новий запис",
+    "@newEntry": {
+        "description": "Title when adding a new entry such as a weight or log entry"
+    },
+    "noWeightEntries": "У вас немає записів ваги",
+    "@noWeightEntries": {
+        "description": "Message shown when the user has no logged weight entries"
+    },
+    "loadingText": "Завантаження...",
+    "@loadingText": {
+        "description": "Text to show when entries are being loaded in the background: Loading..."
+    },
+    "confirmDelete": "Ви впевнені, що бажаєте видалити '{toDelete}'?",
+    "@confirmDelete": {
+        "description": "Confirmation text before the user deletes an object",
+        "type": "text",
+        "placeholders": {
+            "toDelete": {
+                "type": "String"
+            }
+        }
+    },
+    "toggleDetails": "Перемкнути відомості",
+    "@toggleDetails": {
+        "description": "Switch to toggle detail / overview"
+    },
+    "goToDetailPage": "Перейти до сторінки відомостей",
+    "@goToDetailPage": {},
+    "goToToday": "Перейти до сьогодні",
+    "@goToToday": {
+        "description": "Label on button to jump back to 'today' in the calendar widget"
+    },
+    "enterCharacters": "Будь ласка, введіть між{min} та {max} символами",
+    "@enterCharacters": {
+        "description": "Error message when the user hasn't entered the correct number of characters in a form",
+        "type": "text",
+        "placeholders": {
+            "min": {
+                "type": "String"
+            },
+            "max": {
+                "type": "String"
+            }
+        }
+    },
+    "nrOfSets": "Наборів на вправу: {nrOfSets}",
+    "@nrOfSets": {
+        "description": "Label shown on the slider where the user selects the nr of sets",
+        "type": "text",
+        "placeholders": {
+            "nrOfSets": {
+                "type": "String"
+            }
+        }
+    },
+    "setUnitsAndRir": "Встановіть одиниці вимірювання та RiR",
+    "@setUnitsAndRir": {
+        "description": "Label shown on the slider where the user can toggle showing units and RiR",
+        "type": "text"
+    },
+    "enterValidNumber": "Будь ласка, введіть прийнятний номер",
+    "@enterValidNumber": {
+        "description": "Error message when the user has submitted an invalid number (e.g. '3,.,.,.')"
+    },
+    "recentlyUsedIngredients": "Останні інгредієнти",
+    "@recentlyUsedIngredients": {
+        "description": "A message when a user adds a new ingredient to a meal."
+    },
+    "selectImage": "Будь ласка, оберіть зображення",
+    "@selectImage": {
+        "description": "Label and error message when the user hasn't selected an image to save"
+    },
+    "optionsLabel": "Параметри",
+    "@optionsLabel": {
+        "description": "Label for the popup with general app options"
+    },
+    "takePicture": "Зробити знімок",
+    "@takePicture": {},
+    "chooseFromLibrary": "Вибрати з бібліотеки світлин",
+    "@chooseFromLibrary": {},
+    "gallery": "Галерея",
+    "@gallery": {},
+    "imageFormatNotSupported": "{imageFormat} не підтримується",
+    "@imageFormatNotSupported": {
+        "description": "Label shown on the error container when image format is not supported",
+        "type": "text",
+        "placeholders": {
+            "imageFormat": {
+                "type": "String"
+            }
+        }
+    },
+    "imageFormatNotSupportedDetail": "Зображення {imageFormat} поки що не підтримуються.",
+    "@imageFormatNotSupportedDetail": {
+        "description": "Label shown on the image preview container when image format is not supported",
+        "type": "text",
+        "placeholders": {
+            "imageFormat": {
+                "type": "String"
+            }
+        }
+    },
+    "addImage": "Додати зображення",
+    "@addImage": {},
+    "dataCopied": "Дані скопійовано до нового запису",
+    "@dataCopied": {
+        "description": "Snackbar message to show on copying data to a new log entry"
+    },
+    "appUpdateTitle": "Потрібне оновлення",
+    "@appUpdateTitle": {},
+    "appUpdateContent": "Ця версія застосунку несумісна з сервером, будь ласка, оновіть застосунок.",
+    "@appUpdateContent": {},
+    "productFound": "Виріб знайдено",
+    "@productFound": {
+        "description": "Header label for dialog when product is found with barcode"
+    },
+    "productNotFound": "Виріб не знайдено",
+    "@productNotFound": {
+        "description": "Header label for dialog when product is not found with barcode"
+    },
+    "productNotFoundDescription": "Виріб із відсканованим штрих-кодом {barcode} не знайдено в базі даних Wger",
+    "@productNotFoundDescription": {
+        "description": "Dialog info when product is not found with barcode",
+        "type": "text",
+        "placeholders": {
+            "barcode": {
+                "type": "String"
+            }
+        }
+    },
+    "scanBarcode": "Сканувати штрих-код",
+    "@scanBarcode": {
+        "description": "Label for scan barcode button"
+    },
+    "close": "Закрити",
+    "@close": {
+        "description": "Translation for close"
+    },
+    "rir": "RiR",
+    "@rir": {
+        "description": "Shorthand for Repetitions In Reserve"
+    },
+    "miles": "Милі",
+    "@miles": {},
+    "aboutPageTitle": "Про нас та підтримка",
+    "@aboutPageTitle": {},
+    "noMeasurementEntries": "У вас немає записів вимірювання",
+    "@noMeasurementEntries": {},
+    "moreMeasurementEntries": "Додати нове вимірювання",
+    "@moreMeasurementEntries": {
+        "description": "Message shown when the user wants to add new measurement"
+    },
+    "verifiedEmailInfo": "Повідомлення з підтвердженням електронної пошти надіслано на {email}",
+    "@verifiedEmailInfo": {
+        "placeholders": {
+            "email": {
+                "type": "String"
+            }
+        }
+    },
+    "addExercise": "Додати вправу",
+    "@addExercise": {},
+    "none__bodyweight_exercise_": "немає (вправи з власною вагою)",
+    "@none__bodyweight_exercise_": {},
+    "abs": "Живіт",
+    "@abs": {},
+    "baseData": "Основи англійської",
+    "@baseData": {
+        "description": "The base data for an exercise such as category, trained muscles, etc."
+    },
+    "minutes": "Хвилини",
+    "@minutes": {},
+    "glutes": "Сідниці",
+    "@glutes": {},
+    "kilometers": "Кілометри",
+    "@kilometers": {},
+    "seconds": "Секунди",
+    "@seconds": {},
+    "bench": "Лавка",
+    "@bench": {},
+    "barbell": "Штанга",
+    "@barbell": {},
+    "triceps": "Трицепс",
+    "@triceps": {},
+    "swiss_ball": "Швейцарський м'яч",
+    "@swiss_ball": {},
+    "lower_back": "Нижня частина спини",
+    "@lower_back": {},
+    "shoulders": "Плечі",
+    "@shoulders": {},
+    "hamstrings": "Підколінні сухожилля",
+    "@hamstrings": {},
+    "chest": "Груди",
+    "@chest": {},
+    "biceps": "Біцепс",
+    "@biceps": {},
+    "dumbbell": "Гантеля",
+    "@dumbbell": {},
+    "gym_mat": "Гімнастичний мат",
+    "@gym_mat": {},
+    "incline_bench": "Похила лавка",
+    "@incline_bench": {},
+    "lats": "Найширші м'язи спини",
+    "@lats": {},
+    "legs": "Ноги",
+    "@legs": {},
+    "back": "Спина",
+    "@back": {},
+    "quads": "Квадрицепс",
+    "@quads": {},
+    "arms": "Руки",
+    "@arms": {},
+    "sz_bar": "SZ-Штанга",
+    "@sz_bar": {},
+    "kettlebell": "Гиря",
+    "@kettlebell": {},
+    "calves": "Ікри",
+    "@calves": {},
+    "pull_up_bar": "Перекладина",
+    "@pull_up_bar": {},
+    "until_failure": "До відмови",
+    "@until_failure": {},
+    "userProfile": "Твій профіль",
+    "@userProfile": {},
+    "exerciseList": "Список вправ",
+    "@exerciseList": {},
+    "exercises": "Вправи",
+    "@exercises": {
+        "description": "Multiple exercises for a workout"
+    },
+    "exerciseName": "Назва вправи",
+    "@exerciseName": {
+        "description": "Label for the name of a workout exercise"
+    },
+    "add_exercise_image_license": "Зображення повинні бути сумісні з ліцензією CC BY SA. Якщо ви сумніваєтеся, завантажуйте лише фотографії, які ви зробили самі.",
+    "@add_exercise_image_license": {},
+    "translateExercise": "Перекладіть цю вправу зараз",
+    "@translateExercise": {},
+    "selectEntry": "Будь ласка, виберіть запис",
+    "@selectEntry": {},
+    "enterMinCharacters": "Будь ласка, введіть принаймні {min} символи",
+    "@enterMinCharacters": {
+        "description": "Error message when the user hasn't entered the minimum amount characters in a form",
+        "type": "text",
+        "placeholders": {
+            "min": {
+                "type": "String"
+            }
+        }
+    },
+    "baseNameEnglish": "Всі вправи потребують базової назви англійською",
+    "@baseNameEnglish": {},
+    "variations": "Варіації",
+    "@variations": {
+        "description": "Variations of one exercise (e.g. benchpress and benchpress narrow)"
+    },
+    "alsoKnownAs": "Також відомий як: {aliases}",
+    "@alsoKnownAs": {
+        "placeholders": {
+            "aliases": {
+                "type": "String"
+            }
+        },
+        "description": "List of alternative names for an exercise"
+    },
+    "verifiedEmail": "Підтверджена електронна пошта",
+    "@verifiedEmail": {},
+    "unVerifiedEmail": "Непідтверджена електронна пошта",
+    "@unVerifiedEmail": {},
+    "verifiedEmailReason": "Вам потрібно підтвердити свою електронну пошту, щоб виконувати вправи",
+    "@verifiedEmailReason": {},
+    "alternativeNames": "Альтернативні назви",
+    "@alternativeNames": {},
+    "oneNamePerLine": "Одне ім'я на рядок",
+    "@oneNamePerLine": {},
+    "whatVariationsExist": "Які варіації цієї вправи існують, якщо такі є?",
+    "@whatVariationsExist": {},
+    "previous": "Попередній",
+    "@previous": {},
+    "next": "Наступний",
+    "@next": {},
+    "images": "Зображення",
+    "@images": {},
+    "language": "Мова",
+    "@language": {},
+    "contributeExercise": "Внести вправу",
+    "@contributeExercise": {},
+    "translation": "Переклад",
+    "@translation": {},
+    "cardio": "Кардіо",
+    "@cardio": {},
+    "contributeExerciseWarning": "Ви можете брати участь у вправах, лише якщо ваш обліковий запис старший за {days} днів і підтвердив вашу електронну пошту",
+    "@contributeExerciseWarning": {
+        "description": "Number of days before which a person can add exercise",
+        "placeholders": {
+            "days": {
+                "type": "String",
+                "example": "14"
+            }
+        }
+    },
+    "success": "Успіх",
+    "@success": {
+        "description": "Message when an action completed successfully, usually used as a heading"
+    },
+    "cacheWarning": "Через кешування може знадобитися деякий час, перш ніж зміни стануть видимими у всьому застосунку.",
+    "@cacheWarning": {},
+    "searchNamesInEnglish": "Також шукайте імена англійською мовою",
+    "@searchNamesInEnglish": {},
+    "textPromptTitle": "Готові почати?",
+    "@textPromptTitle": {},
+    "textPromptSubheading": "Натисніть кнопку дії, щоб почати",
+    "@textPromptSubheading": {},
+    "body_weight": "Вага тіла",
+    "@body_weight": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "kg": "кг",
+    "@kg": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "kilometers_per_hour": "Кілометри на годину",
+    "@kilometers_per_hour": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "miles_per_hour": "Миль на годину",
+    "@miles_per_hour": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "lb": "фунт",
+    "@lb": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "plates": "Пластини",
+    "@plates": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "verify": "Підтвердити",
+    "@verify": {},
+    "max_reps": "Максимальна кількість повторень",
+    "@max_reps": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "goalMacro": "Макроцілі",
+    "@goalMacro": {
+        "description": "The goal for macronutrients"
+    },
+    "goalFiber": "Волокно гол",
+    "@goalFiber": {},
+    "goalTypeBasic": "Базовий",
+    "@goalTypeBasic": {
+        "description": "added for localization of Class GoalType's filed basic"
+    },
+    "goalTypeAdvanced": "Просунутий",
+    "@goalTypeAdvanced": {
+        "description": "added for localization of Class GoalType's filed advanced"
+    },
+    "useMetric": "Використовуйте метричні одиниці вимірювання маси тіла",
+    "@useMetric": {},
+    "settingsTitle": "налаштування",
+    "@settingsTitle": {},
+    "deficit": "дефіцит",
+    "@deficit": {
+        "description": "Caloric deficit (either planned or unplanned)"
+    },
+    "gValue": "{value} г",
+    "@gValue": {
+        "description": "A value in grams, e.g. 5 g",
+        "type": "text",
+        "placeholders": {
+            "value": {
+                "type": "String"
+            }
+        }
+    },
+    "percentValue": "{value} %",
+    "@percentValue": {
+        "description": "A value in percent, e.g. 10 %",
+        "type": "text",
+        "placeholders": {
+            "value": {
+                "type": "String"
+            }
+        }
+    },
+    "settingsExerciseCacheDescription": "Кеш вправ",
+    "@settingsExerciseCacheDescription": {},
+    "chartAllTimeTitle": "{name} за весь час",
+    "@chartAllTimeTitle": {
+        "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
+        "type": "text",
+        "placeholders": {
+            "name": {
+                "type": "String"
+            }
+        }
+    },
+    "chart30DaysTitle": "{name} останні 30 днів",
+    "@chart30DaysTitle": {
+        "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
+        "type": "text",
+        "placeholders": {
+            "name": {
+                "type": "String"
+            }
+        }
+    },
+    "chartDuringPlanTitle": "{chartName} під час плану харчування {planName}",
+    "@chartDuringPlanTitle": {
+        "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
+        "type": "text",
+        "placeholders": {
+            "chartName": {
+                "type": "String"
+            },
+            "planName": {
+                "type": "String"
+            }
+        }
+    },
+    "kcalValue": "{value} ккал",
+    "@kcalValue": {
+        "description": "A value in kcal, e.g. 500 kcal",
+        "type": "text",
+        "placeholders": {
+            "value": {
+                "type": "String"
+            }
+        }
+    },
+    "log": "Журнал",
+    "@log": {
+        "description": "Log a specific meal (imperative form)"
+    },
+    "settingsIngredientCacheDescription": "Кеш інгредієнтів",
+    "@settingsIngredientCacheDescription": {},
+    "overallChangeWeight": "Загальна зміна",
+    "@overallChangeWeight": {
+        "description": "Overall change in weight, added for localization"
+    },
+    "goalTypeMeals": "Від їжі",
+    "@goalTypeMeals": {
+        "description": "added for localization of Class GoalType's filed meals"
+    },
+    "indicatorRaw": "сирий",
+    "@indicatorRaw": {
+        "description": "added for localization of Class Indicator's field text"
+    },
+    "indicatorAvg": "середнє",
+    "@indicatorAvg": {
+        "description": "added for localization of Class Indicator's field text"
+    },
+    "onlyLogging": "Слідкуйте лише за калоріями",
+    "@onlyLogging": {},
+    "onlyLoggingHelpText": "Поставте прапорець, якщо ви хочете лише реєструвати свої калорії та не хочете встановлювати детальний план харчування з певними стравами",
+    "@onlyLoggingHelpText": {},
+    "goalEnergy": "Енергетична мета",
+    "@goalEnergy": {},
+    "goalProtein": "Білкова мета",
+    "@goalProtein": {},
+    "goalCarbohydrates": "Мета вуглеводів",
+    "@goalCarbohydrates": {},
+    "goalFat": "Товстий гол",
+    "@goalFat": {},
+    "today": "Сьогодні",
+    "@today": {},
+    "loggedToday": "Зареєстровано сьогодні",
+    "@loggedToday": {},
+    "aboutDonateTitle": "Зробіть пожертву",
+    "@aboutDonateTitle": {},
+    "aboutDonateText": "Хоча проект є безкоштовним і завжди ним залишатиметься, запуск сервера - ні! Розвиток також вимагає значного часу і зусиль від волонтерів. Ваш внесок безпосередньо підтримує ці витрати, допомагаючи підтримувати надійність сервісу.",
+    "@aboutDonateText": {},
+    "surplus": "надлишок",
+    "@surplus": {
+        "description": "Caloric surplus (either planned or unplanned)"
+    },
+    "done": "Готово",
+    "@done": {},
+    "noIngredientsDefined": "Інгредієнти ще не визначені",
+    "@noIngredientsDefined": {},
+    "noMatchingExerciseFound": "Відповідних вправ не знайдено",
+    "@noMatchingExerciseFound": {
+        "description": "Message returned if no exercises match the searched string"
+    },
+    "ingredientLogged": "Інгредієнт зареєстровано в щоденнику",
+    "@ingredientLogged": {},
+    "selectMealToLog": "Виберіть страву, щоб записати в щоденник",
+    "@selectMealToLog": {},
+    "aboutMastodonTitle": "Мастодонт",
+    "@aboutMastodonTitle": {},
+    "settingsCacheTitle": "Кеш",
+    "@settingsCacheTitle": {},
+    "settingsCacheDeletedSnackbar": "Кеш успішно очищено",
+    "@settingsCacheDeletedSnackbar": {},
+    "themeMode": "Тематичний режим",
+    "@themeMode": {},
+    "darkMode": "Завжди темний режим",
+    "@darkMode": {},
+    "lightMode": "Завжди легкий режим",
+    "@lightMode": {},
+    "systemMode": "Налаштування системи",
+    "@systemMode": {},
+    "restDay": "День відпочинку",
+    "@restDay": {},
+    "noRoutines": "У вас немає рутин",
+    "@noRoutines": {},
+    "restTime": "Час відпочинку",
+    "@restTime": {},
+    "sets": "Набори",
+    "@sets": {
+        "description": "The number of sets to be done for one exercise"
+    },
+    "supersetNr": "Суперсет {nr}",
+    "@supersetNr": {
+        "description": "Header in form indicating the number of the current exercise. Can also be translated as something like 'Superset Nr. xy'.",
+        "type": "text",
+        "placeholders": {
+            "nr": {
+                "type": "String"
+            }
+        }
+    },
+    "isRestDay": "Є День відпочинку",
+    "@isRestDay": {},
+    "isRestDayHelp": "Будь ласка, зверніть увагу, що всі комплекси та вправи будуть видалені, коли ви позначите день як вихідний.",
+    "@isRestDayHelp": {},
+    "routineDays": "Дні в рутині",
+    "@routineDays": {},
+    "fitInWeek": "Вписується в тиждень",
+    "@fitInWeek": {},
+    "fitInWeekHelp": "Якщо ввімкнено, дні повторюватимуться в тижневому циклі, інакше дні будуть йти послідовно незалежно від початку нового тижня.",
+    "@fitInWeekHelp": {},
+    "addSuperset": "Додайте надмножину",
+    "@addSuperset": {},
+    "setHasProgression": "Набір має прогресію",
+    "@setHasProgression": {},
+    "simpleMode": "Простий режим",
+    "@simpleMode": {},
+    "resultingRoutine": "Результативна рутина",
+    "@resultingRoutine": {},
+    "simpleModeHelp": "Приховайте деякі розширені налаштування під час редагування вправ",
+    "@simpleModeHelp": {},
+    "progressionRules": "Ця вправа має правила прогресу, і її не можна редагувати в мобільному додатку. Щоб відредагувати цю вправу, використовуйте веб-додаток.",
+    "@progressionRules": {},
+    "min": "Мін",
+    "@min": {},
+    "max": "Макс",
+    "@max": {},
+    "newRoutine": "Нова рутина",
+    "@newRoutine": {},
+    "needsLogsToAdvance": "Для просування потрібні журнали",
+    "@needsLogsToAdvance": {},
+    "routines": "Рутини",
+    "@routines": {},
+    "exerciseNr": "Вправа {nr}",
+    "@exerciseNr": {
+        "description": "Header in form indicating the number of the current exercise. Can also be translated as something like 'Set Nr. xy'.",
+        "type": "text",
+        "placeholders": {
+            "nr": {
+                "type": "String"
+            }
+        }
+    },
+    "needsLogsToAdvanceHelp": "Виберіть, якщо ви бажаєте, щоб програма перейшла до наступного запланованого дня, лише якщо ви зареєстрували тренування на цей день",
+    "@needsLogsToAdvanceHelp": {},
+    "setHasProgressionWarning": "Зверніть увагу, що на даний момент неможливо змінити всі параметри набору в мобільному додатку або налаштувати автоматичний прогрес. Наразі використовуйте веб-додаток.",
+    "@setHasProgressionWarning": {},
+    "setHasNoExercises": "У цьому комплексі ще немає вправ!",
+    "@setHasNoExercises": {},
+    "errorCouldNotConnectToServerDetails": "Програмі не вдалося підключитися до сервера. Перевірте підключення до Інтернету або URL-адресу сервера та спробуйте ще раз. Якщо проблема не зникає, зверніться до адміністратора сервера.",
+    "@errorCouldNotConnectToServerDetails": {},
+    "errorViewDetails": "Технічні деталі",
+    "@errorViewDetails": {},
+    "errorCouldNotConnectToServer": "Не вдалося підключитися до сервера",
+    "@errorCouldNotConnectToServer": {},
+    "errorInfoDescription2": "Ви можете продовжувати користуватися додатком, але деякі функції можуть не працювати.",
+    "@errorInfoDescription2": {},
+    "errorInfoDescription": "Вибачте, але щось пішло не так. Ви можете допомогти нам виправити це, повідомивши про проблему на GitHub.",
+    "@errorInfoDescription": {},
+    "copyToClipboard": "Копіювати в буфер обміну",
+    "@copyToClipboard": {},
+    "aboutWhySupportTitle": "Відкритий код та безкоштовний у використанні ❤️",
+    "@aboutWhySupportTitle": {},
+    "aboutJoinCommunityTitle": "Приєднуйтесь до спільноти",
+    "@aboutJoinCommunityTitle": {},
+    "aboutDiscordTitle": "Дискорд",
+    "@aboutDiscordTitle": {},
+    "aboutBugsListTitle": "Повідомити про проблему або запропонувати функцію",
+    "@aboutBugsListTitle": {},
+    "aboutSourceListTitle": "Переглянути вихідний код",
+    "@aboutSourceListTitle": {},
+    "aboutContributeTitle": "Зробити внесок",
+    "@aboutContributeTitle": {},
+    "aboutContributeText": "Ми вітаємо будь-які види внесків. Незалежно від того, чи ви розробник, перекладач, чи просто захоплений фітнесом, ми цінуємо будь-яку підтримку!",
+    "@aboutContributeText": {},
+    "aboutTranslationListTitle": "Перекласти програму",
+    "@aboutTranslationListTitle": {},
+    "others": "Інші",
+    "@others": {},
+    "apiToken": "Токен API",
+    "@apiToken": {},
+    "useApiToken": "Використовувати токен API",
+    "@useApiToken": {},
+    "useUsernameAndPassword": "Використовуйте ім'я користувача та пароль",
+    "@useUsernameAndPassword": {},
+    "invalidApiToken": "Будь ласка, введіть дійсний ключ API",
+    "@invalidApiToken": {
+        "description": "Error message when the user enters an invalid API key"
+    },
+    "apiTokenValidChars": "Ключ API може містити лише літери a-f, цифри 0-9 та мати довжину рівно 40 символів",
+    "@apiTokenValidChars": {
+        "description": "Error message when the user tries to input a API key with forbidden characters"
+    },
+    "resistance_band": "Еспандер",
+    "@resistance_band": {
+        "description": "Generated entry for translation for server strings"
+    },
+    "selectAvailablePlates": "Виберіть доступні тарілки",
+    "@selectAvailablePlates": {},
+    "barWeight": "Вага штанги",
+    "@barWeight": {},
+    "useColors": "Використовуйте кольори",
+    "@useColors": {},
+    "yourCurrentNutritionPlanHasNoMealsDefinedYet": "У вашому поточному плані харчування не визначено жодного прийому їжі",
+    "@yourCurrentNutritionPlanHasNoMealsDefinedYet": {
+        "description": "Message shown when a nutrition plan doesn't have any meals"
+    },
+    "toAddMealsToThePlanGoToNutritionalPlanDetails": "Щоб додати страви до плану, перейдіть до деталей плану харчування",
+    "@toAddMealsToThePlanGoToNutritionalPlanDetails": {
+        "description": "Message shown to guide users to the nutritional plan details page to add meals"
+    },
+    "endDate": "Дата завершення",
+    "@endDate": {},
+    "startDate": "Дата початку",
+    "@startDate": {},
+    "applicationLogs": "Журнали програм",
+    "@applicationLogs": {}
 }
diff --git a/lib/l10n/app_zh.arb b/lib/l10n/app_zh.arb
index 075c6ddb..fd2cda5c 100644
--- a/lib/l10n/app_zh.arb
+++ b/lib/l10n/app_zh.arb
@@ -91,7 +91,7 @@
   "@notes": {
     "description": "Personal notes, e.g. for a workout session"
   },
-  "comment": "备注",
+  "comment": "评论",
   "@comment": {
     "description": "Comment, additional information"
   },
@@ -105,14 +105,6 @@
   "@repetitionUnit": {},
   "weightUnit": "重量单位",
   "@weightUnit": {},
-  "noWorkoutPlans": "您还没有设定锻炼计划",
-  "@noWorkoutPlans": {
-    "description": "Message shown when the user has no workout plans"
-  },
-  "newWorkout": "新增锻炼计划",
-  "@newWorkout": {
-    "description": "Header when adding a new workout"
-  },
   "category": "类别",
   "@category": {
     "description": "Category for an exercise, ingredient, etc."
@@ -153,10 +145,6 @@
   "@labelBottomNavWorkout": {
     "description": "Label used in bottom navigation, use a short word"
   },
-  "labelWorkoutPlans": "锻炼计划",
-  "@labelWorkoutPlans": {
-    "description": "Title for screen workout plans"
-  },
   "loginInstead": "已经有帐号了吗？立即登入",
   "@loginInstead": {},
   "registerInstead": "没有帐户？点击注册",
@@ -194,8 +182,12 @@
     "description": "Error message when the user hasn't entered the correct number of characters in a form",
     "type": "text",
     "placeholders": {
-      "min": {},
-      "max": {}
+      "min": {
+        "type": "String"
+      },
+      "max": {
+        "type": "String"
+      }
     }
   },
   "selectExercise": "请选择一个锻炼项目",
@@ -212,22 +204,6 @@
   },
   "calendar": "日历",
   "@calendar": {},
-  "aboutContactUsTitle": "Hello!",
-  "@aboutContactUsTitle": {
-    "description": "Title for contact us section in the about dialog"
-  },
-  "aboutBugsTitle": "有疑问或者建议?",
-  "@aboutBugsTitle": {
-    "description": "Title for bugs section in the about dialog"
-  },
-  "aboutSourceText": "获取code and server",
-  "@aboutSourceText": {
-    "description": "Text for source code section in the about dialog"
-  },
-  "aboutSourceTitle": "源代码",
-  "@aboutSourceTitle": {
-    "description": "Title for source code section in the about dialog"
-  },
   "aboutDescription": "感谢您使用wger！ wger 是一个协作开源项目，由来自世界各地的健身爱好者创建。",
   "@aboutDescription": {
     "description": "Text in the about dialog"
@@ -245,14 +221,16 @@
     "description": "Confirmation text before the user deletes an object",
     "type": "text",
     "placeholders": {
-      "toDelete": {}
+      "toDelete": {
+        "type": "String"
+      }
     }
   },
   "delete": "删除",
   "@delete": {},
-  "loadingText": "加载...",
+  "loadingText": "加载中...",
   "@loadingText": {
-    "description": "Text to show when entries are being loaded in the background: Loading..."
+    "description": "Text to show when entries are being loaded in the background: Loading..., changed from \"加载\" to \"加载中\""
   },
   "edit": "编辑",
   "@edit": {},
@@ -326,7 +304,7 @@
   },
   "weight": "重量",
   "@weight": {
-    "description": "The weight of a workout log or body weight entry"
+    "description": "The weight of a workout log or body weight entry, changed from \"重量\" to \"体重\""
   },
   "anErrorOccurred": "出错了!",
   "@anErrorOccurred": {},
@@ -348,9 +326,9 @@
   "@addMeal": {},
   "save": "保存",
   "@save": {},
-  "name": "名",
+  "name": "名称",
   "@name": {
-    "description": "Name for a workout or nutritional plan"
+    "description": "Name for a workout or nutritional plan, changed from \"名\" to \"名称\""
   },
   "description": "描述",
   "@description": {},
@@ -370,13 +348,11 @@
     "description": "Label shown on the slider where the user selects the nr of sets",
     "type": "text",
     "placeholders": {
-      "nrOfSets": {}
+      "nrOfSets": {
+        "type": "String"
+      }
     }
   },
-  "enterRepetitionsOrWeight": "请至少填写其中一项的重复次数或重量",
-  "@enterRepetitionsOrWeight": {
-    "description": "Error message when the user hasn't filled in the forms for exercise sets"
-  },
   "timeStartAhead": "开始时间不能早于结束时间",
   "@timeStartAhead": {},
   "addIngredient": "添加营养成分",
@@ -412,21 +388,15 @@
     "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.",
     "type": "text",
     "placeholders": {
-      "nr": {}
+      "nr": {
+        "type": "String"
+      }
     }
   },
   "muscles": "主要部位",
   "@muscles": {
     "description": "(main) muscles trained by an exercise"
   },
-  "aboutTranslationText": "可以在weblate网站上参与翻译工作",
-  "@aboutTranslationText": {
-    "description": "Text for translation section in the about dialog"
-  },
-  "aboutTranslationTitle": "翻译",
-  "@aboutTranslationTitle": {
-    "description": "Title for translation section in the about dialog"
-  },
   "musclesSecondary": "次要部位",
   "@musclesSecondary": {
     "description": "secondary muscles trained by an exercise"
@@ -435,18 +405,6 @@
   "@newSet": {
     "description": "Header when adding a new set to a workout day"
   },
-  "supersetWith": "组合",
-  "@supersetWith": {
-    "description": "Text used between exercise cards when adding a new set. Translate as something like 'in a superset with'"
-  },
-  "aboutContactUsText": "聊一聊",
-  "@aboutContactUsText": {
-    "description": "Text for contact us section in the about dialog"
-  },
-  "aboutBugsText": "如果某些情况未如预期运作或您认为缺少某个功能，请与我们联络。",
-  "@aboutBugsText": {
-    "description": "Text for bugs section in the about dialog"
-  },
   "plateCalculatorNotDivisible": "达不到预定重量",
   "@plateCalculatorNotDivisible": {
     "description": "Error message when the current weight is not reachable with plates (e.g. 33.1 kg)"
@@ -460,7 +418,9 @@
     "description": "Dialog info when product is not found with barcode",
     "type": "text",
     "placeholders": {
-      "barcode": {}
+      "barcode": {
+        "type": "String"
+      }
     }
   },
   "weekAverage": "7天平均",
@@ -472,7 +432,9 @@
     "description": "Dialog info when product is found with barcode",
     "type": "text",
     "placeholders": {
-      "productName": {}
+      "productName": {
+        "type": "String"
+      }
     }
   },
   "measurement": "测量",
@@ -527,9 +489,9 @@
   "@close": {
     "description": "Translation for close"
   },
-  "logIngredient": "保存至营养日志",
+  "logIngredient": "记录食材至营养日志",
   "@logIngredient": {},
-  "searchIngredient": "搜索营养成分表",
+  "searchIngredient": "搜索营养成分",
   "@searchIngredient": {
     "description": "Label on ingredient search form"
   },
@@ -557,21 +519,21 @@
   "@logged": {
     "description": "Header for the column of 'logged' nutritional values, i.e. what was eaten"
   },
-  "userProfile": "账户",
+  "userProfile": "个人资料",
   "@userProfile": {},
   "exerciseName": "锻炼名",
   "@exerciseName": {
     "description": "Label for the name of a workout exercise"
   },
-  "previous": "前一个",
+  "previous": "前",
   "@previous": {},
-  "kg": "公斤",
+  "kg": "千克",
   "@kg": {
     "description": "Generated entry for translation for server strings"
   },
   "verify": "确认",
   "@verify": {},
-  "next": "下一个",
+  "next": "后",
   "@next": {},
   "success": "成功",
   "@success": {
@@ -593,7 +555,7 @@
   "@minutes": {
     "description": "Generated entry for translation for server strings"
   },
-  "pull_up_bar": "上拉杆",
+  "pull_up_bar": "引体向上杆",
   "@pull_up_bar": {
     "description": "Generated entry for translation for server strings"
   },
@@ -650,7 +612,9 @@
     "description": "A value in kcal, e.g. 500 kcal",
     "type": "text",
     "placeholders": {
-      "value": {}
+      "value": {
+        "type": "String"
+      }
     }
   },
   "gValue": "{value} g",
@@ -658,7 +622,9 @@
     "description": "A value in grams, e.g. 5 g",
     "type": "text",
     "placeholders": {
-      "value": {}
+      "value": {
+        "type": "String"
+      }
     }
   },
   "percentValue": "{value} %",
@@ -666,9 +632,435 @@
     "description": "A value in percent, e.g. 10 %",
     "type": "text",
     "placeholders": {
-      "value": {}
+      "value": {
+        "type": "String"
+      }
     }
   },
   "noMeasurementEntries": "您没有测量条目",
-  "@noMeasurementEntries": {}
+  "@noMeasurementEntries": {},
+  "overallChangeWeight": "总体变化",
+  "@overallChangeWeight": {
+    "description": "Overall change in weight"
+  },
+  "goalTypeMeals": "从饮食出发",
+  "@goalTypeMeals": {},
+  "goalTypeBasic": "基础",
+  "@goalTypeBasic": {},
+  "goalTypeAdvanced": "进阶",
+  "@goalTypeAdvanced": {},
+  "chartAllTimeTitle": "{name} 历史记录曲线",
+  "@chartAllTimeTitle": {
+    "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
+    "type": "text",
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "chartDuringPlanTitle": "{chartName} 在计划 \"{planName}\" 期间的改变曲线",
+  "@chartDuringPlanTitle": {
+    "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
+    "type": "text",
+    "placeholders": {
+      "chartName": {
+        "type": "String"
+      },
+      "planName": {
+        "type": "String"
+      }
+    }
+  },
+  "indicatorRaw": "原始值",
+  "@indicatorRaw": {},
+  "indicatorAvg": "平均值",
+  "@indicatorAvg": {},
+  "textPromptTitle": "准备就绪？",
+  "@textPromptTitle": {
+    "description": "Title for the text prompt"
+  },
+  "textPromptSubheading": "点击右下角按钮开始",
+  "@textPromptSubheading": {
+    "description": "Subheading for the text prompt"
+  },
+  "enterMinCharacters": "请输入最少{min}个字符",
+  "@enterMinCharacters": {
+    "description": "Error message when the user hasn't entered the minimum amount characters in a form",
+    "type": "text",
+    "placeholders": {
+      "min": {
+        "type": "String"
+      }
+    }
+  },
+  "baseNameEnglish": "所有运动需要一个英文代号",
+  "@baseNameEnglish": {},
+  "lower_back": "下背",
+  "@lower_back": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "images": "图像",
+  "@images": {},
+  "biceps": "肱二头肌",
+  "@biceps": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "aboutPageTitle": "关于我们&支持",
+  "@aboutPageTitle": {},
+  "selectEntry": "请选择一项",
+  "@selectEntry": {},
+  "cardio": "有氧",
+  "@cardio": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "abs": "腹肌",
+  "@abs": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "plates": "盘",
+  "@plates": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "quads": "大腿前侧",
+  "@quads": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "bench": "凳",
+  "@bench": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "sz_bar": "W型曲杆",
+  "@sz_bar": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "aboutDonateTitle": "进行捐赠",
+  "@aboutDonateTitle": {},
+  "aboutDonateText": "尽管该项目是免费的，且将始终保持免费，但服务器的运营并非如此！开发工作也需要志愿者投入大量的时间和精力。您的捐赠将直接用于支付这些成本，助力维持服务的稳定可靠。",
+  "@aboutDonateText": {},
+  "none__bodyweight_exercise_": "无（自重动作）",
+  "@none__bodyweight_exercise_": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "chart30DaysTitle": "{name} 过去三十天",
+  "@chart30DaysTitle": {
+    "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
+    "type": "text",
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "oneNamePerLine": "每行一个名字",
+  "@oneNamePerLine": {},
+  "settingsExerciseCacheDescription": "动作缓存",
+  "@settingsExerciseCacheDescription": {},
+  "settingsIngredientCacheDescription": "营养成分缓存",
+  "@settingsIngredientCacheDescription": {},
+  "contributeExerciseWarning": "账号注册{days}天且邮箱验证通过后，你方可贡献动作",
+  "@contributeExerciseWarning": {
+    "description": "Number of days before which a person can add exercise",
+    "placeholders": {
+      "days": {
+        "type": "String",
+        "example": "14"
+      }
+    }
+  },
+  "body_weight": "体重",
+  "@body_weight": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "chest": "胸",
+  "@chest": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "dumbbell": "哑铃",
+  "@dumbbell": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "hamstrings": "大腿后侧",
+  "@hamstrings": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "legs": "腿",
+  "@legs": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "max_reps": "最大次数",
+  "@max_reps": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "miles": "英里",
+  "@miles": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "miles_per_hour": "迈",
+  "@miles_per_hour": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "seconds": "秒",
+  "@seconds": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "shoulders": "肩",
+  "@shoulders": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "swiss_ball": "瑜伽球",
+  "@swiss_ball": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "triceps": "肱三头肌",
+  "@triceps": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "until_failure": "直至力竭",
+  "@until_failure": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "variations": "变式",
+  "@variations": {
+    "description": "Variations of one exercise (e.g. benchpress and benchpress narrow)"
+  },
+  "verifiedEmail": "已验证的邮箱",
+  "@verifiedEmail": {},
+  "unVerifiedEmail": "未验证的邮箱",
+  "@unVerifiedEmail": {},
+  "verifiedEmailInfo": "验证邮件已经发往{email}",
+  "@verifiedEmailInfo": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "whatVariationsExist": "这个动作有什么变体吗？",
+  "@whatVariationsExist": {},
+  "language": "语言",
+  "@language": {},
+  "addExercise": "添加动作",
+  "@addExercise": {},
+  "contributeExercise": "贡献一个动作",
+  "@contributeExercise": {},
+  "translateExercise": "翻译该动作",
+  "@translateExercise": {},
+  "baseData": "英文基础动作",
+  "@baseData": {
+    "description": "The base data for an exercise such as category, trained muscles, etc."
+  },
+  "settingsTitle": "设置",
+  "@settingsTitle": {},
+  "settingsCacheTitle": "缓存",
+  "@settingsCacheTitle": {},
+  "settingsCacheDeletedSnackbar": "成功清除缓存",
+  "@settingsCacheDeletedSnackbar": {},
+  "barbell": "杠铃",
+  "@barbell": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "gym_mat": "健身垫",
+  "@gym_mat": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "incline_bench": "上斜凳",
+  "@incline_bench": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "kettlebell": "壶铃",
+  "@kettlebell": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "kilometers_per_hour": "千米每小时",
+  "@kilometers_per_hour": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "lats": "背阔肌",
+  "@lats": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "log": "记录",
+  "@log": {
+    "description": "Log a specific meal (imperative form)"
+  },
+  "done": "完成",
+  "@done": {},
+  "moreMeasurementEntries": "添加新围度",
+  "@moreMeasurementEntries": {
+    "description": "Message shown when the user wants to add new measurement"
+  },
+  "add_exercise_image_license": "图像必须符合 CC BY-SA 知识共享许可。如果你不太确定，那请仅上传你自己拍摄的照片。",
+  "@add_exercise_image_license": {},
+  "cacheWarning": "由于缓存，申请中的变动或需一段时间方可呈现。",
+  "@cacheWarning": {},
+  "alsoKnownAs": "又名：{aliases}",
+  "@alsoKnownAs": {
+    "placeholders": {
+      "aliases": {
+        "type": "String"
+      }
+    },
+    "description": "List of alternative names for an exercise"
+  },
+  "verifiedEmailReason": "你需要验证邮箱来参与贡献",
+  "@verifiedEmailReason": {},
+  "arms": "手臂",
+  "@arms": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "translation": "翻译",
+  "@translation": {},
+  "back": "背",
+  "@back": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "calves": "小腿",
+  "@calves": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "glutes": "臀",
+  "@glutes": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "aboutMastodonTitle": "长毛象",
+  "@aboutMastodonTitle": {},
+  "routines": "训练计划",
+  "@routines": {},
+  "newRoutine": "新计划",
+  "@newRoutine": {},
+  "noRoutines": "你没有训练计划",
+  "@noRoutines": {},
+  "restTime": "休息时间",
+  "@restTime": {},
+  "sets": "组",
+  "@sets": {
+    "description": "The number of sets to be done for one exercise"
+  },
+  "exerciseNr": "练习{nr}",
+  "@exerciseNr": {
+    "description": "Header in form indicating the number of the current exercise. Can also be translated as something like 'Set Nr. xy'.",
+    "type": "text",
+    "placeholders": {
+      "nr": {
+        "type": "String"
+      }
+    }
+  },
+  "supersetNr": "特别组{nr}",
+  "@supersetNr": {
+    "description": "Header in form indicating the number of the current exercise. Can also be translated as something like 'Superset Nr. xy'.",
+    "type": "text",
+    "placeholders": {
+      "nr": {
+        "type": "String"
+      }
+    }
+  },
+  "restDay": "休息日",
+  "@restDay": {},
+  "isRestDay": "是休息日",
+  "@isRestDay": {},
+  "isRestDayHelp": "请注意，当您将某天标记为休息日时，所有的组数和练习都将被删除。",
+  "@isRestDayHelp": {},
+  "needsLogsToAdvance": "需要日志以前进",
+  "@needsLogsToAdvance": {},
+  "needsLogsToAdvanceHelp": "选择您是否希望只有在当天记录了锻炼后，训练计划才会进入下一个计划日",
+  "@needsLogsToAdvanceHelp": {},
+  "routineDays": "计划中的天数",
+  "@routineDays": {},
+  "min": "分钟",
+  "@min": {},
+  "max": "最大",
+  "@max": {},
+  "fitInWeekHelp": "如果启用，天数将以周为周期重复，否则天数将依次重复，而不考虑新一周的开始。",
+  "@fitInWeekHelp": {},
+  "addSuperset": "增加超级组",
+  "@addSuperset": {},
+  "setHasProgression": "此组已经有训练进度",
+  "@setHasProgression": {},
+  "setHasProgressionWarning": "请注意，目前还无法在移动应用程序上编辑一个设置的所有设置，也无法配置自动升级。目前，请使用Web应用程序。",
+  "@setHasProgressionWarning": {},
+  "setHasNoExercises": "此训练组还没有任何练习！",
+  "@setHasNoExercises": {},
+  "simpleMode": "简易模式",
+  "@simpleMode": {},
+  "simpleModeHelp": "在编辑练习时隐藏更多高级设置",
+  "@simpleModeHelp": {},
+  "progressionRules": "此练习有进度规则，无法在移动应用程序上编辑。请使用Web应用程序编辑此练习。",
+  "@progressionRules": {},
+  "themeMode": "主题模式",
+  "@themeMode": {},
+  "darkMode": "总是暗色模式",
+  "@darkMode": {},
+  "lightMode": "总是亮色模式",
+  "@lightMode": {},
+  "systemMode": "系统设置",
+  "@systemMode": {},
+  "barWeight": "杠铃重量",
+  "@barWeight": {},
+  "useColors": "使用颜色",
+  "@useColors": {},
+  "useApiToken": "使用API密钥",
+  "@useApiToken": {},
+  "useUsernameAndPassword": "使用用户名与密码",
+  "@useUsernameAndPassword": {},
+  "apiToken": "API密钥",
+  "@apiToken": {},
+  "invalidApiToken": "请输入有效API值",
+  "@invalidApiToken": {
+    "description": "Error message when the user enters an invalid API key"
+  },
+  "apiTokenValidChars": "API 密钥只能包含字母 a-f、数字 0-9，长度为 40 个字符",
+  "@apiTokenValidChars": {
+    "description": "Error message when the user tries to input a API key with forbidden characters"
+  },
+  "selectAvailablePlates": "选择可用的杠片",
+  "@selectAvailablePlates": {},
+  "yourCurrentNutritionPlanHasNoMealsDefinedYet": "你当前的营养计划中没有设定任何餐食",
+  "@yourCurrentNutritionPlanHasNoMealsDefinedYet": {
+    "description": "Message shown when a nutrition plan doesn't have any meals"
+  },
+  "toAddMealsToThePlanGoToNutritionalPlanDetails": "若要为营养计划添加餐食，请前往营养计划详情页面",
+  "@toAddMealsToThePlanGoToNutritionalPlanDetails": {
+    "description": "Message shown to guide users to the nutritional plan details page to add meals"
+  },
+  "errorInfoDescription": "很抱歉，出现了一些问题。您可以通过在 GitHub 上报告此问题来帮助我们修复它。",
+  "@errorInfoDescription": {},
+  "errorInfoDescription2": "您可以继续使用这款应用，但部分功能可能无法正常运行。",
+  "@errorInfoDescription2": {},
+  "errorViewDetails": "错误技术详情",
+  "@errorViewDetails": {},
+  "errorCouldNotConnectToServer": "无法连接到服务器",
+  "@errorCouldNotConnectToServer": {},
+  "errorCouldNotConnectToServerDetails": "应用程序无法连接到服务器。请检查您的网络连接或服务器网址，然后重试。如果问题持续存在，请联系服务器管理员。",
+  "@errorCouldNotConnectToServerDetails": {},
+  "copyToClipboard": "复制",
+  "@copyToClipboard": {},
+  "aboutWhySupportTitle": "开源 & 免费使用",
+  "@aboutWhySupportTitle": {},
+  "aboutContributeTitle": "贡献",
+  "@aboutContributeTitle": {},
+  "aboutContributeText": "我们鼓励各种形式的贡献。无论您是开发者、翻译人员，还是单纯热爱健身的人士，每一份支持都值得我们由衷感谢！",
+  "@aboutContributeText": {},
+  "aboutBugsListTitle": "报告问题或提出功能建议",
+  "@aboutBugsListTitle": {},
+  "aboutTranslationListTitle": "翻译此软件",
+  "@aboutTranslationListTitle": {},
+  "aboutSourceListTitle": "查看源代码",
+  "@aboutSourceListTitle": {},
+  "aboutJoinCommunityTitle": "加入社区",
+  "@aboutJoinCommunityTitle": {},
+  "aboutDiscordTitle": "Discord",
+  "@aboutDiscordTitle": {},
+  "others": "其他",
+  "@others": {},
+  "fitInWeek": "一周健身计划",
+  "@fitInWeek": {},
+  "resistance_band": "弹力带",
+  "@resistance_band": {
+    "description": "Generated entry for translation for server strings"
+  },
+  "resultingRoutine": "最终生成的训练计划",
+  "@resultingRoutine": {}
 }
diff --git a/lib/l10n/app_zh_Hant.arb b/lib/l10n/app_zh_Hant.arb
index 95d18919..4f3c985b 100644
--- a/lib/l10n/app_zh_Hant.arb
+++ b/lib/l10n/app_zh_Hant.arb
@@ -15,10 +15,6 @@
   "@registerInstead": {},
   "loginInstead": "已經有帳號了嗎？立即登入",
   "@loginInstead": {},
-  "labelWorkoutPlans": "健身計劃",
-  "@labelWorkoutPlans": {
-    "description": "Title for screen workout plans"
-  },
   "userProfile": "你的檔案",
   "@userProfile": {},
   "register": "註冊",
@@ -41,7 +37,7 @@
   "@password": {},
   "confirmPassword": "確認密碼",
   "@confirmPassword": {},
-  "invalidEmail": "請輸入有效的電子郵件信箱",
+  "invalidEmail": "請輸入有效的電子郵件地址",
   "@invalidEmail": {
     "description": "Error message when the user enters an invalid email"
   },
@@ -77,13 +73,13 @@
   "@successfullySaved": {
     "description": "Message when an item was successfully saved"
   },
-  "exerciseList": "運動列表",
+  "exerciseList": "動作清單",
   "@exerciseList": {},
   "exercise": "動作",
   "@exercise": {
     "description": "An exercise for a workout"
   },
-  "exercises": "訓練",
+  "exercises": "動作",
   "@exercises": {
     "description": "Multiple exercises for a workout"
   },
@@ -103,11 +99,11 @@
   "@useDefaultServer": {
     "description": "Toggle button allowing users to switch between the default and a custom wger server"
   },
-  "usernameValidChars": "使用者名稱只能包含字母、數字，以及字元 (@, +, ., -, 和_)",
+  "usernameValidChars": "使用者名稱只能包含字母、數字，以及 @、+、.、-、_ 等符號",
   "@usernameValidChars": {
     "description": "Error message when the user tries to register a username with forbidden characters"
   },
-  "customServerHint": "輸入你自架伺服器的地址，否則將使用預設地址",
+  "customServerHint": "輸入您自架的伺服器位址，否則將使用預設伺服器",
   "@customServerHint": {
     "description": "Hint text for the form where the users can enter their own wger instance"
   },
@@ -123,11 +119,11 @@
   "@successfullyDeleted": {
     "description": "Message when an item was successfully deleted"
   },
-  "noMatchingExerciseFound": "沒有找到符合的運動項目",
+  "noMatchingExerciseFound": "沒有找到符合的動作項目",
   "@noMatchingExerciseFound": {
     "description": "Message returned if no exercises match the searched string"
   },
-  "muscles": "肌肉",
+  "muscles": "主要肌群",
   "@muscles": {
     "description": "(main) muscles trained by an exercise"
   },
@@ -135,13 +131,13 @@
   "@equipment": {
     "description": "Equipment needed to perform an exercise"
   },
-  "searchNamesInEnglish": "也用英文字詞搜尋",
+  "searchNamesInEnglish": "也搜尋英文名稱",
   "@searchNamesInEnglish": {},
-  "logged": "紀錄",
+  "logged": "實際",
   "@logged": {
     "description": "Header for the column of 'logged' nutritional values, i.e. what was eaten"
   },
-  "scanBarcode": "掃描條形碼",
+  "scanBarcode": "掃描條碼",
   "@scanBarcode": {
     "description": "Label for scan barcode button"
   },
@@ -157,33 +153,33 @@
   },
   "repetitionUnit": "重複次數單位",
   "@repetitionUnit": {},
-  "dayDescriptionHelp": "描述這一天做了什麼（例如:拉力日）或訓練了哪些身體部位（例如:胸部和肩膀）",
+  "dayDescriptionHelp": "描述這一天做了什麼（例如：拉力日）或訓練了哪些部位（例如：胸部和肩膀）",
   "@dayDescriptionHelp": {},
-  "comment": "註釋",
+  "comment": "註解",
   "@comment": {
     "description": "Comment, additional information"
   },
-  "impression": "感想",
+  "impression": "感受",
   "@impression": {
     "description": "General impression (e.g. for a workout session) such as good, bad, etc."
   },
-  "sameRepetitions": "如果您對所有組別進行相同的重複次數和重量，則只需填寫一行即可。例如，對於 4 組，只需輸入 10 次重複，這會自動變成「4 x 10」。",
+  "sameRepetitions": "如果您對所有組別進行相同的重複次數和重量，則只需填寫一行即可。例如，4 組每組 10 下，只要輸入 10 次重複，系統會自動變成「4 x 10」。",
   "@sameRepetitions": {},
   "plateCalculator": "槓片",
   "@plateCalculator": {
     "description": "Label used for the plate calculator in the gym mode"
   },
-  "gymMode": "健身模式",
+  "gymMode": "健身房模式",
   "@gymMode": {
     "description": "Label when starting the gym mode"
   },
-  "selectExercises": "如果你想做一個超級組，你可以搜尋幾個訓練，它們會組在一起",
+  "selectExercises": "如果您想進行超級組訓練，您可以搜尋多個動作項目，它們會被組合在一起",
   "@selectExercises": {},
-  "workoutSession": "訓練(節)",
+  "workoutSession": "健身（節）",
   "@workoutSession": {
     "description": "A (logged) workout session"
   },
-  "pause": "暫停",
+  "pause": "休息",
   "@pause": {
     "description": "Noun, not an imperative! Label used for the pause when using the gym mode"
   },
@@ -191,21 +187,21 @@
   "@jumpTo": {
     "description": "Imperative. Label used in popup allowing the user to jump to a specific exercise while in the gym mode"
   },
-  "todaysWorkout": "您今天的訓練",
+  "todaysWorkout": "今天的訓練",
   "@todaysWorkout": {},
-  "logHelpEntries": "如果一天內有多個相同重複次數但重量不同的條目，圖表只會顯示重量較高的條目。",
+  "logHelpEntries": "如果同一天有多筆相同重複次數但不同重量的紀錄，圖表只會顯示重量較重的那筆紀錄。",
   "@logHelpEntries": {},
   "description": "描述",
   "@description": {},
-  "addIngredient": "增加材料",
+  "addIngredient": "新增食材",
   "@addIngredient": {},
-  "verify": "確認",
+  "verify": "驗證",
   "@verify": {},
-  "logMeal": "紀錄這餐",
+  "logMeal": "紀錄餐點到營養日記",
   "@logMeal": {},
-  "logHelpEntriesUnits": "請注意，系統只會繪製帶重量單位（公斤或磅）和重複次數的紀錄，其他組合（例如時間或直到力竭）將被忽略。",
+  "logHelpEntriesUnits": "請注意，圖表只會顯示包含重量單位（公斤或磅）和重複次數的紀錄，其他組合（例如時間或直到力竭）不會被顯示。",
   "@logHelpEntriesUnits": {},
-  "name": "名",
+  "name": "名稱",
   "@name": {
     "description": "Name for a workout or nutritional plan"
   },
@@ -221,15 +217,15 @@
   "@time": {
     "description": "The time of a meal or workout"
   },
-  "searchIngredient": "搜尋材料",
+  "searchIngredient": "搜尋食材",
   "@searchIngredient": {
     "description": "Label on ingredient search form"
   },
-  "logIngredient": "儲存到營養日記",
+  "logIngredient": "紀錄食材到營養日記",
   "@logIngredient": {},
   "anErrorOccurred": "發生錯誤！",
   "@anErrorOccurred": {},
-  "noNutritionalPlans": "你沒有營養計劃",
+  "noNutritionalPlans": "您沒有營養計劃",
   "@noNutritionalPlans": {
     "description": "Message shown when the user has no nutritional plans"
   },
@@ -237,7 +233,7 @@
   "@timeStart": {
     "description": "The starting time of a workout"
   },
-  "timeEnd": "完結時間",
+  "timeEnd": "結束時間",
   "@timeEnd": {
     "description": "The end time of a workout"
   },
@@ -249,35 +245,27 @@
   "@fatShort": {
     "description": "The first letter or short name of the word 'Fat', used in overviews"
   },
-  "fibres": "纖維",
-  "@fibres": {},
   "sodium": "鈉",
   "@sodium": {},
   "edit": "編輯",
   "@edit": {},
-  "moreMeasurementEntries": "增加新的測量",
+  "moreMeasurementEntries": "新增測量紀錄",
   "@moreMeasurementEntries": {
     "description": "Message shown when the user wants to add new measurement"
   },
-  "confirmDelete": "您確定要刪除'{toDelete}'嗎？",
+  "confirmDelete": "您確定要刪除「{toDelete}」嗎？",
   "@confirmDelete": {
     "description": "Confirmation text before the user deletes an object",
     "type": "text",
     "placeholders": {
-      "toDelete": {}
+      "toDelete": {
+        "type": "String"
+      }
     }
   },
-  "aboutBugsTitle": "有問題或想法嗎？",
-  "@aboutBugsTitle": {
-    "description": "Title for bugs section in the about dialog"
-  },
   "newNutritionalPlan": "新的營養計劃",
   "@newNutritionalPlan": {},
-  "aboutSourceText": "在 Github 上取得這應用程式的原始程式碼及伺服器",
-  "@aboutSourceText": {
-    "description": "Text for source code section in the about dialog"
-  },
-  "aboutDescription": "感謝您使用wger！ wger 是一個協作開源項目，由來自世界各地的健身愛好者創建。",
+  "aboutDescription": "感謝您使用 wger！wger 是一個協作式開源專案，由來自世界各地的健身愛好者共同打造。",
   "@aboutDescription": {
     "description": "Text in the about dialog"
   },
@@ -285,21 +273,13 @@
   "@enterValue": {
     "description": "Error message when the user hasn't entered a value on a required field"
   },
-  "enterRepetitionsOrWeight": "請為至少一組輸入重複次數或重量",
-  "@enterRepetitionsOrWeight": {
-    "description": "Error message when the user hasn't filled in the forms for exercise sets"
-  },
-  "aboutBugsText": "如果某些情況未如預期運作或您認為缺少某個功能，請與我們聯絡。",
-  "@aboutBugsText": {
-    "description": "Text for bugs section in the about dialog"
-  },
-  "previous": "前一個",
+  "previous": "上一個",
   "@previous": {},
-  "add_exercise_image_license": "影像必須與 CC BY SA 授權相容。如有疑問，請僅上傳你自己拍攝的照片。",
+  "add_exercise_image_license": "影像必須與 CC BY SA 授權相容。如有疑慮，請僅上傳您自己拍攝的照片。",
   "@add_exercise_image_license": {},
-  "verifiedEmail": "已認證電郵",
+  "verifiedEmail": "已驗證的電子郵件",
   "@verifiedEmail": {},
-  "selectIngredient": "請選擇材料",
+  "selectIngredient": "請選擇一個食材",
   "@selectIngredient": {
     "description": "Error message when the user hasn't selected an ingredient from the autocompleter"
   },
@@ -311,7 +291,7 @@
   "@arms": {
     "description": "Generated entry for translation for server strings"
   },
-  "contributeExerciseWarning": "只有當您的帳戶已超過 {days} 天並且已驗證您的電子郵件時，您才可以貢獻訓練",
+  "contributeExerciseWarning": "只有當您的帳號已超過 {days} 天且已驗證您的電子郵件時，您才能貢獻動作項目",
   "@contributeExerciseWarning": {
     "description": "Number of days before which a person can add exercise",
     "placeholders": {
@@ -333,7 +313,7 @@
   "@calves": {
     "description": "Generated entry for translation for server strings"
   },
-  "bench": "平板凳",
+  "bench": "重訓椅",
   "@bench": {
     "description": "Generated entry for translation for server strings"
   },
@@ -345,7 +325,7 @@
   "@until_failure": {
     "description": "Generated entry for translation for server strings"
   },
-  "none__bodyweight_exercise_": "無（自重訓練）",
+  "none__bodyweight_exercise_": "無（徒手運動）",
   "@none__bodyweight_exercise_": {
     "description": "Generated entry for translation for server strings"
   },
@@ -355,9 +335,9 @@
   "@log": {
     "description": "Log a specific meal (imperative form)"
   },
-  "addMeal": "増加餐單",
+  "addMeal": "新增餐點",
   "@addMeal": {},
-  "sugars": "糖",
+  "sugars": "糖分",
   "@sugars": {},
   "fat": "脂肪",
   "@fat": {},
@@ -369,9 +349,9 @@
   },
   "weightUnit": "重量單位",
   "@weightUnit": {},
-  "newDay": "新一天",
+  "newDay": "新的一天",
   "@newDay": {},
-  "newSet": "新組",
+  "newSet": "新增一組",
   "@newSet": {
     "description": "Header when adding a new set to a workout day"
   },
@@ -379,11 +359,11 @@
   "@start": {
     "description": "Label on button to start the gym mode (i.e., an imperative)"
   },
-  "selectExercise": "請選擇一個訓練",
+  "selectExercise": "請選擇一個動作",
   "@selectExercise": {
     "description": "Error message when the user hasn't selected an exercise in the form"
   },
-  "whatVariationsExist": "此練習有哪些變體（如果有）？",
+  "whatVariationsExist": "這個動作有哪些變化（如果有的話）？",
   "@whatVariationsExist": {},
   "back": "背部",
   "@back": {
@@ -393,24 +373,22 @@
   "@category": {
     "description": "Category for an exercise, ingredient, etc."
   },
-  "newWorkout": "新健身計畫",
-  "@newWorkout": {
-    "description": "Header when adding a new workout"
-  },
-  "musclesSecondary": "輔助肌",
+  "musclesSecondary": "輔助肌群",
   "@musclesSecondary": {
     "description": "secondary muscles trained by an exercise"
   },
-  "rirNotUsed": "保留次數未儲存",
+  "rirNotUsed": "未使用保留次數",
   "@rirNotUsed": {
     "description": "Label used in RiR slider when the RiR value is not used/saved for the current setting or log"
   },
-  "setNr": "設 {nr}",
+  "setNr": "第 {nr} 組",
   "@setNr": {
     "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.",
     "type": "text",
     "placeholders": {
-      "nr": {}
+      "nr": {
+        "type": "String"
+      }
     }
   },
   "notes": "筆記",
@@ -423,11 +401,11 @@
   },
   "save": "儲存",
   "@save": {},
-  "addSet": "加組",
+  "addSet": "新增一組",
   "@addSet": {
     "description": "Label for the button that adds a set (to a workout day)"
   },
-  "mealLogged": "膳食已記錄到日記",
+  "mealLogged": "餐點已紀錄到日記",
   "@mealLogged": {},
   "measurement": "測量",
   "@measurement": {},
@@ -441,9 +419,9 @@
   "@value": {
     "description": "The value of a measurement entry"
   },
-  "measurementEntriesHelpText": "用於測量類別的單位，例如「cm」或「%」",
+  "measurementEntriesHelpText": "用於測量該類別的單位，例如「公分」或「%」",
   "@measurementEntriesHelpText": {},
-  "measurements": "測量",
+  "measurements": "測量項目",
   "@measurements": {
     "description": "Categories for the measurements such as biceps size, body fat, etc."
   },
@@ -459,7 +437,7 @@
   "@kJ": {
     "description": "Energy in a meal in kilo joules, kJ"
   },
-  "carbohydratesShort": "碳水化合物",
+  "carbohydratesShort": "碳水",
   "@carbohydratesShort": {
     "description": "The first letter or short name of the word 'Carbohydrates', used in overviews"
   },
@@ -467,11 +445,11 @@
   "@unit": {
     "description": "The unit used for a repetition (kg, time, etc.)"
   },
-  "newEntry": "新條目",
+  "newEntry": "新增紀錄",
   "@newEntry": {
     "description": "Title when adding a new entry such as a weight or log entry"
   },
-  "amount": "分量",
+  "amount": "份量",
   "@amount": {
     "description": "The amount (e.g. in grams) of an ingredient in a meal"
   },
@@ -481,27 +459,15 @@
   },
   "delete": "刪除",
   "@delete": {},
-  "aboutSourceTitle": "原始碼",
-  "@aboutSourceTitle": {
-    "description": "Title for source code section in the about dialog"
-  },
-  "goToDetailPage": "進入詳情頁面",
+  "goToDetailPage": "前往詳細資訊頁面",
   "@goToDetailPage": {},
-  "aboutContactUsText": "如果您想與我們聊天，請到 Discord 伺服器並取得聯繫",
-  "@aboutContactUsText": {
-    "description": "Text for contact us section in the about dialog"
-  },
-  "aboutMastodonText": "在 Mastodon 上關注我們，以了解有關這項目的更新和新聞",
-  "@aboutMastodonText": {
-    "description": "Text for the mastodon section in the about dialog"
-  },
   "appUpdateTitle": "需要更新",
   "@appUpdateTitle": {},
-  "variations": "變體",
+  "variations": "變化",
   "@variations": {
     "description": "Variations of one exercise (e.g. benchpress and benchpress narrow)"
   },
-  "legs": "腿",
+  "legs": "腿部",
   "@legs": {
     "description": "Generated entry for translation for server strings"
   },
@@ -517,75 +483,73 @@
   "@quads": {
     "description": "Generated entry for translation for server strings"
   },
-  "textPromptTitle": "準備開始？",
+  "textPromptTitle": "準備開始了嗎？",
   "@textPromptTitle": {},
   "body_weight": "體重",
   "@body_weight": {
     "description": "Generated entry for translation for server strings"
   },
-  "textPromptSubheading": "按操作按鈕開始",
+  "textPromptSubheading": "按下動作按鈕開始",
   "@textPromptSubheading": {},
-  "ingredient": "材料",
+  "ingredient": "食材",
   "@ingredient": {},
-  "energy": "能量",
+  "energy": "熱量",
   "@energy": {
     "description": "Energy in a meal, ingredient etc. e.g. in kJ"
   },
-  "goalEnergy": "能量目標",
+  "goalEnergy": "熱量目標",
   "@goalEnergy": {},
   "goalProtein": "蛋白質目標",
   "@goalProtein": {},
   "goalFat": "脂肪目標",
   "@goalFat": {},
-  "onlyLogging": "只追蹤卡路里",
+  "onlyLogging": "僅追蹤卡路里",
   "@onlyLogging": {},
-  "addGoalsToPlan": "新增目標至此計劃",
-  "@addGoalsToPlan": {},
-  "measurementCategoriesHelpText": "測量類別，例如“二頭肌”或“體脂”",
+  "measurementCategoriesHelpText": "測量類別，例如「二頭肌」或「體脂率」",
   "@measurementCategoriesHelpText": {},
   "today": "今天",
   "@today": {},
-  "percentEnergy": "能量百分比",
+  "percentEnergy": "熱量百分比",
   "@percentEnergy": {},
-  "onlyLoggingHelpText": "如果你只想記錄卡路里但不想設計有特定膳食的詳細營養計劃，請選中此框",
+  "onlyLoggingHelpText": "如果您只想紀錄卡路里但不想設定詳細的營養計劃和特定餐點，請勾選此項",
   "@onlyLoggingHelpText": {},
-  "addGoalsToPlanHelpText": "這使你可以為計劃設定能量、蛋白質、碳水化合物或脂肪的總體目標。請注意，如果你設定了詳細的膳食計劃，這些數值將取得優先權。",
-  "@addGoalsToPlanHelpText": {},
   "goalCarbohydrates": "碳水化合物目標",
   "@goalCarbohydrates": {},
-  "loggedToday": "在今天紀錄",
+  "loggedToday": "今天的紀錄",
   "@loggedToday": {},
-  "verifiedEmailReason": "您需要驗證您的電子郵件才能貢獻訓練項目",
+  "verifiedEmailReason": "您需要驗證您的電子郵件才能貢獻動作項目",
   "@verifiedEmailReason": {},
-  "alternativeNames": "別稱",
+  "alternativeNames": "替代名稱",
   "@alternativeNames": {},
   "productNotFound": "找不到產品",
   "@productNotFound": {
     "description": "Header label for dialog when product is not found with barcode"
   },
-  "productNotFoundDescription": "在 wger 資料庫中找不到帶有掃描條碼 {barcode} 的產品",
+  "productNotFoundDescription": "在 wger 資料庫中找不到條碼為 {barcode} 的產品",
   "@productNotFoundDescription": {
     "description": "Dialog info when product is not found with barcode",
     "type": "text",
     "placeholders": {
-      "barcode": {}
+      "barcode": {
+        "type": "String"
+      }
     }
   },
   "images": "圖片",
   "@images": {},
   "language": "語言",
   "@language": {},
-  "translateExercise": "立即翻譯此訓練",
+  "translateExercise": "立即翻譯此動作",
   "@translateExercise": {},
   "translation": "翻譯",
   "@translation": {},
-  "contributeExercise": "貢獻一個訓練",
+  "contributeExercise": "貢獻一個動作",
   "@contributeExercise": {},
-  "baseData": "基礎數據（英文）",
+  "baseData": "英文基本資料",
   "@baseData": {
     "description": "The base data for an exercise such as category, trained muscles, etc."
   },
-  "cacheWarning": "由於緩存中，改變可能需要一些時間才能在應用程式顯示。",
+  "cacheWarning": "由於快取機制，變更可能需要一些時間才會在整個應用程式中顯示。",
   "@cacheWarning": {},
   "miles": "英里",
   "@miles": {
@@ -619,13 +583,13 @@
   "@shoulders": {
     "description": "Generated entry for translation for server strings"
   },
-  "unVerifiedEmail": "未認證電郵",
+  "unVerifiedEmail": "未驗證的電子郵件",
   "@unVerifiedEmail": {},
-  "glutes": "臀大肌",
+  "glutes": "臀大肌群",
   "@glutes": {
     "description": "Generated entry for translation for server strings"
   },
-  "cardio": "帶氧運動",
+  "cardio": "有氧運動",
   "@cardio": {
     "description": "Generated entry for translation for server strings"
   },
@@ -633,10 +597,6 @@
   "@miles_per_hour": {
     "description": "Generated entry for translation for server strings"
   },
-  "supersetWith": "超級組",
-  "@supersetWith": {
-    "description": "Text used between exercise cards when adding a new set. Translate as something like 'in a superset with'"
-  },
   "weekAverage": "七天平均值",
   "@weekAverage": {
     "description": "Header for the column of '7 day average' nutritional values, i.e. what was logged last week"
@@ -657,12 +617,14 @@
   },
   "oneNamePerLine": "每行一個名稱",
   "@oneNamePerLine": {},
-  "aboutPageTitle": "關於Wger",
+  "aboutPageTitle": "關於 Wger",
   "@aboutPageTitle": {},
-  "verifiedEmailInfo": "驗證電郵已發送至 {email}",
+  "verifiedEmailInfo": "驗證郵件已寄送至 {email}",
   "@verifiedEmailInfo": {
     "placeholders": {
-      "email": {}
+      "email": {
+        "type": "String"
+      }
     }
   },
   "gym_mat": "健身墊",
@@ -673,16 +635,18 @@
   "@settingsCacheDeletedSnackbar": {},
   "settingsTitle": "設定",
   "@settingsTitle": {},
-  "settingsCacheTitle": "緩存",
+  "settingsCacheTitle": "快取",
   "@settingsCacheTitle": {},
-  "settingsExerciseCacheDescription": "訓練緩存",
+  "settingsExerciseCacheDescription": "動作快取",
   "@settingsExerciseCacheDescription": {},
   "gValue": "{value} 克",
   "@gValue": {
     "description": "A value in grams, e.g. 5 g",
     "type": "text",
     "placeholders": {
-      "value": {}
+      "value": {
+        "type": "String"
+      }
     }
   },
   "percentValue": "{value} %",
@@ -690,13 +654,11 @@
     "description": "A value in percent, e.g. 10 %",
     "type": "text",
     "placeholders": {
-      "value": {}
+      "value": {
+        "type": "String"
+      }
     }
   },
-  "noWorkoutPlans": "你沒有健身計畫",
-  "@noWorkoutPlans": {
-    "description": "Message shown when the user has no workout plans"
-  },
   "reps": "次",
   "@reps": {
     "description": "Shorthand for repetitions, used when space constraints are tighter"
@@ -705,20 +667,24 @@
   "@rir": {
     "description": "Shorthand for Repetitions In Reserve"
   },
-  "selectEntry": "請選擇一個條目",
+  "selectEntry": "請選擇一個項目",
   "@selectEntry": {},
-  "nrOfSets": "組 / 訓練: {nrOfSets}",
+  "nrOfSets": "每個動作的組數：{nrOfSets}",
   "@nrOfSets": {
     "description": "Label shown on the slider where the user selects the nr of sets",
     "type": "text",
     "placeholders": {
-      "nrOfSets": {}
+      "nrOfSets": {
+        "type": "String"
+      }
     }
   },
-  "alsoKnownAs": "又稱： {aliases}",
+  "alsoKnownAs": "也稱為：{aliases}",
   "@alsoKnownAs": {
     "placeholders": {
-      "aliases": {}
+      "aliases": {
+        "type": "String"
+      }
     },
     "description": "List of alternative names for an exercise"
   },
@@ -726,53 +692,51 @@
   "@abs": {
     "description": "Generated entry for translation for server strings"
   },
-  "energyShort": "能量",
+  "energyShort": "熱量",
   "@energyShort": {
     "description": "The first letter or short name of the word 'Energy', used in overviews"
   },
-  "kcal": "千卡",
+  "kcal": "大卡",
   "@kcal": {
     "description": "Energy in a meal in kilocalories, kcal"
   },
-  "macronutrients": "宏量營養素",
+  "macronutrients": "巨量營養素",
   "@macronutrients": {},
   "proteinShort": "蛋白質",
   "@proteinShort": {
     "description": "The first letter or short name of the word 'Protein', used in overviews"
   },
-  "toggleDetails": "切換詳情",
+  "toggleDetails": "切換詳細資訊",
   "@toggleDetails": {
     "description": "Switch to toggle detail / overview"
   },
-  "aboutContactUsTitle": "您好!",
-  "@aboutContactUsTitle": {
-    "description": "Title for contact us section in the about dialog"
-  },
-  "addImage": "增加圖片",
+  "addImage": "新增圖片",
   "@addImage": {},
-  "addExercise": "增加鍛鍊項目",
+  "addExercise": "新增動作",
   "@addExercise": {},
-  "productFoundDescription": "此條碼對應這產品：{productName}。您想繼續嗎？",
+  "productFoundDescription": "此條碼對應到這個產品：{productName}。您要繼續嗎？",
   "@productFoundDescription": {
     "description": "Dialog info when product is found with barcode",
     "type": "text",
     "placeholders": {
-      "productName": {}
+      "productName": {
+        "type": "String"
+      }
     }
   },
   "appUpdateContent": "此版本的應用程式與伺服器不相容，請更新您的應用程式。",
   "@appUpdateContent": {},
-  "aboutTranslationText": "這應用程式是在 weblate 上翻譯的。如果您也想提供協助，請點擊連結並開始翻譯",
-  "@aboutTranslationText": {
-    "description": "Text for translation section in the about dialog"
-  },
-  "enterCharacters": "請輸入 {min} 到 {max} 個字符",
+  "enterCharacters": "請輸入 {min} 到 {max} 個字元",
   "@enterCharacters": {
     "description": "Error message when the user hasn't entered the correct number of characters in a form",
     "type": "text",
     "placeholders": {
-      "min": {},
-      "max": {}
+      "min": {
+        "type": "String"
+      },
+      "max": {
+        "type": "String"
+      }
     }
   },
   "g": "克",
@@ -787,55 +751,53 @@
   "@surplus": {
     "description": "Caloric surplus (either planned or unplanned)"
   },
-  "deficit": "赤字",
+  "deficit": "不足",
   "@deficit": {
     "description": "Caloric deficit (either planned or unplanned)"
   },
-  "kcalValue": "{value} 千卡",
+  "kcalValue": "{value} 大卡",
   "@kcalValue": {
     "description": "A value in kcal, e.g. 500 kcal",
     "type": "text",
     "placeholders": {
-      "value": {}
+      "value": {
+        "type": "String"
+      }
     }
   },
-  "noWeightEntries": "您沒有體重條目",
+  "noWeightEntries": "您沒有體重紀錄",
   "@noWeightEntries": {
     "description": "Message shown when the user has no logged weight entries"
   },
-  "noMeasurementEntries": "您沒有測量條目",
+  "noMeasurementEntries": "您沒有測量紀錄",
   "@noMeasurementEntries": {},
-  "enterMinCharacters": "請輸入至少 {min} 個字符",
+  "enterMinCharacters": "請輸入至少 {min} 個字元",
   "@enterMinCharacters": {
     "description": "Error message when the user hasn't entered the minimum amount characters in a form",
     "type": "text",
     "placeholders": {
-      "min": {}
+      "min": {
+        "type": "String"
+      }
     }
   },
-  "baseNameEnglish": "所有訓練都需要一個英文基本名稱",
+  "baseNameEnglish": "所有動作都需要一個英文基本名稱",
   "@baseNameEnglish": {},
-  "aboutDonateText": "請我們喝杯咖啡來幫助項目，支付服務器費用，並讓我們保持經費",
+  "aboutDonateText": "請我們喝杯咖啡來支持專案、支付伺服器費用，讓我們持續前進",
   "@aboutDonateText": {},
   "aboutMastodonTitle": "Mastodon",
-  "@aboutMastodonTitle": {
-    "description": "Title for mastodon section in the about dialog"
-  },
-  "aboutTranslationTitle": "翻譯",
-  "@aboutTranslationTitle": {
-    "description": "Title for translation section in the about dialog"
-  },
-  "aboutDonateTitle": "捐贈",
+  "@aboutMastodonTitle": {},
+  "aboutDonateTitle": "贊助",
   "@aboutDonateTitle": {},
-  "goToToday": "轉到今天",
+  "goToToday": "回到今天",
   "@goToToday": {
     "description": "Label on button to jump back to 'today' in the calendar widget"
   },
-  "total": "總共",
+  "total": "總計",
   "@total": {
     "description": "Label used for total sums of e.g. calories or similar"
   },
-  "swiss_ball": "抗力球",
+  "swiss_ball": "瑜伽球",
   "@swiss_ball": {
     "description": "Generated entry for translation for server strings"
   },
@@ -843,7 +805,7 @@
   "@sz_bar": {
     "description": "Generated entry for translation for server strings"
   },
-  "pull_up_bar": "引體上升桿",
+  "pull_up_bar": "引體向上桿",
   "@pull_up_bar": {
     "description": "Generated entry for translation for server strings"
   },
@@ -855,11 +817,11 @@
   "@minutes": {
     "description": "Generated entry for translation for server strings"
   },
-  "incline_bench": "上斜凳",
+  "incline_bench": "上斜椅",
   "@incline_bench": {
     "description": "Generated entry for translation for server strings"
   },
-  "hamstrings": "大腿後肌",
+  "hamstrings": "腿後肌群",
   "@hamstrings": {
     "description": "Generated entry for translation for server strings"
   },
@@ -867,28 +829,28 @@
   "@selectImage": {
     "description": "Label and error message when the user hasn't selected an image to save"
   },
-  "chooseFromLibrary": "從照片庫中選擇",
+  "chooseFromLibrary": "從相簿中選擇",
   "@chooseFromLibrary": {},
-  "enterValidNumber": "請輸入有效數目",
+  "enterValidNumber": "請輸入有效數字",
   "@enterValidNumber": {
     "description": "Error message when the user has submitted an invalid number (e.g. '3,.,.,.')"
   },
-  "dataCopied": "資料已複製到新條目",
+  "dataCopied": "資料已複製到新紀錄",
   "@dataCopied": {
     "description": "Snackbar message to show on copying data to a new log entry"
   },
-  "setUnitsAndRir": "設定單位和次數",
+  "setUnitsAndRir": "設定單位和保留次數",
   "@setUnitsAndRir": {
     "description": "Label shown on the slider where the user can toggle showing units and RiR",
     "type": "text"
   },
-  "recentlyUsedIngredients": "最近加入的材料",
+  "recentlyUsedIngredients": "最近新增的食材",
   "@recentlyUsedIngredients": {
     "description": "A message when a user adds a new ingredient to a meal."
   },
-  "takePicture": "拍張照片",
+  "takePicture": "拍照",
   "@takePicture": {},
-  "gallery": "照片庫",
+  "gallery": "相簿",
   "@gallery": {},
   "next": "下一個",
   "@next": {},
@@ -896,12 +858,91 @@
   "@repetitions": {
     "description": "Generated entry for translation for server strings"
   },
-  "goalMacro": "宏量營養素目標",
+  "goalMacro": "巨量營養素目標",
   "@goalMacro": {
     "description": "The goal for macronutrients"
   },
   "fiber": "纖維",
   "@fiber": {},
   "goalFiber": "纖維目標",
-  "@goalFiber": {}
+  "@goalFiber": {},
+  "settingsIngredientCacheDescription": "食材快取",
+  "@settingsIngredientCacheDescription": {},
+  "overallChangeWeight": "整體變化",
+  "@overallChangeWeight": {
+    "description": "Overall change in weight, added for localization"
+  },
+  "goalTypeMeals": "來自餐點",
+  "@goalTypeMeals": {
+    "description": "added for localization of Class GoalType's filed meals"
+  },
+  "goalTypeBasic": "基本",
+  "@goalTypeBasic": {
+    "description": "added for localization of Class GoalType's filed basic"
+  },
+  "goalTypeAdvanced": "進階",
+  "@goalTypeAdvanced": {
+    "description": "added for localization of Class GoalType's filed advanced"
+  },
+  "indicatorRaw": "原始",
+  "@indicatorRaw": {
+    "description": "added for localization of Class Indicator's field text"
+  },
+  "indicatorAvg": "平均",
+  "@indicatorAvg": {
+    "description": "added for localization of Class Indicator's field text"
+  },
+  "themeMode": "主題模式",
+  "@themeMode": {},
+  "darkMode": "保持深色模式",
+  "@darkMode": {},
+  "lightMode": "保持淺色模式",
+  "@lightMode": {},
+  "systemMode": "系統設定",
+  "@systemMode": {},
+  "chartAllTimeTitle": "{name} 歷史紀錄",
+  "@chartAllTimeTitle": {
+    "description": "All-time chart of 'name' (e.g. 'weight', 'body fat' etc.)",
+    "type": "text",
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "chart30DaysTitle": "{name} 最近 30 天",
+  "@chart30DaysTitle": {
+    "description": "last 30 days chart of 'name' (e.g. 'weight', 'body fat' etc.)",
+    "type": "text",
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "chartDuringPlanTitle": "營養計劃 {planName} 期間的 {chartName}",
+  "@chartDuringPlanTitle": {
+    "description": "chart of 'chartName' (e.g. 'weight', 'body fat' etc.) logged during plan",
+    "type": "text",
+    "placeholders": {
+      "chartName": {
+        "type": "String"
+      },
+      "planName": {
+        "type": "String"
+      }
+    }
+  },
+  "noIngredientsDefined": "尚未定義食材",
+  "@noIngredientsDefined": {},
+  "ingredientLogged": "食材已紀錄到日記",
+  "@ingredientLogged": {},
+  "selectMealToLog": "選擇要紀錄到日記的餐點",
+  "@selectMealToLog": {},
+  "errorCouldNotConnectToServerDetails": "無法連接到伺服器",
+  "@errorCouldNotConnectToServerDetails": {},
+  "copyToClipboard": "複製到剪貼簿",
+  "@copyToClipboard": {},
+  "aboutWhySupportTitle": "開源且免費使用❤️",
+  "@aboutWhySupportTitle": {}
 }
diff --git a/lib/l10n/remove_keys.dart b/lib/l10n/remove_keys.dart
new file mode 100644
index 00000000..23f4d1a2
--- /dev/null
+++ b/lib/l10n/remove_keys.dart
@@ -0,0 +1,39 @@
+import 'dart:convert';
+import 'dart:io';
+
+/// Remove unused keys from .arb files
+///
+/// Usage: dart remove_keys.dart aboutBugsTitle aboutBugsText
+void main(List<String> arguments) {
+  if (arguments.isEmpty) {
+    print('Please provide at least one key as a parameter.');
+    return;
+  }
+
+  final directory = Directory('.');
+  final keysToRemove = arguments;
+
+  // Iterate through all files in the directory that end with .arb
+  for (final file in directory.listSync().where((f) => f.path.endsWith('.arb'))) {
+    final content = File(file.path).readAsStringSync();
+    final Map<String, dynamic> jsonContent = json.decode(content);
+
+    var modified = false;
+    for (final key in keysToRemove) {
+      if (jsonContent.containsKey(key)) {
+        // Remove the key
+        jsonContent.remove(key);
+
+        // Remove the metadata key (e.g., '@$key')
+        jsonContent.remove('@$key');
+
+        modified = true;
+        print('Key "$key" removed from ${file.path}.');
+      }
+    }
+
+    if (modified) {
+      File(file.path).writeAsStringSync(const JsonEncoder.withIndent('  ').convert(jsonContent));
+    }
+  }
+}
diff --git a/lib/main.dart b/lib/main.dart
index 1a3a9bc1..a6b385af 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -18,11 +18,15 @@
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart' as riverpod;
 import 'package:logging/logging.dart';
 import 'package:provider/provider.dart';
 import 'package:wger/core/locator.dart';
 import 'package:wger/powersync.dart';
+import 'package:wger/exceptions/http_exception.dart';
+import 'package:wger/helpers/errors.dart';
+import 'package:wger/helpers/shared_preferences.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/providers/add_exercise.dart';
 import 'package:wger/providers/base_provider.dart';
 import 'package:wger/providers/body_weight.dart';
@@ -30,10 +34,11 @@ import 'package:wger/providers/exercises.dart';
 import 'package:wger/providers/gallery.dart';
 import 'package:wger/providers/measurement.dart';
 import 'package:wger/providers/nutrition.dart';
+import 'package:wger/providers/routines.dart';
 import 'package:wger/providers/user.dart';
-import 'package:wger/providers/workout_plans.dart';
 import 'package:wger/screens/add_exercise_screen.dart';
 import 'package:wger/screens/auth_screen.dart';
+import 'package:wger/screens/configure_plates_screen.dart';
 import 'package:wger/screens/dashboard.dart';
 import 'package:wger/screens/exercise_screen.dart';
 import 'package:wger/screens/exercises_screen.dart';
@@ -48,44 +53,106 @@ import 'package:wger/screens/measurement_entries_screen.dart';
 import 'package:wger/screens/nutritional_diary_screen.dart';
 import 'package:wger/screens/nutritional_plan_screen.dart';
 import 'package:wger/screens/nutritional_plans_screen.dart';
+import 'package:wger/screens/routine_edit_screen.dart';
+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/screens/workout_plan_screen.dart';
-import 'package:wger/screens/workout_plans_screen.dart';
 import 'package:wger/theme/theme.dart';
 import 'package:wger/widgets/core/about.dart';
-import 'package:wger/widgets/core/settingsdart';
+import 'package:wger/widgets/core/log_overview.dart';
+import 'package:wger/widgets/core/settings.dart';
 
+import 'helpers/logs.dart';
 import 'providers/auth.dart';
 
-void main() async {
-  //zx.setLogEnabled(kDebugMode);
-  Logger.root.level = Level.INFO;
+void _setupLogging() {
+  Logger.root.level = kDebugMode ? Level.ALL : Level.INFO;
   Logger.root.onRecord.listen((record) {
-    if (kDebugMode) {
-      print('[${record.loggerName}] ${record.level.name}: ${record.time}: ${record.message}');
-
-      if (record.error != null) {
-        print(record.error);
-      }
-      if (record.stackTrace != null) {
-        print(record.stackTrace);
-      }
-    }
+    print('${record.level.name}: ${record.time} [${record.loggerName}] ${record.message}');
+    InMemoryLogStore().add(record);
   });
+}
 
+final GlobalKey<NavigatorState> navigatorKey = GlobalKey<NavigatorState>();
+
+void main() async {
   // Needs to be called before runApp
   WidgetsFlutterBinding.ensureInitialized();
 
+  // Logger
+  _setupLogging();
+
+  final logger = Logger('main');
+
   // Locator to initialize exerciseDB
   await ServiceLocator().configure();
-  print('running myapp');
+
+  // SharedPreferences to SharedPreferencesAsync migration function
+  await PreferenceHelper.instance.migrationSupportFunctionForSharedPreferences();
+
+  // Catch errors from Flutter itself (widget build, layout, paint, etc.)
+  //
+  // NOTE: it seems this sometimes makes problems and even freezes the flutter
+  //       process when widgets overflow, so it is disabled in dev mode.
+  if (!kDebugMode) {
+    FlutterError.onError = (FlutterErrorDetails details) {
+      final stack = details.stack ?? StackTrace.empty;
+      logger.severe('Error caught by FlutterError.onError: ${details.exception}');
+
+      FlutterError.dumpErrorToConsole(details);
+
+      // Don't show the full error dialog for network image loading errors.
+      if (details.exception is NetworkImageLoadException) {
+        return;
+      }
+
+      showGeneralErrorDialog(details.exception, stack);
+      // throw details.exception;
+    };
+  }
+
+  // Catch errors that happen outside of the Flutter framework (e.g., in async operations)
+  PlatformDispatcher.instance.onError = (error, stack) {
+    logger.severe('Error caught by PlatformDispatcher.instance.onError: $error');
+    logger.severe('Stack trace: $stack');
+
+    if (error is WgerHttpException) {
+      showHttpExceptionErrorDialog(error);
+    } else {
+      showGeneralErrorDialog(error, stack);
+    }
+
+    // Return true to indicate that the error has been handled.
+    return true;
+  };
+
   // Application
-  runApp(const MyApp());
+  runApp(const riverpod.ProviderScope(child: MainApp()));
 }
 
-class MyApp extends StatelessWidget {
-  const MyApp(); // This widget is the root of your application.
+class MainApp extends StatelessWidget {
+  const MainApp();
+
+  Widget _getHomeScreen(AuthProvider auth) {
+    switch (auth.state) {
+      case AuthState.loggedIn:
+        return HomeTabsScreen();
+      case AuthState.updateRequired:
+        return const UpdateAppScreen();
+      default:
+        return FutureBuilder(
+          future: auth.tryAutoLogin(),
+          builder: (ctx, authResultSnapshot) =>
+              authResultSnapshot.connectionState == ConnectionState.waiting
+              ? const SplashScreen()
+              : const AuthScreen(),
+        );
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     return MultiProvider(
@@ -97,14 +164,14 @@ class MyApp extends StatelessWidget {
           update: (context, base, previous) =>
               previous ?? ExercisesProvider(WgerBaseProvider(base)),
         ),
-        ChangeNotifierProxyProvider2<AuthProvider, ExercisesProvider, WorkoutPlansProvider>(
-          create: (context) => WorkoutPlansProvider(
+        ChangeNotifierProxyProvider2<AuthProvider, ExercisesProvider, RoutinesProvider>(
+          create: (context) => RoutinesProvider(
             WgerBaseProvider(Provider.of(context, listen: false)),
             Provider.of(context, listen: false),
             [],
           ),
           update: (context, auth, exercises, previous) =>
-              previous ?? WorkoutPlansProvider(WgerBaseProvider(auth), exercises, []),
+              previous ?? RoutinesProvider(WgerBaseProvider(auth), exercises, []),
         ),
         ChangeNotifierProxyProvider<AuthProvider, NutritionPlansProvider>(
           create: (context) =>
@@ -140,46 +207,45 @@ class MyApp extends StatelessWidget {
         ),
       ],
       child: Consumer<AuthProvider>(
-        builder: (ctx, auth, _) => MaterialApp(
-          title: 'wger',
-          theme: wgerLightTheme,
-          darkTheme: wgerDarkTheme,
-          highContrastTheme: wgerLightThemeHc,
-          highContrastDarkTheme: wgerDarkThemeHc,
-          themeMode: ThemeMode.system,
-          home: auth.isAuth
-              ? const HomeTabsScreen()
-              : FutureBuilder(
-                  future: auth.tryAutoLogin(),
-                  builder: (ctx, authResultSnapshot) =>
-                      authResultSnapshot.connectionState == ConnectionState.waiting
-                      ? const SplashScreen()
-                      : const AuthScreen(),
-                ),
-          routes: {
-            DashboardScreen.routeName: (ctx) => const DashboardScreen(),
-            FormScreen.routeName: (ctx) => const FormScreen(),
-            GalleryScreen.routeName: (ctx) => const GalleryScreen(),
-            GymModeScreen.routeName: (ctx) => const GymModeScreen(),
-            HomeTabsScreen.routeName: (ctx) => const HomeTabsScreen(),
-            MeasurementCategoriesScreen.routeName: (ctx) => const MeasurementCategoriesScreen(),
-            MeasurementEntriesScreen.routeName: (ctx) => const MeasurementEntriesScreen(),
-            NutritionalPlansScreen.routeName: (ctx) => const NutritionalPlansScreen(),
-            NutritionalDiaryScreen.routeName: (ctx) => const NutritionalDiaryScreen(),
-            NutritionalPlanScreen.routeName: (ctx) => const NutritionalPlanScreen(),
-            LogMealsScreen.routeName: (ctx) => const LogMealsScreen(),
-            LogMealScreen.routeName: (ctx) => const LogMealScreen(),
-            WeightScreen.routeName: (ctx) => const WeightScreen(),
-            WorkoutPlanScreen.routeName: (ctx) => const WorkoutPlanScreen(),
-            WorkoutPlansScreen.routeName: (ctx) => const WorkoutPlansScreen(),
-            ExercisesScreen.routeName: (ctx) => const ExercisesScreen(),
-            ExerciseDetailScreen.routeName: (ctx) => const ExerciseDetailScreen(),
-            AddExerciseScreen.routeName: (ctx) => const AddExerciseScreen(),
-            AboutPage.routeName: (ctx) => const AboutPage(),
-            SettingsPage.routeName: (ctx) => const SettingsPage(),
-          },
-          localizationsDelegates: AppLocalizations.localizationsDelegates,
-          supportedLocales: AppLocalizations.supportedLocales,
+        builder: (ctx, auth, _) => Consumer<UserProvider>(
+          builder: (ctx, user, _) => MaterialApp(
+            title: 'wger',
+            navigatorKey: navigatorKey,
+            theme: wgerLightTheme,
+            darkTheme: wgerDarkTheme,
+            highContrastTheme: wgerLightThemeHc,
+            highContrastDarkTheme: wgerDarkThemeHc,
+            themeMode: user.themeMode,
+            home: _getHomeScreen(auth),
+            routes: {
+              DashboardScreen.routeName: (ctx) => const DashboardScreen(),
+              FormScreen.routeName: (ctx) => const FormScreen(),
+              GalleryScreen.routeName: (ctx) => const GalleryScreen(),
+              GymModeScreen.routeName: (ctx) => const GymModeScreen(),
+              HomeTabsScreen.routeName: (ctx) => HomeTabsScreen(),
+              MeasurementCategoriesScreen.routeName: (ctx) => const MeasurementCategoriesScreen(),
+              MeasurementEntriesScreen.routeName: (ctx) => const MeasurementEntriesScreen(),
+              NutritionalPlansScreen.routeName: (ctx) => const NutritionalPlansScreen(),
+              NutritionalDiaryScreen.routeName: (ctx) => const NutritionalDiaryScreen(),
+              NutritionalPlanScreen.routeName: (ctx) => const NutritionalPlanScreen(),
+              LogMealsScreen.routeName: (ctx) => const LogMealsScreen(),
+              LogMealScreen.routeName: (ctx) => const LogMealScreen(),
+              WeightScreen.routeName: (ctx) => const WeightScreen(),
+              RoutineScreen.routeName: (ctx) => const RoutineScreen(),
+              RoutineEditScreen.routeName: (ctx) => const RoutineEditScreen(),
+              WorkoutLogsScreen.routeName: (ctx) => const WorkoutLogsScreen(),
+              RoutineListScreen.routeName: (ctx) => const RoutineListScreen(),
+              ExercisesScreen.routeName: (ctx) => const ExercisesScreen(),
+              ExerciseDetailScreen.routeName: (ctx) => const ExerciseDetailScreen(),
+              AddExerciseScreen.routeName: (ctx) => const AddExerciseScreen(),
+              AboutPage.routeName: (ctx) => const AboutPage(),
+              SettingsPage.routeName: (ctx) => const SettingsPage(),
+              LogOverviewPage.routeName: (ctx) => const LogOverviewPage(),
+              ConfigurePlatesScreen.routeName: (ctx) => const ConfigurePlatesScreen(),
+            },
+            localizationsDelegates: AppLocalizations.localizationsDelegates,
+            supportedLocales: AppLocalizations.supportedLocales,
+          ),
         ),
       ),
     );
diff --git a/lib/models/body_weight/weight_entry.dart b/lib/models/body_weight/weight_entry.dart
index 47c8be9f..d5343cd6 100644
--- a/lib/models/body_weight/weight_entry.dart
+++ b/lib/models/body_weight/weight_entry.dart
@@ -29,7 +29,7 @@ class WeightEntry {
   @JsonKey(required: true, fromJson: stringToNum, toJson: numToString)
   late num weight = 0;
 
-  @JsonKey(required: true, toJson: toDate)
+  @JsonKey(required: true)
   late DateTime date;
 
   WeightEntry({this.id, weight, DateTime? date}) {
@@ -41,10 +41,10 @@ class WeightEntry {
   }
 
   WeightEntry copyWith({int? id, int? weight, DateTime? date}) => WeightEntry(
-        id: id,
-        weight: weight ?? this.weight,
-        date: date ?? this.date,
-      );
+    id: id,
+    weight: weight ?? this.weight,
+    date: date ?? this.date,
+  );
 
   // Boilerplate
   factory WeightEntry.fromJson(Map<String, dynamic> json) => _$WeightEntryFromJson(json);
diff --git a/lib/models/body_weight/weight_entry.g.dart b/lib/models/body_weight/weight_entry.g.dart
index e4ebbbdc..42281afa 100644
--- a/lib/models/body_weight/weight_entry.g.dart
+++ b/lib/models/body_weight/weight_entry.g.dart
@@ -7,10 +7,7 @@ part of 'weight_entry.dart';
 // **************************************************************************
 
 WeightEntry _$WeightEntryFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const ['id', 'weight', 'date'],
-  );
+  $checkKeys(json, requiredKeys: const ['id', 'weight', 'date']);
   return WeightEntry(
     id: (json['id'] as num?)?.toInt(),
     weight: stringToNum(json['weight'] as String?),
@@ -18,9 +15,8 @@ WeightEntry _$WeightEntryFromJson(Map<String, dynamic> json) {
   );
 }
 
-Map<String, dynamic> _$WeightEntryToJson(WeightEntry instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'weight': numToString(instance.weight),
-      'date': toDate(instance.date),
-    };
+Map<String, dynamic> _$WeightEntryToJson(WeightEntry instance) => <String, dynamic>{
+  'id': instance.id,
+  'weight': numToString(instance.weight),
+  'date': instance.date.toIso8601String(),
+};
diff --git a/lib/models/exercises/alias.dart b/lib/models/exercises/alias.dart
index 33715e64..a5ca1fc4 100644
--- a/lib/models/exercises/alias.dart
+++ b/lib/models/exercises/alias.dart
@@ -25,15 +25,16 @@ class Alias {
   @JsonKey(required: true)
   final int? id;
 
-  @JsonKey(name: 'exercise')
-  final int? exerciseId;
+  @JsonKey(name: 'translation')
+  final int? translationId;
 
   @JsonKey(required: true)
   final String alias;
 
-  const Alias({this.id, required this.exerciseId, required this.alias});
+  const Alias({this.id, required this.translationId, required this.alias});
 
   // Boilerplate
   factory Alias.fromJson(Map<String, dynamic> json) => _$AliasFromJson(json);
+
   Map<String, dynamic> toJson() => _$AliasToJson(this);
 }
diff --git a/lib/models/exercises/alias.g.dart b/lib/models/exercises/alias.g.dart
index baafce48..e631ec6e 100644
--- a/lib/models/exercises/alias.g.dart
+++ b/lib/models/exercises/alias.g.dart
@@ -7,19 +7,16 @@ part of 'alias.dart';
 // **************************************************************************
 
 Alias _$AliasFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const ['id', 'alias'],
-  );
+  $checkKeys(json, requiredKeys: const ['id', 'alias']);
   return Alias(
     id: (json['id'] as num?)?.toInt(),
-    exerciseId: (json['exercise'] as num?)?.toInt(),
+    translationId: (json['translation'] as num?)?.toInt(),
     alias: json['alias'] as String,
   );
 }
 
 Map<String, dynamic> _$AliasToJson(Alias instance) => <String, dynamic>{
-      'id': instance.id,
-      'exercise': instance.exerciseId,
-      'alias': instance.alias,
-    };
+  'id': instance.id,
+  'translation': instance.translationId,
+  'alias': instance.alias,
+};
diff --git a/lib/models/exercises/category.g.dart b/lib/models/exercises/category.g.dart
index 911e6db1..c7966369 100644
--- a/lib/models/exercises/category.g.dart
+++ b/lib/models/exercises/category.g.dart
@@ -7,18 +7,11 @@ part of 'category.dart';
 // **************************************************************************
 
 ExerciseCategory _$ExerciseCategoryFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const ['id', 'name'],
-  );
-  return ExerciseCategory(
-    id: (json['id'] as num).toInt(),
-    name: json['name'] as String,
-  );
+  $checkKeys(json, requiredKeys: const ['id', 'name']);
+  return ExerciseCategory(id: (json['id'] as num).toInt(), name: json['name'] as String);
 }
 
-Map<String, dynamic> _$ExerciseCategoryToJson(ExerciseCategory instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'name': instance.name,
-    };
+Map<String, dynamic> _$ExerciseCategoryToJson(ExerciseCategory instance) => <String, dynamic>{
+  'id': instance.id,
+  'name': instance.name,
+};
diff --git a/lib/models/exercises/comment.dart b/lib/models/exercises/comment.dart
index 5fb5fc58..5ebd542c 100644
--- a/lib/models/exercises/comment.dart
+++ b/lib/models/exercises/comment.dart
@@ -25,19 +25,20 @@ class Comment {
   @JsonKey(required: true)
   final int id;
 
-  @JsonKey(name: 'exercise')
-  final int exerciseId;
+  @JsonKey(name: 'translation')
+  final int translationId;
 
   @JsonKey(required: true)
   final String comment;
 
   const Comment({
     required this.id,
-    required this.exerciseId,
+    required this.translationId,
     required this.comment,
   });
 
   // Boilerplate
   factory Comment.fromJson(Map<String, dynamic> json) => _$CommentFromJson(json);
+
   Map<String, dynamic> toJson() => _$CommentToJson(this);
 }
diff --git a/lib/models/exercises/comment.g.dart b/lib/models/exercises/comment.g.dart
index 77d23876..7cf62d92 100644
--- a/lib/models/exercises/comment.g.dart
+++ b/lib/models/exercises/comment.g.dart
@@ -7,19 +7,16 @@ part of 'comment.dart';
 // **************************************************************************
 
 Comment _$CommentFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const ['id', 'comment'],
-  );
+  $checkKeys(json, requiredKeys: const ['id', 'comment']);
   return Comment(
     id: (json['id'] as num).toInt(),
-    exerciseId: (json['exercise'] as num).toInt(),
+    translationId: (json['translation'] as num).toInt(),
     comment: json['comment'] as String,
   );
 }
 
 Map<String, dynamic> _$CommentToJson(Comment instance) => <String, dynamic>{
-      'id': instance.id,
-      'exercise': instance.exerciseId,
-      'comment': instance.comment,
-    };
+  'id': instance.id,
+  'translation': instance.translationId,
+  'comment': instance.comment,
+};
diff --git a/lib/models/exercises/equipment.g.dart b/lib/models/exercises/equipment.g.dart
index 2c8caa17..b452d40a 100644
--- a/lib/models/exercises/equipment.g.dart
+++ b/lib/models/exercises/equipment.g.dart
@@ -7,10 +7,7 @@ part of 'equipment.dart';
 // **************************************************************************
 
 Equipment _$EquipmentFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const ['id', 'name'],
-  );
+  $checkKeys(json, requiredKeys: const ['id', 'name']);
   return Equipment(
     id: (json['id'] as num).toInt(),
     name: json['name'] as String,
@@ -18,6 +15,6 @@ Equipment _$EquipmentFromJson(Map<String, dynamic> json) {
 }
 
 Map<String, dynamic> _$EquipmentToJson(Equipment instance) => <String, dynamic>{
-      'id': instance.id,
-      'name': instance.name,
-    };
+  'id': instance.id,
+  'name': instance.name,
+};
diff --git a/lib/models/exercises/exercise.dart b/lib/models/exercises/exercise.dart
index 2929dce9..dca5341d 100644
--- a/lib/models/exercises/exercise.dart
+++ b/lib/models/exercises/exercise.dart
@@ -15,9 +15,12 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+import 'dart:developer';
 
+import 'package:collection/collection.dart';
 import 'package:equatable/equatable.dart';
 import 'package:json_annotation/json_annotation.dart';
+import 'package:logging/logging.dart';
 import 'package:wger/helpers/consts.dart';
 import 'package:wger/models/exercises/category.dart';
 import 'package:wger/models/exercises/equipment.dart';
@@ -32,6 +35,8 @@ part 'exercise.g.dart';
 
 @JsonSerializable(explicitToJson: true)
 class Exercise extends Equatable {
+  final _logger = Logger('ExerciseModel');
+
   @JsonKey(required: true)
   late final int? id;
 
@@ -139,40 +144,50 @@ class Exercise extends Equatable {
     this.authorsGlobal = authorsGlobal ?? [];
   }
 
+  bool get showPlateCalculator => equipment.map((e) => e.id).contains(ID_EQUIPMENT_BARBELL);
+
   Exercise.fromApiDataString(String baseData, List<Language> languages)
-      : this.fromApiData(ExerciseApiData.fromString(baseData), languages);
+    : this.fromApiData(ExerciseApiData.fromString(baseData), languages);
 
   Exercise.fromApiDataJson(Map<String, dynamic> baseData, List<Language> languages)
-      : this.fromApiData(ExerciseApiData.fromJson(baseData), languages);
+    : this.fromApiData(ExerciseApiData.fromJson(baseData), languages);
 
-  Exercise.fromApiData(ExerciseApiData baseData, List<Language> languages) {
-    id = baseData.id;
-    uuid = baseData.uuid;
-    categoryId = baseData.category.id;
-    category = baseData.category;
+  Exercise.fromApiData(ExerciseApiData exerciseData, List<Language> languages) {
+    id = exerciseData.id;
+    uuid = exerciseData.uuid;
+    categoryId = exerciseData.category.id;
+    category = exerciseData.category;
 
-    created = baseData.created;
-    lastUpdate = baseData.lastUpdate;
-    lastUpdateGlobal = baseData.lastUpdateGlobal;
+    created = exerciseData.created;
+    lastUpdate = exerciseData.lastUpdate;
+    lastUpdateGlobal = exerciseData.lastUpdateGlobal;
 
-    musclesSecondary = baseData.muscles;
-    muscles = baseData.muscles;
-    equipment = baseData.equipment;
-    category = baseData.category;
-    translations = baseData.translations.map((e) {
-      e.language = languages.firstWhere((l) => l.id == e.languageId);
+    musclesSecondary = exerciseData.muscles;
+    muscles = exerciseData.muscles;
+    equipment = exerciseData.equipment;
+    category = exerciseData.category;
+    translations = exerciseData.translations.map((e) {
+      e.language = languages.firstWhere(
+        (l) => l.id == e.languageId,
+
+        // workaround for https://github.com/wger-project/flutter/issues/722
+        orElse: () {
+          log('Could not find language for translation ${e.languageId}');
+          return Language(id: e.languageId, shortName: 'unknown', fullName: 'unknown');
+        },
+      );
       return e;
     }).toList();
-    videos = baseData.videos;
-    images = baseData.images;
+    videos = exerciseData.videos;
+    images = exerciseData.images;
 
-    authors = baseData.authors;
-    authorsGlobal = baseData.authorsGlobal;
+    authors = exerciseData.authors;
+    authorsGlobal = exerciseData.authorsGlobal;
 
-    variationId = baseData.variationId;
+    variationId = exerciseData.variationId;
   }
 
-  /// Returns exercises for the given language
+  /// Returns translation for the given language
   ///
   /// If no translation is found, English will be returned
   ///
@@ -180,7 +195,7 @@ class Exercise extends Equatable {
   ///       translation in English. This is something that should never happen,
   ///       but we can't make sure that no local installation hasn't deleted
   ///       the entry in English.
-  Translation getExercise(String language) {
+  Translation getTranslation(String language) {
     // If the language is in the form en-US, take the language code only
     final languageCode = language.split('-')[0];
 
@@ -188,17 +203,19 @@ class Exercise extends Equatable {
       (e) => e.languageObj.shortName == languageCode,
       orElse: () => translations.firstWhere(
         (e) => e.languageObj.shortName == LANGUAGE_SHORT_ENGLISH,
-        orElse: () => translations.first,
+        orElse: () {
+          _logger.info(
+            'Could not find fallback english translation for exercise-ID ${id}, returning '
+            'first language (${translations.first.languageObj.shortName}) instead.',
+          );
+          return translations.first;
+        },
       ),
     );
   }
 
   ExerciseImage? get getMainImage {
-    try {
-      return images.firstWhere((image) => image.isMain);
-    } on StateError {
-      return null;
-    }
+    return images.firstWhereOrNull((image) => image.isMain);
   }
 
   set setCategory(ExerciseCategory category) {
@@ -213,13 +230,13 @@ class Exercise extends Equatable {
 
   @override
   List<Object?> get props => [
-        id,
-        uuid,
-        created,
-        lastUpdate,
-        category,
-        equipment,
-        muscles,
-        musclesSecondary,
-      ];
+    id,
+    uuid,
+    created,
+    lastUpdate,
+    category,
+    equipment,
+    muscles,
+    musclesSecondary,
+  ];
 }
diff --git a/lib/models/exercises/exercise.g.dart b/lib/models/exercises/exercise.g.dart
index 0b985ab2..8d68fe3d 100644
--- a/lib/models/exercises/exercise.g.dart
+++ b/lib/models/exercises/exercise.g.dart
@@ -19,53 +19,46 @@ Exercise _$ExerciseFromJson(Map<String, dynamic> json) {
       'category',
       'muscles',
       'muscles_secondary',
-      'equipment'
+      'equipment',
     ],
   );
   return Exercise(
-    id: (json['id'] as num?)?.toInt(),
-    uuid: json['uuid'] as String?,
-    created: json['created'] == null
-        ? null
-        : DateTime.parse(json['created'] as String),
-    lastUpdate: json['last_update'] == null
-        ? null
-        : DateTime.parse(json['last_update'] as String),
-    lastUpdateGlobal: json['last_update_global'] == null
-        ? null
-        : DateTime.parse(json['last_update_global'] as String),
-    variationId: (json['variations'] as num?)?.toInt(),
-    translations: (json['translations'] as List<dynamic>?)
-        ?.map((e) => Translation.fromJson(e as Map<String, dynamic>))
-        .toList(),
-    category: json['categories'] == null
-        ? null
-        : ExerciseCategory.fromJson(json['categories'] as Map<String, dynamic>),
-  )
+      id: (json['id'] as num?)?.toInt(),
+      uuid: json['uuid'] as String?,
+      created: json['created'] == null ? null : DateTime.parse(json['created'] as String),
+      lastUpdate: json['last_update'] == null
+          ? null
+          : DateTime.parse(json['last_update'] as String),
+      lastUpdateGlobal: json['last_update_global'] == null
+          ? null
+          : DateTime.parse(json['last_update_global'] as String),
+      variationId: (json['variations'] as num?)?.toInt(),
+      translations: (json['translations'] as List<dynamic>?)
+          ?.map((e) => Translation.fromJson(e as Map<String, dynamic>))
+          .toList(),
+      category: json['categories'] == null
+          ? null
+          : ExerciseCategory.fromJson(json['categories'] as Map<String, dynamic>),
+    )
     ..categoryId = (json['category'] as num).toInt()
-    ..musclesIds = (json['muscles'] as List<dynamic>)
-        .map((e) => (e as num).toInt())
-        .toList()
+    ..musclesIds = (json['muscles'] as List<dynamic>).map((e) => (e as num).toInt()).toList()
     ..musclesSecondaryIds = (json['muscles_secondary'] as List<dynamic>)
         .map((e) => (e as num).toInt())
         .toList()
-    ..equipmentIds = (json['equipment'] as List<dynamic>)
-        .map((e) => (e as num).toInt())
-        .toList();
+    ..equipmentIds = (json['equipment'] as List<dynamic>).map((e) => (e as num).toInt()).toList();
 }
 
 Map<String, dynamic> _$ExerciseToJson(Exercise instance) => <String, dynamic>{
-      'id': instance.id,
-      'uuid': instance.uuid,
-      'variations': instance.variationId,
-      'created': instance.created?.toIso8601String(),
-      'last_update': instance.lastUpdate?.toIso8601String(),
-      'last_update_global': instance.lastUpdateGlobal?.toIso8601String(),
-      'category': instance.categoryId,
-      'categories': instance.category?.toJson(),
-      'muscles': instance.musclesIds,
-      'muscles_secondary': instance.musclesSecondaryIds,
-      'musclesSecondary':
-          instance.musclesSecondary.map((e) => e.toJson()).toList(),
-      'equipment': instance.equipmentIds,
-    };
+  'id': instance.id,
+  'uuid': instance.uuid,
+  'variations': instance.variationId,
+  'created': instance.created?.toIso8601String(),
+  'last_update': instance.lastUpdate?.toIso8601String(),
+  'last_update_global': instance.lastUpdateGlobal?.toIso8601String(),
+  'category': instance.categoryId,
+  'categories': instance.category?.toJson(),
+  'muscles': instance.musclesIds,
+  'muscles_secondary': instance.musclesSecondaryIds,
+  'musclesSecondary': instance.musclesSecondary.map((e) => e.toJson()).toList(),
+  'equipment': instance.equipmentIds,
+};
diff --git a/lib/models/exercises/exercise_api.dart b/lib/models/exercises/exercise_api.dart
index fb9c36e0..b89eafc1 100644
--- a/lib/models/exercises/exercise_api.dart
+++ b/lib/models/exercises/exercise_api.dart
@@ -11,12 +11,12 @@ import 'package:wger/models/exercises/video.dart';
 part 'exercise_api.freezed.dart';
 part 'exercise_api.g.dart';
 
-/// Model for an exercise as returned from the exercisebaseinfo endpoint
+/// Model for an exercise as returned from the exerciseinfo endpoint
 ///
 /// 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,
@@ -35,7 +35,7 @@ class ExerciseApiData with _$ExerciseApiData {
     // ignore: invalid_annotation_target
     required List<Equipment> equipment,
     // ignore: invalid_annotation_target
-    @JsonKey(name: 'exercises') required List<Translation> translations,
+    @JsonKey(name: 'translations', defaultValue: []) required List<Translation> translations,
     required List<ExerciseImage> images,
     required List<Video> videos,
     // ignore: invalid_annotation_target
@@ -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 eccd726d..e3959c06 100644
--- a/lib/models/exercises/exercise_api.freezed.dart
+++ b/lib/models/exercises/exercise_api.freezed.dart
@@ -1,5 +1,5 @@
-// coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
+// coverage:ignore-file
 // ignore_for_file: type=lint
 // ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
 
@@ -9,313 +9,344 @@ 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);
+  return _ExerciseBaseData.fromJson(
+      json
+  );
 }
 
 /// @nodoc
 mixin _$ExerciseApiData {
-  int get id => throw _privateConstructorUsedError;
-  String get uuid =>
-      throw _privateConstructorUsedError; // ignore: invalid_annotation_target
-  @JsonKey(name: 'variations')
-  int? get variationId =>
-      throw _privateConstructorUsedError; // ignore: invalid_annotation_target
-  @JsonKey(name: 'created')
-  DateTime get created =>
-      throw _privateConstructorUsedError; // ignore: invalid_annotation_target
-  @JsonKey(name: 'last_update')
-  DateTime get lastUpdate =>
-      throw _privateConstructorUsedError; // 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
-  @JsonKey(name: 'muscles_secondary')
-  List<Muscle> get musclesSecondary =>
-      throw _privateConstructorUsedError; // ignore: invalid_annotation_target
-  List<Equipment> get equipment =>
-      throw _privateConstructorUsedError; // ignore: invalid_annotation_target
-  @JsonKey(name: 'exercises')
-  List<Translation> get translations => throw _privateConstructorUsedError;
-  List<ExerciseImage> get images => throw _privateConstructorUsedError;
-  List<Video> get videos =>
-      throw _privateConstructorUsedError; // ignore: invalid_annotation_target
-  @JsonKey(name: 'author_history')
-  List<String> get authors =>
-      throw _privateConstructorUsedError; // ignore: invalid_annotation_target
-  @JsonKey(name: 'total_authors_history')
-  List<String> get authorsGlobal => throw _privateConstructorUsedError;
 
-  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-  @JsonKey(ignore: true)
+  int get id;
+
+  String get uuid; // ignore: invalid_annotation_target
+  @JsonKey(name: 'variations') int? get variationId; // ignore: invalid_annotation_target
+  @JsonKey(name: 'created') DateTime get created; // ignore: invalid_annotation_target
+  @JsonKey(name: 'last_update') DateTime get lastUpdate; // ignore: invalid_annotation_target
+  @JsonKey(name: 'last_update_global') DateTime get lastUpdateGlobal;
+
+  ExerciseCategory get category;
+
+  List<Muscle> get muscles; // ignore: invalid_annotation_target
+  @JsonKey(name: 'muscles_secondary') List<
+      Muscle> get musclesSecondary; // ignore: invalid_annotation_target
+  List<Equipment> get equipment; // ignore: invalid_annotation_target
+  @JsonKey(name: 'translations', defaultValue: []) List<Translation> get translations;
+
+  List<ExerciseImage> get images;
+
+  List<Video> get videos; // ignore: invalid_annotation_target
+  @JsonKey(name: 'author_history') List<String> get authors; // ignore: invalid_annotation_target
+  @JsonKey(name: 'total_authors_history') 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)
+  @pragma('vm:prefer-inline')
   $ExerciseApiDataCopyWith<ExerciseApiData> get copyWith =>
-      throw _privateConstructorUsedError;
-}
+      _$ExerciseApiDataCopyWithImpl<ExerciseApiData>(this as ExerciseApiData, _$identity);
 
-/// @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: 'exercises') List<Translation> translations,
-      List<ExerciseImage> images,
-      List<Video> videos,
-      @JsonKey(name: 'author_history') List<String> authors,
-      @JsonKey(name: 'total_authors_history') List<String> authorsGlobal});
-}
+  /// Serializes this ExerciseApiData to a JSON map.
+  Map<String, dynamic> toJson();
 
-/// @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;
-
-  @pragma('vm:prefer-inline')
   @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));
   }
-}
 
-/// @nodoc
-abstract class _$$ExerciseBaseDataImplCopyWith<$Res>
-    implements $ExerciseApiDataCopyWith<$Res> {
-  factory _$$ExerciseBaseDataImplCopyWith(_$ExerciseBaseDataImpl value,
-          $Res Function(_$ExerciseBaseDataImpl) then) =
-      __$$ExerciseBaseDataImplCopyWithImpl<$Res>;
+  @JsonKey(includeFromJson: false, includeToJson: false)
   @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: 'exercises') List<Translation> translations,
-      List<ExerciseImage> images,
-      List<Video> videos,
-      @JsonKey(name: 'author_history') List<String> authors,
-      @JsonKey(name: 'total_authors_history') List<String> authorsGlobal});
+  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
-class __$$ExerciseBaseDataImplCopyWithImpl<$Res>
-    extends _$ExerciseApiDataCopyWithImpl<$Res, _$ExerciseBaseDataImpl>
-    implements _$$ExerciseBaseDataImplCopyWith<$Res> {
-  __$$ExerciseBaseDataImplCopyWithImpl(_$ExerciseBaseDataImpl _value,
-      $Res Function(_$ExerciseBaseDataImpl) _then)
-      : super(_value, _then);
+abstract mixin class $ExerciseApiDataCopyWith<$Res> {
+  factory $ExerciseApiDataCopyWith(ExerciseApiData value,
+      $Res Function(ExerciseApiData) _then) = _$ExerciseApiDataCopyWithImpl;
 
+  @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>
+    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.
   @pragma('vm:prefer-inline')
   @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(_$ExerciseBaseDataImpl(
-      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,
+  $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(_self.copyWith(
+      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
-          ? _value.variationId
+          ? _self.variationId
           : variationId // ignore: cast_nullable_to_non_nullable
-              as int?,
-      created: null == created
-          ? _value.created
-          : created // ignore: cast_nullable_to_non_nullable
-              as DateTime,
+      as int?,
+      created: null == 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,
+      as DateTime,
       lastUpdateGlobal: null == lastUpdateGlobal
-          ? _value.lastUpdateGlobal
+          ? _self.lastUpdateGlobal
           : lastUpdateGlobal // ignore: cast_nullable_to_non_nullable
-              as DateTime,
+      as DateTime,
       category: null == category
-          ? _value.category
+          ? _self.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>,
+      as ExerciseCategory,
+      muscles: null == 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>,
+      as List<Muscle>,
       equipment: null == equipment
-          ? _value._equipment
+          ? _self.equipment
           : equipment // ignore: cast_nullable_to_non_nullable
-              as List<Equipment>,
+      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
-          : 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>,
+      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
-          ? _value._authorsGlobal
+          ? _self.authorsGlobal
           : authorsGlobal // ignore: cast_nullable_to_non_nullable
-              as List<String>,
+      as List<String>,
     ));
   }
+
+}
+
+
+/// Adds pattern-matching-related methods to [ExerciseApiData].
+extension ExerciseApiDataPatterns on ExerciseApiData {
+  /// A variant of `map` that fallback to returning `orElse`.
+  ///
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case final Subclass value:
+  ///     return ...;
+  ///   case _:
+  ///     return orElse();
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult maybeMap
+
+  <
+
+  TResult
+
+  extends
+
+  Object?
+
+  >
+
+  (
+
+  TResult Function( _ExerciseBaseData value)? $default,{required TResult orElse(),}){
+  final _that = this;
+  switch (_that) {
+  case _ExerciseBaseData() when $default != null:
+  return $default(_that);case _:
+  return orElse();
+
+  }
+  }
+  /// A `switch`-like method, using callbacks.
+  ///
+  /// Callbacks receives the raw object, upcasted.
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case final Subclass value:
+  ///     return ...;
+  ///   case final Subclass2 value:
+  ///     return ...;
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _ExerciseBaseData value) $default,){
+  final _that = this;
+  switch (_that) {
+  case _ExerciseBaseData():
+  return $default(_that);}
+  }
+  /// A variant of `map` that fallback to returning `null`.
+  ///
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case final Subclass value:
+  ///     return ...;
+  ///   case _:
+  ///     return null;
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _ExerciseBaseData value)? $default,){
+  final _that = this;
+  switch (_that) {
+  case _ExerciseBaseData() when $default != null:
+  return $default(_that);case _:
+  return null;
+
+  }
+  }
+  /// A variant of `when` that fallback to an `orElse` callback.
+  ///
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case Subclass(:final field):
+  ///     return ...;
+  ///   case _:
+  ///     return orElse();
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( 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)? $default,{required TResult orElse(),}) {final _that = this;
+  switch (_that) {
+  case _ExerciseBaseData() when $default != null:
+  return $default(_that.id,_that.uuid,_that.variationId,_that.created,_that.lastUpdate,_that.lastUpdateGlobal,_that.category,_that.muscles,_that.musclesSecondary,_that.equipment,_that.translations,_that.images,_that.videos,_that.authors,_that.authorsGlobal);case _:
+  return orElse();
+
+  }
+  }
+  /// A `switch`-like method, using callbacks.
+  ///
+  /// As opposed to `map`, this offers destructuring.
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case Subclass(:final field):
+  ///     return ...;
+  ///   case Subclass2(:final field2):
+  ///     return ...;
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( 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) $default,) {final _that = this;
+  switch (_that) {
+  case _ExerciseBaseData():
+  return $default(_that.id,_that.uuid,_that.variationId,_that.created,_that.lastUpdate,_that.lastUpdateGlobal,_that.category,_that.muscles,_that.musclesSecondary,_that.equipment,_that.translations,_that.images,_that.videos,_that.authors,_that.authorsGlobal);}
+  }
+  /// A variant of `when` that fallback to returning `null`
+  ///
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case Subclass(:final field):
+  ///     return ...;
+  ///   case _:
+  ///     return null;
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( 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)? $default,) {final _that = this;
+  switch (_that) {
+  case _ExerciseBaseData() when $default != null:
+  return $default(_that.id,_that.uuid,_that.variationId,_that.created,_that.lastUpdate,_that.lastUpdateGlobal,_that.category,_that.muscles,_that.musclesSecondary,_that.equipment,_that.translations,_that.images,_that.videos,_that.authors,_that.authorsGlobal);case _:
+  return null;
+
+  }
+  }
+
 }
 
 /// @nodoc
 @JsonSerializable()
-class _$ExerciseBaseDataImpl implements _ExerciseBaseData {
-  _$ExerciseBaseDataImpl(
-      {required this.id,
-      required this.uuid,
-      @JsonKey(name: 'variations') this.variationId = null,
-      @JsonKey(name: 'created') required this.created,
-      @JsonKey(name: 'last_update') required this.lastUpdate,
-      @JsonKey(name: 'last_update_global') required this.lastUpdateGlobal,
-      required this.category,
-      required final List<Muscle> muscles,
-      @JsonKey(name: 'muscles_secondary')
-      required final List<Muscle> musclesSecondary,
-      required final List<Equipment> equipment,
-      @JsonKey(name: 'exercises') 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})
+
+class _ExerciseBaseData implements ExerciseApiData {
+  _ExerciseBaseData({required this.id, required this.uuid, @JsonKey(
+      name: 'variations') this.variationId = null, @JsonKey(
+      name: 'created') required this.created, @JsonKey(
+      name: 'last_update') required this.lastUpdate, @JsonKey(
+      name: 'last_update_global') required this.lastUpdateGlobal, required this.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})
       : _muscles = muscles,
         _musclesSecondary = musclesSecondary,
         _equipment = equipment,
@@ -324,14 +355,10 @@ class _$ExerciseBaseDataImpl implements _ExerciseBaseData {
         _videos = videos,
         _authors = authors,
         _authorsGlobal = authorsGlobal;
+  factory _ExerciseBaseData.fromJson(Map<String, dynamic> json) => _$ExerciseBaseDataFromJson(json);
 
-  factory _$ExerciseBaseDataImpl.fromJson(Map<String, dynamic> json) =>
-      _$$ExerciseBaseDataImplFromJson(json);
-
-  @override
-  final int id;
-  @override
-  final String uuid;
+  @override final int id;
+  @override final String uuid;
 // ignore: invalid_annotation_target
   @override
   @JsonKey(name: 'variations')
@@ -348,11 +375,10 @@ class _$ExerciseBaseDataImpl implements _ExerciseBaseData {
   @override
   @JsonKey(name: 'last_update_global')
   final DateTime lastUpdateGlobal;
-  @override
-  final ExerciseCategory category;
+  @override final ExerciseCategory category;
   final List<Muscle> _muscles;
-  @override
-  List<Muscle> get muscles {
+
+  @override List<Muscle> get muscles {
     if (_muscles is EqualUnmodifiableListView) return _muscles;
     // ignore: implicit_dynamic_type
     return EqualUnmodifiableListView(_muscles);
@@ -364,8 +390,7 @@ class _$ExerciseBaseDataImpl implements _ExerciseBaseData {
   @override
   @JsonKey(name: 'muscles_secondary')
   List<Muscle> get musclesSecondary {
-    if (_musclesSecondary is EqualUnmodifiableListView)
-      return _musclesSecondary;
+    if (_musclesSecondary is EqualUnmodifiableListView) return _musclesSecondary;
     // ignore: implicit_dynamic_type
     return EqualUnmodifiableListView(_musclesSecondary);
   }
@@ -373,8 +398,7 @@ class _$ExerciseBaseDataImpl implements _ExerciseBaseData {
 // ignore: invalid_annotation_target
   final List<Equipment> _equipment;
 // ignore: invalid_annotation_target
-  @override
-  List<Equipment> get equipment {
+  @override List<Equipment> get equipment {
     if (_equipment is EqualUnmodifiableListView) return _equipment;
     // ignore: implicit_dynamic_type
     return EqualUnmodifiableListView(_equipment);
@@ -384,7 +408,7 @@ class _$ExerciseBaseDataImpl implements _ExerciseBaseData {
   final List<Translation> _translations;
 // ignore: invalid_annotation_target
   @override
-  @JsonKey(name: 'exercises')
+  @JsonKey(name: 'translations', defaultValue: [])
   List<Translation> get translations {
     if (_translations is EqualUnmodifiableListView) return _translations;
     // ignore: implicit_dynamic_type
@@ -392,16 +416,16 @@ class _$ExerciseBaseDataImpl implements _ExerciseBaseData {
   }
 
   final List<ExerciseImage> _images;
-  @override
-  List<ExerciseImage> get images {
+
+  @override List<ExerciseImage> get images {
     if (_images is EqualUnmodifiableListView) return _images;
     // ignore: implicit_dynamic_type
     return EqualUnmodifiableListView(_images);
   }
 
   final List<Video> _videos;
-  @override
-  List<Video> get videos {
+
+  @override List<Video> get videos {
     if (_videos is EqualUnmodifiableListView) return _videos;
     // ignore: implicit_dynamic_type
     return EqualUnmodifiableListView(_videos);
@@ -429,314 +453,427 @@ 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.runtimeType == runtimeType && other is _ExerciseBaseData &&
             (identical(other.id, id) || other.id == id) &&
             (identical(other.uuid, uuid) || other.uuid == uuid) &&
-            (identical(other.variationId, variationId) ||
-                other.variationId == variationId) &&
+            (identical(other.variationId, variationId) || other.variationId == variationId) &&
             (identical(other.created, created) || other.created == created) &&
-            (identical(other.lastUpdate, lastUpdate) ||
-                other.lastUpdate == lastUpdate) &&
+            (identical(other.lastUpdate, lastUpdate) || other.lastUpdate == lastUpdate) &&
             (identical(other.lastUpdateGlobal, lastUpdateGlobal) ||
                 other.lastUpdateGlobal == lastUpdateGlobal) &&
-            (identical(other.category, category) ||
-                other.category == category) &&
+            (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._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));
+            const DeepCollectionEquality().equals(other._authorsGlobal, _authorsGlobal));
   }
 
-  @JsonKey(ignore: true)
+  @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));
+  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));
 
-  @JsonKey(ignore: true)
+  @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 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
+  });
+
+
+
+
+}
+/// @nodoc
+class __$ExerciseBaseDataCopyWithImpl<$Res>
+    implements _$ExerciseBaseDataCopyWith<$Res> {
+  __$ExerciseBaseDataCopyWithImpl(this._self, this._then);
+
+  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
   @pragma('vm:prefer-inline')
-  _$$ExerciseBaseDataImplCopyWith<_$ExerciseBaseDataImpl> get copyWith =>
-      __$$ExerciseBaseDataImplCopyWithImpl<_$ExerciseBaseDataImpl>(
-          this, _$identity);
-
-  @override
-  Map<String, dynamic> toJson() {
-    return _$$ExerciseBaseDataImplToJson(
-      this,
-    );
+  $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>,
+    ));
   }
+
+
 }
 
-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: 'exercises') 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;
-
-  factory _ExerciseBaseData.fromJson(Map<String, dynamic> json) =
-      _$ExerciseBaseDataImpl.fromJson;
-
-  @override
-  int get id;
-  @override
-  String get uuid;
-  @override // ignore: invalid_annotation_target
-  @JsonKey(name: 'variations')
-  int? get variationId;
-  @override // ignore: invalid_annotation_target
-  @JsonKey(name: 'created')
-  DateTime get created;
-  @override // ignore: invalid_annotation_target
-  @JsonKey(name: 'last_update')
-  DateTime get lastUpdate;
-  @override // ignore: invalid_annotation_target
-  @JsonKey(name: 'last_update_global')
-  DateTime get lastUpdateGlobal;
-  @override
-  ExerciseCategory get category;
-  @override
-  List<Muscle> get muscles;
-  @override // ignore: invalid_annotation_target
-  @JsonKey(name: 'muscles_secondary')
-  List<Muscle> get musclesSecondary;
-  @override // ignore: invalid_annotation_target
-  List<Equipment> get equipment;
-  @override // ignore: invalid_annotation_target
-  @JsonKey(name: 'exercises')
-  List<Translation> get translations;
-  @override
-  List<ExerciseImage> get images;
-  @override
-  List<Video> get videos;
-  @override // ignore: invalid_annotation_target
-  @JsonKey(name: 'author_history')
-  List<String> get authors;
-  @override // ignore: invalid_annotation_target
-  @JsonKey(name: 'total_authors_history')
-  List<String> get authorsGlobal;
-  @override
-  @JsonKey(ignore: true)
-  _$$ExerciseBaseDataImplCopyWith<_$ExerciseBaseDataImpl> get copyWith =>
-      throw _privateConstructorUsedError;
-}
-
-ExerciseSearchDetails _$ExerciseSearchDetailsFromJson(
-    Map<String, dynamic> json) {
-  return _ExerciseSearchDetails.fromJson(json);
-}
 
 /// @nodoc
 mixin _$ExerciseSearchDetails {
+
 // ignore: invalid_annotation_target
-  @JsonKey(name: 'id')
-  int get translationId =>
-      throw _privateConstructorUsedError; // 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
-  @JsonKey(name: 'image_thumbnail')
-  String? get imageThumbnail => throw _privateConstructorUsedError;
+  @JsonKey(name: 'id') int get translationId; // ignore: invalid_annotation_target
+  @JsonKey(name: 'base_id') int get exerciseId;
 
-  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-  @JsonKey(ignore: true)
+  String get name;
+
+  String get category;
+
+  String? get image; // ignore: invalid_annotation_target
+  @JsonKey(name: 'image_thumbnail') String? get imageThumbnail;
+
+  /// Create a copy of ExerciseSearchDetails
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @pragma('vm:prefer-inline')
   $ExerciseSearchDetailsCopyWith<ExerciseSearchDetails> get copyWith =>
-      throw _privateConstructorUsedError;
-}
+      _$ExerciseSearchDetailsCopyWithImpl<ExerciseSearchDetails>(
+          this as ExerciseSearchDetails, _$identity);
 
-/// @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});
-}
+  /// Serializes this ExerciseSearchDetails to a JSON map.
+  Map<String, dynamic> toJson();
 
-/// @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;
-
-  @pragma('vm:prefer-inline')
   @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));
   }
-}
 
-/// @nodoc
-abstract class _$$ExerciseSearchDetailsImplCopyWith<$Res>
-    implements $ExerciseSearchDetailsCopyWith<$Res> {
-  factory _$$ExerciseSearchDetailsImplCopyWith(
-          _$ExerciseSearchDetailsImpl value,
-          $Res Function(_$ExerciseSearchDetailsImpl) then) =
-      __$$ExerciseSearchDetailsImplCopyWithImpl<$Res>;
+  @JsonKey(includeFromJson: false, includeToJson: false)
   @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});
+  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
-class __$$ExerciseSearchDetailsImplCopyWithImpl<$Res>
-    extends _$ExerciseSearchDetailsCopyWithImpl<$Res,
-        _$ExerciseSearchDetailsImpl>
-    implements _$$ExerciseSearchDetailsImplCopyWith<$Res> {
-  __$$ExerciseSearchDetailsImplCopyWithImpl(_$ExerciseSearchDetailsImpl _value,
-      $Res Function(_$ExerciseSearchDetailsImpl) _then)
-      : super(_value, _then);
+abstract mixin class $ExerciseSearchDetailsCopyWith<$Res> {
+  factory $ExerciseSearchDetailsCopyWith(ExerciseSearchDetails value,
+      $Res Function(ExerciseSearchDetails) _then) = _$ExerciseSearchDetailsCopyWithImpl;
 
+  @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>
+    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.
   @pragma('vm:prefer-inline')
   @override
-  $Res call({
-    Object? translationId = null,
-    Object? exerciseId = null,
-    Object? name = null,
-    Object? category = null,
-    Object? image = freezed,
-    Object? imageThumbnail = freezed,
-  }) {
-    return _then(_$ExerciseSearchDetailsImpl(
+  $Res call(
+      {Object? translationId = null, Object? exerciseId = null, Object? name = null, Object? category = null, Object? image = freezed, Object? imageThumbnail = freezed,}) {
+    return _then(_self.copyWith(
       translationId: null == translationId
-          ? _value.translationId
+          ? _self.translationId
           : translationId // ignore: cast_nullable_to_non_nullable
-              as int,
+      as int,
       exerciseId: null == exerciseId
-          ? _value.exerciseId
+          ? _self.exerciseId
           : exerciseId // ignore: cast_nullable_to_non_nullable
-              as int,
-      name: null == name
-          ? _value.name
-          : name // ignore: cast_nullable_to_non_nullable
-              as String,
+      as int,
+      name: null == 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
-          : image // ignore: cast_nullable_to_non_nullable
-              as String?,
+      as String,
+      image: freezed == 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?,
+      as String?,
     ));
   }
+
+}
+
+
+/// Adds pattern-matching-related methods to [ExerciseSearchDetails].
+extension ExerciseSearchDetailsPatterns on ExerciseSearchDetails {
+  /// A variant of `map` that fallback to returning `orElse`.
+  ///
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case final Subclass value:
+  ///     return ...;
+  ///   case _:
+  ///     return orElse();
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult maybeMap
+
+  <
+
+  TResult
+
+  extends
+
+  Object?
+
+  >
+
+  (
+
+  TResult Function( _ExerciseSearchDetails value)? $default,{required TResult orElse(),}){
+  final _that = this;
+  switch (_that) {
+  case _ExerciseSearchDetails() when $default != null:
+  return $default(_that);case _:
+  return orElse();
+
+  }
+  }
+  /// A `switch`-like method, using callbacks.
+  ///
+  /// Callbacks receives the raw object, upcasted.
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case final Subclass value:
+  ///     return ...;
+  ///   case final Subclass2 value:
+  ///     return ...;
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _ExerciseSearchDetails value) $default,){
+  final _that = this;
+  switch (_that) {
+  case _ExerciseSearchDetails():
+  return $default(_that);}
+  }
+  /// A variant of `map` that fallback to returning `null`.
+  ///
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case final Subclass value:
+  ///     return ...;
+  ///   case _:
+  ///     return null;
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _ExerciseSearchDetails value)? $default,){
+  final _that = this;
+  switch (_that) {
+  case _ExerciseSearchDetails() when $default != null:
+  return $default(_that);case _:
+  return null;
+
+  }
+  }
+  /// A variant of `when` that fallback to an `orElse` callback.
+  ///
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case Subclass(:final field):
+  ///     return ...;
+  ///   case _:
+  ///     return orElse();
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function(@JsonKey(name: 'id') int translationId, @JsonKey(name: 'base_id') int exerciseId, String name, String category, String? image, @JsonKey(name: 'image_thumbnail') String? imageThumbnail)? $default,{required TResult orElse(),}) {final _that = this;
+  switch (_that) {
+  case _ExerciseSearchDetails() when $default != null:
+  return $default(_that.translationId,_that.exerciseId,_that.name,_that.category,_that.image,_that.imageThumbnail);case _:
+  return orElse();
+
+  }
+  }
+  /// A `switch`-like method, using callbacks.
+  ///
+  /// As opposed to `map`, this offers destructuring.
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case Subclass(:final field):
+  ///     return ...;
+  ///   case Subclass2(:final field2):
+  ///     return ...;
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult when<TResult extends Object?>(TResult Function(@JsonKey(name: 'id') int translationId, @JsonKey(name: 'base_id') int exerciseId, String name, String category, String? image, @JsonKey(name: 'image_thumbnail') String? imageThumbnail) $default,) {final _that = this;
+  switch (_that) {
+  case _ExerciseSearchDetails():
+  return $default(_that.translationId,_that.exerciseId,_that.name,_that.category,_that.image,_that.imageThumbnail);}
+  }
+  /// A variant of `when` that fallback to returning `null`
+  ///
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case Subclass(:final field):
+  ///     return ...;
+  ///   case _:
+  ///     return null;
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function(@JsonKey(name: 'id') int translationId, @JsonKey(name: 'base_id') int exerciseId, String name, String category, String? image, @JsonKey(name: 'image_thumbnail') String? imageThumbnail)? $default,) {final _that = this;
+  switch (_that) {
+  case _ExerciseSearchDetails() when $default != null:
+  return $default(_that.translationId,_that.exerciseId,_that.name,_that.category,_that.image,_that.imageThumbnail);case _:
+  return null;
+
+  }
+  }
+
 }
 
 /// @nodoc
 @JsonSerializable()
-class _$ExerciseSearchDetailsImpl implements _ExerciseSearchDetails {
-  _$ExerciseSearchDetailsImpl(
-      {@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);
+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 _ExerciseSearchDetails.fromJson(Map<String, dynamic> json) =>
+      _$ExerciseSearchDetailsFromJson(json);
 
 // ignore: invalid_annotation_target
   @override
@@ -746,406 +883,732 @@ class _$ExerciseSearchDetailsImpl implements _ExerciseSearchDetails {
   @override
   @JsonKey(name: 'base_id')
   final int exerciseId;
-  @override
-  final String name;
-  @override
-  final String category;
-  @override
-  final String? image;
+  @override final String name;
+  @override final String category;
+  @override final String? image;
 // ignore: invalid_annotation_target
   @override
   @JsonKey(name: 'image_thumbnail')
   final String? imageThumbnail;
 
+  /// Create a copy of ExerciseSearchDetails
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @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 _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)';
   }
 
-  @override
-  bool operator ==(Object other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _$ExerciseSearchDetailsImpl &&
-            (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(ignore: true)
-  @override
-  int get hashCode => Object.hash(runtimeType, translationId, exerciseId, name,
-      category, image, imageThumbnail);
+}
 
-  @JsonKey(ignore: true)
+/// @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
+  });
+
+
+
+
+}
+/// @nodoc
+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.
   @override
   @pragma('vm:prefer-inline')
-  _$$ExerciseSearchDetailsImplCopyWith<_$ExerciseSearchDetailsImpl>
-      get copyWith => __$$ExerciseSearchDetailsImplCopyWithImpl<
-          _$ExerciseSearchDetailsImpl>(this, _$identity);
-
-  @override
-  Map<String, dynamic> toJson() {
-    return _$$ExerciseSearchDetailsImplToJson(
-      this,
-    );
+  $Res call(
+      {Object? translationId = null, Object? exerciseId = null, Object? name = null, Object? category = null, Object? image = freezed, Object? imageThumbnail = freezed,}) {
+    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,
+      category: null == category
+          ? _self.category
+          : category // ignore: cast_nullable_to_non_nullable
+      as String,
+      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?,
+    ));
   }
+
+
 }
 
-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;
-
-  factory _ExerciseSearchDetails.fromJson(Map<String, dynamic> json) =
-      _$ExerciseSearchDetailsImpl.fromJson;
-
-  @override // ignore: invalid_annotation_target
-  @JsonKey(name: 'id')
-  int get translationId;
-  @override // ignore: invalid_annotation_target
-  @JsonKey(name: 'base_id')
-  int get exerciseId;
-  @override
-  String get name;
-  @override
-  String get category;
-  @override
-  String? get image;
-  @override // ignore: invalid_annotation_target
-  @JsonKey(name: 'image_thumbnail')
-  String? get imageThumbnail;
-  @override
-  @JsonKey(ignore: true)
-  _$$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;
 
-  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-  @JsonKey(ignore: true)
+  String get value;
+
+  ExerciseSearchDetails get data;
+
+  /// 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 =>
-      throw _privateConstructorUsedError;
-}
+      _$ExerciseSearchEntryCopyWithImpl<ExerciseSearchEntry>(
+          this as ExerciseSearchEntry, _$identity);
 
-/// @nodoc
-abstract class $ExerciseSearchEntryCopyWith<$Res> {
-  factory $ExerciseSearchEntryCopyWith(
-          ExerciseSearchEntry value, $Res Function(ExerciseSearchEntry) then) =
-      _$ExerciseSearchEntryCopyWithImpl<$Res, ExerciseSearchEntry>;
-  @useResult
-  $Res call({String value, ExerciseSearchDetails data});
+  /// Serializes this ExerciseSearchEntry to a JSON map.
+  Map<String, dynamic> toJson();
 
-  $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;
-
-  @pragma('vm:prefer-inline')
   @override
-  $Res call({
-    Object? value = null,
-    Object? data = null,
-  }) {
-    return _then(_value.copyWith(
-      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 ExerciseSearchDetails,
-    ) as $Val);
+  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
-  @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);
-
-  @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
-              as String,
-      data: null == data
-          ? _value.data
-          : data // ignore: cast_nullable_to_non_nullable
-              as ExerciseSearchDetails,
-    ));
-  }
-}
-
-/// @nodoc
-@JsonSerializable()
-class _$ExerciseSearchEntryImpl implements _ExerciseSearchEntry {
-  _$ExerciseSearchEntryImpl({required this.value, required this.data});
-
-  factory _$ExerciseSearchEntryImpl.fromJson(Map<String, dynamic> json) =>
-      _$$ExerciseSearchEntryImplFromJson(json);
-
-  @override
-  final String value;
-  @override
-  final ExerciseSearchDetails data;
+  int get hashCode => Object.hash(runtimeType, value, data);
 
   @override
   String toString() {
     return 'ExerciseSearchEntry(value: $value, data: $data)';
   }
 
-  @override
-  bool operator ==(Object other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _$ExerciseSearchEntryImpl &&
-            (identical(other.value, value) || other.value == value) &&
-            (identical(other.data, data) || other.data == data));
-  }
 
-  @JsonKey(ignore: true)
-  @override
-  int get hashCode => Object.hash(runtimeType, value, data);
-
-  @JsonKey(ignore: true)
-  @override
-  @pragma('vm:prefer-inline')
-  _$$ExerciseSearchEntryImplCopyWith<_$ExerciseSearchEntryImpl> get copyWith =>
-      __$$ExerciseSearchEntryImplCopyWithImpl<_$ExerciseSearchEntryImpl>(
-          this, _$identity);
-
-  @override
-  Map<String, dynamic> toJson() {
-    return _$$ExerciseSearchEntryImplToJson(
-      this,
-    );
-  }
-}
-
-abstract class _ExerciseSearchEntry implements ExerciseSearchEntry {
-  factory _ExerciseSearchEntry(
-      {required final String value,
-      required final ExerciseSearchDetails data}) = _$ExerciseSearchEntryImpl;
-
-  factory _ExerciseSearchEntry.fromJson(Map<String, dynamic> json) =
-      _$ExerciseSearchEntryImpl.fromJson;
-
-  @override
-  String get value;
-  @override
-  ExerciseSearchDetails get data;
-  @override
-  @JsonKey(ignore: true)
-  _$$ExerciseSearchEntryImplCopyWith<_$ExerciseSearchEntryImpl> get copyWith =>
-      throw _privateConstructorUsedError;
-}
-
-ExerciseApiSearch _$ExerciseApiSearchFromJson(Map<String, dynamic> json) {
-  return _ExerciseApiSearch.fromJson(json);
 }
 
 /// @nodoc
-mixin _$ExerciseApiSearch {
-  List<ExerciseSearchEntry> get suggestions =>
-      throw _privateConstructorUsedError;
+abstract mixin class $ExerciseSearchEntryCopyWith<$Res> {
+  factory $ExerciseSearchEntryCopyWith(ExerciseSearchEntry value,
+      $Res Function(ExerciseSearchEntry) _then) = _$ExerciseSearchEntryCopyWithImpl;
 
-  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-  @JsonKey(ignore: true)
-  $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});
+  $Res call({
+    String value, ExerciseSearchDetails data
+  });
+
+
+  $ExerciseSearchDetailsCopyWith<$Res> get data;
+
 }
-
 /// @nodoc
-class _$ExerciseApiSearchCopyWithImpl<$Res, $Val extends ExerciseApiSearch>
-    implements $ExerciseApiSearchCopyWith<$Res> {
-  _$ExerciseApiSearchCopyWithImpl(this._value, this._then);
+class _$ExerciseSearchEntryCopyWithImpl<$Res>
+    implements $ExerciseSearchEntryCopyWith<$Res> {
+  _$ExerciseSearchEntryCopyWithImpl(this._self, this._then);
 
-  // ignore: unused_field
-  final $Val _value;
-  // ignore: unused_field
-  final $Res Function($Val) _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? suggestions = null,
-  }) {
-    return _then(_value.copyWith(
-      suggestions: null == suggestions
-          ? _value.suggestions
-          : suggestions // ignore: cast_nullable_to_non_nullable
-              as List<ExerciseSearchEntry>,
-    ) as $Val);
-  }
-}
-
-/// @nodoc
-abstract class _$$ExerciseApiSearchImplCopyWith<$Res>
-    implements $ExerciseApiSearchCopyWith<$Res> {
-  factory _$$ExerciseApiSearchImplCopyWith(_$ExerciseApiSearchImpl value,
-          $Res Function(_$ExerciseApiSearchImpl) then) =
-      __$$ExerciseApiSearchImplCopyWithImpl<$Res>;
-  @override
-  @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);
-
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? suggestions = null,
-  }) {
-    return _then(_$ExerciseApiSearchImpl(
-      suggestions: null == suggestions
-          ? _value._suggestions
-          : suggestions // ignore: cast_nullable_to_non_nullable
-              as List<ExerciseSearchEntry>,
+  $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));
+    });
+  }
+}
+
+
+/// Adds pattern-matching-related methods to [ExerciseSearchEntry].
+extension ExerciseSearchEntryPatterns on ExerciseSearchEntry {
+  /// A variant of `map` that fallback to returning `orElse`.
+  ///
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case final Subclass value:
+  ///     return ...;
+  ///   case _:
+  ///     return orElse();
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult maybeMap
+
+  <
+
+  TResult
+
+  extends
+
+  Object?
+
+  >
+
+  (
+
+  TResult Function( _ExerciseSearchEntry value)? $default,{required TResult orElse(),}){
+  final _that = this;
+  switch (_that) {
+  case _ExerciseSearchEntry() when $default != null:
+  return $default(_that);case _:
+  return orElse();
+
+  }
+  }
+  /// A `switch`-like method, using callbacks.
+  ///
+  /// Callbacks receives the raw object, upcasted.
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case final Subclass value:
+  ///     return ...;
+  ///   case final Subclass2 value:
+  ///     return ...;
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _ExerciseSearchEntry value) $default,){
+  final _that = this;
+  switch (_that) {
+  case _ExerciseSearchEntry():
+  return $default(_that);}
+  }
+  /// A variant of `map` that fallback to returning `null`.
+  ///
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case final Subclass value:
+  ///     return ...;
+  ///   case _:
+  ///     return null;
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _ExerciseSearchEntry value)? $default,){
+  final _that = this;
+  switch (_that) {
+  case _ExerciseSearchEntry() when $default != null:
+  return $default(_that);case _:
+  return null;
+
+  }
+  }
+  /// A variant of `when` that fallback to an `orElse` callback.
+  ///
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case Subclass(:final field):
+  ///     return ...;
+  ///   case _:
+  ///     return orElse();
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String value, ExerciseSearchDetails data)? $default,{required TResult orElse(),}) {final _that = this;
+  switch (_that) {
+  case _ExerciseSearchEntry() when $default != null:
+  return $default(_that.value,_that.data);case _:
+  return orElse();
+
+  }
+  }
+  /// A `switch`-like method, using callbacks.
+  ///
+  /// As opposed to `map`, this offers destructuring.
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case Subclass(:final field):
+  ///     return ...;
+  ///   case Subclass2(:final field2):
+  ///     return ...;
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String value, ExerciseSearchDetails data) $default,) {final _that = this;
+  switch (_that) {
+  case _ExerciseSearchEntry():
+  return $default(_that.value,_that.data);}
+  }
+  /// A variant of `when` that fallback to returning `null`
+  ///
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case Subclass(:final field):
+  ///     return ...;
+  ///   case _:
+  ///     return null;
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String value, ExerciseSearchDetails data)? $default,) {final _that = this;
+  switch (_that) {
+  case _ExerciseSearchEntry() when $default != null:
+  return $default(_that.value,_that.data);case _:
+  return null;
+
+  }
+  }
+
 }
 
 /// @nodoc
 @JsonSerializable()
-class _$ExerciseApiSearchImpl implements _ExerciseApiSearch {
-  _$ExerciseApiSearchImpl(
-      {required final List<ExerciseSearchEntry> suggestions})
-      : _suggestions = suggestions;
 
-  factory _$ExerciseApiSearchImpl.fromJson(Map<String, dynamic> json) =>
-      _$$ExerciseApiSearchImplFromJson(json);
+class _ExerciseSearchEntry implements ExerciseSearchEntry {
+  _ExerciseSearchEntry({required this.value, required this.data});
 
-  final List<ExerciseSearchEntry> _suggestions;
+  factory _ExerciseSearchEntry.fromJson(Map<String, dynamic> json) =>
+      _$ExerciseSearchEntryFromJson(json);
+
+  @override final String value;
+  @override final ExerciseSearchDetails data;
+
+  /// Create a copy of ExerciseSearchEntry
+  /// with the given fields replaced by the non-null parameter values.
   @override
-  List<ExerciseSearchEntry> get suggestions {
-    if (_suggestions is EqualUnmodifiableListView) return _suggestions;
-    // ignore: implicit_dynamic_type
-    return EqualUnmodifiableListView(_suggestions);
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @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)';
+  }
+
+
+}
+
+/// @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;
+
+  /// Create a copy of ExerciseApiSearch
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @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
+  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 mixin class $ExerciseApiSearchCopyWith<$Res> {
+  factory $ExerciseApiSearchCopyWith(ExerciseApiSearch value,
+      $Res Function(ExerciseApiSearch) _then) = _$ExerciseApiSearchCopyWithImpl;
+
+  @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.
+  @pragma('vm:prefer-inline')
   @override
-  bool operator ==(Object other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _$ExerciseApiSearchImpl &&
-            const DeepCollectionEquality()
-                .equals(other._suggestions, _suggestions));
+  $Res call({Object? suggestions = null,}) {
+    return _then(_self.copyWith(
+      suggestions: null == suggestions
+          ? _self.suggestions
+          : suggestions // ignore: cast_nullable_to_non_nullable
+      as List<ExerciseSearchEntry>,
+    ));
   }
 
-  @JsonKey(ignore: true)
-  @override
-  int get hashCode => Object.hash(
-      runtimeType, const DeepCollectionEquality().hash(_suggestions));
+}
 
-  @JsonKey(ignore: true)
+
+/// Adds pattern-matching-related methods to [ExerciseApiSearch].
+extension ExerciseApiSearchPatterns on ExerciseApiSearch {
+  /// A variant of `map` that fallback to returning `orElse`.
+  ///
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case final Subclass value:
+  ///     return ...;
+  ///   case _:
+  ///     return orElse();
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult maybeMap
+
+  <
+
+  TResult
+
+  extends
+
+  Object?
+
+  >
+
+  (
+
+  TResult Function( _ExerciseApiSearch value)? $default,{required TResult orElse(),}){
+  final _that = this;
+  switch (_that) {
+  case _ExerciseApiSearch() when $default != null:
+  return $default(_that);case _:
+  return orElse();
+
+  }
+  }
+  /// A `switch`-like method, using callbacks.
+  ///
+  /// Callbacks receives the raw object, upcasted.
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case final Subclass value:
+  ///     return ...;
+  ///   case final Subclass2 value:
+  ///     return ...;
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _ExerciseApiSearch value) $default,){
+  final _that = this;
+  switch (_that) {
+  case _ExerciseApiSearch():
+  return $default(_that);}
+  }
+  /// A variant of `map` that fallback to returning `null`.
+  ///
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case final Subclass value:
+  ///     return ...;
+  ///   case _:
+  ///     return null;
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _ExerciseApiSearch value)? $default,){
+  final _that = this;
+  switch (_that) {
+  case _ExerciseApiSearch() when $default != null:
+  return $default(_that);case _:
+  return null;
+
+  }
+  }
+  /// A variant of `when` that fallback to an `orElse` callback.
+  ///
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case Subclass(:final field):
+  ///     return ...;
+  ///   case _:
+  ///     return orElse();
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( List<ExerciseSearchEntry> suggestions)? $default,{required TResult orElse(),}) {final _that = this;
+  switch (_that) {
+  case _ExerciseApiSearch() when $default != null:
+  return $default(_that.suggestions);case _:
+  return orElse();
+
+  }
+  }
+  /// A `switch`-like method, using callbacks.
+  ///
+  /// As opposed to `map`, this offers destructuring.
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case Subclass(:final field):
+  ///     return ...;
+  ///   case Subclass2(:final field2):
+  ///     return ...;
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( List<ExerciseSearchEntry> suggestions) $default,) {final _that = this;
+  switch (_that) {
+  case _ExerciseApiSearch():
+  return $default(_that.suggestions);}
+  }
+  /// A variant of `when` that fallback to returning `null`
+  ///
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case Subclass(:final field):
+  ///     return ...;
+  ///   case _:
+  ///     return null;
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( List<ExerciseSearchEntry> suggestions)? $default,) {final _that = this;
+  switch (_that) {
+  case _ExerciseApiSearch() when $default != null:
+  return $default(_that.suggestions);case _:
+  return null;
+
+  }
+  }
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _ExerciseApiSearch implements ExerciseApiSearch {
+  _ExerciseApiSearch({required final List<ExerciseSearchEntry> suggestions})
+      : _suggestions = suggestions;
+
+  factory _ExerciseApiSearch.fromJson(Map<String, dynamic> json) =>
+      _$ExerciseApiSearchFromJson(json);
+
+  final List<ExerciseSearchEntry> _suggestions;
+
+  @override List<ExerciseSearchEntry> get suggestions {
+    if (_suggestions is EqualUnmodifiableListView) return _suggestions;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_suggestions);
+  }
+
+
+  /// Create a copy of ExerciseApiSearch
+  /// with the given fields replaced by the non-null parameter values.
   @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  _$$ExerciseApiSearchImplCopyWith<_$ExerciseApiSearchImpl> get copyWith =>
-      __$$ExerciseApiSearchImplCopyWithImpl<_$ExerciseApiSearchImpl>(
-          this, _$identity);
+  _$ExerciseApiSearchCopyWith<_ExerciseApiSearch> get copyWith =>
+      __$ExerciseApiSearchCopyWithImpl<_ExerciseApiSearch>(this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$ExerciseApiSearchImplToJson(
-      this,
-    );
+    return _$ExerciseApiSearchToJson(this,);
   }
-}
-
-abstract class _ExerciseApiSearch implements ExerciseApiSearch {
-  factory _ExerciseApiSearch(
-          {required final List<ExerciseSearchEntry> suggestions}) =
-      _$ExerciseApiSearchImpl;
-
-  factory _ExerciseApiSearch.fromJson(Map<String, dynamic> json) =
-      _$ExerciseApiSearchImpl.fromJson;
 
   @override
-  List<ExerciseSearchEntry> get suggestions;
+  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
-  @JsonKey(ignore: true)
-  _$$ExerciseApiSearchImplCopyWith<_$ExerciseApiSearchImpl> get copyWith =>
-      throw _privateConstructorUsedError;
+  int get hashCode => Object.hash(runtimeType, const DeepCollectionEquality().hash(_suggestions));
+
+  @override
+  String toString() {
+    return 'ExerciseApiSearch(suggestions: $suggestions)';
+  }
+
+
 }
+
+/// @nodoc
+abstract mixin class _$ExerciseApiSearchCopyWith<$Res> implements $ExerciseApiSearchCopyWith<$Res> {
+  factory _$ExerciseApiSearchCopyWith(_ExerciseApiSearch value,
+      $Res Function(_ExerciseApiSearch) _then) = __$ExerciseApiSearchCopyWithImpl;
+
+  @override
+  @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
+  @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 a6911a73..76d995a6 100644
--- a/lib/models/exercises/exercise_api.g.dart
+++ b/lib/models/exercises/exercise_api.g.dart
@@ -6,66 +6,58 @@ part of 'exercise_api.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-_$ExerciseBaseDataImpl _$$ExerciseBaseDataImplFromJson(
-        Map<String, dynamic> json) =>
-    _$ExerciseBaseDataImpl(
-      id: (json['id'] as num).toInt(),
-      uuid: json['uuid'] as String,
-      variationId: (json['variations'] as num?)?.toInt() ?? null,
-      created: DateTime.parse(json['created'] as String),
-      lastUpdate: DateTime.parse(json['last_update'] as String),
-      lastUpdateGlobal: DateTime.parse(json['last_update_global'] as String),
-      category:
-          ExerciseCategory.fromJson(json['category'] as Map<String, dynamic>),
-      muscles: (json['muscles'] as List<dynamic>)
-          .map((e) => Muscle.fromJson(e as Map<String, dynamic>))
-          .toList(),
-      musclesSecondary: (json['muscles_secondary'] as List<dynamic>)
-          .map((e) => Muscle.fromJson(e as Map<String, dynamic>))
-          .toList(),
-      equipment: (json['equipment'] as List<dynamic>)
-          .map((e) => Equipment.fromJson(e as Map<String, dynamic>))
-          .toList(),
-      translations: (json['exercises'] as List<dynamic>)
-          .map((e) => Translation.fromJson(e as Map<String, dynamic>))
-          .toList(),
-      images: (json['images'] as List<dynamic>)
-          .map((e) => ExerciseImage.fromJson(e as Map<String, dynamic>))
-          .toList(),
-      videos: (json['videos'] as List<dynamic>)
-          .map((e) => Video.fromJson(e as Map<String, dynamic>))
-          .toList(),
-      authors: (json['author_history'] as List<dynamic>)
-          .map((e) => e as String)
-          .toList(),
-      authorsGlobal: (json['total_authors_history'] as List<dynamic>)
-          .map((e) => e as String)
-          .toList(),
-    );
+_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,
+  created: DateTime.parse(json['created'] as String),
+  lastUpdate: DateTime.parse(json['last_update'] as String),
+  lastUpdateGlobal: DateTime.parse(json['last_update_global'] as String),
+  category: ExerciseCategory.fromJson(json['category'] as Map<String, dynamic>),
+  muscles: (json['muscles'] as List<dynamic>)
+      .map((e) => Muscle.fromJson(e as Map<String, dynamic>))
+      .toList(),
+  musclesSecondary: (json['muscles_secondary'] as List<dynamic>)
+      .map((e) => Muscle.fromJson(e as Map<String, dynamic>))
+      .toList(),
+  equipment: (json['equipment'] as List<dynamic>)
+      .map((e) => Equipment.fromJson(e as Map<String, dynamic>))
+      .toList(),
+  translations:
+      (json['translations'] as List<dynamic>?)
+          ?.map((e) => Translation.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
+  images: (json['images'] as List<dynamic>)
+      .map((e) => ExerciseImage.fromJson(e as Map<String, dynamic>))
+      .toList(),
+  videos: (json['videos'] as List<dynamic>)
+      .map((e) => Video.fromJson(e as Map<String, dynamic>))
+      .toList(),
+  authors: (json['author_history'] as List<dynamic>).map((e) => e as String).toList(),
+  authorsGlobal: (json['total_authors_history'] as List<dynamic>).map((e) => e as String).toList(),
+);
 
-Map<String, dynamic> _$$ExerciseBaseDataImplToJson(
-        _$ExerciseBaseDataImpl instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'uuid': instance.uuid,
-      'variations': instance.variationId,
-      'created': instance.created.toIso8601String(),
-      'last_update': instance.lastUpdate.toIso8601String(),
-      'last_update_global': instance.lastUpdateGlobal.toIso8601String(),
-      'category': instance.category,
-      'muscles': instance.muscles,
-      'muscles_secondary': instance.musclesSecondary,
-      'equipment': instance.equipment,
-      'exercises': instance.translations,
-      'images': instance.images,
-      'videos': instance.videos,
-      'author_history': instance.authors,
-      'total_authors_history': instance.authorsGlobal,
-    };
+Map<String, dynamic> _$ExerciseBaseDataToJson(_ExerciseBaseData instance) => <String, dynamic>{
+  'id': instance.id,
+  'uuid': instance.uuid,
+  'variations': instance.variationId,
+  'created': instance.created.toIso8601String(),
+  'last_update': instance.lastUpdate.toIso8601String(),
+  'last_update_global': instance.lastUpdateGlobal.toIso8601String(),
+  'category': instance.category,
+  'muscles': instance.muscles,
+  'muscles_secondary': instance.musclesSecondary,
+  'equipment': instance.equipment,
+  'translations': instance.translations,
+  'images': instance.images,
+  'videos': instance.videos,
+  'author_history': instance.authors,
+  '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,
@@ -74,8 +66,7 @@ _$ExerciseSearchDetailsImpl _$$ExerciseSearchDetailsImplFromJson(
       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,
@@ -85,31 +76,21 @@ Map<String, dynamic> _$$ExerciseSearchDetailsImplToJson(
       '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>),
+      data: ExerciseSearchDetails.fromJson(json['data'] as Map<String, dynamic>),
     );
 
-Map<String, dynamic> _$$ExerciseSearchEntryImplToJson(
-        _$ExerciseSearchEntryImpl instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-      'data': instance.data,
-    };
+Map<String, dynamic> _$ExerciseSearchEntryToJson(_ExerciseSearchEntry instance) =>
+    <String, dynamic>{'value': instance.value, 'data': instance.data};
 
-_$ExerciseApiSearchImpl _$$ExerciseApiSearchImplFromJson(
-        Map<String, dynamic> json) =>
-    _$ExerciseApiSearchImpl(
-      suggestions: (json['suggestions'] as List<dynamic>)
-          .map((e) => ExerciseSearchEntry.fromJson(e as Map<String, dynamic>))
-          .toList(),
-    );
+_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>{
-      'suggestions': instance.suggestions,
-    };
+Map<String, dynamic> _$ExerciseApiSearchToJson(_ExerciseApiSearch instance) => <String, dynamic>{
+  'suggestions': instance.suggestions,
+};
diff --git a/lib/models/exercises/exercise_submission.dart b/lib/models/exercises/exercise_submission.dart
new file mode 100644
index 00000000..db678a7f
--- /dev/null
+++ b/lib/models/exercises/exercise_submission.dart
@@ -0,0 +1,81 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'exercise_submission.freezed.dart';
+part 'exercise_submission.g.dart';
+
+// ignore_for_file: invalid_annotation_target
+
+///
+/// Models for the data model used when submitting an exercise to the API
+///
+
+/// Alias part of an exercise submission
+@freezed
+sealed class ExerciseAliasSubmissionApi with _$ExerciseAliasSubmissionApi {
+  const factory ExerciseAliasSubmissionApi({required String alias}) = _ExerciseAliasSubmissionApi;
+
+  factory ExerciseAliasSubmissionApi.fromJson(Map<String, dynamic> json) =>
+      _$ExerciseAliasSubmissionApiFromJson(json);
+}
+
+/// Comment part of an exercise submission
+@freezed
+sealed class ExerciseCommentSubmissionApi with _$ExerciseCommentSubmissionApi {
+  const factory ExerciseCommentSubmissionApi({required String alias}) =
+      _ExerciseCommentSubmissionApi;
+
+  factory ExerciseCommentSubmissionApi.fromJson(Map<String, dynamic> json) =>
+      _$ExerciseCommentSubmissionApiFromJson(json);
+}
+
+/// Translation part of an exercise submission
+@freezed
+sealed class ExerciseTranslationSubmissionApi with _$ExerciseTranslationSubmissionApi {
+  const factory ExerciseTranslationSubmissionApi({
+    required String name,
+    required String description,
+    required int language,
+    @JsonKey(name: 'license_author') required String author,
+    @Default([]) List<ExerciseAliasSubmissionApi> aliases,
+    @Default([]) List<ExerciseCommentSubmissionApi> comments,
+  }) = _ExerciseTranslationSubmissionApi;
+
+  factory ExerciseTranslationSubmissionApi.fromJson(Map<String, dynamic> json) =>
+      _$ExerciseTranslationSubmissionApiFromJson(json);
+}
+
+/// "Main" part of an exercise submission
+@freezed
+sealed class ExerciseSubmissionApi with _$ExerciseSubmissionApi {
+  const factory ExerciseSubmissionApi({
+    required int category,
+    required List<int> muscles,
+    @JsonKey(name: 'muscles_secondary') required List<int> musclesSecondary,
+    required List<int> equipment,
+    @JsonKey(name: 'license_author') required String author,
+    @JsonKey(includeToJson: true) int? variation,
+    @JsonKey(includeToJson: true, name: 'variations_connect_to') int? variationConnectTo,
+    required List<ExerciseTranslationSubmissionApi> translations,
+  }) = _ExerciseSubmissionApi;
+
+  factory ExerciseSubmissionApi.fromJson(Map<String, dynamic> json) =>
+      _$ExerciseSubmissionApiFromJson(json);
+}
diff --git a/lib/models/exercises/exercise_submission.freezed.dart b/lib/models/exercises/exercise_submission.freezed.dart
new file mode 100644
index 00000000..4babf039
--- /dev/null
+++ b/lib/models/exercises/exercise_submission.freezed.dart
@@ -0,0 +1,1446 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// coverage:ignore-file
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'exercise_submission.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+// dart format off
+T _$identity<T>(T value) => value;
+
+/// @nodoc
+mixin _$ExerciseAliasSubmissionApi {
+
+  String get alias;
+
+  /// Create a copy of ExerciseAliasSubmissionApi
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @pragma('vm:prefer-inline')
+  $ExerciseAliasSubmissionApiCopyWith<ExerciseAliasSubmissionApi> get copyWith =>
+      _$ExerciseAliasSubmissionApiCopyWithImpl<ExerciseAliasSubmissionApi>(
+          this as ExerciseAliasSubmissionApi, _$identity);
+
+  /// Serializes this ExerciseAliasSubmissionApi to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType && other is ExerciseAliasSubmissionApi &&
+            (identical(other.alias, alias) || other.alias == alias));
+  }
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  int get hashCode => Object.hash(runtimeType, alias);
+
+  @override
+  String toString() {
+    return 'ExerciseAliasSubmissionApi(alias: $alias)';
+  }
+
+
+}
+
+/// @nodoc
+abstract mixin class $ExerciseAliasSubmissionApiCopyWith<$Res> {
+  factory $ExerciseAliasSubmissionApiCopyWith(ExerciseAliasSubmissionApi value,
+      $Res Function(ExerciseAliasSubmissionApi) _then) = _$ExerciseAliasSubmissionApiCopyWithImpl;
+
+  @useResult
+  $Res call({
+    String alias
+  });
+
+
+}
+/// @nodoc
+class _$ExerciseAliasSubmissionApiCopyWithImpl<$Res>
+    implements $ExerciseAliasSubmissionApiCopyWith<$Res> {
+  _$ExerciseAliasSubmissionApiCopyWithImpl(this._self, this._then);
+
+  final ExerciseAliasSubmissionApi _self;
+  final $Res Function(ExerciseAliasSubmissionApi) _then;
+
+  /// Create a copy of ExerciseAliasSubmissionApi
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({Object? alias = null,}) {
+    return _then(_self.copyWith(
+      alias: null == alias ? _self.alias : alias // ignore: cast_nullable_to_non_nullable
+      as String,
+    ));
+  }
+
+}
+
+
+/// Adds pattern-matching-related methods to [ExerciseAliasSubmissionApi].
+extension ExerciseAliasSubmissionApiPatterns on ExerciseAliasSubmissionApi {
+  /// A variant of `map` that fallback to returning `orElse`.
+  ///
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case final Subclass value:
+  ///     return ...;
+  ///   case _:
+  ///     return orElse();
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult maybeMap
+
+  <
+
+  TResult
+
+  extends
+
+  Object?
+
+  >
+
+  (
+
+  TResult Function( _ExerciseAliasSubmissionApi value)? $default,{required TResult orElse(),}){
+  final _that = this;
+  switch (_that) {
+  case _ExerciseAliasSubmissionApi() when $default != null:
+  return $default(_that);case _:
+  return orElse();
+
+  }
+  }
+  /// A `switch`-like method, using callbacks.
+  ///
+  /// Callbacks receives the raw object, upcasted.
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case final Subclass value:
+  ///     return ...;
+  ///   case final Subclass2 value:
+  ///     return ...;
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _ExerciseAliasSubmissionApi value) $default,){
+  final _that = this;
+  switch (_that) {
+  case _ExerciseAliasSubmissionApi():
+  return $default(_that);}
+  }
+  /// A variant of `map` that fallback to returning `null`.
+  ///
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case final Subclass value:
+  ///     return ...;
+  ///   case _:
+  ///     return null;
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _ExerciseAliasSubmissionApi value)? $default,){
+  final _that = this;
+  switch (_that) {
+  case _ExerciseAliasSubmissionApi() when $default != null:
+  return $default(_that);case _:
+  return null;
+
+  }
+  }
+  /// A variant of `when` that fallback to an `orElse` callback.
+  ///
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case Subclass(:final field):
+  ///     return ...;
+  ///   case _:
+  ///     return orElse();
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String alias)? $default,{required TResult orElse(),}) {final _that = this;
+  switch (_that) {
+  case _ExerciseAliasSubmissionApi() when $default != null:
+  return $default(_that.alias);case _:
+  return orElse();
+
+  }
+  }
+  /// A `switch`-like method, using callbacks.
+  ///
+  /// As opposed to `map`, this offers destructuring.
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case Subclass(:final field):
+  ///     return ...;
+  ///   case Subclass2(:final field2):
+  ///     return ...;
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String alias) $default,) {final _that = this;
+  switch (_that) {
+  case _ExerciseAliasSubmissionApi():
+  return $default(_that.alias);}
+  }
+  /// A variant of `when` that fallback to returning `null`
+  ///
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case Subclass(:final field):
+  ///     return ...;
+  ///   case _:
+  ///     return null;
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String alias)? $default,) {final _that = this;
+  switch (_that) {
+  case _ExerciseAliasSubmissionApi() when $default != null:
+  return $default(_that.alias);case _:
+  return null;
+
+  }
+  }
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _ExerciseAliasSubmissionApi implements ExerciseAliasSubmissionApi {
+  const _ExerciseAliasSubmissionApi({required this.alias});
+
+  factory _ExerciseAliasSubmissionApi.fromJson(Map<String, dynamic> json) =>
+      _$ExerciseAliasSubmissionApiFromJson(json);
+
+  @override final String alias;
+
+  /// Create a copy of ExerciseAliasSubmissionApi
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @pragma('vm:prefer-inline')
+  _$ExerciseAliasSubmissionApiCopyWith<_ExerciseAliasSubmissionApi> get copyWith =>
+      __$ExerciseAliasSubmissionApiCopyWithImpl<_ExerciseAliasSubmissionApi>(this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$ExerciseAliasSubmissionApiToJson(this,);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType && other is _ExerciseAliasSubmissionApi &&
+            (identical(other.alias, alias) || other.alias == alias));
+  }
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  int get hashCode => Object.hash(runtimeType, alias);
+
+  @override
+  String toString() {
+    return 'ExerciseAliasSubmissionApi(alias: $alias)';
+  }
+
+
+}
+
+/// @nodoc
+abstract mixin class _$ExerciseAliasSubmissionApiCopyWith<$Res>
+    implements $ExerciseAliasSubmissionApiCopyWith<$Res> {
+  factory _$ExerciseAliasSubmissionApiCopyWith(_ExerciseAliasSubmissionApi value,
+      $Res Function(_ExerciseAliasSubmissionApi) _then) = __$ExerciseAliasSubmissionApiCopyWithImpl;
+
+  @override
+  @useResult
+  $Res call({
+    String alias
+  });
+
+
+}
+/// @nodoc
+class __$ExerciseAliasSubmissionApiCopyWithImpl<$Res>
+    implements _$ExerciseAliasSubmissionApiCopyWith<$Res> {
+  __$ExerciseAliasSubmissionApiCopyWithImpl(this._self, this._then);
+
+  final _ExerciseAliasSubmissionApi _self;
+  final $Res Function(_ExerciseAliasSubmissionApi) _then;
+
+  /// Create a copy of ExerciseAliasSubmissionApi
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @pragma('vm:prefer-inline')
+  $Res call({Object? alias = null,}) {
+    return _then(_ExerciseAliasSubmissionApi(
+      alias: null == alias ? _self.alias : alias // ignore: cast_nullable_to_non_nullable
+      as String,
+    ));
+  }
+
+
+}
+
+
+/// @nodoc
+mixin _$ExerciseCommentSubmissionApi {
+
+  String get alias;
+
+  /// Create a copy of ExerciseCommentSubmissionApi
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @pragma('vm:prefer-inline')
+  $ExerciseCommentSubmissionApiCopyWith<ExerciseCommentSubmissionApi> get copyWith =>
+      _$ExerciseCommentSubmissionApiCopyWithImpl<ExerciseCommentSubmissionApi>(
+          this as ExerciseCommentSubmissionApi, _$identity);
+
+  /// Serializes this ExerciseCommentSubmissionApi to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType && other is ExerciseCommentSubmissionApi &&
+            (identical(other.alias, alias) || other.alias == alias));
+  }
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  int get hashCode => Object.hash(runtimeType, alias);
+
+  @override
+  String toString() {
+    return 'ExerciseCommentSubmissionApi(alias: $alias)';
+  }
+
+
+}
+
+/// @nodoc
+abstract mixin class $ExerciseCommentSubmissionApiCopyWith<$Res> {
+  factory $ExerciseCommentSubmissionApiCopyWith(ExerciseCommentSubmissionApi value,
+      $Res Function(ExerciseCommentSubmissionApi) _then) = _$ExerciseCommentSubmissionApiCopyWithImpl;
+
+  @useResult
+  $Res call({
+    String alias
+  });
+
+
+}
+/// @nodoc
+class _$ExerciseCommentSubmissionApiCopyWithImpl<$Res>
+    implements $ExerciseCommentSubmissionApiCopyWith<$Res> {
+  _$ExerciseCommentSubmissionApiCopyWithImpl(this._self, this._then);
+
+  final ExerciseCommentSubmissionApi _self;
+  final $Res Function(ExerciseCommentSubmissionApi) _then;
+
+  /// Create a copy of ExerciseCommentSubmissionApi
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({Object? alias = null,}) {
+    return _then(_self.copyWith(
+      alias: null == alias ? _self.alias : alias // ignore: cast_nullable_to_non_nullable
+      as String,
+    ));
+  }
+
+}
+
+
+/// Adds pattern-matching-related methods to [ExerciseCommentSubmissionApi].
+extension ExerciseCommentSubmissionApiPatterns on ExerciseCommentSubmissionApi {
+  /// A variant of `map` that fallback to returning `orElse`.
+  ///
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case final Subclass value:
+  ///     return ...;
+  ///   case _:
+  ///     return orElse();
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult maybeMap
+
+  <
+
+  TResult
+
+  extends
+
+  Object?
+
+  >
+
+  (
+
+  TResult Function( _ExerciseCommentSubmissionApi value)? $default,{required TResult orElse(),}){
+  final _that = this;
+  switch (_that) {
+  case _ExerciseCommentSubmissionApi() when $default != null:
+  return $default(_that);case _:
+  return orElse();
+
+  }
+  }
+  /// A `switch`-like method, using callbacks.
+  ///
+  /// Callbacks receives the raw object, upcasted.
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case final Subclass value:
+  ///     return ...;
+  ///   case final Subclass2 value:
+  ///     return ...;
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _ExerciseCommentSubmissionApi value) $default,){
+  final _that = this;
+  switch (_that) {
+  case _ExerciseCommentSubmissionApi():
+  return $default(_that);}
+  }
+  /// A variant of `map` that fallback to returning `null`.
+  ///
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case final Subclass value:
+  ///     return ...;
+  ///   case _:
+  ///     return null;
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _ExerciseCommentSubmissionApi value)? $default,){
+  final _that = this;
+  switch (_that) {
+  case _ExerciseCommentSubmissionApi() when $default != null:
+  return $default(_that);case _:
+  return null;
+
+  }
+  }
+  /// A variant of `when` that fallback to an `orElse` callback.
+  ///
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case Subclass(:final field):
+  ///     return ...;
+  ///   case _:
+  ///     return orElse();
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String alias)? $default,{required TResult orElse(),}) {final _that = this;
+  switch (_that) {
+  case _ExerciseCommentSubmissionApi() when $default != null:
+  return $default(_that.alias);case _:
+  return orElse();
+
+  }
+  }
+  /// A `switch`-like method, using callbacks.
+  ///
+  /// As opposed to `map`, this offers destructuring.
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case Subclass(:final field):
+  ///     return ...;
+  ///   case Subclass2(:final field2):
+  ///     return ...;
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String alias) $default,) {final _that = this;
+  switch (_that) {
+  case _ExerciseCommentSubmissionApi():
+  return $default(_that.alias);}
+  }
+  /// A variant of `when` that fallback to returning `null`
+  ///
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case Subclass(:final field):
+  ///     return ...;
+  ///   case _:
+  ///     return null;
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String alias)? $default,) {final _that = this;
+  switch (_that) {
+  case _ExerciseCommentSubmissionApi() when $default != null:
+  return $default(_that.alias);case _:
+  return null;
+
+  }
+  }
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _ExerciseCommentSubmissionApi implements ExerciseCommentSubmissionApi {
+  const _ExerciseCommentSubmissionApi({required this.alias});
+
+  factory _ExerciseCommentSubmissionApi.fromJson(Map<String, dynamic> json) =>
+      _$ExerciseCommentSubmissionApiFromJson(json);
+
+  @override final String alias;
+
+  /// Create a copy of ExerciseCommentSubmissionApi
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @pragma('vm:prefer-inline')
+  _$ExerciseCommentSubmissionApiCopyWith<_ExerciseCommentSubmissionApi> get copyWith =>
+      __$ExerciseCommentSubmissionApiCopyWithImpl<_ExerciseCommentSubmissionApi>(this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$ExerciseCommentSubmissionApiToJson(this,);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType && other is _ExerciseCommentSubmissionApi &&
+            (identical(other.alias, alias) || other.alias == alias));
+  }
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  int get hashCode => Object.hash(runtimeType, alias);
+
+  @override
+  String toString() {
+    return 'ExerciseCommentSubmissionApi(alias: $alias)';
+  }
+
+
+}
+
+/// @nodoc
+abstract mixin class _$ExerciseCommentSubmissionApiCopyWith<$Res>
+    implements $ExerciseCommentSubmissionApiCopyWith<$Res> {
+  factory _$ExerciseCommentSubmissionApiCopyWith(_ExerciseCommentSubmissionApi value,
+      $Res Function(_ExerciseCommentSubmissionApi) _then) = __$ExerciseCommentSubmissionApiCopyWithImpl;
+
+  @override
+  @useResult
+  $Res call({
+    String alias
+  });
+
+
+}
+/// @nodoc
+class __$ExerciseCommentSubmissionApiCopyWithImpl<$Res>
+    implements _$ExerciseCommentSubmissionApiCopyWith<$Res> {
+  __$ExerciseCommentSubmissionApiCopyWithImpl(this._self, this._then);
+
+  final _ExerciseCommentSubmissionApi _self;
+  final $Res Function(_ExerciseCommentSubmissionApi) _then;
+
+  /// Create a copy of ExerciseCommentSubmissionApi
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @pragma('vm:prefer-inline')
+  $Res call({Object? alias = null,}) {
+    return _then(_ExerciseCommentSubmissionApi(
+      alias: null == alias ? _self.alias : alias // ignore: cast_nullable_to_non_nullable
+      as String,
+    ));
+  }
+
+
+}
+
+
+/// @nodoc
+mixin _$ExerciseTranslationSubmissionApi {
+
+  String get name;
+
+  String get description;
+
+  int get language;
+
+  @JsonKey(name: 'license_author') String get author;
+
+  List<ExerciseAliasSubmissionApi> get aliases;
+
+  List<ExerciseCommentSubmissionApi> get comments;
+
+  /// Create a copy of ExerciseTranslationSubmissionApi
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @pragma('vm:prefer-inline')
+  $ExerciseTranslationSubmissionApiCopyWith<ExerciseTranslationSubmissionApi> get copyWith =>
+      _$ExerciseTranslationSubmissionApiCopyWithImpl<ExerciseTranslationSubmissionApi>(
+          this as ExerciseTranslationSubmissionApi, _$identity);
+
+  /// Serializes this ExerciseTranslationSubmissionApi to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType && other is ExerciseTranslationSubmissionApi &&
+            (identical(other.name, name) || other.name == name) &&
+            (identical(other.description, description) || other.description == description) &&
+            (identical(other.language, language) || other.language == language) &&
+            (identical(other.author, author) || other.author == author) &&
+            const DeepCollectionEquality().equals(other.aliases, aliases) &&
+            const DeepCollectionEquality().equals(other.comments, comments));
+  }
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  int get hashCode =>
+      Object.hash(
+          runtimeType,
+          name,
+          description,
+          language,
+          author,
+          const DeepCollectionEquality().hash(aliases),
+          const DeepCollectionEquality().hash(comments));
+
+  @override
+  String toString() {
+    return 'ExerciseTranslationSubmissionApi(name: $name, description: $description, language: $language, author: $author, aliases: $aliases, comments: $comments)';
+  }
+
+
+}
+
+/// @nodoc
+abstract mixin class $ExerciseTranslationSubmissionApiCopyWith<$Res> {
+  factory $ExerciseTranslationSubmissionApiCopyWith(ExerciseTranslationSubmissionApi value,
+      $Res Function(ExerciseTranslationSubmissionApi) _then) = _$ExerciseTranslationSubmissionApiCopyWithImpl;
+
+  @useResult
+  $Res call({
+    String name, String description, int language, @JsonKey(
+        name: 'license_author') String author, List<ExerciseAliasSubmissionApi> aliases, List<
+        ExerciseCommentSubmissionApi> comments
+  });
+
+
+
+
+}
+/// @nodoc
+class _$ExerciseTranslationSubmissionApiCopyWithImpl<$Res>
+    implements $ExerciseTranslationSubmissionApiCopyWith<$Res> {
+  _$ExerciseTranslationSubmissionApiCopyWithImpl(this._self, this._then);
+
+  final ExerciseTranslationSubmissionApi _self;
+  final $Res Function(ExerciseTranslationSubmissionApi) _then;
+
+  /// Create a copy of ExerciseTranslationSubmissionApi
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call(
+      {Object? name = null, Object? description = null, Object? language = null, Object? author = null, Object? aliases = null, Object? comments = null,}) {
+    return _then(_self.copyWith(
+      name: null == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
+      as String,
+      description: null == description
+          ? _self.description
+          : description // ignore: cast_nullable_to_non_nullable
+      as String,
+      language: null == language
+          ? _self.language
+          : language // ignore: cast_nullable_to_non_nullable
+      as int,
+      author: null == author ? _self.author : author // ignore: cast_nullable_to_non_nullable
+      as String,
+      aliases: null == aliases ? _self.aliases : aliases // ignore: cast_nullable_to_non_nullable
+      as List<ExerciseAliasSubmissionApi>,
+      comments: null == comments
+          ? _self.comments
+          : comments // ignore: cast_nullable_to_non_nullable
+      as List<ExerciseCommentSubmissionApi>,
+    ));
+  }
+
+}
+
+
+/// Adds pattern-matching-related methods to [ExerciseTranslationSubmissionApi].
+extension ExerciseTranslationSubmissionApiPatterns on ExerciseTranslationSubmissionApi {
+  /// A variant of `map` that fallback to returning `orElse`.
+  ///
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case final Subclass value:
+  ///     return ...;
+  ///   case _:
+  ///     return orElse();
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult maybeMap
+
+  <
+
+  TResult
+
+  extends
+
+  Object?
+
+  >
+
+  (
+
+  TResult Function( _ExerciseTranslationSubmissionApi value)? $default,{required TResult orElse(),}){
+  final _that = this;
+  switch (_that) {
+  case _ExerciseTranslationSubmissionApi() when $default != null:
+  return $default(_that);case _:
+  return orElse();
+
+  }
+  }
+  /// A `switch`-like method, using callbacks.
+  ///
+  /// Callbacks receives the raw object, upcasted.
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case final Subclass value:
+  ///     return ...;
+  ///   case final Subclass2 value:
+  ///     return ...;
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _ExerciseTranslationSubmissionApi value) $default,){
+  final _that = this;
+  switch (_that) {
+  case _ExerciseTranslationSubmissionApi():
+  return $default(_that);}
+  }
+  /// A variant of `map` that fallback to returning `null`.
+  ///
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case final Subclass value:
+  ///     return ...;
+  ///   case _:
+  ///     return null;
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _ExerciseTranslationSubmissionApi value)? $default,){
+  final _that = this;
+  switch (_that) {
+  case _ExerciseTranslationSubmissionApi() when $default != null:
+  return $default(_that);case _:
+  return null;
+
+  }
+  }
+  /// A variant of `when` that fallback to an `orElse` callback.
+  ///
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case Subclass(:final field):
+  ///     return ...;
+  ///   case _:
+  ///     return orElse();
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String name, String description, int language, @JsonKey(name: 'license_author') String author, List<ExerciseAliasSubmissionApi> aliases, List<ExerciseCommentSubmissionApi> comments)? $default,{required TResult orElse(),}) {final _that = this;
+  switch (_that) {
+  case _ExerciseTranslationSubmissionApi() when $default != null:
+  return $default(_that.name,_that.description,_that.language,_that.author,_that.aliases,_that.comments);case _:
+  return orElse();
+
+  }
+  }
+  /// A `switch`-like method, using callbacks.
+  ///
+  /// As opposed to `map`, this offers destructuring.
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case Subclass(:final field):
+  ///     return ...;
+  ///   case Subclass2(:final field2):
+  ///     return ...;
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String name, String description, int language, @JsonKey(name: 'license_author') String author, List<ExerciseAliasSubmissionApi> aliases, List<ExerciseCommentSubmissionApi> comments) $default,) {final _that = this;
+  switch (_that) {
+  case _ExerciseTranslationSubmissionApi():
+  return $default(_that.name,_that.description,_that.language,_that.author,_that.aliases,_that.comments);}
+  }
+  /// A variant of `when` that fallback to returning `null`
+  ///
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case Subclass(:final field):
+  ///     return ...;
+  ///   case _:
+  ///     return null;
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String name, String description, int language, @JsonKey(name: 'license_author') String author, List<ExerciseAliasSubmissionApi> aliases, List<ExerciseCommentSubmissionApi> comments)? $default,) {final _that = this;
+  switch (_that) {
+  case _ExerciseTranslationSubmissionApi() when $default != null:
+  return $default(_that.name,_that.description,_that.language,_that.author,_that.aliases,_that.comments);case _:
+  return null;
+
+  }
+  }
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _ExerciseTranslationSubmissionApi implements ExerciseTranslationSubmissionApi {
+  const _ExerciseTranslationSubmissionApi(
+      {required this.name, required this.description, required this.language, @JsonKey(
+          name: 'license_author') required this.author, final List<
+          ExerciseAliasSubmissionApi> aliases = const [], final List<
+          ExerciseCommentSubmissionApi> comments = const []})
+      : _aliases = aliases,
+        _comments = comments;
+
+  factory _ExerciseTranslationSubmissionApi.fromJson(Map<String, dynamic> json) =>
+      _$ExerciseTranslationSubmissionApiFromJson(json);
+
+  @override final String name;
+  @override final String description;
+  @override final int language;
+  @override
+  @JsonKey(name: 'license_author')
+  final String author;
+  final List<ExerciseAliasSubmissionApi> _aliases;
+
+  @override
+  @JsonKey()
+  List<ExerciseAliasSubmissionApi> get aliases {
+    if (_aliases is EqualUnmodifiableListView) return _aliases;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_aliases);
+  }
+
+  final List<ExerciseCommentSubmissionApi> _comments;
+
+  @override
+  @JsonKey()
+  List<ExerciseCommentSubmissionApi> get comments {
+    if (_comments is EqualUnmodifiableListView) return _comments;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_comments);
+  }
+
+
+  /// Create a copy of ExerciseTranslationSubmissionApi
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @pragma('vm:prefer-inline')
+  _$ExerciseTranslationSubmissionApiCopyWith<_ExerciseTranslationSubmissionApi> get copyWith =>
+      __$ExerciseTranslationSubmissionApiCopyWithImpl<_ExerciseTranslationSubmissionApi>(
+          this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$ExerciseTranslationSubmissionApiToJson(this,);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType && other is _ExerciseTranslationSubmissionApi &&
+            (identical(other.name, name) || other.name == name) &&
+            (identical(other.description, description) || other.description == description) &&
+            (identical(other.language, language) || other.language == language) &&
+            (identical(other.author, author) || other.author == author) &&
+            const DeepCollectionEquality().equals(other._aliases, _aliases) &&
+            const DeepCollectionEquality().equals(other._comments, _comments));
+  }
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  int get hashCode =>
+      Object.hash(
+          runtimeType,
+          name,
+          description,
+          language,
+          author,
+          const DeepCollectionEquality().hash(_aliases),
+          const DeepCollectionEquality().hash(_comments));
+
+  @override
+  String toString() {
+    return 'ExerciseTranslationSubmissionApi(name: $name, description: $description, language: $language, author: $author, aliases: $aliases, comments: $comments)';
+  }
+
+
+}
+
+/// @nodoc
+abstract mixin class _$ExerciseTranslationSubmissionApiCopyWith<$Res>
+    implements $ExerciseTranslationSubmissionApiCopyWith<$Res> {
+  factory _$ExerciseTranslationSubmissionApiCopyWith(_ExerciseTranslationSubmissionApi value,
+      $Res Function(_ExerciseTranslationSubmissionApi) _then) = __$ExerciseTranslationSubmissionApiCopyWithImpl;
+
+  @override
+  @useResult
+  $Res call({
+    String name, String description, int language, @JsonKey(
+        name: 'license_author') String author, List<ExerciseAliasSubmissionApi> aliases, List<
+        ExerciseCommentSubmissionApi> comments
+  });
+
+
+
+
+}
+/// @nodoc
+class __$ExerciseTranslationSubmissionApiCopyWithImpl<$Res>
+    implements _$ExerciseTranslationSubmissionApiCopyWith<$Res> {
+  __$ExerciseTranslationSubmissionApiCopyWithImpl(this._self, this._then);
+
+  final _ExerciseTranslationSubmissionApi _self;
+  final $Res Function(_ExerciseTranslationSubmissionApi) _then;
+
+  /// Create a copy of ExerciseTranslationSubmissionApi
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @pragma('vm:prefer-inline')
+  $Res call(
+      {Object? name = null, Object? description = null, Object? language = null, Object? author = null, Object? aliases = null, Object? comments = null,}) {
+    return _then(_ExerciseTranslationSubmissionApi(
+      name: null == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
+      as String,
+      description: null == description
+          ? _self.description
+          : description // ignore: cast_nullable_to_non_nullable
+      as String,
+      language: null == language
+          ? _self.language
+          : language // ignore: cast_nullable_to_non_nullable
+      as int,
+      author: null == author ? _self.author : author // ignore: cast_nullable_to_non_nullable
+      as String,
+      aliases: null == aliases ? _self._aliases : aliases // ignore: cast_nullable_to_non_nullable
+      as List<ExerciseAliasSubmissionApi>,
+      comments: null == comments
+          ? _self._comments
+          : comments // ignore: cast_nullable_to_non_nullable
+      as List<ExerciseCommentSubmissionApi>,
+    ));
+  }
+
+
+}
+
+
+/// @nodoc
+mixin _$ExerciseSubmissionApi {
+
+  int get category;
+
+  List<int> get muscles;
+
+  @JsonKey(name: 'muscles_secondary') List<int> get musclesSecondary;
+
+  List<int> get equipment;
+
+  @JsonKey(name: 'license_author') String get author;
+
+  @JsonKey(includeToJson: true) int? get variation;
+
+  @JsonKey(includeToJson: true, name: 'variations_connect_to') int? get variationConnectTo;
+
+  List<ExerciseTranslationSubmissionApi> get translations;
+
+  /// Create a copy of ExerciseSubmissionApi
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @pragma('vm:prefer-inline')
+  $ExerciseSubmissionApiCopyWith<ExerciseSubmissionApi> get copyWith =>
+      _$ExerciseSubmissionApiCopyWithImpl<ExerciseSubmissionApi>(
+          this as ExerciseSubmissionApi, _$identity);
+
+  /// Serializes this ExerciseSubmissionApi to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType && other is ExerciseSubmissionApi &&
+            (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) &&
+            (identical(other.author, author) || other.author == author) &&
+            (identical(other.variation, variation) || other.variation == variation) &&
+            (identical(other.variationConnectTo, variationConnectTo) ||
+                other.variationConnectTo == variationConnectTo) &&
+            const DeepCollectionEquality().equals(other.translations, translations));
+  }
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  int get hashCode =>
+      Object.hash(
+          runtimeType,
+          category,
+          const DeepCollectionEquality().hash(muscles),
+          const DeepCollectionEquality().hash(musclesSecondary),
+          const DeepCollectionEquality().hash(equipment),
+          author,
+          variation,
+          variationConnectTo,
+          const DeepCollectionEquality().hash(translations));
+
+  @override
+  String toString() {
+    return 'ExerciseSubmissionApi(category: $category, muscles: $muscles, musclesSecondary: $musclesSecondary, equipment: $equipment, author: $author, variation: $variation, variationConnectTo: $variationConnectTo, translations: $translations)';
+  }
+
+
+}
+
+/// @nodoc
+abstract mixin class $ExerciseSubmissionApiCopyWith<$Res> {
+  factory $ExerciseSubmissionApiCopyWith(ExerciseSubmissionApi value,
+      $Res Function(ExerciseSubmissionApi) _then) = _$ExerciseSubmissionApiCopyWithImpl;
+
+  @useResult
+  $Res call({
+    int category, List<int> muscles, @JsonKey(name: 'muscles_secondary') List<
+        int> musclesSecondary, List<int> equipment, @JsonKey(
+        name: 'license_author') String author, @JsonKey(
+        includeToJson: true) int? variation, @JsonKey(
+        includeToJson: true, name: 'variations_connect_to') int? variationConnectTo, List<
+        ExerciseTranslationSubmissionApi> translations
+  });
+
+
+
+
+}
+/// @nodoc
+class _$ExerciseSubmissionApiCopyWithImpl<$Res>
+    implements $ExerciseSubmissionApiCopyWith<$Res> {
+  _$ExerciseSubmissionApiCopyWithImpl(this._self, this._then);
+
+  final ExerciseSubmissionApi _self;
+  final $Res Function(ExerciseSubmissionApi) _then;
+
+  /// Create a copy of ExerciseSubmissionApi
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call(
+      {Object? category = null, Object? muscles = null, Object? musclesSecondary = null, Object? equipment = null, Object? author = null, Object? variation = freezed, Object? variationConnectTo = freezed, Object? translations = null,}) {
+    return _then(_self.copyWith(
+      category: null == category
+          ? _self.category
+          : category // ignore: cast_nullable_to_non_nullable
+      as int,
+      muscles: null == muscles ? _self.muscles : muscles // ignore: cast_nullable_to_non_nullable
+      as List<int>,
+      musclesSecondary: null == musclesSecondary
+          ? _self.musclesSecondary
+          : musclesSecondary // ignore: cast_nullable_to_non_nullable
+      as List<int>,
+      equipment: null == equipment
+          ? _self.equipment
+          : equipment // ignore: cast_nullable_to_non_nullable
+      as List<int>,
+      author: null == author ? _self.author : author // ignore: cast_nullable_to_non_nullable
+      as String,
+      variation: freezed == variation
+          ? _self.variation
+          : variation // ignore: cast_nullable_to_non_nullable
+      as int?,
+      variationConnectTo: freezed == variationConnectTo
+          ? _self.variationConnectTo
+          : variationConnectTo // ignore: cast_nullable_to_non_nullable
+      as int?,
+      translations: null == translations
+          ? _self.translations
+          : translations // ignore: cast_nullable_to_non_nullable
+      as List<ExerciseTranslationSubmissionApi>,
+    ));
+  }
+
+}
+
+
+/// Adds pattern-matching-related methods to [ExerciseSubmissionApi].
+extension ExerciseSubmissionApiPatterns on ExerciseSubmissionApi {
+  /// A variant of `map` that fallback to returning `orElse`.
+  ///
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case final Subclass value:
+  ///     return ...;
+  ///   case _:
+  ///     return orElse();
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult maybeMap
+
+  <
+
+  TResult
+
+  extends
+
+  Object?
+
+  >
+
+  (
+
+  TResult Function( _ExerciseSubmissionApi value)? $default,{required TResult orElse(),}){
+  final _that = this;
+  switch (_that) {
+  case _ExerciseSubmissionApi() when $default != null:
+  return $default(_that);case _:
+  return orElse();
+
+  }
+  }
+  /// A `switch`-like method, using callbacks.
+  ///
+  /// Callbacks receives the raw object, upcasted.
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case final Subclass value:
+  ///     return ...;
+  ///   case final Subclass2 value:
+  ///     return ...;
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _ExerciseSubmissionApi value) $default,){
+  final _that = this;
+  switch (_that) {
+  case _ExerciseSubmissionApi():
+  return $default(_that);}
+  }
+  /// A variant of `map` that fallback to returning `null`.
+  ///
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case final Subclass value:
+  ///     return ...;
+  ///   case _:
+  ///     return null;
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _ExerciseSubmissionApi value)? $default,){
+  final _that = this;
+  switch (_that) {
+  case _ExerciseSubmissionApi() when $default != null:
+  return $default(_that);case _:
+  return null;
+
+  }
+  }
+  /// A variant of `when` that fallback to an `orElse` callback.
+  ///
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case Subclass(:final field):
+  ///     return ...;
+  ///   case _:
+  ///     return orElse();
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( int category, List<int> muscles, @JsonKey(name: 'muscles_secondary') List<int> musclesSecondary, List<int> equipment, @JsonKey(name: 'license_author') String author, @JsonKey(includeToJson: true) int? variation, @JsonKey(includeToJson: true, name: 'variations_connect_to') int? variationConnectTo, List<ExerciseTranslationSubmissionApi> translations)? $default,{required TResult orElse(),}) {final _that = this;
+  switch (_that) {
+  case _ExerciseSubmissionApi() when $default != null:
+  return $default(_that.category,_that.muscles,_that.musclesSecondary,_that.equipment,_that.author,_that.variation,_that.variationConnectTo,_that.translations);case _:
+  return orElse();
+
+  }
+  }
+  /// A `switch`-like method, using callbacks.
+  ///
+  /// As opposed to `map`, this offers destructuring.
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case Subclass(:final field):
+  ///     return ...;
+  ///   case Subclass2(:final field2):
+  ///     return ...;
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( int category, List<int> muscles, @JsonKey(name: 'muscles_secondary') List<int> musclesSecondary, List<int> equipment, @JsonKey(name: 'license_author') String author, @JsonKey(includeToJson: true) int? variation, @JsonKey(includeToJson: true, name: 'variations_connect_to') int? variationConnectTo, List<ExerciseTranslationSubmissionApi> translations) $default,) {final _that = this;
+  switch (_that) {
+  case _ExerciseSubmissionApi():
+  return $default(_that.category,_that.muscles,_that.musclesSecondary,_that.equipment,_that.author,_that.variation,_that.variationConnectTo,_that.translations);}
+  }
+  /// A variant of `when` that fallback to returning `null`
+  ///
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case Subclass(:final field):
+  ///     return ...;
+  ///   case _:
+  ///     return null;
+  /// }
+  /// ```
+
+  @optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( int category, List<int> muscles, @JsonKey(name: 'muscles_secondary') List<int> musclesSecondary, List<int> equipment, @JsonKey(name: 'license_author') String author, @JsonKey(includeToJson: true) int? variation, @JsonKey(includeToJson: true, name: 'variations_connect_to') int? variationConnectTo, List<ExerciseTranslationSubmissionApi> translations)? $default,) {final _that = this;
+  switch (_that) {
+  case _ExerciseSubmissionApi() when $default != null:
+  return $default(_that.category,_that.muscles,_that.musclesSecondary,_that.equipment,_that.author,_that.variation,_that.variationConnectTo,_that.translations);case _:
+  return null;
+
+  }
+  }
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _ExerciseSubmissionApi implements ExerciseSubmissionApi {
+  const _ExerciseSubmissionApi({required this.category, required final List<int> muscles, @JsonKey(
+      name: 'muscles_secondary') required final List<int> musclesSecondary, required final List<
+      int> equipment, @JsonKey(name: 'license_author') required this.author, @JsonKey(
+      includeToJson: true) this.variation, @JsonKey(includeToJson: true,
+      name: 'variations_connect_to') this.variationConnectTo, required final List<
+      ExerciseTranslationSubmissionApi> translations})
+      : _muscles = muscles,
+        _musclesSecondary = musclesSecondary,
+        _equipment = equipment,
+        _translations = translations;
+
+  factory _ExerciseSubmissionApi.fromJson(Map<String, dynamic> json) =>
+      _$ExerciseSubmissionApiFromJson(json);
+
+  @override final int category;
+  final List<int> _muscles;
+
+  @override List<int> get muscles {
+    if (_muscles is EqualUnmodifiableListView) return _muscles;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_muscles);
+  }
+
+  final List<int> _musclesSecondary;
+
+  @override
+  @JsonKey(name: 'muscles_secondary')
+  List<int> get musclesSecondary {
+    if (_musclesSecondary is EqualUnmodifiableListView) return _musclesSecondary;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_musclesSecondary);
+  }
+
+  final List<int> _equipment;
+
+  @override List<int> get equipment {
+    if (_equipment is EqualUnmodifiableListView) return _equipment;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_equipment);
+  }
+
+  @override
+  @JsonKey(name: 'license_author')
+  final String author;
+  @override
+  @JsonKey(includeToJson: true)
+  final int? variation;
+  @override
+  @JsonKey(includeToJson: true, name: 'variations_connect_to')
+  final int? variationConnectTo;
+  final List<ExerciseTranslationSubmissionApi> _translations;
+
+  @override List<ExerciseTranslationSubmissionApi> get translations {
+    if (_translations is EqualUnmodifiableListView) return _translations;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_translations);
+  }
+
+
+  /// Create a copy of ExerciseSubmissionApi
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @pragma('vm:prefer-inline')
+  _$ExerciseSubmissionApiCopyWith<_ExerciseSubmissionApi> get copyWith =>
+      __$ExerciseSubmissionApiCopyWithImpl<_ExerciseSubmissionApi>(this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$ExerciseSubmissionApiToJson(this,);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType && other is _ExerciseSubmissionApi &&
+            (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) &&
+            (identical(other.author, author) || other.author == author) &&
+            (identical(other.variation, variation) || other.variation == variation) &&
+            (identical(other.variationConnectTo, variationConnectTo) ||
+                other.variationConnectTo == variationConnectTo) &&
+            const DeepCollectionEquality().equals(other._translations, _translations));
+  }
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  int get hashCode =>
+      Object.hash(
+          runtimeType,
+          category,
+          const DeepCollectionEquality().hash(_muscles),
+          const DeepCollectionEquality().hash(_musclesSecondary),
+          const DeepCollectionEquality().hash(_equipment),
+          author,
+          variation,
+          variationConnectTo,
+          const DeepCollectionEquality().hash(_translations));
+
+  @override
+  String toString() {
+    return 'ExerciseSubmissionApi(category: $category, muscles: $muscles, musclesSecondary: $musclesSecondary, equipment: $equipment, author: $author, variation: $variation, variationConnectTo: $variationConnectTo, translations: $translations)';
+  }
+
+
+}
+
+/// @nodoc
+abstract mixin class _$ExerciseSubmissionApiCopyWith<$Res>
+    implements $ExerciseSubmissionApiCopyWith<$Res> {
+  factory _$ExerciseSubmissionApiCopyWith(_ExerciseSubmissionApi value,
+      $Res Function(_ExerciseSubmissionApi) _then) = __$ExerciseSubmissionApiCopyWithImpl;
+
+  @override
+  @useResult
+  $Res call({
+    int category, List<int> muscles, @JsonKey(name: 'muscles_secondary') List<
+        int> musclesSecondary, List<int> equipment, @JsonKey(
+        name: 'license_author') String author, @JsonKey(
+        includeToJson: true) int? variation, @JsonKey(
+        includeToJson: true, name: 'variations_connect_to') int? variationConnectTo, List<
+        ExerciseTranslationSubmissionApi> translations
+  });
+
+
+
+
+}
+/// @nodoc
+class __$ExerciseSubmissionApiCopyWithImpl<$Res>
+    implements _$ExerciseSubmissionApiCopyWith<$Res> {
+  __$ExerciseSubmissionApiCopyWithImpl(this._self, this._then);
+
+  final _ExerciseSubmissionApi _self;
+  final $Res Function(_ExerciseSubmissionApi) _then;
+
+  /// Create a copy of ExerciseSubmissionApi
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @pragma('vm:prefer-inline')
+  $Res call(
+      {Object? category = null, Object? muscles = null, Object? musclesSecondary = null, Object? equipment = null, Object? author = null, Object? variation = freezed, Object? variationConnectTo = freezed, Object? translations = null,}) {
+    return _then(_ExerciseSubmissionApi(
+      category: null == category
+          ? _self.category
+          : category // ignore: cast_nullable_to_non_nullable
+      as int,
+      muscles: null == muscles ? _self._muscles : muscles // ignore: cast_nullable_to_non_nullable
+      as List<int>,
+      musclesSecondary: null == musclesSecondary
+          ? _self._musclesSecondary
+          : musclesSecondary // ignore: cast_nullable_to_non_nullable
+      as List<int>,
+      equipment: null == equipment
+          ? _self._equipment
+          : equipment // ignore: cast_nullable_to_non_nullable
+      as List<int>,
+      author: null == author ? _self.author : author // ignore: cast_nullable_to_non_nullable
+      as String,
+      variation: freezed == variation
+          ? _self.variation
+          : variation // ignore: cast_nullable_to_non_nullable
+      as int?,
+      variationConnectTo: freezed == variationConnectTo
+          ? _self.variationConnectTo
+          : variationConnectTo // ignore: cast_nullable_to_non_nullable
+      as int?,
+      translations: null == translations
+          ? _self._translations
+          : translations // ignore: cast_nullable_to_non_nullable
+      as List<ExerciseTranslationSubmissionApi>,
+    ));
+  }
+
+
+}
+
+// dart format on
diff --git a/lib/models/exercises/exercise_submission.g.dart b/lib/models/exercises/exercise_submission.g.dart
new file mode 100644
index 00000000..4ca10994
--- /dev/null
+++ b/lib/models/exercises/exercise_submission.g.dart
@@ -0,0 +1,77 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'exercise_submission.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_ExerciseAliasSubmissionApi _$ExerciseAliasSubmissionApiFromJson(Map<String, dynamic> json) =>
+    _ExerciseAliasSubmissionApi(alias: json['alias'] as String);
+
+Map<String, dynamic> _$ExerciseAliasSubmissionApiToJson(_ExerciseAliasSubmissionApi instance) =>
+    <String, dynamic>{'alias': instance.alias};
+
+_ExerciseCommentSubmissionApi _$ExerciseCommentSubmissionApiFromJson(Map<String, dynamic> json) =>
+    _ExerciseCommentSubmissionApi(alias: json['alias'] as String);
+
+Map<String, dynamic> _$ExerciseCommentSubmissionApiToJson(_ExerciseCommentSubmissionApi instance) =>
+    <String, dynamic>{'alias': instance.alias};
+
+_ExerciseTranslationSubmissionApi _$ExerciseTranslationSubmissionApiFromJson(
+  Map<String, dynamic> json,
+) => _ExerciseTranslationSubmissionApi(
+  name: json['name'] as String,
+  description: json['description'] as String,
+  language: (json['language'] as num).toInt(),
+  author: json['license_author'] as String,
+  aliases:
+      (json['aliases'] as List<dynamic>?)
+          ?.map((e) => ExerciseAliasSubmissionApi.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      const [],
+  comments:
+      (json['comments'] as List<dynamic>?)
+          ?.map((e) => ExerciseCommentSubmissionApi.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      const [],
+);
+
+Map<String, dynamic> _$ExerciseTranslationSubmissionApiToJson(
+  _ExerciseTranslationSubmissionApi instance,
+) => <String, dynamic>{
+  'name': instance.name,
+  'description': instance.description,
+  'language': instance.language,
+  'license_author': instance.author,
+  'aliases': instance.aliases,
+  'comments': instance.comments,
+};
+
+_ExerciseSubmissionApi _$ExerciseSubmissionApiFromJson(Map<String, dynamic> json) =>
+    _ExerciseSubmissionApi(
+      category: (json['category'] as num).toInt(),
+      muscles: (json['muscles'] as List<dynamic>).map((e) => (e as num).toInt()).toList(),
+      musclesSecondary: (json['muscles_secondary'] as List<dynamic>)
+          .map((e) => (e as num).toInt())
+          .toList(),
+      equipment: (json['equipment'] as List<dynamic>).map((e) => (e as num).toInt()).toList(),
+      author: json['license_author'] as String,
+      variation: (json['variation'] as num?)?.toInt(),
+      variationConnectTo: (json['variations_connect_to'] as num?)?.toInt(),
+      translations: (json['translations'] as List<dynamic>)
+          .map((e) => ExerciseTranslationSubmissionApi.fromJson(e as Map<String, dynamic>))
+          .toList(),
+    );
+
+Map<String, dynamic> _$ExerciseSubmissionApiToJson(_ExerciseSubmissionApi instance) =>
+    <String, dynamic>{
+      'category': instance.category,
+      'muscles': instance.muscles,
+      'muscles_secondary': instance.musclesSecondary,
+      'equipment': instance.equipment,
+      'license_author': instance.author,
+      'variation': instance.variation,
+      'variations_connect_to': instance.variationConnectTo,
+      'translations': instance.translations,
+    };
diff --git a/lib/models/exercises/exercise_submission_images.dart b/lib/models/exercises/exercise_submission_images.dart
new file mode 100644
index 00000000..935e85f3
--- /dev/null
+++ b/lib/models/exercises/exercise_submission_images.dart
@@ -0,0 +1,67 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'dart:io';
+
+import 'package:flutter/material.dart';
+
+enum ImageType {
+  photo(id: 1, label: 'Photo', icon: Icons.photo_camera),
+  threeD(id: 2, label: '3D', icon: Icons.view_in_ar),
+  line(id: 3, label: 'Line', icon: Icons.show_chart),
+  lowPoly(id: 4, label: 'Low-Poly', icon: Icons.filter_vintage),
+  other(id: 5, label: 'Other', icon: Icons.more_horiz);
+
+  const ImageType({required this.id, required this.label, required this.icon});
+
+  final int id;
+  final String label;
+  final IconData icon;
+}
+
+class ExerciseSubmissionImage {
+  final File imageFile;
+
+  String? title;
+  String? author;
+  String? authorUrl;
+  String? sourceUrl;
+  String? derivativeSourceUrl;
+  ImageType type = ImageType.photo;
+
+  ExerciseSubmissionImage({
+    this.title,
+    this.author,
+    this.authorUrl,
+    this.sourceUrl,
+    this.derivativeSourceUrl,
+    this.type = ImageType.photo,
+    required this.imageFile,
+  });
+
+  Map<String, String> toJson() {
+    return {
+      'license_title': title ?? '',
+      'license_author': author ?? '',
+      'license_author_url': authorUrl ?? '',
+      'license_object_url': sourceUrl ?? '',
+      'license_derivative_source_url': derivativeSourceUrl ?? '',
+      'style': type.id.toString(),
+    };
+  }
+}
diff --git a/lib/models/exercises/image.dart b/lib/models/exercises/image.dart
index d9b5dff9..0a4f5893 100644
--- a/lib/models/exercises/image.dart
+++ b/lib/models/exercises/image.dart
@@ -28,8 +28,8 @@ class ExerciseImage {
   @JsonKey(required: true)
   final String uuid;
 
-  @JsonKey(required: true, name: 'exercise_base')
-  final int exerciseBaseId;
+  @JsonKey(required: true, name: 'exercise')
+  final int exerciseId;
 
   @JsonKey(required: true, name: 'image')
   final String url;
@@ -40,13 +40,14 @@ class ExerciseImage {
   const ExerciseImage({
     required this.id,
     required this.uuid,
-    required this.exerciseBaseId,
+    required this.exerciseId,
     required this.url,
     required this.isMain,
   });
 
   // Boilerplate
   factory ExerciseImage.fromJson(Map<String, dynamic> json) => _$ExerciseImageFromJson(json);
+
   Map<String, dynamic> toJson() => _$ExerciseImageToJson(this);
 
   @override
diff --git a/lib/models/exercises/image.g.dart b/lib/models/exercises/image.g.dart
index 062b860e..c5baa02b 100644
--- a/lib/models/exercises/image.g.dart
+++ b/lib/models/exercises/image.g.dart
@@ -7,24 +7,20 @@ part of 'image.dart';
 // **************************************************************************
 
 ExerciseImage _$ExerciseImageFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const ['id', 'uuid', 'exercise_base', 'image'],
-  );
+  $checkKeys(json, requiredKeys: const ['id', 'uuid', 'exercise', 'image']);
   return ExerciseImage(
     id: (json['id'] as num).toInt(),
     uuid: json['uuid'] as String,
-    exerciseBaseId: (json['exercise_base'] as num).toInt(),
+    exerciseId: (json['exercise'] as num).toInt(),
     url: json['image'] as String,
     isMain: json['is_main'] as bool? ?? false,
   );
 }
 
-Map<String, dynamic> _$ExerciseImageToJson(ExerciseImage instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'uuid': instance.uuid,
-      'exercise_base': instance.exerciseBaseId,
-      'image': instance.url,
-      'is_main': instance.isMain,
-    };
+Map<String, dynamic> _$ExerciseImageToJson(ExerciseImage instance) => <String, dynamic>{
+  'id': instance.id,
+  'uuid': instance.uuid,
+  'exercise': instance.exerciseId,
+  'image': instance.url,
+  'is_main': instance.isMain,
+};
diff --git a/lib/models/exercises/ingredient_api.dart b/lib/models/exercises/ingredient_api.dart
deleted file mode 100644
index 68d7c33a..00000000
--- a/lib/models/exercises/ingredient_api.dart
+++ /dev/null
@@ -1,40 +0,0 @@
-import 'package:freezed_annotation/freezed_annotation.dart';
-
-part 'ingredient_api.freezed.dart';
-part 'ingredient_api.g.dart';
-
-/// Model for the search results returned from the /api/v2/ingredient/search endpoint
-@freezed
-class IngredientApiSearchDetails with _$IngredientApiSearchDetails {
-  factory IngredientApiSearchDetails({
-    required int id,
-    required String name,
-    required String? image,
-    // ignore: invalid_annotation_target
-    @JsonKey(name: 'image_thumbnail') required String? imageThumbnail,
-  }) = _IngredientApiSearchDetails;
-
-  factory IngredientApiSearchDetails.fromJson(Map<String, dynamic> json) =>
-      _$IngredientApiSearchDetailsFromJson(json);
-}
-
-@freezed
-class IngredientApiSearchEntry with _$IngredientApiSearchEntry {
-  factory IngredientApiSearchEntry({
-    required String value,
-    required IngredientApiSearchDetails data,
-  }) = _IngredientApiSearchEntry;
-
-  factory IngredientApiSearchEntry.fromJson(Map<String, dynamic> json) =>
-      _$IngredientApiSearchEntryFromJson(json);
-}
-
-@freezed
-class IngredientApiSearch with _$IngredientApiSearch {
-  factory IngredientApiSearch({
-    required List<IngredientApiSearchEntry> suggestions,
-  }) = _IngredientApiSearch;
-
-  factory IngredientApiSearch.fromJson(Map<String, dynamic> json) =>
-      _$IngredientApiSearchFromJson(json);
-}
diff --git a/lib/models/exercises/ingredient_api.freezed.dart b/lib/models/exercises/ingredient_api.freezed.dart
deleted file mode 100644
index 2186a242..00000000
--- a/lib/models/exercises/ingredient_api.freezed.dart
+++ /dev/null
@@ -1,555 +0,0 @@
-// coverage:ignore-file
-// GENERATED CODE - DO NOT MODIFY BY HAND
-// ignore_for_file: type=lint
-// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
-
-part of 'ingredient_api.dart';
-
-// **************************************************************************
-// FreezedGenerator
-// **************************************************************************
-
-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
-  @JsonKey(name: 'image_thumbnail')
-  String? get imageThumbnail => throw _privateConstructorUsedError;
-
-  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-  @JsonKey(ignore: true)
-  $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;
-
-  @pragma('vm:prefer-inline')
-  @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);
-  }
-}
-
-/// @nodoc
-abstract class _$$IngredientApiSearchDetailsImplCopyWith<$Res>
-    implements $IngredientApiSearchDetailsCopyWith<$Res> {
-  factory _$$IngredientApiSearchDetailsImplCopyWith(
-          _$IngredientApiSearchDetailsImpl value,
-          $Res Function(_$IngredientApiSearchDetailsImpl) then) =
-      __$$IngredientApiSearchDetailsImplCopyWithImpl<$Res>;
-  @override
-  @useResult
-  $Res call(
-      {int id,
-      String name,
-      String? image,
-      @JsonKey(name: 'image_thumbnail') String? imageThumbnail});
-}
-
-/// @nodoc
-class __$$IngredientApiSearchDetailsImplCopyWithImpl<$Res>
-    extends _$IngredientApiSearchDetailsCopyWithImpl<$Res,
-        _$IngredientApiSearchDetailsImpl>
-    implements _$$IngredientApiSearchDetailsImplCopyWith<$Res> {
-  __$$IngredientApiSearchDetailsImplCopyWithImpl(
-      _$IngredientApiSearchDetailsImpl _value,
-      $Res Function(_$IngredientApiSearchDetailsImpl) _then)
-      : super(_value, _then);
-
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? id = null,
-    Object? name = null,
-    Object? image = freezed,
-    Object? imageThumbnail = freezed,
-  }) {
-    return _then(_$IngredientApiSearchDetailsImpl(
-      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?,
-    ));
-  }
-}
-
-/// @nodoc
-@JsonSerializable()
-class _$IngredientApiSearchDetailsImpl implements _IngredientApiSearchDetails {
-  _$IngredientApiSearchDetailsImpl(
-      {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);
-
-  @override
-  final int id;
-  @override
-  final String name;
-  @override
-  final String? image;
-// ignore: invalid_annotation_target
-  @override
-  @JsonKey(name: 'image_thumbnail')
-  final String? imageThumbnail;
-
-  @override
-  String toString() {
-    return 'IngredientApiSearchDetails(id: $id, name: $name, image: $image, imageThumbnail: $imageThumbnail)';
-  }
-
-  @override
-  bool operator ==(Object other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _$IngredientApiSearchDetailsImpl &&
-            (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(ignore: true)
-  @override
-  int get hashCode => Object.hash(runtimeType, id, name, image, imageThumbnail);
-
-  @JsonKey(ignore: true)
-  @override
-  @pragma('vm:prefer-inline')
-  _$$IngredientApiSearchDetailsImplCopyWith<_$IngredientApiSearchDetailsImpl>
-      get copyWith => __$$IngredientApiSearchDetailsImplCopyWithImpl<
-          _$IngredientApiSearchDetailsImpl>(this, _$identity);
-
-  @override
-  Map<String, dynamic> toJson() {
-    return _$$IngredientApiSearchDetailsImplToJson(
-      this,
-    );
-  }
-}
-
-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;
-
-  factory _IngredientApiSearchDetails.fromJson(Map<String, dynamic> json) =
-      _$IngredientApiSearchDetailsImpl.fromJson;
-
-  @override
-  int get id;
-  @override
-  String get name;
-  @override
-  String? get image;
-  @override // ignore: invalid_annotation_target
-  @JsonKey(name: 'image_thumbnail')
-  String? get imageThumbnail;
-  @override
-  @JsonKey(ignore: true)
-  _$$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;
-
-  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-  @JsonKey(ignore: true)
-  $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;
-
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? value = null,
-    Object? data = null,
-  }) {
-    return _then(_value.copyWith(
-      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,
-    ) as $Val);
-  }
-
-  @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);
-
-  @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,
-    ));
-  }
-}
-
-/// @nodoc
-@JsonSerializable()
-class _$IngredientApiSearchEntryImpl implements _IngredientApiSearchEntry {
-  _$IngredientApiSearchEntryImpl({required this.value, required this.data});
-
-  factory _$IngredientApiSearchEntryImpl.fromJson(Map<String, dynamic> json) =>
-      _$$IngredientApiSearchEntryImplFromJson(json);
-
-  @override
-  final String value;
-  @override
-  final IngredientApiSearchDetails data;
-
-  @override
-  String toString() {
-    return 'IngredientApiSearchEntry(value: $value, data: $data)';
-  }
-
-  @override
-  bool operator ==(Object other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _$IngredientApiSearchEntryImpl &&
-            (identical(other.value, value) || other.value == value) &&
-            (identical(other.data, data) || other.data == data));
-  }
-
-  @JsonKey(ignore: true)
-  @override
-  int get hashCode => Object.hash(runtimeType, value, data);
-
-  @JsonKey(ignore: true)
-  @override
-  @pragma('vm:prefer-inline')
-  _$$IngredientApiSearchEntryImplCopyWith<_$IngredientApiSearchEntryImpl>
-      get copyWith => __$$IngredientApiSearchEntryImplCopyWithImpl<
-          _$IngredientApiSearchEntryImpl>(this, _$identity);
-
-  @override
-  Map<String, dynamic> toJson() {
-    return _$$IngredientApiSearchEntryImplToJson(
-      this,
-    );
-  }
-}
-
-abstract class _IngredientApiSearchEntry implements IngredientApiSearchEntry {
-  factory _IngredientApiSearchEntry(
-          {required final String value,
-          required final IngredientApiSearchDetails data}) =
-      _$IngredientApiSearchEntryImpl;
-
-  factory _IngredientApiSearchEntry.fromJson(Map<String, dynamic> json) =
-      _$IngredientApiSearchEntryImpl.fromJson;
-
-  @override
-  String get value;
-  @override
-  IngredientApiSearchDetails get data;
-  @override
-  @JsonKey(ignore: true)
-  _$$IngredientApiSearchEntryImplCopyWith<_$IngredientApiSearchEntryImpl>
-      get copyWith => throw _privateConstructorUsedError;
-}
-
-IngredientApiSearch _$IngredientApiSearchFromJson(Map<String, dynamic> json) {
-  return _IngredientApiSearch.fromJson(json);
-}
-
-/// @nodoc
-mixin _$IngredientApiSearch {
-  List<IngredientApiSearchEntry> get suggestions =>
-      throw _privateConstructorUsedError;
-
-  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-  @JsonKey(ignore: true)
-  $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;
-
-  @pragma('vm:prefer-inline')
-  @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);
-  }
-}
-
-/// @nodoc
-abstract class _$$IngredientApiSearchImplCopyWith<$Res>
-    implements $IngredientApiSearchCopyWith<$Res> {
-  factory _$$IngredientApiSearchImplCopyWith(_$IngredientApiSearchImpl value,
-          $Res Function(_$IngredientApiSearchImpl) then) =
-      __$$IngredientApiSearchImplCopyWithImpl<$Res>;
-  @override
-  @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);
-
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? suggestions = null,
-  }) {
-    return _then(_$IngredientApiSearchImpl(
-      suggestions: null == suggestions
-          ? _value._suggestions
-          : suggestions // ignore: cast_nullable_to_non_nullable
-              as List<IngredientApiSearchEntry>,
-    ));
-  }
-}
-
-/// @nodoc
-@JsonSerializable()
-class _$IngredientApiSearchImpl implements _IngredientApiSearch {
-  _$IngredientApiSearchImpl(
-      {required final List<IngredientApiSearchEntry> suggestions})
-      : _suggestions = suggestions;
-
-  factory _$IngredientApiSearchImpl.fromJson(Map<String, dynamic> json) =>
-      _$$IngredientApiSearchImplFromJson(json);
-
-  final List<IngredientApiSearchEntry> _suggestions;
-  @override
-  List<IngredientApiSearchEntry> get suggestions {
-    if (_suggestions is EqualUnmodifiableListView) return _suggestions;
-    // ignore: implicit_dynamic_type
-    return EqualUnmodifiableListView(_suggestions);
-  }
-
-  @override
-  String toString() {
-    return 'IngredientApiSearch(suggestions: $suggestions)';
-  }
-
-  @override
-  bool operator ==(Object other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _$IngredientApiSearchImpl &&
-            const DeepCollectionEquality()
-                .equals(other._suggestions, _suggestions));
-  }
-
-  @JsonKey(ignore: true)
-  @override
-  int get hashCode => Object.hash(
-      runtimeType, const DeepCollectionEquality().hash(_suggestions));
-
-  @JsonKey(ignore: true)
-  @override
-  @pragma('vm:prefer-inline')
-  _$$IngredientApiSearchImplCopyWith<_$IngredientApiSearchImpl> get copyWith =>
-      __$$IngredientApiSearchImplCopyWithImpl<_$IngredientApiSearchImpl>(
-          this, _$identity);
-
-  @override
-  Map<String, dynamic> toJson() {
-    return _$$IngredientApiSearchImplToJson(
-      this,
-    );
-  }
-}
-
-abstract class _IngredientApiSearch implements IngredientApiSearch {
-  factory _IngredientApiSearch(
-          {required final List<IngredientApiSearchEntry> suggestions}) =
-      _$IngredientApiSearchImpl;
-
-  factory _IngredientApiSearch.fromJson(Map<String, dynamic> json) =
-      _$IngredientApiSearchImpl.fromJson;
-
-  @override
-  List<IngredientApiSearchEntry> get suggestions;
-  @override
-  @JsonKey(ignore: true)
-  _$$IngredientApiSearchImplCopyWith<_$IngredientApiSearchImpl> get copyWith =>
-      throw _privateConstructorUsedError;
-}
diff --git a/lib/models/exercises/ingredient_api.g.dart b/lib/models/exercises/ingredient_api.g.dart
deleted file mode 100644
index 225feab1..00000000
--- a/lib/models/exercises/ingredient_api.g.dart
+++ /dev/null
@@ -1,55 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'ingredient_api.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-_$IngredientApiSearchDetailsImpl _$$IngredientApiSearchDetailsImplFromJson(
-        Map<String, dynamic> json) =>
-    _$IngredientApiSearchDetailsImpl(
-      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) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'name': instance.name,
-      'image': instance.image,
-      'image_thumbnail': instance.imageThumbnail,
-    };
-
-_$IngredientApiSearchEntryImpl _$$IngredientApiSearchEntryImplFromJson(
-        Map<String, dynamic> json) =>
-    _$IngredientApiSearchEntryImpl(
-      value: json['value'] as String,
-      data: IngredientApiSearchDetails.fromJson(
-          json['data'] as Map<String, dynamic>),
-    );
-
-Map<String, dynamic> _$$IngredientApiSearchEntryImplToJson(
-        _$IngredientApiSearchEntryImpl instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-      'data': instance.data,
-    };
-
-_$IngredientApiSearchImpl _$$IngredientApiSearchImplFromJson(
-        Map<String, dynamic> json) =>
-    _$IngredientApiSearchImpl(
-      suggestions: (json['suggestions'] as List<dynamic>)
-          .map((e) =>
-              IngredientApiSearchEntry.fromJson(e as Map<String, dynamic>))
-          .toList(),
-    );
-
-Map<String, dynamic> _$$IngredientApiSearchImplToJson(
-        _$IngredientApiSearchImpl instance) =>
-    <String, dynamic>{
-      'suggestions': instance.suggestions,
-    };
diff --git a/lib/models/exercises/language.g.dart b/lib/models/exercises/language.g.dart
index 28a31848..e1129373 100644
--- a/lib/models/exercises/language.g.dart
+++ b/lib/models/exercises/language.g.dart
@@ -7,10 +7,7 @@ part of 'language.dart';
 // **************************************************************************
 
 Language _$LanguageFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const ['id', 'short_name', 'full_name'],
-  );
+  $checkKeys(json, requiredKeys: const ['id', 'short_name', 'full_name']);
   return Language(
     id: (json['id'] as num).toInt(),
     shortName: json['short_name'] as String,
@@ -19,7 +16,7 @@ Language _$LanguageFromJson(Map<String, dynamic> json) {
 }
 
 Map<String, dynamic> _$LanguageToJson(Language instance) => <String, dynamic>{
-      'id': instance.id,
-      'short_name': instance.shortName,
-      'full_name': instance.fullName,
-    };
+  'id': instance.id,
+  'short_name': instance.shortName,
+  'full_name': instance.fullName,
+};
diff --git a/lib/models/exercises/muscle.g.dart b/lib/models/exercises/muscle.g.dart
index 04319680..37a9b073 100644
--- a/lib/models/exercises/muscle.g.dart
+++ b/lib/models/exercises/muscle.g.dart
@@ -7,10 +7,7 @@ part of 'muscle.dart';
 // **************************************************************************
 
 Muscle _$MuscleFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const ['id', 'name', 'name_en', 'is_front'],
-  );
+  $checkKeys(json, requiredKeys: const ['id', 'name', 'name_en', 'is_front']);
   return Muscle(
     id: (json['id'] as num).toInt(),
     name: json['name'] as String,
@@ -20,8 +17,8 @@ Muscle _$MuscleFromJson(Map<String, dynamic> json) {
 }
 
 Map<String, dynamic> _$MuscleToJson(Muscle instance) => <String, dynamic>{
-      'id': instance.id,
-      'name': instance.name,
-      'name_en': instance.nameEn,
-      'is_front': instance.isFront,
-    };
+  'id': instance.id,
+  'name': instance.name,
+  'name_en': instance.nameEn,
+  'is_front': instance.isFront,
+};
diff --git a/lib/models/exercises/translation.dart b/lib/models/exercises/translation.dart
index d7a3775d..0fc40534 100644
--- a/lib/models/exercises/translation.dart
+++ b/lib/models/exercises/translation.dart
@@ -42,7 +42,7 @@ class Translation extends Equatable {
   @JsonKey(required: true, name: 'created')
   final DateTime? created;
 
-  @JsonKey(required: true, name: 'exercise_base')
+  @JsonKey(required: true, name: 'exercise')
   late int? exerciseId;
 
   @JsonKey(required: true)
@@ -92,12 +92,12 @@ class Translation extends Equatable {
 
   @override
   List<Object?> get props => [
-        id,
-        exerciseId,
-        uuid,
-        languageId,
-        created,
-        name,
-        description,
-      ];
+    id,
+    exerciseId,
+    uuid,
+    languageId,
+    created,
+    name,
+    description,
+  ];
 }
diff --git a/lib/models/exercises/translation.g.dart b/lib/models/exercises/translation.g.dart
index e308dc10..2042296d 100644
--- a/lib/models/exercises/translation.g.dart
+++ b/lib/models/exercises/translation.g.dart
@@ -9,26 +9,16 @@ part of 'translation.dart';
 Translation _$TranslationFromJson(Map<String, dynamic> json) {
   $checkKeys(
     json,
-    requiredKeys: const [
-      'id',
-      'uuid',
-      'language',
-      'created',
-      'exercise_base',
-      'name',
-      'description'
-    ],
+    requiredKeys: const ['id', 'uuid', 'language', 'created', 'exercise', 'name', 'description'],
   );
   return Translation(
-    id: (json['id'] as num?)?.toInt(),
-    uuid: json['uuid'] as String?,
-    created: json['created'] == null
-        ? null
-        : DateTime.parse(json['created'] as String),
-    name: json['name'] as String,
-    description: json['description'] as String,
-    exerciseId: (json['exercise_base'] as num?)?.toInt(),
-  )
+      id: (json['id'] as num?)?.toInt(),
+      uuid: json['uuid'] as String?,
+      created: json['created'] == null ? null : DateTime.parse(json['created'] as String),
+      name: json['name'] as String,
+      description: json['description'] as String,
+      exerciseId: (json['exercise'] as num?)?.toInt(),
+    )
     ..languageId = (json['language'] as num).toInt()
     ..notes = (json['notes'] as List<dynamic>)
         .map((e) => Comment.fromJson(e as Map<String, dynamic>))
@@ -38,13 +28,12 @@ Translation _$TranslationFromJson(Map<String, dynamic> json) {
         .toList();
 }
 
-Map<String, dynamic> _$TranslationToJson(Translation instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'uuid': instance.uuid,
-      'language': instance.languageId,
-      'created': instance.created?.toIso8601String(),
-      'exercise_base': instance.exerciseId,
-      'name': instance.name,
-      'description': instance.description,
-    };
+Map<String, dynamic> _$TranslationToJson(Translation instance) => <String, dynamic>{
+  'id': instance.id,
+  'uuid': instance.uuid,
+  'language': instance.languageId,
+  'created': instance.created?.toIso8601String(),
+  'exercise': instance.exerciseId,
+  'name': instance.name,
+  'description': instance.description,
+};
diff --git a/lib/models/exercises/variation.g.dart b/lib/models/exercises/variation.g.dart
index 9b9901e2..b9d3b187 100644
--- a/lib/models/exercises/variation.g.dart
+++ b/lib/models/exercises/variation.g.dart
@@ -7,15 +7,10 @@ part of 'variation.dart';
 // **************************************************************************
 
 Variation _$VariationFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const ['id'],
-  );
-  return Variation(
-    id: (json['id'] as num).toInt(),
-  );
+  $checkKeys(json, requiredKeys: const ['id']);
+  return Variation(id: (json['id'] as num).toInt());
 }
 
 Map<String, dynamic> _$VariationToJson(Variation instance) => <String, dynamic>{
-      'id': instance.id,
-    };
+  'id': instance.id,
+};
diff --git a/lib/models/exercises/video.dart b/lib/models/exercises/video.dart
index 1213a3c7..a6948baa 100644
--- a/lib/models/exercises/video.dart
+++ b/lib/models/exercises/video.dart
@@ -32,8 +32,10 @@ class Video {
   @JsonKey(name: 'video', required: true)
   final String url;
 
-  @JsonKey(name: 'exercise_base', required: true)
-  final int base;
+  Uri get uri => Uri.parse(url);
+
+  @JsonKey(name: 'exercise', required: true)
+  final int exerciseId;
 
   @JsonKey(required: true)
   final int size;
@@ -62,7 +64,7 @@ class Video {
   const Video({
     required this.id,
     required this.uuid,
-    required this.base,
+    required this.exerciseId,
     required this.size,
     required this.url,
     required this.duration,
@@ -76,5 +78,6 @@ class Video {
 
   // Boilerplate
   factory Video.fromJson(Map<String, dynamic> json) => _$VideoFromJson(json);
+
   Map<String, dynamic> toJson() => _$VideoToJson(this);
 }
diff --git a/lib/models/exercises/video.g.dart b/lib/models/exercises/video.g.dart
index 0d0cc875..f574eb65 100644
--- a/lib/models/exercises/video.g.dart
+++ b/lib/models/exercises/video.g.dart
@@ -13,7 +13,7 @@ Video _$VideoFromJson(Map<String, dynamic> json) {
       'id',
       'uuid',
       'video',
-      'exercise_base',
+      'exercise',
       'size',
       'duration',
       'width',
@@ -21,13 +21,13 @@ Video _$VideoFromJson(Map<String, dynamic> json) {
       'codec',
       'codec_long',
       'license',
-      'license_author'
+      'license_author',
     ],
   );
   return Video(
     id: (json['id'] as num).toInt(),
     uuid: json['uuid'] as String,
-    base: (json['exercise_base'] as num).toInt(),
+    exerciseId: (json['exercise'] as num).toInt(),
     size: (json['size'] as num).toInt(),
     url: json['video'] as String,
     duration: stringToNum(json['duration'] as String?),
@@ -41,16 +41,16 @@ Video _$VideoFromJson(Map<String, dynamic> json) {
 }
 
 Map<String, dynamic> _$VideoToJson(Video instance) => <String, dynamic>{
-      'id': instance.id,
-      'uuid': instance.uuid,
-      'video': instance.url,
-      'exercise_base': instance.base,
-      'size': instance.size,
-      'duration': numToString(instance.duration),
-      'width': instance.width,
-      'height': instance.height,
-      'codec': instance.codec,
-      'codec_long': instance.codecLong,
-      'license': instance.license,
-      'license_author': instance.licenseAuthor,
-    };
+  'id': instance.id,
+  'uuid': instance.uuid,
+  'video': instance.url,
+  'exercise': instance.exerciseId,
+  'size': instance.size,
+  'duration': numToString(instance.duration),
+  'width': instance.width,
+  'height': instance.height,
+  'codec': instance.codec,
+  'codec_long': instance.codecLong,
+  'license': instance.license,
+  'license_author': instance.licenseAuthor,
+};
diff --git a/lib/models/gallery/image.dart b/lib/models/gallery/image.dart
index 2fb60fbd..2645cf77 100644
--- a/lib/models/gallery/image.dart
+++ b/lib/models/gallery/image.dart
@@ -26,7 +26,7 @@ class Image {
   @JsonKey(required: true)
   int? id;
 
-  @JsonKey(required: true, toJson: toDate)
+  @JsonKey(required: true, toJson: dateToYYYYMMDD)
   late DateTime date;
 
   @JsonKey(required: true, name: 'image')
@@ -49,5 +49,6 @@ class Image {
 
   // Boilerplate
   factory Image.fromJson(Map<String, dynamic> json) => _$ImageFromJson(json);
+
   Map<String, dynamic> toJson() => _$ImageToJson(this);
 }
diff --git a/lib/models/gallery/image.g.dart b/lib/models/gallery/image.g.dart
index 54ab9af5..0a6f9694 100644
--- a/lib/models/gallery/image.g.dart
+++ b/lib/models/gallery/image.g.dart
@@ -7,10 +7,7 @@ part of 'image.dart';
 // **************************************************************************
 
 Image _$ImageFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const ['id', 'date', 'image'],
-  );
+  $checkKeys(json, requiredKeys: const ['id', 'date', 'image']);
   return Image(
     id: (json['id'] as num?)?.toInt(),
     date: DateTime.parse(json['date'] as String),
@@ -20,8 +17,8 @@ Image _$ImageFromJson(Map<String, dynamic> json) {
 }
 
 Map<String, dynamic> _$ImageToJson(Image instance) => <String, dynamic>{
-      'id': instance.id,
-      'date': toDate(instance.date),
-      'image': instance.url,
-      'description': instance.description,
-    };
+  'id': instance.id,
+  'date': dateToYYYYMMDD(instance.date),
+  'image': instance.url,
+  'description': instance.description,
+};
diff --git a/lib/models/measurements/measurement_category.g.dart b/lib/models/measurements/measurement_category.g.dart
index 8563188f..89600fb7 100644
--- a/lib/models/measurements/measurement_category.g.dart
+++ b/lib/models/measurements/measurement_category.g.dart
@@ -7,26 +7,22 @@ part of 'measurement_category.dart';
 // **************************************************************************
 
 MeasurementCategory _$MeasurementCategoryFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const ['id', 'name', 'unit'],
-  );
+  $checkKeys(json, requiredKeys: const ['id', 'name', 'unit']);
   return MeasurementCategory(
     id: (json['id'] as num?)?.toInt(),
     name: json['name'] as String,
     unit: json['unit'] as String,
-    entries: (json['entries'] as List<dynamic>?)
+    entries:
+        (json['entries'] as List<dynamic>?)
             ?.map((e) => MeasurementEntry.fromJson(e as Map<String, dynamic>))
             .toList() ??
         [],
   );
 }
 
-Map<String, dynamic> _$MeasurementCategoryToJson(
-        MeasurementCategory instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'name': instance.name,
-      'unit': instance.unit,
-      'entries': MeasurementCategory._nullValue(instance.entries),
-    };
+Map<String, dynamic> _$MeasurementCategoryToJson(MeasurementCategory instance) => <String, dynamic>{
+  'id': instance.id,
+  'name': instance.name,
+  'unit': instance.unit,
+  'entries': MeasurementCategory._nullValue(instance.entries),
+};
diff --git a/lib/models/measurements/measurement_entry.dart b/lib/models/measurements/measurement_entry.dart
index dd24b05e..6bb1e2eb 100644
--- a/lib/models/measurements/measurement_entry.dart
+++ b/lib/models/measurements/measurement_entry.dart
@@ -12,7 +12,7 @@ class MeasurementEntry extends Equatable {
   @JsonKey(required: true)
   final int category;
 
-  @JsonKey(required: true, toJson: toDate)
+  @JsonKey(required: true, toJson: dateToYYYYMMDD)
   final DateTime date;
 
   @JsonKey(required: true)
diff --git a/lib/models/measurements/measurement_entry.g.dart b/lib/models/measurements/measurement_entry.g.dart
index 4219e737..f8eebb7d 100644
--- a/lib/models/measurements/measurement_entry.g.dart
+++ b/lib/models/measurements/measurement_entry.g.dart
@@ -20,11 +20,10 @@ MeasurementEntry _$MeasurementEntryFromJson(Map<String, dynamic> json) {
   );
 }
 
-Map<String, dynamic> _$MeasurementEntryToJson(MeasurementEntry instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'category': instance.category,
-      'date': toDate(instance.date),
-      'value': instance.value,
-      'notes': instance.notes,
-    };
+Map<String, dynamic> _$MeasurementEntryToJson(MeasurementEntry instance) => <String, dynamic>{
+  'id': instance.id,
+  'category': instance.category,
+  'date': dateToYYYYMMDD(instance.date),
+  'value': instance.value,
+  'notes': instance.notes,
+};
diff --git a/lib/models/nutrition/ingredient.dart b/lib/models/nutrition/ingredient.dart
index eb3bcf9a..69a44885 100644
--- a/lib/models/nutrition/ingredient.dart
+++ b/lib/models/nutrition/ingredient.dart
@@ -18,6 +18,7 @@
 import 'package:json_annotation/json_annotation.dart';
 import 'package:wger/helpers/json.dart';
 import 'package:wger/models/nutrition/ingredient_image.dart';
+import 'package:wger/models/nutrition/ingredient_image_thumbnails.dart';
 import 'package:wger/models/nutrition/nutritional_values.dart';
 
 part 'ingredient.g.dart';
@@ -90,6 +91,8 @@ class Ingredient {
 
   IngredientImage? image;
 
+  IngredientImageThumbnails? thumbnails;
+
   Ingredient({
     required this.remoteId,
     required this.sourceName,
@@ -108,6 +111,7 @@ class Ingredient {
     required this.fiber,
     required this.sodium,
     this.image,
+    this.thumbnails,
   });
 
   // Boilerplate
diff --git a/lib/models/nutrition/ingredient.g.dart b/lib/models/nutrition/ingredient.g.dart
index 6c820420..c862786c 100644
--- a/lib/models/nutrition/ingredient.g.dart
+++ b/lib/models/nutrition/ingredient.g.dart
@@ -25,7 +25,7 @@ Ingredient _$IngredientFromJson(Map<String, dynamic> json) {
       'fat',
       'fat_saturated',
       'fiber',
-      'sodium'
+      'sodium',
     ],
   );
   return Ingredient(
@@ -48,26 +48,29 @@ Ingredient _$IngredientFromJson(Map<String, dynamic> json) {
     image: json['image'] == null
         ? null
         : IngredientImage.fromJson(json['image'] as Map<String, dynamic>),
+    thumbnails: json['thumbnails'] == null
+        ? null
+        : IngredientImageThumbnails.fromJson(json['thumbnails'] as Map<String, dynamic>),
   );
 }
 
-Map<String, dynamic> _$IngredientToJson(Ingredient instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'remote_id': instance.remoteId,
-      'source_name': instance.sourceName,
-      'source_url': instance.sourceUrl,
-      'license_object_url': instance.licenseObjectURl,
-      'code': instance.code,
-      'name': instance.name,
-      'created': instance.created.toIso8601String(),
-      'energy': instance.energy,
-      'carbohydrates': numToString(instance.carbohydrates),
-      'carbohydrates_sugar': numToString(instance.carbohydratesSugar),
-      'protein': numToString(instance.protein),
-      'fat': numToString(instance.fat),
-      'fat_saturated': numToString(instance.fatSaturated),
-      'fiber': numToString(instance.fiber),
-      'sodium': numToString(instance.sodium),
-      'image': instance.image,
-    };
+Map<String, dynamic> _$IngredientToJson(Ingredient instance) => <String, dynamic>{
+  'id': instance.id,
+  'remote_id': instance.remoteId,
+  'source_name': instance.sourceName,
+  'source_url': instance.sourceUrl,
+  'license_object_url': instance.licenseObjectURl,
+  'code': instance.code,
+  'name': instance.name,
+  'created': instance.created.toIso8601String(),
+  'energy': instance.energy,
+  'carbohydrates': numToString(instance.carbohydrates),
+  'carbohydrates_sugar': numToString(instance.carbohydratesSugar),
+  'protein': numToString(instance.protein),
+  'fat': numToString(instance.fat),
+  'fat_saturated': numToString(instance.fatSaturated),
+  'fiber': numToString(instance.fiber),
+  'sodium': numToString(instance.sodium),
+  'image': instance.image,
+  'thumbnails': instance.thumbnails,
+};
diff --git a/lib/models/nutrition/ingredient_image.dart b/lib/models/nutrition/ingredient_image.dart
index 30983bfb..42a31fe3 100644
--- a/lib/models/nutrition/ingredient_image.dart
+++ b/lib/models/nutrition/ingredient_image.dart
@@ -33,8 +33,8 @@ class IngredientImage {
   final int ingredientId;
 
   /// URL of the image on the server
-  @JsonKey(required: true)
-  final String image;
+  @JsonKey(required: true, name: 'image')
+  final String url;
 
   /// Size in bytes
   @JsonKey(required: true)
@@ -70,7 +70,7 @@ class IngredientImage {
     required this.id,
     required this.uuid,
     required this.ingredientId,
-    required this.image,
+    required this.url,
     required this.size,
     required this.licenseId,
     required this.author,
diff --git a/lib/models/nutrition/ingredient_image.g.dart b/lib/models/nutrition/ingredient_image.g.dart
index 558217ee..e772150b 100644
--- a/lib/models/nutrition/ingredient_image.g.dart
+++ b/lib/models/nutrition/ingredient_image.g.dart
@@ -20,14 +20,14 @@ IngredientImage _$IngredientImageFromJson(Map<String, dynamic> json) {
       'license_author_url',
       'license_title',
       'license_object_url',
-      'license_derivative_source_url'
+      'license_derivative_source_url',
     ],
   );
   return IngredientImage(
     id: (json['id'] as num).toInt(),
     uuid: json['uuid'] as String,
     ingredientId: (json['ingredient_id'] as num).toInt(),
-    image: json['image'] as String,
+    url: json['image'] as String,
     size: (json['size'] as num).toInt(),
     licenseId: (json['license'] as num).toInt(),
     author: json['license_author'] as String,
@@ -38,17 +38,16 @@ IngredientImage _$IngredientImageFromJson(Map<String, dynamic> json) {
   );
 }
 
-Map<String, dynamic> _$IngredientImageToJson(IngredientImage instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'uuid': instance.uuid,
-      'ingredient_id': instance.ingredientId,
-      'image': instance.image,
-      'size': instance.size,
-      'license': instance.licenseId,
-      'license_author': instance.author,
-      'license_author_url': instance.authorUrl,
-      'license_title': instance.title,
-      'license_object_url': instance.objectUrl,
-      'license_derivative_source_url': instance.derivativeSourceUrl,
-    };
+Map<String, dynamic> _$IngredientImageToJson(IngredientImage instance) => <String, dynamic>{
+  'id': instance.id,
+  'uuid': instance.uuid,
+  'ingredient_id': instance.ingredientId,
+  'image': instance.url,
+  'size': instance.size,
+  'license': instance.licenseId,
+  'license_author': instance.author,
+  'license_author_url': instance.authorUrl,
+  'license_title': instance.title,
+  'license_object_url': instance.objectUrl,
+  'license_derivative_source_url': instance.derivativeSourceUrl,
+};
diff --git a/lib/models/nutrition/ingredient_image_thumbnails.dart b/lib/models/nutrition/ingredient_image_thumbnails.dart
new file mode 100644
index 00000000..68278e64
--- /dev/null
+++ b/lib/models/nutrition/ingredient_image_thumbnails.dart
@@ -0,0 +1,56 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+import 'package:json_annotation/json_annotation.dart';
+
+part 'ingredient_image_thumbnails.g.dart';
+
+@JsonSerializable()
+class IngredientImageThumbnails {
+  @JsonKey(required: true)
+  final String small;
+
+  @JsonKey(required: true, name: 'small_cropped')
+  final String smallCropped;
+
+  @JsonKey(required: true)
+  final String medium;
+
+  @JsonKey(required: true, name: 'medium_cropped')
+  final String mediumCropped;
+
+  @JsonKey(required: true)
+  final String large;
+
+  @JsonKey(required: true, name: 'large_cropped')
+  final String largeCropped;
+
+  const IngredientImageThumbnails({
+    required this.small,
+    required this.smallCropped,
+    required this.medium,
+    required this.mediumCropped,
+    required this.large,
+    required this.largeCropped,
+  });
+
+  // Boilerplate
+  factory IngredientImageThumbnails.fromJson(Map<String, dynamic> json) =>
+      _$IngredientImageThumbnailsFromJson(json);
+
+  Map<String, dynamic> toJson() => _$IngredientImageThumbnailsToJson(this);
+}
diff --git a/lib/models/nutrition/ingredient_image_thumbnails.g.dart b/lib/models/nutrition/ingredient_image_thumbnails.g.dart
new file mode 100644
index 00000000..ba75fd01
--- /dev/null
+++ b/lib/models/nutrition/ingredient_image_thumbnails.g.dart
@@ -0,0 +1,39 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'ingredient_image_thumbnails.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+IngredientImageThumbnails _$IngredientImageThumbnailsFromJson(Map<String, dynamic> json) {
+  $checkKeys(
+    json,
+    requiredKeys: const [
+      'small',
+      'small_cropped',
+      'medium',
+      'medium_cropped',
+      'large',
+      'large_cropped',
+    ],
+  );
+  return IngredientImageThumbnails(
+    small: json['small'] as String,
+    smallCropped: json['small_cropped'] as String,
+    medium: json['medium'] as String,
+    mediumCropped: json['medium_cropped'] as String,
+    large: json['large'] as String,
+    largeCropped: json['large_cropped'] as String,
+  );
+}
+
+Map<String, dynamic> _$IngredientImageThumbnailsToJson(IngredientImageThumbnails instance) =>
+    <String, dynamic>{
+      'small': instance.small,
+      'small_cropped': instance.smallCropped,
+      'medium': instance.medium,
+      'medium_cropped': instance.mediumCropped,
+      'large': instance.large,
+      'large_cropped': instance.largeCropped,
+    };
diff --git a/lib/models/nutrition/ingredient_weight_unit.g.dart b/lib/models/nutrition/ingredient_weight_unit.g.dart
index fa424264..6356e8d3 100644
--- a/lib/models/nutrition/ingredient_weight_unit.g.dart
+++ b/lib/models/nutrition/ingredient_weight_unit.g.dart
@@ -7,22 +7,17 @@ part of 'ingredient_weight_unit.dart';
 // **************************************************************************
 
 IngredientWeightUnit _$IngredientWeightUnitFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const ['id', 'weight_unit', 'ingredient', 'grams', 'amount'],
-  );
+  $checkKeys(json, requiredKeys: const ['id', 'weight_unit', 'ingredient', 'grams', 'amount']);
   return IngredientWeightUnit(
     id: (json['id'] as num).toInt(),
-    weightUnit:
-        WeightUnit.fromJson(json['weight_unit'] as Map<String, dynamic>),
+    weightUnit: WeightUnit.fromJson(json['weight_unit'] as Map<String, dynamic>),
     ingredient: Ingredient.fromJson(json['ingredient'] as Map<String, dynamic>),
     grams: (json['grams'] as num).toInt(),
     amount: (json['amount'] as num).toDouble(),
   );
 }
 
-Map<String, dynamic> _$IngredientWeightUnitToJson(
-        IngredientWeightUnit instance) =>
+Map<String, dynamic> _$IngredientWeightUnitToJson(IngredientWeightUnit instance) =>
     <String, dynamic>{
       'id': instance.id,
       'weight_unit': instance.weightUnit,
diff --git a/lib/models/nutrition/log.dart b/lib/models/nutrition/log.dart
index 362edf05..ca4220c8 100644
--- a/lib/models/nutrition/log.dart
+++ b/lib/models/nutrition/log.dart
@@ -40,7 +40,7 @@ class Log {
   @JsonKey(required: true, name: 'plan')
   String planId;
 
-  @JsonKey(required: true)
+  @JsonKey(required: true, toJson: dateToUtcIso8601)
   late DateTime datetime;
 
   String? comment;
@@ -101,8 +101,9 @@ class Log {
   NutritionalValues get nutritionalValues {
     // This is already done on the server. It might be better to read it from there.
 
-    final weight =
-        weightUnitObj == null ? amount : amount * weightUnitObj!.amount * weightUnitObj!.grams;
+    final weight = weightUnitObj == null
+        ? amount
+        : amount * weightUnitObj!.amount * weightUnitObj!.grams;
 
     return ingredient.nutritionalValues / (100 / weight);
   }
diff --git a/lib/models/nutrition/log.g.dart b/lib/models/nutrition/log.g.dart
index 11e5eb54..0da0e683 100644
--- a/lib/models/nutrition/log.g.dart
+++ b/lib/models/nutrition/log.g.dart
@@ -15,7 +15,7 @@ Log _$LogFromJson(Map<String, dynamic> json) {
       'datetime',
       'ingredient',
       'weight_unit',
-      'amount'
+      'amount',
     ],
   );
   return Log(
@@ -31,12 +31,12 @@ Log _$LogFromJson(Map<String, dynamic> json) {
 }
 
 Map<String, dynamic> _$LogToJson(Log instance) => <String, dynamic>{
-      'id': instance.id,
-      'meal': instance.mealId,
-      'plan': instance.planId,
-      'datetime': instance.datetime.toIso8601String(),
-      'comment': instance.comment,
-      'ingredient': instance.ingredientId,
-      'weight_unit': instance.weightUnitId,
-      'amount': instance.amount,
-    };
+  'id': instance.id,
+  'meal': instance.mealId,
+  'plan': instance.planId,
+  'datetime': dateToUtcIso8601(instance.datetime),
+  'comment': instance.comment,
+  'ingredient': instance.ingredientId,
+  'weight_unit': instance.weightUnitId,
+  'amount': instance.amount,
+};
diff --git a/lib/models/nutrition/meal.dart b/lib/models/nutrition/meal.dart
index 10b6109c..83a95b9b 100644
--- a/lib/models/nutrition/meal.dart
+++ b/lib/models/nutrition/meal.dart
@@ -20,8 +20,8 @@ import 'package:flutter/material.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:powersync/sqlite3.dart' as sqlite;
 import 'package:wger/helpers/consts.dart';
+import 'package:wger/helpers/date.dart';
 import 'package:wger/helpers/json.dart';
-import 'package:wger/helpers/misc.dart';
 import 'package:wger/models/nutrition/log.dart';
 import 'package:wger/models/nutrition/meal_item.dart';
 import 'package:wger/models/nutrition/nutritional_values.dart';
@@ -38,7 +38,7 @@ class Meal {
   @JsonKey(name: 'plan')
   late String planId;
 
-  @JsonKey(toJson: timeToString, fromJson: stringToTime)
+  @JsonKey(toJson: timeToString, fromJson: stringToTimeNull)
   TimeOfDay? time;
 
   @JsonKey(name: 'name')
diff --git a/lib/models/nutrition/meal.g.dart b/lib/models/nutrition/meal.g.dart
index 187537b4..0edad8cd 100644
--- a/lib/models/nutrition/meal.g.dart
+++ b/lib/models/nutrition/meal.g.dart
@@ -7,14 +7,14 @@ part of 'meal.dart';
 // **************************************************************************
 
 Meal _$MealFromJson(Map<String, dynamic> json) => Meal(
-      id: json['id'] as String?,
-      time: stringToTime(json['time'] as String?),
-      name: json['name'] as String?,
-    )..planId = json['plan'] as String;
+  id: (json['id'] as num?)?.toInt(),
+  time: stringToTimeNull(json['time'] as String?),
+  name: json['name'] as String?,
+)..planId = (json['plan'] as num).toInt();
 
 Map<String, dynamic> _$MealToJson(Meal instance) => <String, dynamic>{
-      'id': instance.id,
-      'plan': instance.planId,
-      'time': timeToString(instance.time),
-      'name': instance.name,
-    };
+  'id': instance.id,
+  'plan': instance.planId,
+  'time': timeToString(instance.time),
+  'name': instance.name,
+};
diff --git a/lib/models/nutrition/meal_item.g.dart b/lib/models/nutrition/meal_item.g.dart
index e503d3fc..a961f4e0 100644
--- a/lib/models/nutrition/meal_item.g.dart
+++ b/lib/models/nutrition/meal_item.g.dart
@@ -7,10 +7,7 @@ part of 'meal_item.dart';
 // **************************************************************************
 
 MealItem _$MealItemFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const ['id', 'amount'],
-  );
+  $checkKeys(json, requiredKeys: const ['id', 'amount']);
   return MealItem(
     id: (json['id'] as num?)?.toInt(),
     mealId: json['meal'] as String?,
@@ -21,9 +18,9 @@ MealItem _$MealItemFromJson(Map<String, dynamic> json) {
 }
 
 Map<String, dynamic> _$MealItemToJson(MealItem instance) => <String, dynamic>{
-      'id': instance.id,
-      'meal': instance.mealId,
-      'ingredient': instance.ingredientId,
-      'weight_unit': instance.weightUnitId,
-      'amount': numToString(instance.amount),
-    };
+  'id': instance.id,
+  'meal': instance.mealId,
+  'ingredient': instance.ingredientId,
+  'weight_unit': instance.weightUnitId,
+  'amount': numToString(instance.amount),
+};
diff --git a/lib/models/nutrition/nutritional_goals.dart b/lib/models/nutrition/nutritional_goals.dart
index 7a668a46..cca69674 100644
--- a/lib/models/nutrition/nutritional_goals.dart
+++ b/lib/models/nutrition/nutritional_goals.dart
@@ -57,7 +57,8 @@ class NutritionalGoals {
           (energy! - protein! * ENERGY_PROTEIN - fat! * ENERGY_FAT) / ENERGY_CARBOHYDRATES;
       assert(carbohydrates! > 0);
     } else if (fat == null && protein != null && carbohydrates != null) {
-      fat = (energy! - protein! * ENERGY_PROTEIN - carbohydrates! * ENERGY_CARBOHYDRATES) /
+      fat =
+          (energy! - protein! * ENERGY_PROTEIN - carbohydrates! * ENERGY_CARBOHYDRATES) /
           ENERGY_FAT;
       assert(fat! > 0);
     }
@@ -141,15 +142,15 @@ class NutritionalGoals {
   @override
   //ignore: avoid_equals_and_hash_code_on_mutable_classes
   int get hashCode => Object.hash(
-        energy,
-        protein,
-        carbohydrates,
-        carbohydratesSugar,
-        fat,
-        fatSaturated,
-        fiber,
-        sodium,
-      );
+    energy,
+    protein,
+    carbohydrates,
+    carbohydratesSugar,
+    fat,
+    fatSaturated,
+    fiber,
+    sodium,
+  );
 
   @override
   // ignore: avoid_equals_and_hash_code_on_mutable_classes
diff --git a/lib/models/nutrition/nutritional_plan.dart b/lib/models/nutrition/nutritional_plan.dart
index 9bd58c6a..651054dd 100644
--- a/lib/models/nutrition/nutritional_plan.dart
+++ b/lib/models/nutrition/nutritional_plan.dart
@@ -19,6 +19,7 @@
 import 'package:collection/collection.dart';
 import 'package:flutter/widgets.dart';
 import 'package:json_annotation/json_annotation.dart';
+import 'package:logging/logging.dart';
 import 'package:powersync/sqlite3.dart' as sqlite;
 import 'package:wger/helpers/consts.dart';
 import 'package:wger/helpers/json.dart';
@@ -35,15 +36,23 @@ part 'nutritional_plan.g.dart';
 
 @JsonSerializable(explicitToJson: true)
 class NutritionalPlan {
-  @JsonKey(required: false)
-  String? id;
+  final _logger = Logger('NutritionalPlan Model');
+
+  @JsonKey(required: true)
+  int? id;
 
   @JsonKey(required: true)
   late String description;
 
-  @JsonKey(required: true, name: 'creation_date', toJson: toDate)
+  @JsonKey(required: true, name: 'creation_date', toJson: dateToUtcIso8601)
   late DateTime creationDate;
 
+  @JsonKey(required: true, name: 'start', toJson: dateToYYYYMMDD)
+  late DateTime startDate;
+
+  @JsonKey(required: true, name: 'end', toJson: dateToYYYYMMDD)
+  late DateTime? endDate;
+
   @JsonKey(required: true, name: 'only_logging')
   late bool onlyLogging;
 
@@ -71,7 +80,9 @@ class NutritionalPlan {
   NutritionalPlan({
     this.id,
     required this.description,
-    required this.creationDate,
+    DateTime? creationDate,
+    required this.startDate,
+    this.endDate,
     this.onlyLogging = false,
     this.goalEnergy,
     this.goalProtein,
@@ -80,9 +91,17 @@ class NutritionalPlan {
     this.goalFiber,
     List<Meal>? meals,
     List<Log>? diaryEntries,
-  }) {
+  }) : creationDate = creationDate ?? DateTime.now() {
     this.meals = meals ?? [];
     this.diaryEntries = diaryEntries ?? [];
+
+    if (endDate != null && endDate!.isBefore(startDate)) {
+      _logger.warning(
+        'The end date of a nutritional plan is before the start. Setting to null! '
+        'PlanId: $id, startDate: $startDate, endDate: $endDate',
+      );
+      endDate = null;
+    }
   }
 
   factory NutritionalPlan.fromRow(sqlite.Row row) {
@@ -133,6 +152,8 @@ class NutritionalPlan {
 
   NutritionalPlan.empty() {
     creationDate = DateTime.now();
+    startDate = DateTime.now();
+    endDate = null;
     description = '';
     onlyLogging = false;
     goalEnergy = null;
diff --git a/lib/models/nutrition/nutritional_plan.g.dart b/lib/models/nutrition/nutritional_plan.g.dart
index 93445942..f1669809 100644
--- a/lib/models/nutrition/nutritional_plan.g.dart
+++ b/lib/models/nutrition/nutritional_plan.g.dart
@@ -12,18 +12,24 @@ NutritionalPlan _$NutritionalPlanFromJson(Map<String, dynamic> json) {
     requiredKeys: const [
       'description',
       'creation_date',
+      'start',
+      'end',
       'only_logging',
       'goal_energy',
       'goal_protein',
       'goal_carbohydrates',
       'goal_fat',
-      'goal_fiber'
+      'goal_fiber',
     ],
   );
   return NutritionalPlan(
     id: json['id'] as String?,
     description: json['description'] as String,
-    creationDate: DateTime.parse(json['creation_date'] as String),
+    creationDate: json['creation_date'] == null
+        ? null
+        : DateTime.parse(json['creation_date'] as String),
+    startDate: DateTime.parse(json['start'] as String),
+    endDate: json['end'] == null ? null : DateTime.parse(json['end'] as String),
     onlyLogging: json['only_logging'] as bool? ?? false,
     goalEnergy: json['goal_energy'] as num?,
     goalProtein: json['goal_protein'] as num?,
@@ -33,15 +39,16 @@ NutritionalPlan _$NutritionalPlanFromJson(Map<String, dynamic> json) {
   );
 }
 
-Map<String, dynamic> _$NutritionalPlanToJson(NutritionalPlan instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'description': instance.description,
-      'creation_date': toDate(instance.creationDate),
-      'only_logging': instance.onlyLogging,
-      'goal_energy': instance.goalEnergy,
-      'goal_protein': instance.goalProtein,
-      'goal_carbohydrates': instance.goalCarbohydrates,
-      'goal_fat': instance.goalFat,
-      'goal_fiber': instance.goalFiber,
-    };
+Map<String, dynamic> _$NutritionalPlanToJson(NutritionalPlan instance) => <String, dynamic>{
+  'id': instance.id,
+  'description': instance.description,
+  'creation_date': dateToUtcIso8601(instance.creationDate),
+  'start': dateToYYYYMMDD(instance.startDate),
+  'end': dateToYYYYMMDD(instance.endDate),
+  'only_logging': instance.onlyLogging,
+  'goal_energy': instance.goalEnergy,
+  'goal_protein': instance.goalProtein,
+  'goal_carbohydrates': instance.goalCarbohydrates,
+  'goal_fat': instance.goalFat,
+  'goal_fiber': instance.goalFiber,
+};
diff --git a/lib/models/nutrition/nutritional_values.dart b/lib/models/nutrition/nutritional_values.dart
index fee6c370..1cb5c7fe 100644
--- a/lib/models/nutrition/nutritional_values.dart
+++ b/lib/models/nutrition/nutritional_values.dart
@@ -132,13 +132,13 @@ class NutritionalValues {
   @override
   //ignore: avoid_equals_and_hash_code_on_mutable_classes
   int get hashCode => Object.hash(
-        energy,
-        protein,
-        carbohydrates,
-        carbohydratesSugar,
-        fat,
-        fatSaturated,
-        fiber,
-        sodium,
-      );
+    energy,
+    protein,
+    carbohydrates,
+    carbohydratesSugar,
+    fat,
+    fatSaturated,
+    fiber,
+    sodium,
+  );
 }
diff --git a/lib/models/nutrition/weight_unit.g.dart b/lib/models/nutrition/weight_unit.g.dart
index 8e5474aa..a8f86e6d 100644
--- a/lib/models/nutrition/weight_unit.g.dart
+++ b/lib/models/nutrition/weight_unit.g.dart
@@ -7,18 +7,14 @@ part of 'weight_unit.dart';
 // **************************************************************************
 
 WeightUnit _$WeightUnitFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const ['id', 'name'],
-  );
+  $checkKeys(json, requiredKeys: const ['id', 'name']);
   return WeightUnit(
     id: (json['id'] as num).toInt(),
     name: json['name'] as String,
   );
 }
 
-Map<String, dynamic> _$WeightUnitToJson(WeightUnit instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'name': instance.name,
-    };
+Map<String, dynamic> _$WeightUnitToJson(WeightUnit instance) => <String, dynamic>{
+  'id': instance.id,
+  'name': instance.name,
+};
diff --git a/lib/models/user/profile.g.dart b/lib/models/user/profile.g.dart
index 795f8fef..e3106444 100644
--- a/lib/models/user/profile.g.dart
+++ b/lib/models/user/profile.g.dart
@@ -14,7 +14,7 @@ Profile _$ProfileFromJson(Map<String, dynamic> json) {
       'email_verified',
       'is_trustworthy',
       'weight_unit',
-      'email'
+      'email',
     ],
   );
   return Profile(
@@ -27,9 +27,9 @@ Profile _$ProfileFromJson(Map<String, dynamic> json) {
 }
 
 Map<String, dynamic> _$ProfileToJson(Profile instance) => <String, dynamic>{
-      'username': instance.username,
-      'email_verified': instance.emailVerified,
-      'is_trustworthy': instance.isTrustworthy,
-      'weight_unit': instance.weightUnitStr,
-      'email': instance.email,
-    };
+  'username': instance.username,
+  'email_verified': instance.emailVerified,
+  'is_trustworthy': instance.isTrustworthy,
+  'weight_unit': instance.weightUnitStr,
+  'email': instance.email,
+};
diff --git a/lib/models/workouts/base_config.dart b/lib/models/workouts/base_config.dart
new file mode 100644
index 00000000..a7ffbd7b
--- /dev/null
+++ b/lib/models/workouts/base_config.dart
@@ -0,0 +1,73 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:json_annotation/json_annotation.dart';
+import 'package:wger/helpers/json.dart';
+
+part 'base_config.g.dart';
+
+@JsonSerializable()
+class BaseConfig {
+  @JsonKey(required: true, includeToJson: false)
+  late int? id;
+
+  @JsonKey(required: true, name: 'slot_entry')
+  late int slotEntryId;
+
+  @JsonKey(required: true)
+  late int iteration;
+
+  @JsonKey(required: true, fromJson: stringOrIntToNum)
+  late num value;
+
+  @JsonKey(required: true)
+  late String operation;
+
+  @JsonKey(required: true)
+  late String step;
+
+  @JsonKey(required: true, name: 'repeat')
+  late bool repeat;
+
+  @JsonKey(required: true, name: 'requirements')
+  late Map<String, dynamic>? requirements;
+
+  BaseConfig({
+    required this.id,
+    required this.slotEntryId,
+    required this.iteration,
+    this.repeat = false,
+    required this.value,
+    this.operation = 'r',
+    this.step = 'abs',
+    this.requirements = null,
+  });
+
+  BaseConfig.firstIteration(this.value, this.slotEntryId) {
+    iteration = 1;
+    operation = 'r';
+    step = 'abs';
+    requirements = null;
+    repeat = false;
+  }
+
+  // Boilerplate
+  factory BaseConfig.fromJson(Map<String, dynamic> json) => _$BaseConfigFromJson(json);
+
+  Map<String, dynamic> toJson() => _$BaseConfigToJson(this);
+}
diff --git a/lib/models/workouts/base_config.g.dart b/lib/models/workouts/base_config.g.dart
new file mode 100644
index 00000000..a3513312
--- /dev/null
+++ b/lib/models/workouts/base_config.g.dart
@@ -0,0 +1,43 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'base_config.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+BaseConfig _$BaseConfigFromJson(Map<String, dynamic> json) {
+  $checkKeys(
+    json,
+    requiredKeys: const [
+      'id',
+      'slot_entry',
+      'iteration',
+      'value',
+      'operation',
+      'step',
+      'repeat',
+      'requirements',
+    ],
+  );
+  return BaseConfig(
+    id: (json['id'] as num?)?.toInt(),
+    slotEntryId: (json['slot_entry'] as num).toInt(),
+    iteration: (json['iteration'] as num).toInt(),
+    repeat: json['repeat'] as bool? ?? false,
+    value: stringOrIntToNum(json['value']),
+    operation: json['operation'] as String? ?? 'r',
+    step: json['step'] as String? ?? 'abs',
+    requirements: json['requirements'] as Map<String, dynamic>? ?? null,
+  );
+}
+
+Map<String, dynamic> _$BaseConfigToJson(BaseConfig instance) => <String, dynamic>{
+  'slot_entry': instance.slotEntryId,
+  'iteration': instance.iteration,
+  'value': instance.value,
+  'operation': instance.operation,
+  'step': instance.step,
+  'repeat': instance.repeat,
+  'requirements': instance.requirements,
+};
diff --git a/lib/models/workouts/day.dart b/lib/models/workouts/day.dart
index 88b5954c..68b4828e 100644
--- a/lib/models/workouts/day.dart
+++ b/lib/models/workouts/day.dart
@@ -16,67 +16,115 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import 'package:intl/intl.dart';
 import 'package:json_annotation/json_annotation.dart';
-import 'package:wger/models/workouts/set.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/workouts/slot.dart';
 
 part 'day.g.dart';
 
+enum DayType { custom, enom, amrap, hiit, tabata, edt, rft, afap }
+
+extension DayTypeExtension on DayType {
+  String i18Label(AppLocalizations i18n) {
+    switch (this) {
+      case DayType.custom:
+        return i18n.dayTypeCustom;
+      case DayType.enom:
+        return i18n.dayTypeEnom;
+      case DayType.amrap:
+        return i18n.dayTypeAmrap;
+      case DayType.hiit:
+        return i18n.dayTypeHiit;
+      case DayType.tabata:
+        return i18n.dayTypeTabata;
+      case DayType.edt:
+        return i18n.dayTypeEdt;
+      case DayType.rft:
+        return i18n.dayTypeRft;
+      case DayType.afap:
+        return i18n.dayTypeAfap;
+    }
+  }
+}
+
 @JsonSerializable()
 class Day {
-  static const Map<int, String> weekdays = {
-    1: 'Monday',
-    2: 'Tuesday',
-    3: 'Wednesday',
-    4: 'Thursday',
-    5: 'Friday',
-    6: 'Saturday',
-    7: 'Sunday',
-  };
+  static const MIN_LENGTH_NAME = 3;
+  static const MAX_LENGTH_NAME = 20;
+  static const MAX_LENGTH_DESCRIPTION = 1000;
 
-  @JsonKey(required: true)
+  @JsonKey(required: true, includeToJson: false)
   int? id;
 
-  @JsonKey(required: true, name: 'training')
-  late int workoutId;
+  @JsonKey(required: true, name: 'routine')
+  late int routineId;
+
+  @JsonKey(required: true)
+  late String name;
 
   @JsonKey(required: true)
   late String description;
 
-  @JsonKey(required: true, name: 'day')
-  List<int> daysOfWeek = [];
+  @JsonKey(required: true)
+  late DayType type;
 
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  List<Set> sets = [];
+  @JsonKey(required: true, name: 'is_rest')
+  late bool isRest;
 
-  //@JsonKey(includeFromJson: false, includeToJson: false)
-  //late WorkoutPlan workout;
+  @JsonKey(required: true, name: 'need_logs_to_advance')
+  late bool needLogsToAdvance;
 
-  Day() {
-    daysOfWeek = [];
-    sets = [];
+  @JsonKey(required: true)
+  late num order;
+
+  @JsonKey(required: true)
+  late Object? config;
+
+  @JsonKey(required: false, includeFromJson: true, includeToJson: false)
+  List<Slot> slots = [];
+
+  Day({
+    this.id,
+    required this.routineId,
+    required this.name,
+    this.description = '',
+    this.isRest = false,
+    this.needLogsToAdvance = false,
+    this.type = DayType.custom,
+    this.order = 1,
+    this.config,
+    this.slots = const [],
+  });
+
+  Day copyWith({
+    int? id,
+    int? routineId,
+    String? name,
+    String? description,
+    DayType? type,
+    bool? isRest,
+    bool? needLogsToAdvance,
+    num? order,
+    Object? config,
+    List<Slot>? slots,
+  }) {
+    return Day(
+      id: id ?? this.id,
+      routineId: routineId ?? this.routineId,
+      name: name ?? this.name,
+      description: description ?? this.description,
+      type: type ?? this.type,
+      isRest: isRest ?? this.isRest,
+      needLogsToAdvance: needLogsToAdvance ?? this.needLogsToAdvance,
+      order: order ?? this.order,
+      config: config ?? this.config,
+      slots: slots ?? this.slots,
+    );
   }
 
-  String getDayName(int weekDay) {
-    return weekdays[weekDay]!;
-  }
+  bool get isSpecialType => type != DayType.custom;
 
-  String get getDaysText {
-    return daysOfWeek.map((e) => getDayName(e)).join(', ');
-  }
-
-  String getDaysTextTranslated(locale) {
-    return daysOfWeek.map((e) => getDayTranslated(e, locale)).join(', ');
-  }
-
-  /// Returns the translated name of the given day
-  String getDayTranslated(int day, locale) {
-    // Isn't there another way?... 🙄
-    final now = DateTime.now();
-    final firstDayOfWeek = now.subtract(Duration(days: now.weekday));
-
-    return DateFormat(DateFormat.WEEKDAY, locale).format(firstDayOfWeek.add(Duration(days: day)));
-  }
+  String get nameWithType => isSpecialType ? '${type.name.toUpperCase()} - $name' : name;
 
   // Boilerplate
   factory Day.fromJson(Map<String, dynamic> json) => _$DayFromJson(json);
diff --git a/lib/models/workouts/day.g.dart b/lib/models/workouts/day.g.dart
index 809d47d2..8497895c 100644
--- a/lib/models/workouts/day.g.dart
+++ b/lib/models/workouts/day.g.dart
@@ -9,19 +9,54 @@ part of 'day.dart';
 Day _$DayFromJson(Map<String, dynamic> json) {
   $checkKeys(
     json,
-    requiredKeys: const ['id', 'training', 'description', 'day'],
+    requiredKeys: const [
+      'id',
+      'routine',
+      'name',
+      'description',
+      'type',
+      'is_rest',
+      'need_logs_to_advance',
+      'order',
+      'config',
+    ],
+  );
+  return Day(
+    id: (json['id'] as num?)?.toInt(),
+    routineId: (json['routine'] as num).toInt(),
+    name: json['name'] as String,
+    description: json['description'] as String? ?? '',
+    isRest: json['is_rest'] as bool? ?? false,
+    needLogsToAdvance: json['need_logs_to_advance'] as bool? ?? false,
+    type: $enumDecodeNullable(_$DayTypeEnumMap, json['type']) ?? DayType.custom,
+    order: json['order'] as num? ?? 1,
+    config: json['config'],
+    slots:
+        (json['slots'] as List<dynamic>?)
+            ?.map((e) => Slot.fromJson(e as Map<String, dynamic>))
+            .toList() ??
+        const [],
   );
-  return Day()
-    ..id = (json['id'] as num?)?.toInt()
-    ..workoutId = (json['training'] as num).toInt()
-    ..description = json['description'] as String
-    ..daysOfWeek =
-        (json['day'] as List<dynamic>).map((e) => (e as num).toInt()).toList();
 }
 
 Map<String, dynamic> _$DayToJson(Day instance) => <String, dynamic>{
-      'id': instance.id,
-      'training': instance.workoutId,
-      'description': instance.description,
-      'day': instance.daysOfWeek,
-    };
+  'routine': instance.routineId,
+  'name': instance.name,
+  'description': instance.description,
+  'type': _$DayTypeEnumMap[instance.type]!,
+  'is_rest': instance.isRest,
+  'need_logs_to_advance': instance.needLogsToAdvance,
+  'order': instance.order,
+  'config': instance.config,
+};
+
+const _$DayTypeEnumMap = {
+  DayType.custom: 'custom',
+  DayType.enom: 'enom',
+  DayType.amrap: 'amrap',
+  DayType.hiit: 'hiit',
+  DayType.tabata: 'tabata',
+  DayType.edt: 'edt',
+  DayType.rft: 'rft',
+  DayType.afap: 'afap',
+};
diff --git a/lib/models/workouts/day_data.dart b/lib/models/workouts/day_data.dart
new file mode 100644
index 00000000..8ed4fe88
--- /dev/null
+++ b/lib/models/workouts/day_data.dart
@@ -0,0 +1,54 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:json_annotation/json_annotation.dart';
+import 'package:wger/models/workouts/day.dart';
+import 'package:wger/models/workouts/slot_data.dart';
+
+part 'day_data.g.dart';
+
+@JsonSerializable()
+class DayData {
+  @JsonKey(required: true)
+  late int iteration;
+
+  @JsonKey(required: true)
+  late DateTime date;
+
+  @JsonKey(required: true)
+  late String? label;
+
+  @JsonKey(required: false)
+  late Day? day;
+
+  @JsonKey(required: false)
+  late List<SlotData> slots;
+
+  DayData({
+    required this.iteration,
+    required this.date,
+    this.label = '',
+    required this.day,
+    this.slots = const [],
+  });
+
+  // Boilerplate
+  factory DayData.fromJson(Map<String, dynamic> json) => _$DayDataFromJson(json);
+
+  Map<String, dynamic> toJson() => _$DayDataToJson(this);
+}
diff --git a/lib/models/workouts/day_data.g.dart b/lib/models/workouts/day_data.g.dart
new file mode 100644
index 00000000..4744c90b
--- /dev/null
+++ b/lib/models/workouts/day_data.g.dart
@@ -0,0 +1,30 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'day_data.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+DayData _$DayDataFromJson(Map<String, dynamic> json) {
+  $checkKeys(json, requiredKeys: const ['iteration', 'date', 'label']);
+  return DayData(
+    iteration: (json['iteration'] as num).toInt(),
+    date: DateTime.parse(json['date'] as String),
+    label: json['label'] as String? ?? '',
+    day: json['day'] == null ? null : Day.fromJson(json['day'] as Map<String, dynamic>),
+    slots:
+        (json['slots'] as List<dynamic>?)
+            ?.map((e) => SlotData.fromJson(e as Map<String, dynamic>))
+            .toList() ??
+        const [],
+  );
+}
+
+Map<String, dynamic> _$DayDataToJson(DayData instance) => <String, dynamic>{
+  'iteration': instance.iteration,
+  'date': instance.date.toIso8601String(),
+  'label': instance.label,
+  'day': instance.day,
+  'slots': instance.slots,
+};
diff --git a/lib/models/workouts/log.dart b/lib/models/workouts/log.dart
index 17cbd7e1..f3ccfb81 100644
--- a/lib/models/workouts/log.dart
+++ b/lib/models/workouts/log.dart
@@ -17,10 +17,12 @@
  */
 
 import 'package:json_annotation/json_annotation.dart';
+import 'package:wger/helpers/consts.dart';
 import 'package:wger/helpers/json.dart';
 import 'package:wger/helpers/misc.dart';
 import 'package:wger/models/exercises/exercise.dart';
 import 'package:wger/models/workouts/repetition_unit.dart';
+import 'package:wger/models/workouts/set_config_data.dart';
 import 'package:wger/models/workouts/weight_unit.dart';
 
 part 'log.g.dart';
@@ -30,88 +32,123 @@ class Log {
   @JsonKey(required: true)
   int? id;
 
-  @JsonKey(required: true, name: 'exercise_base')
-  late int exerciseBaseId;
+  @JsonKey(required: true, name: 'exercise')
+  late int exerciseId;
 
   @JsonKey(includeFromJson: false, includeToJson: false)
-  late Exercise exerciseBaseObj;
+  late Exercise exercise;
 
-  @JsonKey(required: true, name: 'workout')
-  late int workoutPlan;
+  @JsonKey(required: true, name: 'routine')
+  late int routineId;
+
+  @JsonKey(required: true, name: 'session')
+  late int? sessionId;
 
   @JsonKey(required: true)
-  late int reps;
+  int? iteration;
 
-  @JsonKey(required: false)
-  String? rir;
+  @JsonKey(required: true, name: 'slot_entry')
+  int? slotEntryId;
 
-  @JsonKey(required: true, name: 'repetition_unit')
-  late int repetitionUnitId;
+  @JsonKey(required: false, fromJson: stringToNum)
+  num? rir;
+
+  @JsonKey(required: false, fromJson: stringToNum, name: 'rir_target')
+  num? rirTarget;
+
+  @JsonKey(required: true, fromJson: stringToNum, name: 'repetitions')
+  num? repetitions;
+
+  @JsonKey(required: true, fromJson: stringToNum, name: 'repetitions_target')
+  num? repetitionsTarget;
+
+  @JsonKey(required: true, name: 'repetitions_unit')
+  late int? repetitionsUnitId;
 
   @JsonKey(includeFromJson: false, includeToJson: false)
-  late RepetitionUnit repetitionUnitObj;
+  late RepetitionUnit? repetitionsUnitObj;
 
   @JsonKey(required: true, fromJson: stringToNum, toJson: numToString)
-  late num weight;
+  late num? weight;
+
+  @JsonKey(required: true, fromJson: stringToNum, toJson: numToString, name: 'weight_target')
+  num? weightTarget;
 
   @JsonKey(required: true, name: 'weight_unit')
-  late int weightUnitId;
+  late int? weightUnitId;
 
   @JsonKey(includeFromJson: false, includeToJson: false)
-  late WeightUnit weightUnitObj;
+  late WeightUnit? weightUnitObj;
 
-  @JsonKey(required: true, toJson: toDate)
+  @JsonKey(required: true, toJson: dateToUtcIso8601)
   late DateTime date;
 
-  //@JsonKey(required: true)
-  //String comment;
-
   Log({
     this.id,
-    required this.exerciseBaseId,
-    required this.workoutPlan,
-    required this.reps,
+    required this.exerciseId,
+    this.iteration,
+    this.slotEntryId,
+    required this.routineId,
+    this.repetitions,
+    this.repetitionsTarget,
+    this.repetitionsUnitId = REP_UNIT_REPETITIONS_ID,
     required this.rir,
-    required this.repetitionUnitId,
-    required this.weight,
-    required this.weightUnitId,
+    this.rirTarget,
+    this.weight,
+    this.weightTarget,
+    this.weightUnitId = WEIGHT_UNIT_KG,
     required this.date,
   });
 
   Log.empty();
 
+  Log.fromSetConfigData(SetConfigData data) {
+    date = DateTime.now();
+    sessionId = null;
+    slotEntryId = data.slotEntryId;
+    exerciseBase = data.exercise;
+
+    weight = data.weight;
+    weightTarget = data.weight;
+    weightUnit = data.weightUnit;
+
+    repetitions = data.repetitions;
+    repetitionsTarget = data.repetitions;
+    repetitionUnit = data.repetitionsUnit;
+
+    rir = data.rir;
+    rirTarget = data.rir;
+  }
+
   // Boilerplate
   factory Log.fromJson(Map<String, dynamic> json) => _$LogFromJson(json);
 
   Map<String, dynamic> toJson() => _$LogToJson(this);
 
   set exerciseBase(Exercise base) {
-    exerciseBaseObj = base;
-    exerciseBaseId = base.id!;
+    exercise = base;
+    exerciseId = base.id!;
   }
 
-  set weightUnit(WeightUnit weightUnit) {
+  set weightUnit(WeightUnit? weightUnit) {
     weightUnitObj = weightUnit;
-    weightUnitId = weightUnit.id;
+    weightUnitId = weightUnit?.id;
   }
 
-  set repetitionUnit(RepetitionUnit repetitionUnit) {
-    repetitionUnitObj = repetitionUnit;
-    repetitionUnitId = repetitionUnit.id;
-  }
-
-  void setRir(String rir) {
-    this.rir = rir;
-  }
-
-  /// Returns the text representation for a single setting, used in the gym mode
-  String get singleLogRepText {
-    return repText(reps, repetitionUnitObj, weight, weightUnitObj, rir);
+  set repetitionUnit(RepetitionUnit? repetitionUnit) {
+    repetitionsUnitObj = repetitionUnit;
+    repetitionsUnitId = repetitionUnit?.id;
   }
 
   /// Returns the text representation for a single setting, used in the gym mode
   String get singleLogRepTextNoNl {
-    return repText(reps, repetitionUnitObj, weight, weightUnitObj, rir).replaceAll('\n', '');
+    return repText(
+      repetitions,
+      repetitionsUnitObj,
+      weight,
+      weightUnitObj,
+      rir,
+    ).replaceAll('\n', '');
   }
 
   /// Override the equals operator
@@ -122,24 +159,24 @@ class Log {
   //ignore: avoid_equals_and_hash_code_on_mutable_classes
   bool operator ==(o) {
     return o is Log &&
-        exerciseBaseId == o.exerciseBaseId &&
+        exerciseId == o.exerciseId &&
         weight == o.weight &&
         weightUnitId == o.weightUnitId &&
-        reps == o.reps &&
-        repetitionUnitId == o.repetitionUnitId &&
+        repetitions == o.repetitions &&
+        repetitionsUnitId == o.repetitionsUnitId &&
         rir == o.rir;
   }
 
   @override
   //ignore: avoid_equals_and_hash_code_on_mutable_classes
   int get hashCode =>
-      Object.hash(exerciseBaseId, weight, weightUnitId, reps, repetitionUnitId, rir);
+      Object.hash(exerciseId, weight, weightUnitId, repetitions, repetitionsUnitId, rir);
 
   //@override
   //int get hashCode => super.hashCode;
 
   @override
   String toString() {
-    return 'Log(id: $id, ex: $exerciseBaseId, weightU: $weightUnitId, w: $weight, repU: $repetitionUnitId, rep: $reps, rir: $rir)';
+    return 'Log(id: $id, ex: $exerciseId, weightU: $weightUnitId, w: $weight, repU: $repetitionsUnitId, rep: $repetitions, rir: $rir)';
   }
 }
diff --git a/lib/models/workouts/log.g.dart b/lib/models/workouts/log.g.dart
index 68f7fe3d..803f1778 100644
--- a/lib/models/workouts/log.g.dart
+++ b/lib/models/workouts/log.g.dart
@@ -11,36 +11,52 @@ Log _$LogFromJson(Map<String, dynamic> json) {
     json,
     requiredKeys: const [
       'id',
-      'exercise_base',
-      'workout',
-      'reps',
-      'repetition_unit',
+      'exercise',
+      'routine',
+      'session',
+      'iteration',
+      'slot_entry',
+      'repetitions',
+      'repetitions_target',
+      'repetitions_unit',
       'weight',
+      'weight_target',
       'weight_unit',
-      'date'
+      'date',
     ],
   );
   return Log(
     id: (json['id'] as num?)?.toInt(),
-    exerciseBaseId: (json['exercise_base'] as num).toInt(),
-    workoutPlan: (json['workout'] as num).toInt(),
-    reps: (json['reps'] as num).toInt(),
-    rir: json['rir'] as String?,
-    repetitionUnitId: (json['repetition_unit'] as num).toInt(),
+    exerciseId: (json['exercise'] as num).toInt(),
+    iteration: (json['iteration'] as num?)?.toInt(),
+    slotEntryId: (json['slot_entry'] as num?)?.toInt(),
+    routineId: (json['routine'] as num).toInt(),
+    repetitions: stringToNum(json['repetitions'] as String?),
+    repetitionsTarget: stringToNum(json['repetitions_target'] as String?),
+    repetitionsUnitId: (json['repetitions_unit'] as num?)?.toInt() ?? REP_UNIT_REPETITIONS_ID,
+    rir: stringToNum(json['rir'] as String?),
+    rirTarget: stringToNum(json['rir_target'] as String?),
     weight: stringToNum(json['weight'] as String?),
-    weightUnitId: (json['weight_unit'] as num).toInt(),
+    weightTarget: stringToNum(json['weight_target'] as String?),
+    weightUnitId: (json['weight_unit'] as num?)?.toInt() ?? WEIGHT_UNIT_KG,
     date: DateTime.parse(json['date'] as String),
-  );
+  )..sessionId = (json['session'] as num?)?.toInt();
 }
 
 Map<String, dynamic> _$LogToJson(Log instance) => <String, dynamic>{
-      'id': instance.id,
-      'exercise_base': instance.exerciseBaseId,
-      'workout': instance.workoutPlan,
-      'reps': instance.reps,
-      'rir': instance.rir,
-      'repetition_unit': instance.repetitionUnitId,
-      'weight': numToString(instance.weight),
-      'weight_unit': instance.weightUnitId,
-      'date': toDate(instance.date),
-    };
+  'id': instance.id,
+  'exercise': instance.exerciseId,
+  'routine': instance.routineId,
+  'session': instance.sessionId,
+  'iteration': instance.iteration,
+  'slot_entry': instance.slotEntryId,
+  'rir': instance.rir,
+  'rir_target': instance.rirTarget,
+  'repetitions': instance.repetitions,
+  'repetitions_target': instance.repetitionsTarget,
+  'repetitions_unit': instance.repetitionsUnitId,
+  'weight': numToString(instance.weight),
+  'weight_target': numToString(instance.weightTarget),
+  'weight_unit': instance.weightUnitId,
+  'date': dateToUtcIso8601(instance.date),
+};
diff --git a/lib/models/workouts/repetition_unit.dart b/lib/models/workouts/repetition_unit.dart
index 207b69b1..55347d4e 100644
--- a/lib/models/workouts/repetition_unit.dart
+++ b/lib/models/workouts/repetition_unit.dart
@@ -30,7 +30,13 @@ class RepetitionUnit {
 
   const RepetitionUnit({required this.id, required this.name});
 
+  @override
+  String toString() {
+    return 'RepetitionUnit{id: $id, name: $name}';
+  }
+
   // Boilerplate
   factory RepetitionUnit.fromJson(Map<String, dynamic> json) => _$RepetitionUnitFromJson(json);
+
   Map<String, dynamic> toJson() => _$RepetitionUnitToJson(this);
 }
diff --git a/lib/models/workouts/repetition_unit.g.dart b/lib/models/workouts/repetition_unit.g.dart
index e375f459..679c55ef 100644
--- a/lib/models/workouts/repetition_unit.g.dart
+++ b/lib/models/workouts/repetition_unit.g.dart
@@ -7,18 +7,14 @@ part of 'repetition_unit.dart';
 // **************************************************************************
 
 RepetitionUnit _$RepetitionUnitFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const ['id', 'name'],
-  );
+  $checkKeys(json, requiredKeys: const ['id', 'name']);
   return RepetitionUnit(
     id: (json['id'] as num).toInt(),
     name: json['name'] as String,
   );
 }
 
-Map<String, dynamic> _$RepetitionUnitToJson(RepetitionUnit instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'name': instance.name,
-    };
+Map<String, dynamic> _$RepetitionUnitToJson(RepetitionUnit instance) => <String, dynamic>{
+  'id': instance.id,
+  'name': instance.name,
+};
diff --git a/lib/models/workouts/routine.dart b/lib/models/workouts/routine.dart
new file mode 100644
index 00000000..bd90d6bb
--- /dev/null
+++ b/lib/models/workouts/routine.dart
@@ -0,0 +1,179 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:json_annotation/json_annotation.dart';
+import 'package:wger/helpers/date.dart';
+import 'package:wger/helpers/json.dart';
+import 'package:wger/models/workouts/day.dart';
+import 'package:wger/models/workouts/day_data.dart';
+import 'package:wger/models/workouts/log.dart';
+import 'package:wger/models/workouts/session_api.dart';
+
+part 'routine.g.dart';
+
+@JsonSerializable()
+class Routine {
+  static const MIN_LENGTH_DESCRIPTION = 0;
+  static const MAX_LENGTH_DESCRIPTION = 1000;
+
+  static const MIN_LENGTH_NAME = 3;
+  static const MAX_LENGTH_NAME = 25;
+
+  /// In weeks
+  static const MIN_DURATION = 2;
+  static const MAX_DURATION = 16;
+  static const DEFAULT_DURATION = 12;
+
+  @JsonKey(required: true, includeToJson: false)
+  int? id;
+
+  @JsonKey(required: true, toJson: dateToUtcIso8601)
+  late DateTime created;
+
+  @JsonKey(required: true, name: 'name')
+  late String name;
+
+  @JsonKey(required: true, name: 'description')
+  late String description;
+
+  @JsonKey(required: true, name: 'fit_in_week')
+  late bool fitInWeek;
+
+  @JsonKey(required: true, toJson: dateToYYYYMMDD)
+  late DateTime start;
+
+  @JsonKey(required: true, toJson: dateToYYYYMMDD)
+  late DateTime end;
+
+  @JsonKey(includeFromJson: true, required: false, includeToJson: false)
+  List<Day> days = [];
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  List<DayData> dayData = [];
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  List<DayData> dayDataGym = [];
+
+  @JsonKey(required: false, includeToJson: false, defaultValue: [])
+  List<WorkoutSessionApi> sessions = [];
+
+  Routine({
+    this.id,
+    DateTime? created,
+    required this.name,
+    DateTime? start,
+    DateTime? end,
+    this.fitInWeek = false,
+    String? description,
+    this.days = const [],
+    this.dayData = const [],
+    this.dayDataGym = const [],
+    this.sessions = const [],
+  }) {
+    this.created = created ?? DateTime.now();
+    this.start = start ?? DateTime.now();
+    this.end = end ?? DateTime.now().add(const Duration(days: DEFAULT_DURATION * 7));
+    this.description = description ?? '';
+  }
+
+  Routine.empty() {
+    name = '';
+    description = '';
+    created = DateTime.now();
+    start = DateTime.now();
+    end = DateTime.now().add(const Duration(days: DEFAULT_DURATION * 7));
+    fitInWeek = true;
+  }
+
+  // Boilerplate
+  factory Routine.fromJson(Map<String, dynamic> json) => _$RoutineFromJson(json);
+
+  Map<String, dynamic> toJson() => _$RoutineToJson(this);
+
+  List<Log> get logs {
+    final out = <Log>[];
+    for (final session in sessions) {
+      out.addAll(session.logs);
+    }
+    return out;
+  }
+
+  int? getIteration({DateTime? date}) {
+    date ??= DateTime.now();
+
+    for (final data in dayData) {
+      if (data.date.isSameDayAs(date)) {
+        return data.iteration;
+      }
+    }
+    return null;
+  }
+
+  List<DayData> get dayDataCurrentIteration {
+    final iteration = getIteration(date: DateTime.now()) ?? 1;
+    return dayData.where((data) => data.iteration == iteration).toList();
+  }
+
+  List<DayData> get dayDataCurrentIterationGym {
+    final iteration = getIteration(date: DateTime.now()) ?? 1;
+    return dayDataGym.where((data) => data.iteration == iteration).toList();
+  }
+
+  /// Filters the workout logs by exercise and sorts them by date
+  ///
+  /// Optionally, filters list so that only unique logs are returned. "Unique"
+  /// means here that the values are the same, i.e. logs with the same weight,
+  /// reps, etc. are considered equal. Workout ID, Log ID and date are not
+  /// considered.
+  List<Log> filterLogsByExercise(int exerciseId, {bool unique = false}) {
+    var out = logs.where((log) => log.exerciseId == exerciseId).toList();
+
+    if (unique) {
+      out = out.toSet().toList();
+    }
+
+    out.sort((a, b) => b.date.compareTo(a.date));
+    return out;
+  }
+
+  /// Groups logs by repetition
+  Map<num, List<Log>> groupLogsByRepetition({
+    List<Log>? logs,
+    filterNullWeights = false,
+    filterNullReps = false,
+  }) {
+    final workoutLogs = logs ?? this.logs;
+    final Map<num, List<Log>> groupedLogs = {};
+
+    for (final log in workoutLogs) {
+      if (log.repetitions == null ||
+          (filterNullWeights && log.weight == null) ||
+          (filterNullReps && log.repetitions == null)) {
+        continue;
+      }
+
+      if (!groupedLogs.containsKey(log.repetitions)) {
+        groupedLogs[log.repetitions!] = [];
+      }
+
+      groupedLogs[log.repetitions]!.add(log);
+    }
+
+    return groupedLogs;
+  }
+}
diff --git a/lib/models/workouts/routine.g.dart b/lib/models/workouts/routine.g.dart
new file mode 100644
index 00000000..d6385c8b
--- /dev/null
+++ b/lib/models/workouts/routine.g.dart
@@ -0,0 +1,42 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'routine.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+Routine _$RoutineFromJson(Map<String, dynamic> json) {
+  $checkKeys(
+    json,
+    requiredKeys: const ['id', 'created', 'name', 'description', 'fit_in_week', 'start', 'end'],
+  );
+  return Routine(
+    id: (json['id'] as num?)?.toInt(),
+    created: json['created'] == null ? null : DateTime.parse(json['created'] as String),
+    name: json['name'] as String,
+    start: json['start'] == null ? null : DateTime.parse(json['start'] as String),
+    end: json['end'] == null ? null : DateTime.parse(json['end'] as String),
+    fitInWeek: json['fit_in_week'] as bool? ?? false,
+    description: json['description'] as String?,
+    days:
+        (json['days'] as List<dynamic>?)
+            ?.map((e) => Day.fromJson(e as Map<String, dynamic>))
+            .toList() ??
+        const [],
+    sessions:
+        (json['sessions'] as List<dynamic>?)
+            ?.map((e) => WorkoutSessionApi.fromJson(e as Map<String, dynamic>))
+            .toList() ??
+        [],
+  );
+}
+
+Map<String, dynamic> _$RoutineToJson(Routine instance) => <String, dynamic>{
+  'created': dateToUtcIso8601(instance.created),
+  'name': instance.name,
+  'description': instance.description,
+  'fit_in_week': instance.fitInWeek,
+  'start': dateToYYYYMMDD(instance.start),
+  'end': dateToYYYYMMDD(instance.end),
+};
diff --git a/lib/models/workouts/session.dart b/lib/models/workouts/session.dart
index 1c2aea7b..f12030a6 100644
--- a/lib/models/workouts/session.dart
+++ b/lib/models/workouts/session.dart
@@ -19,6 +19,7 @@
 import 'package:flutter/material.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:wger/helpers/json.dart';
+import 'package:wger/models/workouts/log.dart';
 
 part 'session.g.dart';
 
@@ -29,46 +30,50 @@ class WorkoutSession {
   @JsonKey(required: true)
   int? id;
 
-  @JsonKey(required: true, name: 'workout')
-  late int workoutId;
+  @JsonKey(required: true, name: 'routine')
+  late int? routineId;
 
-  @JsonKey(required: true, toJson: toDate)
+  @JsonKey(required: true, name: 'day')
+  int? dayId;
+
+  @JsonKey(required: true, toJson: dateToYYYYMMDD)
   late DateTime date;
 
-  @JsonKey(required: true, fromJson: stringToNum, toJson: numToString)
-  late num impression;
+  @JsonKey(required: true, fromJson: int.parse, toJson: numToString)
+  late int impression;
 
   @JsonKey(required: false, defaultValue: '')
   late String notes;
 
-  @JsonKey(required: true, name: 'time_start', toJson: timeToString, fromJson: stringToTime)
-  late TimeOfDay timeStart;
+  @JsonKey(required: true, name: 'time_start', toJson: timeToString, fromJson: stringToTimeNull)
+  late TimeOfDay? timeStart;
 
-  @JsonKey(required: true, name: 'time_end', toJson: timeToString, fromJson: stringToTime)
-  late TimeOfDay timeEnd;
+  @JsonKey(required: true, name: 'time_end', toJson: timeToString, fromJson: stringToTimeNull)
+  late TimeOfDay? timeEnd;
 
-  WorkoutSession();
+  @JsonKey(required: false, includeToJson: false, defaultValue: [])
+  List<Log> logs = [];
 
-  WorkoutSession.withData({
-    required this.id,
-    required this.workoutId,
-    required this.date,
-    required this.impression,
-    required this.notes,
-    required this.timeStart,
-    required this.timeEnd,
-  });
-
-  WorkoutSession.now() {
-    timeStart = TimeOfDay.now();
-    timeEnd = TimeOfDay.now();
+  WorkoutSession({
+    this.id,
+    this.dayId,
+    required this.routineId,
+    this.impression = 2,
+    this.notes = '',
+    this.timeStart,
+    this.timeEnd,
+    this.logs = const <Log>[],
+    DateTime? date,
+  }) {
+    this.date = date ?? DateTime.now();
   }
 
   // Boilerplate
   factory WorkoutSession.fromJson(Map<String, dynamic> json) => _$WorkoutSessionFromJson(json);
+
   Map<String, dynamic> toJson() => _$WorkoutSessionToJson(this);
 
-  String? get impressionAsString {
-    return IMPRESSION_MAP[impression];
+  String get impressionAsString {
+    return IMPRESSION_MAP[impression]!;
   }
 }
diff --git a/lib/models/workouts/session.g.dart b/lib/models/workouts/session.g.dart
index 1d988f34..7cfc9d89 100644
--- a/lib/models/workouts/session.g.dart
+++ b/lib/models/workouts/session.g.dart
@@ -9,32 +9,32 @@ part of 'session.dart';
 WorkoutSession _$WorkoutSessionFromJson(Map<String, dynamic> json) {
   $checkKeys(
     json,
-    requiredKeys: const [
-      'id',
-      'workout',
-      'date',
-      'impression',
-      'time_start',
-      'time_end'
-    ],
+    requiredKeys: const ['id', 'routine', 'day', 'date', 'impression', 'time_start', 'time_end'],
+  );
+  return WorkoutSession(
+    id: (json['id'] as num?)?.toInt(),
+    dayId: (json['day'] as num?)?.toInt(),
+    routineId: (json['routine'] as num?)?.toInt(),
+    impression: json['impression'] == null ? 2 : int.parse(json['impression'] as String),
+    notes: json['notes'] as String? ?? '',
+    timeStart: stringToTimeNull(json['time_start'] as String?),
+    timeEnd: stringToTimeNull(json['time_end'] as String?),
+    logs:
+        (json['logs'] as List<dynamic>?)
+            ?.map((e) => Log.fromJson(e as Map<String, dynamic>))
+            .toList() ??
+        [],
+    date: json['date'] == null ? null : DateTime.parse(json['date'] as String),
   );
-  return WorkoutSession()
-    ..id = (json['id'] as num?)?.toInt()
-    ..workoutId = (json['workout'] as num).toInt()
-    ..date = DateTime.parse(json['date'] as String)
-    ..impression = stringToNum(json['impression'] as String?)
-    ..notes = json['notes'] as String? ?? ''
-    ..timeStart = stringToTime(json['time_start'] as String?)
-    ..timeEnd = stringToTime(json['time_end'] as String?);
 }
 
-Map<String, dynamic> _$WorkoutSessionToJson(WorkoutSession instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'workout': instance.workoutId,
-      'date': toDate(instance.date),
-      'impression': numToString(instance.impression),
-      'notes': instance.notes,
-      'time_start': timeToString(instance.timeStart),
-      'time_end': timeToString(instance.timeEnd),
-    };
+Map<String, dynamic> _$WorkoutSessionToJson(WorkoutSession instance) => <String, dynamic>{
+  'id': instance.id,
+  'routine': instance.routineId,
+  'day': instance.dayId,
+  'date': dateToYYYYMMDD(instance.date),
+  'impression': numToString(instance.impression),
+  'notes': instance.notes,
+  'time_start': timeToString(instance.timeStart),
+  'time_end': timeToString(instance.timeEnd),
+};
diff --git a/lib/models/workouts/session_api.dart b/lib/models/workouts/session_api.dart
new file mode 100644
index 00000000..ca0e2bd3
--- /dev/null
+++ b/lib/models/workouts/session_api.dart
@@ -0,0 +1,52 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:json_annotation/json_annotation.dart';
+import 'package:wger/models/exercises/exercise.dart';
+import 'package:wger/models/workouts/log.dart';
+import 'package:wger/models/workouts/session.dart';
+
+part 'session_api.g.dart';
+
+@JsonSerializable()
+class WorkoutSessionApi {
+  @JsonKey(required: true, name: 'session')
+  late WorkoutSession session;
+
+  @JsonKey(required: false, includeToJson: false, defaultValue: [])
+  List<Log> logs = [];
+
+  WorkoutSessionApi({required this.session, this.logs = const []});
+
+  /// Returns all different exercises in the session
+  ///
+  /// This is used to display the exercises in the session
+  List<Exercise> get exercises {
+    final Set<Exercise> exerciseSet = {};
+    for (final log in logs) {
+      exerciseSet.add(log.exercise);
+    }
+    return exerciseSet.toList();
+  }
+
+  // Boilerplate
+  factory WorkoutSessionApi.fromJson(Map<String, dynamic> json) =>
+      _$WorkoutSessionApiFromJson(json);
+
+  Map<String, dynamic> toJson() => _$WorkoutSessionApiToJson(this);
+}
diff --git a/lib/models/workouts/session_api.g.dart b/lib/models/workouts/session_api.g.dart
new file mode 100644
index 00000000..1e75cdcd
--- /dev/null
+++ b/lib/models/workouts/session_api.g.dart
@@ -0,0 +1,23 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'session_api.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+WorkoutSessionApi _$WorkoutSessionApiFromJson(Map<String, dynamic> json) {
+  $checkKeys(json, requiredKeys: const ['session']);
+  return WorkoutSessionApi(
+    session: WorkoutSession.fromJson(json['session'] as Map<String, dynamic>),
+    logs:
+        (json['logs'] as List<dynamic>?)
+            ?.map((e) => Log.fromJson(e as Map<String, dynamic>))
+            .toList() ??
+        [],
+  );
+}
+
+Map<String, dynamic> _$WorkoutSessionApiToJson(WorkoutSessionApi instance) => <String, dynamic>{
+  'session': instance.session,
+};
diff --git a/lib/models/workouts/set.dart b/lib/models/workouts/set.dart
deleted file mode 100644
index a1caa104..00000000
--- a/lib/models/workouts/set.dart
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * This file is part of wger Workout Manager <https://github.com/wger-project>.
- * Copyright (C) 2020, 2021 wger Team
- *
- * wger Workout Manager is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import 'package:json_annotation/json_annotation.dart';
-import 'package:wger/models/exercises/exercise.dart';
-import 'package:wger/models/workouts/setting.dart';
-
-part 'set.g.dart';
-
-@JsonSerializable()
-class Set {
-  static const DEFAULT_NR_SETS = 4;
-
-  @JsonKey(required: true)
-  int? id;
-
-  @JsonKey(required: true)
-  late int sets;
-
-  @JsonKey(required: false, name: 'exerciseday')
-  late int day;
-
-  @JsonKey(required: true)
-  late int order;
-
-  @JsonKey(required: true, defaultValue: '')
-  late String comment;
-
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  List<Exercise> exerciseBasesObj = [];
-
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  List<int> exerciseBasesIds = [];
-
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  List<Setting> settings = [];
-
-  /// Computed settings (instead of 4x10 this has [10, 10, 10, 10]), used for
-  /// the gym mode where the individual values are used
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  List<Setting> settingsComputed = [];
-
-  Set({required this.day, required this.sets, required this.order});
-
-  Set.empty();
-
-  Set.withData({
-    this.id,
-    sets,
-    day,
-    comment,
-    order,
-    exercises,
-    settings,
-    settingsComputed,
-  }) {
-    this.sets = sets ?? DEFAULT_NR_SETS;
-    this.order = order ?? 1;
-    this.comment = comment ?? '';
-    exerciseBasesObj = exercises ?? [];
-    exerciseBasesIds = exerciseBasesObj.map((e) => e.id!).toList();
-    this.settings = settings ?? [];
-    this.settingsComputed = settingsComputed ?? [];
-    if (day != null) {
-      this.day = day;
-    }
-  }
-
-  /// Return only one setting object per exercise, this makes rendering workout
-  /// plans easier and the gym mode uses the synthetic settings anyway.
-  List<Setting> get settingsFiltered {
-    final List<Setting> out = [];
-
-    for (final setting in settings) {
-      final foundSettings = out.where(
-        (element) => element.exerciseId == setting.exerciseId,
-      );
-
-      if (foundSettings.isEmpty) {
-        out.add(setting);
-      }
-    }
-    return out;
-  }
-
-  void addExerciseBase(Exercise base) {
-    exerciseBasesObj.add(base);
-    exerciseBasesIds.add(base.id!);
-  }
-
-  void removeExercise(Exercise base) {
-    exerciseBasesObj.removeWhere((e) => e.id == base.id);
-    exerciseBasesIds.removeWhere((e) => e == base.id);
-  }
-
-  /// Returns all settings for the given exercise
-  List<Setting> filterSettingsByExercise(Exercise exerciseBase) {
-    return settings.where((element) => element.exerciseId == exerciseBase.id).toList();
-  }
-
-  /// Returns a list with all repetitions for the given exercise
-  List<String> getSmartRepr(Exercise exerciseBase) {
-    final List<String> out = [];
-
-    final settingList = filterSettingsByExercise(exerciseBase);
-
-    if (settingList.isEmpty) {
-      out.add('');
-    }
-
-    if (settingList.length == 1) {
-      out.add(settingList.first.singleSettingRepText.replaceAll('\n', ''));
-    }
-
-    if (settingList.length > 1) {
-      for (final setting in settingList) {
-        out.add(setting.singleSettingRepText.replaceAll('\n', ''));
-      }
-    }
-
-    return out;
-  }
-
-  /// Returns a string with all repetitions for the given exercise
-  String getSmartTextRepr(Exercise execiseBase) {
-    return getSmartRepr(execiseBase).join(' – ');
-  }
-
-  // Boilerplate
-  factory Set.fromJson(Map<String, dynamic> json) => _$SetFromJson(json);
-
-  Map<String, dynamic> toJson() => _$SetToJson(this);
-}
diff --git a/lib/models/workouts/set.g.dart b/lib/models/workouts/set.g.dart
deleted file mode 100644
index 1e489fa2..00000000
--- a/lib/models/workouts/set.g.dart
+++ /dev/null
@@ -1,29 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'set.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-Set _$SetFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const ['id', 'sets', 'order', 'comment'],
-  );
-  return Set(
-    day: (json['exerciseday'] as num).toInt(),
-    sets: (json['sets'] as num).toInt(),
-    order: (json['order'] as num).toInt(),
-  )
-    ..id = (json['id'] as num?)?.toInt()
-    ..comment = json['comment'] as String? ?? '';
-}
-
-Map<String, dynamic> _$SetToJson(Set instance) => <String, dynamic>{
-      'id': instance.id,
-      'sets': instance.sets,
-      'exerciseday': instance.day,
-      'order': instance.order,
-      'comment': instance.comment,
-    };
diff --git a/lib/models/workouts/set_config_data.dart b/lib/models/workouts/set_config_data.dart
new file mode 100644
index 00000000..bdebc47c
--- /dev/null
+++ b/lib/models/workouts/set_config_data.dart
@@ -0,0 +1,142 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:json_annotation/json_annotation.dart';
+import 'package:wger/helpers/consts.dart';
+import 'package:wger/helpers/json.dart';
+import 'package:wger/models/exercises/exercise.dart';
+import 'package:wger/models/workouts/repetition_unit.dart';
+import 'package:wger/models/workouts/slot_entry.dart';
+import 'package:wger/models/workouts/weight_unit.dart';
+
+part 'set_config_data.g.dart';
+
+@JsonSerializable()
+class SetConfigData {
+  @JsonKey(required: true, name: 'exercise')
+  late int exerciseId;
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  late Exercise exercise;
+
+  @JsonKey(required: true, name: 'slot_entry_id')
+  late int slotEntryId;
+
+  @JsonKey(required: true)
+  late SlotEntryType type;
+
+  @JsonKey(required: true, name: 'text_repr')
+  late String textRepr;
+
+  String get textReprWithType => '$textRepr${type.typeLabel}';
+
+  @JsonKey(required: true, name: 'sets')
+  late num? nrOfSets;
+
+  @JsonKey(required: true, name: 'max_sets')
+  late num? maxNrOfSets;
+
+  @JsonKey(required: true, fromJson: stringToNumNull)
+  late num? weight;
+
+  @JsonKey(required: true, name: 'max_weight', fromJson: stringToNumNull)
+  late num? maxWeight;
+
+  @JsonKey(required: true, name: 'weight_unit')
+  late int? weightUnitId;
+
+  @JsonKey(includeToJson: false, includeFromJson: false)
+  late WeightUnit? weightUnit;
+
+  @JsonKey(required: true, name: 'weight_rounding', fromJson: stringToNumNull)
+  late num? weightRounding;
+
+  @JsonKey(required: true, name: 'repetitions', fromJson: stringToNumNull)
+  late num? repetitions;
+
+  @JsonKey(required: true, name: 'max_repetitions', fromJson: stringToNumNull)
+  late num? maxRepetitions;
+
+  @JsonKey(required: true, name: 'repetitions_unit')
+  late int? repetitionsUnitId;
+
+  @JsonKey(includeToJson: false, includeFromJson: false)
+  late RepetitionUnit? repetitionsUnit;
+
+  @JsonKey(required: true, name: 'repetitions_rounding', fromJson: stringToNumNull)
+  late num? repetitionsRounding;
+
+  @JsonKey(required: true, fromJson: stringToNumNull)
+  late num? rir;
+
+  @JsonKey(required: true, name: 'max_rir', fromJson: stringToNumNull)
+  late num? maxRir;
+
+  @JsonKey(required: true, fromJson: stringToNumNull)
+  late num? rpe;
+
+  @JsonKey(required: true, name: 'rest', fromJson: stringToNumNull)
+  late num? restTime;
+
+  @JsonKey(required: true, name: 'max_rest', fromJson: stringToNumNull)
+  late num? maxRestTime;
+
+  @JsonKey(required: true)
+  late String comment;
+
+  SetConfigData({
+    required this.exerciseId,
+    required this.slotEntryId,
+    this.type = SlotEntryType.normal,
+    required this.nrOfSets,
+    this.maxNrOfSets,
+    required this.weight,
+    this.maxWeight,
+    this.weightUnitId = WEIGHT_UNIT_KG,
+    this.weightRounding,
+    required this.repetitions,
+    this.maxRepetitions,
+    this.repetitionsUnitId = REP_UNIT_REPETITIONS_ID,
+    this.repetitionsRounding,
+    required this.rir,
+    this.maxRir,
+    required this.rpe,
+    required this.restTime,
+    this.maxRestTime,
+    this.comment = '',
+    this.textRepr = '',
+    Exercise? exercise,
+    WeightUnit? weightUnit,
+    RepetitionUnit? repetitionsUnit,
+  }) {
+    if (exercise != null) {
+      this.exercise = exercise;
+    }
+    if (weightUnit != null) {
+      this.weightUnit = weightUnit;
+    }
+    if (repetitionsUnit != null) {
+      this.repetitionsUnit = repetitionsUnit;
+    }
+  }
+
+  // Boilerplate
+  factory SetConfigData.fromJson(Map<String, dynamic> json) => _$SetConfigDataFromJson(json);
+
+  Map<String, dynamic> toJson() => _$SetConfigDataToJson(this);
+}
diff --git a/lib/models/workouts/set_config_data.g.dart b/lib/models/workouts/set_config_data.g.dart
new file mode 100644
index 00000000..6f22528b
--- /dev/null
+++ b/lib/models/workouts/set_config_data.g.dart
@@ -0,0 +1,93 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'set_config_data.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+SetConfigData _$SetConfigDataFromJson(Map<String, dynamic> json) {
+  $checkKeys(
+    json,
+    requiredKeys: const [
+      'exercise',
+      'slot_entry_id',
+      'type',
+      'text_repr',
+      'sets',
+      'max_sets',
+      'weight',
+      'max_weight',
+      'weight_unit',
+      'weight_rounding',
+      'repetitions',
+      'max_repetitions',
+      'repetitions_unit',
+      'repetitions_rounding',
+      'rir',
+      'max_rir',
+      'rpe',
+      'rest',
+      'max_rest',
+      'comment',
+    ],
+  );
+  return SetConfigData(
+    exerciseId: (json['exercise'] as num).toInt(),
+    slotEntryId: (json['slot_entry_id'] as num).toInt(),
+    type: $enumDecodeNullable(_$SlotEntryTypeEnumMap, json['type']) ?? SlotEntryType.normal,
+    nrOfSets: json['sets'] as num?,
+    maxNrOfSets: json['max_sets'] as num?,
+    weight: stringToNumNull(json['weight'] as String?),
+    maxWeight: stringToNumNull(json['max_weight'] as String?),
+    weightUnitId: (json['weight_unit'] as num?)?.toInt() ?? WEIGHT_UNIT_KG,
+    weightRounding: stringToNumNull(json['weight_rounding'] as String?),
+    repetitions: stringToNumNull(json['repetitions'] as String?),
+    maxRepetitions: stringToNumNull(json['max_repetitions'] as String?),
+    repetitionsUnitId: (json['repetitions_unit'] as num?)?.toInt() ?? REP_UNIT_REPETITIONS_ID,
+    repetitionsRounding: stringToNumNull(
+      json['repetitions_rounding'] as String?,
+    ),
+    rir: stringToNumNull(json['rir'] as String?),
+    maxRir: stringToNumNull(json['max_rir'] as String?),
+    rpe: stringToNumNull(json['rpe'] as String?),
+    restTime: stringToNumNull(json['rest'] as String?),
+    maxRestTime: stringToNumNull(json['max_rest'] as String?),
+    comment: json['comment'] as String? ?? '',
+    textRepr: json['text_repr'] as String? ?? '',
+  );
+}
+
+Map<String, dynamic> _$SetConfigDataToJson(SetConfigData instance) => <String, dynamic>{
+  'exercise': instance.exerciseId,
+  'slot_entry_id': instance.slotEntryId,
+  'type': _$SlotEntryTypeEnumMap[instance.type]!,
+  'text_repr': instance.textRepr,
+  'sets': instance.nrOfSets,
+  'max_sets': instance.maxNrOfSets,
+  'weight': instance.weight,
+  'max_weight': instance.maxWeight,
+  'weight_unit': instance.weightUnitId,
+  'weight_rounding': instance.weightRounding,
+  'repetitions': instance.repetitions,
+  'max_repetitions': instance.maxRepetitions,
+  'repetitions_unit': instance.repetitionsUnitId,
+  'repetitions_rounding': instance.repetitionsRounding,
+  'rir': instance.rir,
+  'max_rir': instance.maxRir,
+  'rpe': instance.rpe,
+  'rest': instance.restTime,
+  'max_rest': instance.maxRestTime,
+  'comment': instance.comment,
+};
+
+const _$SlotEntryTypeEnumMap = {
+  SlotEntryType.normal: 'normal',
+  SlotEntryType.dropset: 'dropset',
+  SlotEntryType.myo: 'myo',
+  SlotEntryType.partial: 'partial',
+  SlotEntryType.forced: 'forced',
+  SlotEntryType.tut: 'tut',
+  SlotEntryType.iso: 'iso',
+  SlotEntryType.jump: 'jump',
+};
diff --git a/lib/models/workouts/setting.dart b/lib/models/workouts/setting.dart
deleted file mode 100644
index 035e431f..00000000
--- a/lib/models/workouts/setting.dart
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * This file is part of wger Workout Manager <https://github.com/wger-project>.
- * Copyright (C) 2020, 2021 wger Team
- *
- * wger Workout Manager is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import 'package:json_annotation/json_annotation.dart';
-import 'package:wger/helpers/json.dart';
-import 'package:wger/helpers/misc.dart';
-import 'package:wger/models/exercises/exercise.dart';
-import 'package:wger/models/workouts/repetition_unit.dart';
-import 'package:wger/models/workouts/weight_unit.dart';
-
-part 'setting.g.dart';
-
-@JsonSerializable()
-class Setting {
-  /// Allowed RiR values. This list must be kept in sync with RIR_OPTIONS in the
-  /// wger server
-  static const POSSIBLE_RIR_VALUES = ['', '0', '0.5', '1', '1.5', '2', '2.5', '3', '3.5', '4'];
-  static const DEFAULT_RIR = '';
-
-  @JsonKey(required: true)
-  int? id;
-
-  @JsonKey(required: true, name: 'set')
-  late int setId;
-
-  @JsonKey(required: true)
-  late int order;
-
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  late Exercise exerciseObj;
-
-  @JsonKey(required: true, name: 'exercise_base')
-  late int exerciseId;
-
-  @JsonKey(required: true, name: 'repetition_unit')
-  late int repetitionUnitId;
-
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  late RepetitionUnit repetitionUnitObj;
-
-  @JsonKey(required: true)
-  int? reps;
-
-  @JsonKey(required: true, fromJson: stringToNum, toJson: numToString)
-  num? weight;
-
-  @JsonKey(required: true, name: 'weight_unit')
-  late int weightUnitId;
-
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  late WeightUnit weightUnitObj;
-
-  /// Personal notes about this setting. Currently not used
-  @JsonKey(required: true)
-  late String comment = '';
-
-  /// Reps in Reserve
-  @JsonKey(required: true)
-  String? rir = '';
-
-  Setting({
-    this.id,
-    required this.setId,
-    required this.order,
-    required this.exerciseId,
-    required this.repetitionUnitId,
-    required this.reps,
-    required this.weightUnitId,
-    required this.comment,
-    required this.rir,
-  });
-
-  Setting.empty();
-
-  // Boilerplate
-  factory Setting.fromJson(Map<String, dynamic> json) => _$SettingFromJson(json);
-
-  Map<String, dynamic> toJson() => _$SettingToJson(this);
-
-  set exercise(Exercise exercise) {
-    exerciseObj = exercise;
-    exerciseId = exercise.id!;
-  }
-
-  set weightUnit(WeightUnit weightUnit) {
-    weightUnitObj = weightUnit;
-    weightUnitId = weightUnit.id;
-  }
-
-  set repetitionUnit(RepetitionUnit repetitionUnit) {
-    repetitionUnitObj = repetitionUnit;
-    repetitionUnitId = repetitionUnit.id;
-  }
-
-  void setRir(String newRir) {
-    if (POSSIBLE_RIR_VALUES.contains(newRir)) {
-      rir = newRir;
-    } else {
-      throw Exception('RiR value not allowed: $newRir');
-    }
-  }
-
-  /// Returns the text representation for a single setting, used in the gym mode
-  String get singleSettingRepText {
-    return repText(reps, repetitionUnitObj, weight, weightUnitObj, rir);
-  }
-}
diff --git a/lib/models/workouts/setting.g.dart b/lib/models/workouts/setting.g.dart
deleted file mode 100644
index 88b5b16f..00000000
--- a/lib/models/workouts/setting.g.dart
+++ /dev/null
@@ -1,49 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'setting.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-Setting _$SettingFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const [
-      'id',
-      'set',
-      'order',
-      'exercise_base',
-      'repetition_unit',
-      'reps',
-      'weight',
-      'weight_unit',
-      'comment',
-      'rir'
-    ],
-  );
-  return Setting(
-    id: (json['id'] as num?)?.toInt(),
-    setId: (json['set'] as num).toInt(),
-    order: (json['order'] as num).toInt(),
-    exerciseId: (json['exercise_base'] as num).toInt(),
-    repetitionUnitId: (json['repetition_unit'] as num).toInt(),
-    reps: (json['reps'] as num?)?.toInt(),
-    weightUnitId: (json['weight_unit'] as num).toInt(),
-    comment: json['comment'] as String,
-    rir: json['rir'] as String?,
-  )..weight = stringToNum(json['weight'] as String?);
-}
-
-Map<String, dynamic> _$SettingToJson(Setting instance) => <String, dynamic>{
-      'id': instance.id,
-      'set': instance.setId,
-      'order': instance.order,
-      'exercise_base': instance.exerciseId,
-      'repetition_unit': instance.repetitionUnitId,
-      'reps': instance.reps,
-      'weight': numToString(instance.weight),
-      'weight_unit': instance.weightUnitId,
-      'comment': instance.comment,
-      'rir': instance.rir,
-    };
diff --git a/lib/models/workouts/slot.dart b/lib/models/workouts/slot.dart
new file mode 100644
index 00000000..656f58ae
--- /dev/null
+++ b/lib/models/workouts/slot.dart
@@ -0,0 +1,100 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:json_annotation/json_annotation.dart';
+import 'package:wger/models/exercises/exercise.dart';
+import 'package:wger/models/workouts/slot_entry.dart';
+
+part 'slot.g.dart';
+
+@JsonSerializable()
+class Slot {
+  static const DEFAULT_NR_SETS = 4;
+
+  @JsonKey(required: true, includeToJson: false)
+  int? id;
+
+  @JsonKey(required: false)
+  late int day;
+
+  @JsonKey(required: true)
+  late int order;
+
+  @JsonKey(required: true, defaultValue: '')
+  late String comment;
+
+  @JsonKey(required: true)
+  late Object? config;
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  List<Exercise> exercisesObj = [];
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  List<int> exercisesIds = [];
+
+  @JsonKey(required: false, includeFromJson: true, defaultValue: [], includeToJson: false)
+  List<SlotEntry> entries = [];
+
+  Slot({
+    required this.id,
+    required this.day,
+    required this.comment,
+    required this.order,
+    required this.config,
+  });
+
+  Slot.empty();
+
+  Slot.withData({
+    this.id,
+    int? day,
+    String? comment,
+    int? order,
+    List<Exercise>? exercises,
+    List<SlotEntry>? entries,
+  }) {
+    this.order = order ?? 1;
+    this.comment = comment ?? '';
+    config = null;
+    exercisesObj = exercises ?? [];
+    exercisesIds = exercisesObj.map((e) => e.id!).toList();
+    entries = entries ?? [];
+    if (day != null) {
+      this.day = day;
+    }
+  }
+
+  void addExerciseBase(Exercise base) {
+    exercisesObj.add(base);
+    exercisesIds.add(base.id!);
+  }
+
+  void removeExercise(Exercise base) {
+    exercisesObj.removeWhere((e) => e.id == base.id);
+    exercisesIds.removeWhere((e) => e == base.id);
+  }
+
+  bool get isSuperset {
+    return exercisesObj.length > 1;
+  }
+
+  // Boilerplate
+  factory Slot.fromJson(Map<String, dynamic> json) => _$SlotFromJson(json);
+
+  Map<String, dynamic> toJson() => _$SlotToJson(this);
+}
diff --git a/lib/models/workouts/slot.g.dart b/lib/models/workouts/slot.g.dart
new file mode 100644
index 00000000..c059c53a
--- /dev/null
+++ b/lib/models/workouts/slot.g.dart
@@ -0,0 +1,30 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'slot.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+Slot _$SlotFromJson(Map<String, dynamic> json) {
+  $checkKeys(json, requiredKeys: const ['id', 'order', 'comment', 'config']);
+  return Slot(
+      id: (json['id'] as num?)?.toInt(),
+      day: (json['day'] as num).toInt(),
+      comment: json['comment'] as String? ?? '',
+      order: (json['order'] as num).toInt(),
+      config: json['config'],
+    )
+    ..entries =
+        (json['entries'] as List<dynamic>?)
+            ?.map((e) => SlotEntry.fromJson(e as Map<String, dynamic>))
+            .toList() ??
+        [];
+}
+
+Map<String, dynamic> _$SlotToJson(Slot instance) => <String, dynamic>{
+  'day': instance.day,
+  'order': instance.order,
+  'comment': instance.comment,
+  'config': instance.config,
+};
diff --git a/lib/models/workouts/slot_data.dart b/lib/models/workouts/slot_data.dart
new file mode 100644
index 00000000..cd36464e
--- /dev/null
+++ b/lib/models/workouts/slot_data.dart
@@ -0,0 +1,49 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:json_annotation/json_annotation.dart';
+import 'package:wger/models/workouts/set_config_data.dart';
+
+part 'slot_data.g.dart';
+
+@JsonSerializable()
+class SlotData {
+  @JsonKey(required: true)
+  late String comment;
+
+  @JsonKey(required: true, name: 'is_superset')
+  late bool isSuperset;
+
+  @JsonKey(required: true, name: 'exercises')
+  late List<int> exerciseIds;
+
+  @JsonKey(required: true, name: 'sets')
+  late List<SetConfigData> setConfigs;
+
+  SlotData({
+    required this.comment,
+    required this.isSuperset,
+    this.exerciseIds = const [],
+    this.setConfigs = const [],
+  });
+
+  // Boilerplate
+  factory SlotData.fromJson(Map<String, dynamic> json) => _$SlotDataFromJson(json);
+
+  Map<String, dynamic> toJson() => _$SlotDataToJson(this);
+}
diff --git a/lib/models/workouts/slot_data.g.dart b/lib/models/workouts/slot_data.g.dart
new file mode 100644
index 00000000..a8d70f14
--- /dev/null
+++ b/lib/models/workouts/slot_data.g.dart
@@ -0,0 +1,32 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'slot_data.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+SlotData _$SlotDataFromJson(Map<String, dynamic> json) {
+  $checkKeys(
+    json,
+    requiredKeys: const ['comment', 'is_superset', 'exercises', 'sets'],
+  );
+  return SlotData(
+    comment: json['comment'] as String,
+    isSuperset: json['is_superset'] as bool,
+    exerciseIds:
+        (json['exercises'] as List<dynamic>?)?.map((e) => (e as num).toInt()).toList() ?? const [],
+    setConfigs:
+        (json['sets'] as List<dynamic>?)
+            ?.map((e) => SetConfigData.fromJson(e as Map<String, dynamic>))
+            .toList() ??
+        const [],
+  );
+}
+
+Map<String, dynamic> _$SlotDataToJson(SlotData instance) => <String, dynamic>{
+  'comment': instance.comment,
+  'is_superset': instance.isSuperset,
+  'exercises': instance.exerciseIds,
+  'sets': instance.setConfigs,
+};
diff --git a/lib/models/workouts/slot_entry.dart b/lib/models/workouts/slot_entry.dart
new file mode 100644
index 00000000..13fee755
--- /dev/null
+++ b/lib/models/workouts/slot_entry.dart
@@ -0,0 +1,271 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:json_annotation/json_annotation.dart';
+import 'package:wger/helpers/consts.dart';
+import 'package:wger/helpers/json.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/exercises/exercise.dart';
+import 'package:wger/models/workouts/base_config.dart';
+import 'package:wger/models/workouts/repetition_unit.dart';
+import 'package:wger/models/workouts/weight_unit.dart';
+
+part 'slot_entry.g.dart';
+
+enum SlotEntryType { normal, dropset, myo, partial, forced, tut, iso, jump }
+
+extension SlotEntryTypeExtension on SlotEntryType {
+  String i18Label(AppLocalizations i18n) {
+    switch (this) {
+      case SlotEntryType.normal:
+        return i18n.slotEntryTypeNormal;
+      case SlotEntryType.dropset:
+        return i18n.slotEntryTypeDropset;
+      case SlotEntryType.myo:
+        return i18n.slotEntryTypeMyo;
+      case SlotEntryType.partial:
+        return i18n.slotEntryTypePartial;
+      case SlotEntryType.forced:
+        return i18n.slotEntryTypeForced;
+      case SlotEntryType.tut:
+        return i18n.slotEntryTypeTut;
+      case SlotEntryType.iso:
+        return i18n.slotEntryTypeIso;
+      case SlotEntryType.jump:
+        return i18n.slotEntryTypeJump;
+    }
+  }
+
+  String get typeLabel => this != SlotEntryType.normal ? ' (${name.toUpperCase()})' : '';
+}
+
+enum ConfigType {
+  weight,
+  maxWeight,
+  repetitions,
+  maxRepetitions,
+  sets,
+  maxSets,
+  rir,
+  maxRir,
+  rest,
+  maxRest,
+}
+
+@JsonSerializable()
+class SlotEntry {
+  /// Allowed RiR values. This list must be kept in sync with RIR_OPTIONS in the
+  /// wger server
+  static const POSSIBLE_RIR_VALUES = ['', 0, 0.5, 1, 1.5, 2, 2.5, 3, 3.5, 4, 4.5];
+  static const DEFAULT_RIR = '';
+
+  @JsonKey(required: true, includeToJson: false)
+  int? id;
+
+  @JsonKey(required: true, name: 'slot')
+  late int slotId;
+
+  @JsonKey(required: true)
+  late int order;
+
+  @JsonKey(required: true)
+  late String comment;
+
+  @JsonKey(required: true)
+  late SlotEntryType type;
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  late Exercise exerciseObj;
+
+  @JsonKey(required: true, name: 'exercise')
+  late int exerciseId;
+
+  @JsonKey(required: true, name: 'repetition_unit')
+  late int? repetitionUnitId;
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  late RepetitionUnit? repetitionUnitObj;
+
+  @JsonKey(required: true, name: 'repetition_rounding', fromJson: stringToNumNull)
+  late num? repetitionRounding;
+
+  @JsonKey(required: false, name: 'repetitions_configs', includeToJson: false, defaultValue: [])
+  late List<BaseConfig> repetitionsConfigs = [];
+
+  @JsonKey(required: false, name: 'max_repetitions_configs', includeToJson: false, defaultValue: [])
+  late List<BaseConfig> maxRepetitionsConfigs = [];
+
+  @JsonKey(required: true, name: 'weight_unit')
+  late int? weightUnitId;
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  late WeightUnit? weightUnitObj;
+
+  @JsonKey(required: true, name: 'weight_rounding', fromJson: stringToNumNull)
+  late num? weightRounding;
+
+  @JsonKey(required: false, name: 'weight_configs', includeToJson: false, defaultValue: [])
+  late List<BaseConfig> weightConfigs = [];
+
+  @JsonKey(required: false, name: 'max_weight_configs', includeToJson: false, defaultValue: [])
+  late List<BaseConfig> maxWeightConfigs = [];
+
+  @JsonKey(required: false, name: 'set_nr_configs', includeToJson: false, defaultValue: [])
+  late List<BaseConfig> nrOfSetsConfigs = [];
+
+  @JsonKey(required: false, name: 'max_set_nr_configs', includeToJson: false, defaultValue: [])
+  late List<BaseConfig> maxNrOfSetsConfigs = [];
+
+  @JsonKey(required: false, name: 'rir_configs', includeToJson: false, defaultValue: [])
+  late List<BaseConfig> rirConfigs = [];
+
+  @JsonKey(required: false, name: 'max_rir_configs', includeToJson: false, defaultValue: [])
+  late List<BaseConfig> maxRirConfigs = [];
+
+  @JsonKey(required: false, name: 'rest_configs', includeToJson: false, defaultValue: [])
+  late List<BaseConfig> restTimeConfigs = [];
+
+  @JsonKey(required: false, name: 'max_rest_configs', includeToJson: false, defaultValue: [])
+  late List<BaseConfig> maxRestTimeConfigs = [];
+
+  @JsonKey(required: true)
+  late Object? config;
+
+  SlotEntry({
+    this.id,
+    required this.slotId,
+    this.order = 1,
+    this.type = SlotEntryType.normal,
+    required this.exerciseId,
+    required this.repetitionUnitId,
+    required this.repetitionRounding,
+    required this.weightUnitId,
+    required this.weightRounding,
+    this.comment = '',
+    this.weightConfigs = const [],
+    this.maxWeightConfigs = const [],
+    this.nrOfSetsConfigs = const [],
+    this.maxNrOfSetsConfigs = const [],
+    this.rirConfigs = const [],
+    this.maxRirConfigs = const [],
+    this.restTimeConfigs = const [],
+    this.maxRestTimeConfigs = const [],
+    this.repetitionsConfigs = const [],
+    this.maxRepetitionsConfigs = const [],
+    RepetitionUnit? repetitionUnit,
+    WeightUnit? weightUnit,
+    Exercise? exercise,
+  }) {
+    if (repetitionUnit != null) {
+      repetitionUnitObj = repetitionUnit;
+    }
+    if (weightUnit != null) {
+      weightUnitObj = weightUnit;
+    }
+    if (exercise != null) {
+      exerciseObj = exercise;
+    }
+  }
+
+  SlotEntry.empty();
+
+  SlotEntry.withData({
+    required this.slotId,
+    String? comment,
+    int? order,
+    SlotEntryType? type,
+    required Exercise exercise,
+    int? weightUnitId,
+    this.weightRounding,
+    int? repetitionUnitId,
+    this.repetitionRounding,
+  }) {
+    this.order = order ?? 1;
+    this.comment = comment ?? '';
+    config = null;
+    this.type = type ?? SlotEntryType.normal;
+    exerciseObj = exercise;
+    exerciseId = exercise.id!;
+    this.weightUnitId = weightUnitId ?? WEIGHT_UNIT_KG;
+
+    this.repetitionUnitId = repetitionUnitId ?? REP_UNIT_REPETITIONS_ID;
+  }
+
+  String get rir {
+    return 'DELETE ME! RIR';
+  }
+
+  bool get hasProgressionRules {
+    return weightConfigs.length > 1 ||
+        repetitionsConfigs.length > 1 ||
+        maxRepetitionsConfigs.length > 1 ||
+        nrOfSetsConfigs.length > 1 ||
+        maxNrOfSetsConfigs.length > 1 ||
+        rirConfigs.length > 1 ||
+        maxRirConfigs.length > 1 ||
+        restTimeConfigs.length > 1 ||
+        maxRestTimeConfigs.length > 1 ||
+        maxWeightConfigs.length > 1 ||
+        maxWeightConfigs.length > 1;
+  }
+
+  List<BaseConfig> getConfigsByType(ConfigType type) {
+    switch (type) {
+      case ConfigType.weight:
+        return weightConfigs;
+      case ConfigType.maxWeight:
+        return maxWeightConfigs;
+      case ConfigType.sets:
+        return nrOfSetsConfigs;
+      case ConfigType.maxSets:
+        return maxNrOfSetsConfigs;
+      case ConfigType.repetitions:
+        return repetitionsConfigs;
+      case ConfigType.maxRepetitions:
+        return maxRepetitionsConfigs;
+      case ConfigType.rir:
+        return rirConfigs;
+      case ConfigType.maxRir:
+        return maxRirConfigs;
+      case ConfigType.rest:
+        return restTimeConfigs;
+      case ConfigType.maxRest:
+        return maxRestTimeConfigs;
+    }
+  }
+
+  // Boilerplate
+  factory SlotEntry.fromJson(Map<String, dynamic> json) => _$SlotEntryFromJson(json);
+
+  Map<String, dynamic> toJson() => _$SlotEntryToJson(this);
+
+  set exercise(Exercise exercise) {
+    exerciseObj = exercise;
+    exerciseId = exercise.id!;
+  }
+
+  set weightUnit(WeightUnit weightUnit) {
+    weightUnitObj = weightUnit;
+    weightUnitId = weightUnit.id;
+  }
+
+  set repetitionUnit(RepetitionUnit repetitionUnit) {
+    repetitionUnitObj = repetitionUnit;
+    repetitionUnitId = repetitionUnit.id;
+  }
+}
diff --git a/lib/models/workouts/slot_entry.g.dart b/lib/models/workouts/slot_entry.g.dart
new file mode 100644
index 00000000..e17c05a1
--- /dev/null
+++ b/lib/models/workouts/slot_entry.g.dart
@@ -0,0 +1,112 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'slot_entry.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+SlotEntry _$SlotEntryFromJson(Map<String, dynamic> json) {
+  $checkKeys(
+    json,
+    requiredKeys: const [
+      'id',
+      'slot',
+      'order',
+      'comment',
+      'type',
+      'exercise',
+      'repetition_unit',
+      'repetition_rounding',
+      'weight_unit',
+      'weight_rounding',
+      'config',
+    ],
+  );
+  return SlotEntry(
+    id: (json['id'] as num?)?.toInt(),
+    slotId: (json['slot'] as num).toInt(),
+    order: (json['order'] as num?)?.toInt() ?? 1,
+    type: $enumDecodeNullable(_$SlotEntryTypeEnumMap, json['type']) ?? SlotEntryType.normal,
+    exerciseId: (json['exercise'] as num).toInt(),
+    repetitionUnitId: (json['repetition_unit'] as num?)?.toInt(),
+    repetitionRounding: stringToNumNull(json['repetition_rounding'] as String?),
+    weightUnitId: (json['weight_unit'] as num?)?.toInt(),
+    weightRounding: stringToNumNull(json['weight_rounding'] as String?),
+    comment: json['comment'] as String? ?? '',
+    weightConfigs:
+        (json['weight_configs'] as List<dynamic>?)
+            ?.map((e) => BaseConfig.fromJson(e as Map<String, dynamic>))
+            .toList() ??
+        [],
+    maxWeightConfigs:
+        (json['max_weight_configs'] as List<dynamic>?)
+            ?.map((e) => BaseConfig.fromJson(e as Map<String, dynamic>))
+            .toList() ??
+        [],
+    nrOfSetsConfigs:
+        (json['set_nr_configs'] as List<dynamic>?)
+            ?.map((e) => BaseConfig.fromJson(e as Map<String, dynamic>))
+            .toList() ??
+        [],
+    maxNrOfSetsConfigs:
+        (json['max_set_nr_configs'] as List<dynamic>?)
+            ?.map((e) => BaseConfig.fromJson(e as Map<String, dynamic>))
+            .toList() ??
+        [],
+    rirConfigs:
+        (json['rir_configs'] as List<dynamic>?)
+            ?.map((e) => BaseConfig.fromJson(e as Map<String, dynamic>))
+            .toList() ??
+        [],
+    maxRirConfigs:
+        (json['max_rir_configs'] as List<dynamic>?)
+            ?.map((e) => BaseConfig.fromJson(e as Map<String, dynamic>))
+            .toList() ??
+        [],
+    restTimeConfigs:
+        (json['rest_configs'] as List<dynamic>?)
+            ?.map((e) => BaseConfig.fromJson(e as Map<String, dynamic>))
+            .toList() ??
+        [],
+    maxRestTimeConfigs:
+        (json['max_rest_configs'] as List<dynamic>?)
+            ?.map((e) => BaseConfig.fromJson(e as Map<String, dynamic>))
+            .toList() ??
+        [],
+    repetitionsConfigs:
+        (json['repetitions_configs'] as List<dynamic>?)
+            ?.map((e) => BaseConfig.fromJson(e as Map<String, dynamic>))
+            .toList() ??
+        [],
+    maxRepetitionsConfigs:
+        (json['max_repetitions_configs'] as List<dynamic>?)
+            ?.map((e) => BaseConfig.fromJson(e as Map<String, dynamic>))
+            .toList() ??
+        [],
+  )..config = json['config'];
+}
+
+Map<String, dynamic> _$SlotEntryToJson(SlotEntry instance) => <String, dynamic>{
+  'slot': instance.slotId,
+  'order': instance.order,
+  'comment': instance.comment,
+  'type': _$SlotEntryTypeEnumMap[instance.type]!,
+  'exercise': instance.exerciseId,
+  'repetition_unit': instance.repetitionUnitId,
+  'repetition_rounding': instance.repetitionRounding,
+  'weight_unit': instance.weightUnitId,
+  'weight_rounding': instance.weightRounding,
+  'config': instance.config,
+};
+
+const _$SlotEntryTypeEnumMap = {
+  SlotEntryType.normal: 'normal',
+  SlotEntryType.dropset: 'dropset',
+  SlotEntryType.myo: 'myo',
+  SlotEntryType.partial: 'partial',
+  SlotEntryType.forced: 'forced',
+  SlotEntryType.tut: 'tut',
+  SlotEntryType.iso: 'iso',
+  SlotEntryType.jump: 'jump',
+};
diff --git a/lib/models/workouts/weight_unit.g.dart b/lib/models/workouts/weight_unit.g.dart
index 8e5474aa..7caef784 100644
--- a/lib/models/workouts/weight_unit.g.dart
+++ b/lib/models/workouts/weight_unit.g.dart
@@ -7,18 +7,11 @@ part of 'weight_unit.dart';
 // **************************************************************************
 
 WeightUnit _$WeightUnitFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const ['id', 'name'],
-  );
-  return WeightUnit(
-    id: (json['id'] as num).toInt(),
-    name: json['name'] as String,
-  );
+  $checkKeys(json, requiredKeys: const ['id', 'name']);
+  return WeightUnit(id: (json['id'] as num).toInt(), name: json['name'] as String);
 }
 
-Map<String, dynamic> _$WeightUnitToJson(WeightUnit instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'name': instance.name,
-    };
+Map<String, dynamic> _$WeightUnitToJson(WeightUnit instance) => <String, dynamic>{
+  'id': instance.id,
+  'name': instance.name,
+};
diff --git a/lib/models/workouts/workout_plan.dart b/lib/models/workouts/workout_plan.dart
deleted file mode 100644
index 995bd9c5..00000000
--- a/lib/models/workouts/workout_plan.dart
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * This file is part of wger Workout Manager <https://github.com/wger-project>.
- * Copyright (C) 2020 wger Team
- *
- * wger Workout Manager is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * wger Workout Manager is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import 'package:json_annotation/json_annotation.dart';
-import 'package:wger/models/exercises/exercise.dart';
-import 'package:wger/models/workouts/day.dart';
-import 'package:wger/models/workouts/log.dart';
-
-part 'workout_plan.g.dart';
-
-@JsonSerializable()
-class WorkoutPlan {
-  @JsonKey(required: true)
-  int? id;
-
-  @JsonKey(required: true, name: 'creation_date')
-  late DateTime creationDate;
-
-  @JsonKey(required: true, name: 'name')
-  late String name;
-
-  @JsonKey(required: true, name: 'description')
-  late String description;
-
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  List<Day> days = [];
-
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  List<Log> logs = [];
-
-  WorkoutPlan({
-    this.id,
-    required this.creationDate,
-    required this.name,
-    String? description,
-    List<Day>? days,
-    List<Log>? logs,
-  }) {
-    this.days = days ?? [];
-    this.logs = logs ?? [];
-    this.description = description ?? '';
-  }
-
-  WorkoutPlan.empty() {
-    creationDate = DateTime.now();
-    name = '';
-    description = '';
-  }
-
-  // Boilerplate
-  factory WorkoutPlan.fromJson(Map<String, dynamic> json) => _$WorkoutPlanFromJson(json);
-
-  Map<String, dynamic> toJson() => _$WorkoutPlanToJson(this);
-
-  /// Filters the workout logs by exercise and sorts them by date
-  ///
-  /// Optionally, filters list so that only unique logs are returned. "Unique"
-  /// means here that the values are the same, i.e. logs with the same weight,
-  /// reps, etc. are considered equal. Workout ID, Log ID and date are not
-  /// considered.
-  List<Log> filterLogsByExerciseBase(Exercise exerciseBase, {bool unique = false}) {
-    var out = logs.where((element) => element.exerciseBaseId == exerciseBase.id).toList();
-
-    if (unique) {
-      out = out.toSet().toList();
-    }
-
-    out.sort((a, b) => b.date.compareTo(a.date));
-    return out;
-  }
-
-  /// Massages the log data to more easily present on the log overview
-  ///
-  Map<DateTime, Map<String, dynamic>> get logData {
-    final out = <DateTime, Map<String, dynamic>>{};
-    for (final log in logs) {
-      final exercise = log.exerciseBaseObj;
-      final date = log.date;
-
-      if (!out.containsKey(date)) {
-        out[date] = {
-          'session': null,
-          'exercises': <Exercise, List<Log>>{},
-        };
-      }
-
-      if (!out[date]!['exercises']!.containsKey(exercise)) {
-        out[date]!['exercises']![exercise] = <Log>[];
-      }
-
-      out[date]!['exercises']![exercise].add(log);
-    }
-
-    return out;
-  }
-}
diff --git a/lib/models/workouts/workout_plan.g.dart b/lib/models/workouts/workout_plan.g.dart
deleted file mode 100644
index 99c210ca..00000000
--- a/lib/models/workouts/workout_plan.g.dart
+++ /dev/null
@@ -1,28 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'workout_plan.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-WorkoutPlan _$WorkoutPlanFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const ['id', 'creation_date', 'name', 'description'],
-  );
-  return WorkoutPlan(
-    id: (json['id'] as num?)?.toInt(),
-    creationDate: DateTime.parse(json['creation_date'] as String),
-    name: json['name'] as String,
-    description: json['description'] as String?,
-  );
-}
-
-Map<String, dynamic> _$WorkoutPlanToJson(WorkoutPlan instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'creation_date': instance.creationDate.toIso8601String(),
-      'name': instance.name,
-      'description': instance.description,
-    };
diff --git a/lib/providers/add_exercise.dart b/lib/providers/add_exercise.dart
index 718e149e..a813744f 100644
--- a/lib/providers/add_exercise.dart
+++ b/lib/providers/add_exercise.dart
@@ -1,86 +1,73 @@
-import 'dart:developer';
-import 'dart:io';
-
 import 'package:flutter/foundation.dart';
 import 'package:http/http.dart' as http;
+import 'package:logging/logging.dart';
 import 'package:wger/helpers/consts.dart';
-import 'package:wger/models/exercises/alias.dart';
 import 'package:wger/models/exercises/category.dart';
 import 'package:wger/models/exercises/equipment.dart';
-import 'package:wger/models/exercises/exercise.dart';
+import 'package:wger/models/exercises/exercise_submission.dart';
+import 'package:wger/models/exercises/exercise_submission_images.dart';
 import 'package:wger/models/exercises/language.dart';
 import 'package:wger/models/exercises/muscle.dart';
-import 'package:wger/models/exercises/translation.dart';
 import 'package:wger/models/exercises/variation.dart';
 
 import 'base_provider.dart';
 
 class AddExerciseProvider with ChangeNotifier {
   final WgerBaseProvider baseProvider;
+  static final _logger = Logger('AddExerciseProvider');
 
   AddExerciseProvider(this.baseProvider);
 
-  List<File> get exerciseImages => [..._exerciseImages];
-  List<File> _exerciseImages = [];
-  String? _nameEn;
-  String? _nameTranslation;
-  String? _descriptionEn;
-  String? _descriptionTranslation;
+  // Images and their metadata (license info, style)
+  final List<ExerciseSubmissionImage> _exerciseImages = [];
+
+  List<ExerciseSubmissionImage> get exerciseImages => [..._exerciseImages];
+
+  String author = '';
+  String? exerciseNameEn;
+  String? exerciseNameTrans;
+  String? descriptionEn;
+  String? descriptionTrans;
   int? _variationId;
-  int? _newVariationForExercise;
-  Language? language;
-  List<String> _alternativeNamesEn = [];
-  List<String> _alternativeNamesTranslation = [];
+  int? _variationConnectToExercise;
+  Language? languageEn;
+  Language? languageTranslation;
+  List<String> alternateNamesEn = [];
+  List<String> alternateNamesTrans = [];
   ExerciseCategory? category;
-  List<Exercise> _variations = [];
   List<Equipment> _equipment = [];
   List<Muscle> _primaryMuscles = [];
   List<Muscle> _secondaryMuscles = [];
 
-  static const _exerciseBaseUrlPath = 'exercise-base';
+  static const _exerciseSubmissionUrlPath = 'exercise-submission';
   static const _imagesUrlPath = 'exerciseimage';
-  static const _exerciseTranslationUrlPath = 'exercise-translation';
-  static const _exerciseAliasPath = 'exercisealias';
-  static const _exerciseVariationPath = 'variation';
+  static const _checkLanguageUrlPath = 'check-language';
 
   void clear() {
-    _exerciseImages = [];
-    language = null;
+    _exerciseImages.clear();
+    languageTranslation = null;
     category = null;
-    _nameEn = null;
-    _nameTranslation = null;
-    _descriptionEn = null;
-    _descriptionTranslation = null;
-    _alternativeNamesEn = [];
-    _alternativeNamesTranslation = [];
-    _variations = [];
+    exerciseNameEn = null;
+    exerciseNameTrans = null;
+    descriptionEn = null;
+    descriptionTrans = null;
+    alternateNamesEn = [];
+    alternateNamesTrans = [];
     _equipment = [];
     _primaryMuscles = [];
     _secondaryMuscles = [];
   }
 
-  set exerciseNameEn(String name) => _nameEn = name;
-
-  set exerciseNameTrans(String name) => _nameTranslation = name;
-
-  set descriptionEn(String description) => _descriptionEn = description;
-
-  set descriptionTrans(String description) => _descriptionTranslation = description;
-
-  set alternateNamesEn(List<String> names) => _alternativeNamesEn = names;
-
-  set alternateNamesTrans(List<String> names) => _alternativeNamesTranslation = names;
-
   set equipment(List<Equipment> equipment) => _equipment = equipment;
 
   List<Equipment> get equipment => [..._equipment];
 
-  bool get newVariation => _newVariationForExercise != null;
+  bool get newVariation => _variationConnectToExercise != null;
 
-  int? get newVariationForExercise => _newVariationForExercise;
+  int? get variationConnectToExercise => _variationConnectToExercise;
 
-  set newVariationForExercise(int? value) {
-    _newVariationForExercise = value;
+  set variationConnectToExercise(int? value) {
+    _variationConnectToExercise = value;
     _variationId = null;
     notifyListeners();
   }
@@ -89,36 +76,10 @@ class AddExerciseProvider with ChangeNotifier {
 
   set variationId(int? variation) {
     _variationId = variation;
-    _newVariationForExercise = null;
+    _variationConnectToExercise = null;
     notifyListeners();
   }
 
-  Exercise get exercise {
-    return Exercise(
-      category: category,
-      equipment: _equipment,
-      muscles: _primaryMuscles,
-      musclesSecondary: _secondaryMuscles,
-      variationId: _variationId,
-    );
-  }
-
-  Translation get translationEn {
-    return Translation(
-      name: _nameEn!,
-      description: _descriptionEn!,
-      language: const Language(id: 2, fullName: 'English', shortName: 'en'),
-    );
-  }
-
-  Translation get translation {
-    return Translation(
-      name: _nameTranslation!,
-      description: _descriptionTranslation!,
-      language: language,
-    );
-  }
-
   Variation get variation {
     return Variation(id: _variationId!);
   }
@@ -137,136 +98,130 @@ class AddExerciseProvider with ChangeNotifier {
     notifyListeners();
   }
 
-  void addExerciseImages(List<File> exercises) {
-    _exerciseImages.addAll(exercises);
+  ExerciseSubmissionApi get exerciseApiObject {
+    return ExerciseSubmissionApi(
+      author: '',
+      variation: _variationId,
+      variationConnectTo: _variationConnectToExercise,
+      category: category!.id,
+      muscles: _primaryMuscles.map((e) => e.id).toList(),
+      musclesSecondary: _secondaryMuscles.map((e) => e.id).toList(),
+      equipment: _equipment.map((e) => e.id).toList(),
+      translations: [
+        // Base language (English)
+        ExerciseTranslationSubmissionApi(
+          author: '',
+          language: languageEn!.id,
+          name: exerciseNameEn!,
+          description: descriptionEn!,
+          aliases: alternateNamesEn
+              .where((element) => element.isNotEmpty)
+              .map((e) => ExerciseAliasSubmissionApi(alias: e))
+              .toList(),
+        ),
+
+        // Optional translation
+        if (languageTranslation != null)
+          ExerciseTranslationSubmissionApi(
+            author: '',
+            language: languageTranslation!.id,
+            name: exerciseNameTrans!,
+            description: descriptionTrans!,
+            aliases: alternateNamesTrans
+                .where((element) => element.isNotEmpty)
+                .map((e) => ExerciseAliasSubmissionApi(alias: e))
+                .toList(),
+          ),
+      ],
+    );
+  }
+
+  /// Add images with optional license metadata
+  void addExerciseImages(List<ExerciseSubmissionImage> images) {
+    _exerciseImages.addAll(images);
     notifyListeners();
   }
 
-  void removeExercise(String path) {
-    final file = _exerciseImages.where((element) => element.path == path).first;
+  void removeImage(String path) {
+    final file = _exerciseImages.where((element) => element.imageFile.path == path).first;
     _exerciseImages.remove(file);
     notifyListeners();
   }
 
-  //Just to Debug Provider
-  void printValues() {
-    log('Collected exercise data');
-    log('------------------------');
+  /// Main method to submit exercise with images
+  ///
+  /// Returns the ID of the created exercise
+  /// Throws exception if submission fails
+  Future<int> postExerciseToServer() async {
+    try {
+      // 1. Create the exercise
+      final exerciseId = await addExerciseSubmission();
 
-    log('Base data...');
-    log('Target area : $category');
-    log('Primary muscles: $_primaryMuscles');
-    log('Secondary muscles: $_secondaryMuscles');
-    log('Equipment: $_equipment');
-    log('Variations: $_variations');
+      // 2. Upload images if any exist
+      if (_exerciseImages.isNotEmpty) {
+        await addImages(exerciseId);
+      }
 
-    log('');
-    log('Language specific...');
-    log('Language: ${language?.shortName}');
-    log('Name: en/$_nameEn translation/$_nameTranslation');
-    log('Description: en/$_descriptionEn translation/$_descriptionTranslation');
-    log('Alternate names: en/$_alternativeNamesEn translation/$_alternativeNamesTranslation');
+      // 3. Clear all data after successful upload
+      clear();
+
+      return exerciseId;
+    } catch (e) {
+      // Don't clear on error so user can retry
+      rethrow;
+    }
   }
 
-  Future<int> addExercise() async {
-    printValues();
-
-    // Create the variations if needed
-    if (newVariation) {
-      await addVariation();
-    }
-
-    // Create the exercise
-    final exercise = await addExerciseBase();
-
-    // Create the base description in English
-    Translation exerciseTranslationEn = translationEn;
-    exerciseTranslationEn.exercise = exercise;
-    exerciseTranslationEn = await addExerciseTranslation(exerciseTranslationEn);
-    for (final alias in _alternativeNamesEn) {
-      if (alias.isNotEmpty) {
-        exerciseTranslationEn.aliases.add(await addExerciseAlias(alias, exerciseTranslationEn.id!));
-      }
-    }
-
-    // Create the translations
-    if (language != null) {
-      Translation exerciseTranslationLang = translation;
-      exerciseTranslationLang.exercise = exercise;
-      exerciseTranslationLang = await addExerciseTranslation(exerciseTranslationLang);
-      for (final alias in _alternativeNamesTranslation) {
-        if (alias.isNotEmpty) {
-          exerciseTranslationLang.aliases.add(
-            await addExerciseAlias(alias, exerciseTranslationLang.id!),
-          );
-        }
-      }
-      await addExerciseTranslation(exerciseTranslationLang);
-    }
-
-    // Create the images
-    await addImages(exercise);
-
-    // Clear everything
-    clear();
-
-    // Return exercise ID
-    return exercise.id!;
-  }
-
-  Future<Exercise> addExerciseBase() async {
-    final Uri postUri = baseProvider.makeUrl(_exerciseBaseUrlPath);
-
-    final Map<String, dynamic> newBaseMap = await baseProvider.post(exercise.toJson(), postUri);
-    final Exercise newExerciseBase = Exercise.fromJson(newBaseMap);
+  Future<int> addExerciseSubmission() async {
+    final Map<String, dynamic> result = await baseProvider.post(
+      exerciseApiObject.toJson(),
+      baseProvider.makeUrl(_exerciseSubmissionUrlPath),
+    );
     notifyListeners();
 
-    return newExerciseBase;
+    return result['id'];
   }
 
-  Future<Variation> addVariation() async {
-    final Uri postUri = baseProvider.makeUrl(_exerciseVariationPath);
-
-    // We send an empty dictionary since at the moment the variations only have an ID
-    final Map<String, dynamic> variationMap = await baseProvider.post({}, postUri);
-    final Variation newVariation = Variation.fromJson(variationMap);
-    _variationId = newVariation.id;
-    notifyListeners();
-    return newVariation;
-  }
-
-  Future<void> addImages(Exercise base) async {
+  /// Upload exercise images with license metadata
+  Future<void> addImages(int exerciseId) async {
     for (final image in _exerciseImages) {
       final request = http.MultipartRequest('POST', baseProvider.makeUrl(_imagesUrlPath));
       request.headers.addAll(baseProvider.getDefaultHeaders(includeAuth: true));
 
-      request.files.add(await http.MultipartFile.fromPath('image', image.path));
-      request.fields['exercise_base'] = base.id!.toString();
-      request.fields['style'] = EXERCISE_IMAGE_ART_STYLE.PHOTO.index.toString();
+      request.files.add(await http.MultipartFile.fromPath('image', image.imageFile.path));
+      request.fields['exercise'] = exerciseId.toString();
+      request.fields['license'] = CC_BY_SA_4_ID.toString();
+      request.fields['is_main'] = 'false';
 
-      await request.send();
+      final details = image.toJson();
+      if (details.isNotEmpty) {
+        request.fields.addAll(details);
+      }
+
+      try {
+        final streamedResponse = await request.send();
+
+        if (streamedResponse.statusCode == 201 || streamedResponse.statusCode == 200) {
+          _logger.fine('Image uploaded successfully');
+        } else {
+          final response = await http.Response.fromStream(streamedResponse);
+          throw Exception('Upload failed: ${streamedResponse.statusCode}');
+        }
+      } catch (e) {
+        rethrow;
+      }
     }
 
     notifyListeners();
   }
 
-  Future<Translation> addExerciseTranslation(Translation exercise) async {
-    final Uri postUri = baseProvider.makeUrl(_exerciseTranslationUrlPath);
-
-    final Map<String, dynamic> newTranslation = await baseProvider.post(exercise.toJson(), postUri);
-    final Translation newExercise = Translation.fromJson(newTranslation);
+  Future<bool> validateLanguage(String input, String languageCode) async {
+    final Map<String, dynamic> result = await baseProvider.post({
+      'input': input,
+      'language_code': languageCode,
+    }, baseProvider.makeUrl(_checkLanguageUrlPath));
     notifyListeners();
 
-    return newExercise;
-  }
-
-  Future<Alias> addExerciseAlias(String name, int exerciseId) async {
-    final alias = Alias(exerciseId: exerciseId, alias: name);
-    final Uri postUri = baseProvider.makeUrl(_exerciseAliasPath);
-
-    final Alias newAlias = Alias.fromJson(await baseProvider.post(alias.toJson(), postUri));
-    notifyListeners();
-
-    return newAlias;
+    return false;
   }
 }
diff --git a/lib/providers/auth.dart b/lib/providers/auth.dart
index fa07f0d9..3f393cea 100644
--- a/lib/providers/auth.dart
+++ b/lib/providers/auth.dart
@@ -18,19 +18,18 @@
 
 import 'dart:async';
 import 'dart:convert';
-import 'dart:developer';
 import 'dart:io';
 
-import 'package:android_metadata/android_metadata.dart';
 import 'package:flutter/cupertino.dart';
-import 'package:flutter/services.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:http/http.dart' as http;
+import 'package:logging/logging.dart';
 import 'package:package_info_plus/package_info_plus.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 import 'package:version/version.dart';
 import 'package:wger/exceptions/http_exception.dart';
 import 'package:wger/helpers/consts.dart';
+import 'package:wger/helpers/shared_preferences.dart';
 
 import 'helpers.dart';
 
@@ -39,40 +38,32 @@ enum LoginActions {
   proceed,
 }
 
+enum AuthState {
+  updateRequired,
+  loggedIn,
+  loggedOut,
+}
+
 class AuthProvider with ChangeNotifier {
+  final _logger = Logger('AuthProvider');
+
   String? token;
   String? serverUrl;
   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';
   static const REGISTRATION_URL = 'register';
   static const LOGIN_URL = 'login';
+  static const TEST_URL = 'userprofile';
 
   late http.Client client;
 
-  AuthProvider([http.Client? client, bool? checkMetadata]) {
+  AuthProvider([http.Client? client]) {
     this.client = client ?? http.Client();
-
-    // TODO: this is a workaround since AndroidMetadata doesn't work while running tests
-    if (checkMetadata ?? true) {
-      try {
-        if (Platform.isAndroid) {
-          AndroidMetadata.metaDataAsMap.then((value) => metadata = value!);
-        } else if (Platform.isLinux || Platform.isMacOS) {
-          metadata = {
-            MANIFEST_KEY_CHECK_UPDATE: Platform.environment[MANIFEST_KEY_CHECK_UPDATE] ?? '',
-            MANIFEST_KEY_API: Platform.environment[MANIFEST_KEY_API] ?? '',
-          };
-        }
-      } on PlatformException {
-        throw Exception(
-          'An error occurred reading the metadata from AndroidManifest',
-        );
-      } catch (error) {}
-    }
   }
 
   /// flag to indicate that the application has successfully loaded all initial data
@@ -100,26 +91,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,
@@ -138,7 +125,6 @@ class AuthProvider with ChangeNotifier {
       makeUri(serverUrl, REGISTRATION_URL),
       headers: {
         HttpHeaders.contentTypeHeader: 'application/json; charset=UTF-8',
-        HttpHeaders.authorizationHeader: 'Token ${metadata[MANIFEST_KEY_API]}',
         HttpHeaders.userAgentHeader: getAppNameHeader(),
         HttpHeaders.acceptLanguageHeader: locale,
       },
@@ -149,45 +135,69 @@ class AuthProvider with ChangeNotifier {
       throw WgerHttpException(response.body);
     }
 
-    return login(username, password, serverUrl);
+    return login(username, password, serverUrl, null);
   }
 
   /// Authenticates a user
-  Future<Map<String, LoginActions>> login(
+  Future<LoginActions> login(
     String username,
     String password,
     String serverUrl,
+    String? apiToken,
   ) async {
     await logout(shouldNotify: false);
 
-    final response = await client.post(
-      makeUri(serverUrl, LOGIN_URL),
-      headers: {
-        HttpHeaders.contentTypeHeader: 'application/json; charset=UTF-8',
-        HttpHeaders.userAgentHeader: getAppNameHeader(),
-      },
-      body: json.encode({'username': username, 'password': password}),
-    );
-    final responseData = json.decode(response.body);
+    // Login using the API token
+    if (apiToken != null && apiToken.isNotEmpty) {
+      final response = await client.get(
+        makeUri(serverUrl, TEST_URL),
+        headers: {
+          HttpHeaders.contentTypeHeader: 'application/json; charset=UTF-8',
+          HttpHeaders.userAgentHeader: getAppNameHeader(),
+          HttpHeaders.authorizationHeader: 'Token $apiToken',
+        },
+      );
 
-    if (response.statusCode >= 400) {
-      throw WgerHttpException(response.body);
+      if (response.statusCode != 200) {
+        throw WgerHttpException(response.body);
+      }
+
+      token = apiToken;
+
+      // Login using password
+    } else {
+      final response = await client.post(
+        makeUri(serverUrl, LOGIN_URL),
+        headers: {
+          HttpHeaders.contentTypeHeader: 'application/json; charset=UTF-8',
+          HttpHeaders.userAgentHeader: getAppNameHeader(),
+        },
+        body: json.encode({'username': username, 'password': password}),
+      );
+      final responseData = json.decode(response.body);
+
+      if (response.statusCode >= 400) {
+        throw WgerHttpException(response.body);
+      }
+
+      token = responseData['token'];
     }
 
     await initVersions(serverUrl);
 
     // If update is required don't log in user
     if (await applicationUpdateRequired()) {
-      return {'action': LoginActions.update};
+      state = AuthState.updateRequired;
+      return LoginActions.update;
     }
 
     // Log user in
     // should we update the backend to just include a powersync token also?
-    token = responseData['token'];
+    state = AuthState.loggedIn;
     notifyListeners();
 
     // store login data in shared preferences
-    final prefs = await SharedPreferences.getInstance();
+    final prefs = PreferenceHelper.asyncPref;
     final userData = json.encode({
       'token': token,
       'serverUrl': this.serverUrl,
@@ -196,50 +206,86 @@ 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
   Future<String> getServerUrlFromPrefs() async {
-    final prefs = await SharedPreferences.getInstance();
-    if (!prefs.containsKey(PREFS_LAST_SERVER)) {
+    final prefs = PreferenceHelper.asyncPref;
+    if (!(await prefs.containsKey(PREFS_LAST_SERVER))) {
       return DEFAULT_SERVER_PROD;
     }
 
-    final userData = json.decode(prefs.getString(PREFS_LAST_SERVER)!);
+    final userData = json.decode((await prefs.getString(PREFS_LAST_SERVER))!);
     return userData['serverUrl'] as String;
   }
 
-  Future<bool> tryAutoLogin() async {
-    final prefs = await SharedPreferences.getInstance();
-    if (!prefs.containsKey(PREFS_USER)) {
-      log('autologin failed');
-      return false;
+  /// 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, no saved user data');
+      state = AuthState.loggedOut;
+      return;
     }
-    final extractedUserData = json.decode(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');
+    }
 
-    log('autologin successful');
-    setApplicationVersion();
-    setServerVersion();
     notifyListeners();
-    //_autoLogout();
-    return true;
   }
 
   Future<void> logout({bool shouldNotify = true}) async {
-    log('logging out');
+    _logger.fine('logging out');
     token = null;
     serverUrl = null;
     dataInit = false;
+    state = AuthState.loggedOut;
 
     if (shouldNotify) {
       notifyListeners();
     }
 
-    final prefs = await SharedPreferences.getInstance();
+    final prefs = PreferenceHelper.asyncPref;
     prefs.remove(PREFS_USER);
   }
 
@@ -249,9 +295,11 @@ class AuthProvider with ChangeNotifier {
   String getAppNameHeader() {
     String out = '';
     if (applicationVersion != null) {
-      out = '/${applicationVersion!.version} '
+      out =
+          '/${applicationVersion!.version} '
           '(${applicationVersion!.packageName}; '
-          'build: ${applicationVersion!.buildNumber})';
+          'build: ${applicationVersion!.buildNumber})'
+          ' - https://github.com/wger-project';
     }
     return 'wger App$out';
   }
diff --git a/lib/providers/base_provider.dart b/lib/providers/base_provider.dart
index e729e8cd..351efe99 100644
--- a/lib/providers/base_provider.dart
+++ b/lib/providers/base_provider.dart
@@ -56,7 +56,8 @@ class WgerBaseProvider {
   }
 
   /// Fetch and retrieve the overview list of objects, returns the JSON parsed response
-  Future<Map<String, dynamic>> fetch(Uri uri) async {
+  Future<dynamic> fetch(Uri uri) async {
+    // Future<Map<String, dynamic> | List<dynamic>> fetch(Uri uri) async {
     // Send the request
     final response = await client.get(
       uri,
diff --git a/lib/providers/body_weight.dart b/lib/providers/body_weight.dart
index 4ecba70b..dddb8cec 100644
--- a/lib/providers/body_weight.dart
+++ b/lib/providers/body_weight.dart
@@ -17,11 +17,15 @@
  */
 
 import 'package:flutter/material.dart';
+import 'package:logging/logging.dart';
 import 'package:wger/exceptions/http_exception.dart';
+import 'package:wger/helpers/consts.dart';
 import 'package:wger/models/body_weight/weight_entry.dart';
 import 'package:wger/providers/base_provider.dart';
 
 class BodyWeightProvider with ChangeNotifier {
+  final _logger = Logger('BodyWeightProvider');
+
   final WgerBaseProvider baseProvider;
 
   static const BODY_WEIGHT_URL = 'weightentry';
@@ -61,11 +65,15 @@ class BodyWeightProvider with ChangeNotifier {
   }
 
   Future<List<WeightEntry>> fetchAndSetEntries() async {
+    _logger.info('Fetching all body weight entries');
+
     // Process the response
-    final data = await baseProvider.fetchPaginated(baseProvider.makeUrl(
-      BODY_WEIGHT_URL,
-      query: {'ordering': '-date', 'limit': '100'},
-    ));
+    final data = await baseProvider.fetchPaginated(
+      baseProvider.makeUrl(
+        BODY_WEIGHT_URL,
+        query: {'ordering': '-date', 'limit': API_MAX_PAGE_SIZE},
+      ),
+    );
     _entries = [];
     for (final entry in data) {
       _entries.add(WeightEntry.fromJson(entry));
diff --git a/lib/providers/exercises.dart b/lib/providers/exercises.dart
index dc13c823..5ab3d70f 100644
--- a/lib/providers/exercises.dart
+++ b/lib/providers/exercises.dart
@@ -18,15 +18,15 @@
 
 import 'dart:async';
 import 'dart:convert';
-import 'dart:developer';
 
 import 'package:drift/drift.dart';
 import 'package:flutter/material.dart';
-import 'package:shared_preferences/shared_preferences.dart';
+import 'package:logging/logging.dart';
 import 'package:wger/core/locator.dart';
 import 'package:wger/database/exercises/exercise_database.dart';
 import 'package:wger/exceptions/no_such_entry_exception.dart';
 import 'package:wger/helpers/consts.dart';
+import 'package:wger/helpers/shared_preferences.dart';
 import 'package:wger/models/exercises/category.dart';
 import 'package:wger/models/exercises/equipment.dart';
 import 'package:wger/models/exercises/exercise.dart';
@@ -36,18 +36,19 @@ import 'package:wger/models/exercises/muscle.dart';
 import 'package:wger/providers/base_provider.dart';
 
 class ExercisesProvider with ChangeNotifier {
-  final WgerBaseProvider baseProvider;
-  late ExerciseDatabase database;
+  final _logger = Logger('ExercisesProvider');
 
-  ExercisesProvider(this.baseProvider, {ExerciseDatabase? database}) {
-    this.database = database ?? locator<ExerciseDatabase>();
-  }
+  final WgerBaseProvider baseProvider;
+  ExerciseDatabase database;
+
+  ExercisesProvider(this.baseProvider, {ExerciseDatabase? database})
+    : database = database ?? locator<ExerciseDatabase>();
 
   static const EXERCISE_CACHE_DAYS = 7;
-  static const EXERCISE_FETCH_HOURS = 4;
   static const CACHE_VERSION = 4;
 
-  static const exerciseInfoUrlPath = 'exercisebaseinfo';
+  static const exerciseUrlPath = 'exercise';
+  static const exerciseInfoUrlPath = 'exerciseinfo';
   static const exerciseSearchPath = 'exercise/search';
 
   static const categoriesUrlPath = 'exercisecategory';
@@ -80,7 +81,7 @@ class ExercisesProvider with ChangeNotifier {
     notifyListeners();
   }
 
-  Map<int, List<Exercise>> get exerciseBasesByVariation {
+  Map<int, List<Exercise>> get exerciseByVariation {
     final Map<int, List<Exercise>> variations = {};
 
     for (final exercise in exercises.where((e) => e.variationId != null)) {
@@ -117,17 +118,13 @@ class ExercisesProvider with ChangeNotifier {
         exerciseCategories: FilterCategory(
           title: 'Category',
           items: Map.fromEntries(
-            _categories.map(
-              (category) => MapEntry<ExerciseCategory, bool>(category, false),
-            ),
+            _categories.map((category) => MapEntry<ExerciseCategory, bool>(category, false)),
           ),
         ),
         equipment: FilterCategory(
           title: 'Equipment',
           items: Map.fromEntries(
-            _equipment.map(
-              (singleEquipment) => MapEntry<Equipment, bool>(singleEquipment, false),
-            ),
+            _equipment.map((singleEquipment) => MapEntry<Equipment, bool>(singleEquipment, false)),
           ),
         ),
       ),
@@ -153,8 +150,6 @@ class ExercisesProvider with ChangeNotifier {
     if (filters!.searchTerm.length > 1) {
       filteredItems = await searchExercise(filters!.searchTerm);
     }
-
-    // Filter by exercise category and equipment (REPLACE WITH HTTP REQUEST)
     filteredExercises = filteredItems.where((exercise) {
       final bool isInAnyCategory = filters!.exerciseCategories.selected.contains(exercise.category);
 
@@ -181,7 +176,7 @@ class ExercisesProvider with ChangeNotifier {
   /// Note: prefer using the async `fetchAndSetExercise` method
   Exercise findExerciseById(int id) {
     return exercises.firstWhere(
-      (base) => base.id == id,
+      (exercise) => exercise.id == id,
       orElse: () => throw const NoSuchEntryException(),
     );
   }
@@ -192,14 +187,15 @@ class ExercisesProvider with ChangeNotifier {
   /// returned exercises. Since this is typically called by one exercise, we are
   /// not interested in seeing that same exercise returned in the list of variations.
   /// If this parameter is not passed, all exercises are returned.
-  List<Exercise> findExercisesByVariationId(
-    int id, {
-    int? exerciseBaseIdToExclude,
-  }) {
-    var out = exercises.where((base) => base.variationId == id).toList();
+  List<Exercise> findExercisesByVariationId(int? variationId, {int? exerciseIdToExclude}) {
+    if (variationId == null) {
+      return [];
+    }
 
-    if (exerciseBaseIdToExclude != null) {
-      out = out.where((e) => e.id != exerciseBaseIdToExclude).toList();
+    var out = exercises.where((base) => base.variationId == variationId).toList();
+
+    if (exerciseIdToExclude != null) {
+      out = out.where((e) => e.id != exerciseIdToExclude).toList();
     }
     return out;
   }
@@ -237,6 +233,7 @@ class ExercisesProvider with ChangeNotifier {
   }
 
   Future<void> fetchAndSetCategoriesFromApi() async {
+    _logger.info('Loading exercise categories from API');
     final categories = await baseProvider.fetchPaginated(baseProvider.makeUrl(categoriesUrlPath));
     for (final category in categories) {
       _categories.add(ExerciseCategory.fromJson(category));
@@ -244,6 +241,7 @@ class ExercisesProvider with ChangeNotifier {
   }
 
   Future<void> fetchAndSetMusclesFromApi() async {
+    _logger.info('Loading muscles from API');
     final muscles = await baseProvider.fetchPaginated(baseProvider.makeUrl(musclesUrlPath));
 
     for (final muscle in muscles) {
@@ -252,6 +250,7 @@ class ExercisesProvider with ChangeNotifier {
   }
 
   Future<void> fetchAndSetEquipmentsFromApi() async {
+    _logger.info('Loading equipment from API');
     final equipments = await baseProvider.fetchPaginated(baseProvider.makeUrl(equipmentUrlPath));
 
     for (final equipment in equipments) {
@@ -260,6 +259,8 @@ class ExercisesProvider with ChangeNotifier {
   }
 
   Future<void> fetchAndSetLanguagesFromApi() async {
+    _logger.info('Loading languages from API');
+
     final languageData = await baseProvider.fetchPaginated(baseProvider.makeUrl(languageUrlPath));
 
     for (final language in languageData) {
@@ -267,13 +268,28 @@ class ExercisesProvider with ChangeNotifier {
     }
   }
 
+  Future<void> fetchAndSetAllExercises() async {
+    _logger.info('Loading all exercises from API');
+    final exerciseData = await baseProvider.fetchPaginated(
+      baseProvider.makeUrl(exerciseUrlPath, query: {'limit': API_MAX_PAGE_SIZE}),
+    );
+    final exerciseIds = exerciseData.map<int>((e) => e['id'] as int).toSet();
+
+    for (final exerciseId in exerciseIds) {
+      await handleUpdateExerciseFromApi(database, exerciseId);
+    }
+  }
+
   /// Returns the exercise with the given ID
   ///
   /// If the exercise is not known locally, it is fetched from the server.
-  Future<Exercise> fetchAndSetExercise(int exerciseId) async {
+  Future<Exercise?> fetchAndSetExercise(int exerciseId) async {
+    // _logger.finer('Fetching exercise $exerciseId');
     try {
       final exercise = findExerciseById(exerciseId);
 
+      // _logger.finer('Found $exerciseId in provider list');
+
       // Note: no await since we don't care for the updated data right now. It
       // will be written to the db whenever the request finishes and we will get
       // the updated exercise the next time
@@ -281,6 +297,7 @@ class ExercisesProvider with ChangeNotifier {
 
       return exercise;
     } on NoSuchEntryException {
+      // _logger.finer('Exercise not found locally, fetching from the API');
       return handleUpdateExerciseFromApi(database, exerciseId);
     }
   }
@@ -293,22 +310,38 @@ class ExercisesProvider with ChangeNotifier {
   /// -> yes: Do we need to re-fetch?
   ///    -> no: just return what we have in the DB
   ///    -> yes: fetch data and update if necessary
-  Future<Exercise> handleUpdateExerciseFromApi(
-    ExerciseDatabase database,
-    int exerciseId,
-  ) async {
+  Future<Exercise> handleUpdateExerciseFromApi(ExerciseDatabase database, int exerciseId) async {
     Exercise exercise;
-    final exerciseDb = await (database.select(database.exercises)
-          ..where((e) => e.id.equals(exerciseId)))
-        .getSingleOrNull();
+
+    // NOTE: this should not be necessary anymore. We had a bug that would
+    //       create duplicate entries in the database and should be fixed now.
+    //       However, we keep it here for now to be on the safe side.
+    //       In the future this can be replaced by a .getSingleOrNull()
+    final exerciseResult = await (database.select(
+      database.exercises,
+    )..where((e) => e.id.equals(exerciseId))).get();
+
+    ExerciseTable? exerciseDb;
+    if (exerciseResult.isNotEmpty) {
+      exerciseDb = exerciseResult.first;
+    }
+
+    // Note that this shouldn't happen anymore...
+    if (exerciseResult.length > 1) {
+      _logger.warning('Found ${exerciseResult.length} entries for exercise $exerciseId in the db');
+    }
 
     // Exercise is already known locally
     if (exerciseDb != null) {
-      final nextFetch = exerciseDb.lastFetched.add(const Duration(hours: EXERCISE_FETCH_HOURS));
+      final nextFetch = exerciseDb.lastFetched.add(const Duration(days: EXERCISE_CACHE_DAYS));
       exercise = Exercise.fromApiDataString(exerciseDb.data, _languages);
 
       // Fetch and update
       if (nextFetch.isBefore(DateTime.now())) {
+        _logger.fine(
+          'Re-fetching exercise $exerciseId from API since last fetch was ${exerciseDb.lastFetched}',
+        );
+
         final apiData = await baseProvider.fetch(
           baseProvider.makeUrl(exerciseInfoUrlPath, id: exerciseId),
         );
@@ -334,25 +367,29 @@ class ExercisesProvider with ChangeNotifier {
       }
       // New exercise, fetch and insert to DB
     } else {
-      final baseData = await baseProvider.fetch(
+      _logger.fine('New exercise $exerciseId, fetching from API');
+      final exerciseData = await baseProvider.fetch(
         baseProvider.makeUrl(exerciseInfoUrlPath, id: exerciseId),
       );
-      exercise = Exercise.fromApiDataJson(baseData, _languages);
+      exercise = Exercise.fromApiDataJson(exerciseData, _languages);
 
       if (exerciseDb == null) {
-        await database.into(database.exercises).insert(
+        await database
+            .into(database.exercises)
+            .insert(
               ExercisesCompanion.insert(
                 id: exercise.id!,
-                data: jsonEncode(baseData),
+                data: jsonEncode(exerciseData),
                 lastUpdate: exercise.lastUpdateGlobal!,
                 lastFetched: DateTime.now(),
               ),
             );
+        _logger.finer('Saved exercise ${exercise.id!} to db cache');
       }
     }
 
     // Either update or add the exercise to local list
-    final index = exercises.indexWhere((element) => element.id == exerciseId);
+    final index = exercises.indexWhere((exercise) => exercise.id == exerciseId);
     if (index != -1) {
       exercises[index] = exercise;
     } else {
@@ -363,25 +400,26 @@ class ExercisesProvider with ChangeNotifier {
   }
 
   Future<void> initCacheTimesLocalPrefs({forceInit = false}) async {
-    final prefs = await SharedPreferences.getInstance();
+    final prefs = PreferenceHelper.asyncPref;
 
     final initDate = DateTime(2023, 1, 1).toIso8601String();
 
-    if (forceInit || !prefs.containsKey(PREFS_LAST_UPDATED_MUSCLES)) {
+    if (forceInit || !(await prefs.containsKey(PREFS_LAST_UPDATED_MUSCLES))) {
       await prefs.setString(PREFS_LAST_UPDATED_MUSCLES, initDate);
     }
-    if (forceInit || !prefs.containsKey(PREFS_LAST_UPDATED_EQUIPMENT)) {
+    if (forceInit || !(await prefs.containsKey(PREFS_LAST_UPDATED_EQUIPMENT))) {
       await prefs.setString(PREFS_LAST_UPDATED_EQUIPMENT, initDate);
     }
-    if (forceInit || !prefs.containsKey(PREFS_LAST_UPDATED_LANGUAGES)) {
+    if (forceInit || !(await prefs.containsKey(PREFS_LAST_UPDATED_LANGUAGES))) {
       await prefs.setString(PREFS_LAST_UPDATED_LANGUAGES, initDate);
     }
-    if (forceInit || !prefs.containsKey(PREFS_LAST_UPDATED_CATEGORIES)) {
+    if (forceInit || !(await prefs.containsKey(PREFS_LAST_UPDATED_CATEGORIES))) {
       await prefs.setString(PREFS_LAST_UPDATED_CATEGORIES, initDate);
     }
   }
 
   Future<void> clearAllCachesAndPrefs() async {
+    clear();
     await database.deleteEverything();
     await initCacheTimesLocalPrefs(forceInit: true);
   }
@@ -394,7 +432,8 @@ class ExercisesProvider with ChangeNotifier {
   /// - Equipment
   /// - Exercises (only local cache)
   Future<void> fetchAndSetInitialData() async {
-    clear();
+    // clear();
+    _logger.info('Fetching initial exercise data');
 
     await initCacheTimesLocalPrefs();
 
@@ -421,29 +460,29 @@ class ExercisesProvider with ChangeNotifier {
     }
 
     final exercisesDb = await database.select(database.exercises).get();
-    log('Loaded ${exercisesDb.length} exercises from cache');
+    _logger.info('Loaded ${exercisesDb.length} exercises from DB cache');
 
     exercises = exercisesDb.map((e) => Exercise.fromApiDataString(e.data, _languages)).toList();
   }
 
   /// Updates the exercise database with *all* the exercises from the server
   Future<void> updateExerciseCache(ExerciseDatabase database) async {
-    final data = await baseProvider.fetch(
-      baseProvider.makeUrl(exerciseInfoUrlPath, query: {'limit': '1000'}),
+    final data = await baseProvider.fetchPaginated(
+      baseProvider.makeUrl(exerciseInfoUrlPath, query: {'limit': API_MAX_PAGE_SIZE}),
     );
-
-    final List<dynamic> exercisesData = data['results'];
-    exercises = exercisesData.map((e) => Exercise.fromApiDataJson(e, _languages)).toList();
+    exercises = data.map((e) => Exercise.fromApiDataJson(e, _languages)).toList();
 
     // Insert new entries and update ones that have been edited
-    Future.forEach(exercisesData, (exerciseData) async {
-      final exercise = await (database.select(database.exercises)
-            ..where((e) => e.id.equals(exerciseData['id'])))
-          .getSingleOrNull();
+    Future.forEach(data, (exerciseData) async {
+      final exercise = await (database.select(
+        database.exercises,
+      )..where((e) => e.id.equals(exerciseData['id']))).getSingleOrNull();
 
       // New exercise, insert
       if (exercise == null) {
-        database.into(database.exercises).insert(
+        database
+            .into(database.exercises)
+            .insert(
               ExercisesCompanion.insert(
                 id: exerciseData['id'],
                 data: jsonEncode(exerciseData),
@@ -457,7 +496,7 @@ class ExercisesProvider with ChangeNotifier {
       final lastUpdateApi = DateTime.parse(exerciseData['last_update_global']);
       if (exercise != null && lastUpdateApi.isAfter(exercise.lastUpdate)) {
         // TODO: timezones 🥳
-        print(
+        _logger.fine(
           'Exercise ${exercise.id}: update API $lastUpdateApi | Update DB: ${exercise.lastUpdate}',
         );
         (database.update(database.exercises)..where((e) => e.id.equals(exerciseData['id']))).write(
@@ -476,8 +515,8 @@ class ExercisesProvider with ChangeNotifier {
   ///
   /// We first try to read from the local DB, and from the API if the data is too old
   Future<void> fetchAndSetMuscles(ExerciseDatabase database) async {
-    final prefs = await SharedPreferences.getInstance();
-    var validTill = DateTime.parse(prefs.getString(PREFS_LAST_UPDATED_MUSCLES)!);
+    final prefs = PreferenceHelper.asyncPref;
+    var validTill = DateTime.parse((await prefs.getString(PREFS_LAST_UPDATED_MUSCLES))!);
 
     // Cache still valid, return it
     if (validTill.isAfter(DateTime.now())) {
@@ -485,7 +524,7 @@ class ExercisesProvider with ChangeNotifier {
 
       if (muscles.isNotEmpty) {
         _muscles = muscles.map((e) => e.data).toList();
-        log('Loaded ${_muscles.length} muscles from cache');
+        _logger.info('Loaded ${_muscles.length} muscles from cache');
         return;
       }
     }
@@ -494,24 +533,19 @@ class ExercisesProvider with ChangeNotifier {
     await fetchAndSetMusclesFromApi();
     await database.delete(database.muscles).go();
     await Future.forEach(_muscles, (e) async {
-      await database.into(database.muscles).insert(
-            MusclesCompanion.insert(id: e.id, data: e),
-          );
+      await database.into(database.muscles).insert(MusclesCompanion.insert(id: e.id, data: e));
     });
     validTill = DateTime.now().add(const Duration(days: EXERCISE_CACHE_DAYS));
-    await prefs.setString(
-      PREFS_LAST_UPDATED_MUSCLES,
-      validTill.toIso8601String(),
-    );
-    log('Wrote ${_muscles.length} muscles from cache. Valid till $validTill');
+    await prefs.setString(PREFS_LAST_UPDATED_MUSCLES, validTill.toIso8601String());
+    _logger.fine('Saved ${_muscles.length} muscles to cache (valid till $validTill)');
   }
 
   /// Fetches and sets the available categories
   ///
   /// We first try to read from the local DB, and from the API if the data is too old
   Future<void> fetchAndSetCategories(ExerciseDatabase database) async {
-    final prefs = await SharedPreferences.getInstance();
-    var validTill = DateTime.parse(prefs.getString(PREFS_LAST_UPDATED_CATEGORIES)!);
+    final prefs = PreferenceHelper.asyncPref;
+    var validTill = DateTime.parse((await prefs.getString(PREFS_LAST_UPDATED_CATEGORIES))!);
 
     // Cache still valid, return it
     if (validTill.isAfter(DateTime.now())) {
@@ -519,7 +553,7 @@ class ExercisesProvider with ChangeNotifier {
 
       if (categories.isNotEmpty) {
         _categories = categories.map((e) => e.data).toList();
-        log('Loaded ${categories.length} categories from cache');
+        _logger.info('Loaded ${categories.length} categories from cache');
         return;
       }
     }
@@ -528,23 +562,21 @@ class ExercisesProvider with ChangeNotifier {
     await fetchAndSetCategoriesFromApi();
     await database.delete(database.categories).go();
     await Future.forEach(_categories, (e) async {
-      await database.into(database.categories).insert(
-            CategoriesCompanion.insert(id: e.id, data: e),
-          );
+      await database
+          .into(database.categories)
+          .insert(CategoriesCompanion.insert(id: e.id, data: e));
     });
     validTill = DateTime.now().add(const Duration(days: EXERCISE_CACHE_DAYS));
-    await prefs.setString(
-      PREFS_LAST_UPDATED_CATEGORIES,
-      validTill.toIso8601String(),
-    );
+    await prefs.setString(PREFS_LAST_UPDATED_CATEGORIES, validTill.toIso8601String());
+    _logger.fine('Saved ${_categories.length} categories to cache (valid till $validTill)');
   }
 
   /// Fetches and sets the available languages
   ///
   /// We first try to read from the local DB, and from the API if the data is too old
   Future<void> fetchAndSetLanguages(ExerciseDatabase database) async {
-    final prefs = await SharedPreferences.getInstance();
-    var validTill = DateTime.parse(prefs.getString(PREFS_LAST_UPDATED_LANGUAGES)!);
+    final prefs = PreferenceHelper.asyncPref;
+    var validTill = DateTime.parse((await prefs.getString(PREFS_LAST_UPDATED_LANGUAGES))!);
 
     // Cache still valid, return it
     if (validTill.isAfter(DateTime.now())) {
@@ -552,6 +584,7 @@ class ExercisesProvider with ChangeNotifier {
 
       if (languages.isNotEmpty) {
         _languages = languages.map((e) => e.data).toList();
+        _logger.info('Loaded ${languages.length} languages from cache');
         return;
       }
     }
@@ -560,23 +593,20 @@ class ExercisesProvider with ChangeNotifier {
     await fetchAndSetLanguagesFromApi();
     await database.delete(database.languages).go();
     await Future.forEach(_languages, (e) async {
-      await database.into(database.languages).insert(
-            LanguagesCompanion.insert(id: e.id, data: e),
-          );
+      await database.into(database.languages).insert(LanguagesCompanion.insert(id: e.id, data: e));
     });
+
     validTill = DateTime.now().add(const Duration(days: EXERCISE_CACHE_DAYS));
-    await prefs.setString(
-      PREFS_LAST_UPDATED_LANGUAGES,
-      validTill.toIso8601String(),
-    );
+    await prefs.setString(PREFS_LAST_UPDATED_LANGUAGES, validTill.toIso8601String());
+    _logger.info('Saved ${languages.length} languages to cache (valid till $validTill)');
   }
 
   /// Fetches and sets the available equipment
   ///
   /// We first try to read from the local DB, and from the API if the data is too old
   Future<void> fetchAndSetEquipments(ExerciseDatabase database) async {
-    final prefs = await SharedPreferences.getInstance();
-    var validTill = DateTime.parse(prefs.getString(PREFS_LAST_UPDATED_EQUIPMENT)!);
+    final prefs = PreferenceHelper.asyncPref;
+    var validTill = DateTime.parse((await prefs.getString(PREFS_LAST_UPDATED_EQUIPMENT))!);
 
     // Cache still valid, return it
     if (validTill.isAfter(DateTime.now())) {
@@ -584,7 +614,7 @@ class ExercisesProvider with ChangeNotifier {
 
       if (equipments.isNotEmpty) {
         _equipment = equipments.map((e) => e.data).toList();
-        log('Loaded ${equipment.length} equipment from cache');
+        _logger.info('Loaded ${equipment.length} equipment from cache');
         return;
       }
     }
@@ -593,15 +623,13 @@ class ExercisesProvider with ChangeNotifier {
     await fetchAndSetEquipmentsFromApi();
     await database.delete(database.equipments).go();
     await Future.forEach(_equipment, (e) async {
-      await database.into(database.equipments).insert(
-            EquipmentsCompanion.insert(id: e.id, data: e),
-          );
+      await database
+          .into(database.equipments)
+          .insert(EquipmentsCompanion.insert(id: e.id, data: e));
     });
     validTill = DateTime.now().add(const Duration(days: EXERCISE_CACHE_DAYS));
-    await prefs.setString(
-      PREFS_LAST_UPDATED_EQUIPMENT,
-      validTill.toIso8601String(),
-    );
+    await prefs.setString(PREFS_LAST_UPDATED_EQUIPMENT, validTill.toIso8601String());
+    _logger.fine('Saved ${_equipment.length} equipment entries to cache (valid till $validTill)');
   }
 
   /// Searches for an exercise
@@ -630,11 +658,21 @@ class ExercisesProvider with ChangeNotifier {
       ),
     );
 
-    // Load the ingredients
+    // Load the exercises
     final results = ExerciseApiSearch.fromJson(result);
-    return Future.wait(
-      results.suggestions.map((e) => fetchAndSetExercise(e.data.exerciseId)),
-    );
+
+    final List<Exercise> out = [];
+    for (final result in results.suggestions) {
+      final exercise = await fetchAndSetExercise(result.data.exerciseId);
+      if (exercise != null) {
+        out.add(exercise);
+      }
+    }
+    // return Future.wait(
+    //   results.suggestions.map((e) => fetchAndSetExercise(e.data.exerciseId)),
+    // );
+
+    return out;
   }
 }
 
@@ -645,17 +683,9 @@ class FilterCategory<T> {
 
   List<T> get selected => [...items.keys].where((key) => items[key]!).toList();
 
-  FilterCategory({
-    required this.title,
-    required this.items,
-    this.isExpanded = false,
-  });
+  FilterCategory({required this.title, required this.items, this.isExpanded = false});
 
-  FilterCategory<T> copyWith({
-    bool? isExpanded,
-    Map<T, bool>? items,
-    String? title,
-  }) {
+  FilterCategory<T> copyWith({bool? isExpanded, Map<T, bool>? items, String? title}) {
     return FilterCategory(
       isExpanded: isExpanded ?? this.isExpanded,
       items: items ?? this.items,
diff --git a/lib/providers/gallery.dart b/lib/providers/gallery.dart
index f55a8119..71adbf29 100644
--- a/lib/providers/gallery.dart
+++ b/lib/providers/gallery.dart
@@ -61,7 +61,7 @@ class GalleryProvider extends WgerBaseProvider with ChangeNotifier {
       HttpHeaders.userAgentHeader: auth.getAppNameHeader(),
     });
     request.files.add(await http.MultipartFile.fromPath('image', imageFile.path));
-    request.fields['date'] = toDate(image.date)!;
+    request.fields['date'] = dateToYYYYMMDD(image.date)!;
     request.fields['description'] = image.description;
 
     final res = await request.send();
diff --git a/lib/providers/gym_state.dart b/lib/providers/gym_state.dart
new file mode 100644
index 00000000..659cc525
--- /dev/null
+++ b/lib/providers/gym_state.dart
@@ -0,0 +1,101 @@
+import 'package:clock/clock.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:logging/logging.dart';
+import 'package:wger/models/exercises/exercise.dart';
+
+const DEFAULT_DURATION = Duration(hours: 5);
+
+final StateNotifierProvider<GymStateNotifier, GymState> gymStateProvider =
+    StateNotifierProvider<GymStateNotifier, GymState>((ref) {
+      return GymStateNotifier();
+    });
+
+class GymState {
+  final Map<Exercise, int> exercisePages;
+  final bool showExercisePages;
+  final int currentPage;
+  final int? dayId;
+  late TimeOfDay startTime;
+  late DateTime validUntil;
+
+  GymState({
+    this.exercisePages = const {},
+    this.showExercisePages = true,
+    this.currentPage = 0,
+    this.dayId,
+    DateTime? validUntil,
+    TimeOfDay? startTime,
+  }) {
+    this.validUntil = validUntil ?? DateTime.now().add(DEFAULT_DURATION);
+    this.startTime = startTime ?? TimeOfDay.fromDateTime(clock.now());
+  }
+
+  GymState copyWith({
+    Map<Exercise, int>? exercisePages,
+    bool? showExercisePages,
+    int? currentPage,
+    int? dayId,
+    DateTime? validUntil,
+    TimeOfDay? startTime,
+  }) {
+    return GymState(
+      exercisePages: exercisePages ?? this.exercisePages,
+      showExercisePages: showExercisePages ?? this.showExercisePages,
+      currentPage: currentPage ?? this.currentPage,
+      dayId: dayId ?? this.dayId,
+      validUntil: validUntil ?? this.validUntil.add(DEFAULT_DURATION),
+      startTime: startTime ?? this.startTime,
+    );
+  }
+
+  @override
+  String toString() {
+    return 'GymState('
+        'currentPage: $currentPage, '
+        'showExercisePages: $showExercisePages, '
+        'exercisePages: ${exercisePages.length} exercises, '
+        'dayId: $dayId, '
+        'validUntil: $validUntil '
+        'startTime: $startTime, '
+        ')';
+  }
+}
+
+class GymStateNotifier extends StateNotifier<GymState> {
+  final _logger = Logger('GymStateNotifier');
+
+  GymStateNotifier() : super(GymState());
+
+  void setCurrentPage(int page) {
+    // _logger.fine('Setting page from ${state.currentPage} to $page');
+    state = state.copyWith(currentPage: page);
+  }
+
+  void toggleExercisePages() {
+    state = state.copyWith(showExercisePages: !state.showExercisePages);
+  }
+
+  void setDayId(int dayId) {
+    // _logger.fine('Setting day id from ${state.dayId} to $dayId');
+    state = state.copyWith(dayId: dayId);
+  }
+
+  void setExercisePages(Map<Exercise, int> exercisePages) {
+    // _logger.fine('Setting exercise pages - ${exercisePages.length} exercises');
+    state = state.copyWith(exercisePages: exercisePages);
+    // _logger.fine(
+    //     'Exercise pages set - ${exercisePages.entries.map((e) => '${e.key.id}: ${e.value}').join(', ')}');
+  }
+
+  void clear() {
+    _logger.fine('Clearing state');
+    state = state.copyWith(
+      exercisePages: {},
+      currentPage: 0,
+      dayId: null,
+      validUntil: DateTime.now().add(DEFAULT_DURATION),
+      startTime: TimeOfDay.now(),
+    );
+  }
+}
diff --git a/lib/providers/measurement.dart b/lib/providers/measurement.dart
index de9d9bcf..c961e938 100644
--- a/lib/providers/measurement.dart
+++ b/lib/providers/measurement.dart
@@ -17,13 +17,17 @@
  */
 
 import 'package:flutter/material.dart';
+import 'package:logging/logging.dart';
 import 'package:wger/exceptions/http_exception.dart';
 import 'package:wger/exceptions/no_such_entry_exception.dart';
+import 'package:wger/helpers/consts.dart';
 import 'package:wger/models/measurements/measurement_category.dart';
 import 'package:wger/models/measurements/measurement_entry.dart';
 import 'package:wger/providers/base_provider.dart';
 
 class MeasurementProvider with ChangeNotifier {
+  final _logger = Logger('MeasurementProvider');
+
   static const _categoryUrl = 'measurement-category';
   static const _entryUrl = 'measurement';
 
@@ -51,10 +55,10 @@ class MeasurementProvider with ChangeNotifier {
   /// Fetches and sets the categories from the server (no entries)
   Future<void> fetchAndSetCategories() async {
     // Process the response
-    final requestUrl = baseProvider.makeUrl(_categoryUrl);
-    final data = await baseProvider.fetch(requestUrl);
+    final requestUrl = baseProvider.makeUrl(_categoryUrl, query: {'limit': API_MAX_PAGE_SIZE});
+    final data = await baseProvider.fetchPaginated(requestUrl);
     final List<MeasurementCategory> loadedEntries = [];
-    for (final entry in data['results']) {
+    for (final entry in data) {
       loadedEntries.add(MeasurementCategory.fromJson(entry));
     }
 
@@ -68,10 +72,13 @@ class MeasurementProvider with ChangeNotifier {
     final categoryIndex = _categories.indexOf(category);
 
     // Process the response
-    final requestUrl = baseProvider.makeUrl(_entryUrl, query: {'category': category.id.toString()});
-    final data = await baseProvider.fetch(requestUrl);
+    final requestUrl = baseProvider.makeUrl(
+      _entryUrl,
+      query: {'category': category.id.toString(), 'limit': API_MAX_PAGE_SIZE},
+    );
+    final data = await baseProvider.fetchPaginated(requestUrl);
     final List<MeasurementEntry> loadedEntries = [];
-    for (final entry in data['results']) {
+    for (final entry in data) {
       loadedEntries.add(MeasurementEntry.fromJson(entry));
     }
     final MeasurementCategory editedCategory = category.copyWith(entries: loadedEntries);
@@ -82,6 +89,8 @@ class MeasurementProvider with ChangeNotifier {
 
   /// Fetches and sets the measurement categories and their entries
   Future<void> fetchAndSetAllCategoriesAndEntries() async {
+    _logger.info('Fetching all measurement categories and entries');
+
     await fetchAndSetCategories();
     await Future.wait(_categories.map((e) => fetchAndSetCategoryEntries(e.id!)).toList());
   }
@@ -124,8 +133,9 @@ class MeasurementProvider with ChangeNotifier {
       tempNewCategory.toJson(),
       baseProvider.makeUrl(_categoryUrl, id: id),
     );
-    final MeasurementCategory newCategory =
-        MeasurementCategory.fromJson(response).copyWith(entries: oldCategory.entries);
+    final MeasurementCategory newCategory = MeasurementCategory.fromJson(
+      response,
+    ).copyWith(entries: oldCategory.entries);
     _categories.removeAt(categoryIndex);
     _categories.insert(categoryIndex, newCategory);
     notifyListeners();
@@ -183,8 +193,10 @@ class MeasurementProvider with ChangeNotifier {
       date: newDate,
     );
 
-    final Map<String, dynamic> response =
-        await baseProvider.patch(tempNewEntry.toJson(), baseProvider.makeUrl(_entryUrl, id: id));
+    final Map<String, dynamic> response = await baseProvider.patch(
+      tempNewEntry.toJson(),
+      baseProvider.makeUrl(_entryUrl, id: id),
+    );
 
     final MeasurementEntry newEntry = MeasurementEntry.fromJson(response);
     category.entries.removeAt(entryIndex);
diff --git a/lib/providers/nutrition.dart b/lib/providers/nutrition.dart
index 62c8ef3f..b3e49a93 100644
--- a/lib/providers/nutrition.dart
+++ b/lib/providers/nutrition.dart
@@ -18,15 +18,15 @@
 
 import 'dart:async';
 import 'dart:convert';
-import 'dart:developer';
 
+import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
+import 'package:logging/logging.dart';
 import 'package:wger/core/locator.dart';
 import 'package:wger/database/ingredients/ingredients_database.dart';
 import 'package:wger/exceptions/http_exception.dart';
 import 'package:wger/exceptions/no_such_entry_exception.dart';
 import 'package:wger/helpers/consts.dart';
-import 'package:wger/models/exercises/ingredient_api.dart';
 import 'package:wger/models/nutrition/ingredient.dart';
 import 'package:wger/models/nutrition/ingredient_image.dart';
 import 'package:wger/models/nutrition/log.dart';
@@ -36,13 +36,14 @@ import 'package:wger/models/nutrition/nutritional_plan.dart';
 import 'package:wger/providers/base_provider.dart';
 
 class NutritionPlansProvider with ChangeNotifier {
+  final _logger = Logger('NutritionPlansProvider');
+
   // TODO: should be able to delete many of these paths and their corresponding code
   static const _nutritionalPlansPath = 'nutritionplan';
   static const _nutritionalPlansInfoPath = 'nutritionplaninfo';
   static const _mealPath = 'meal';
   static const _mealItemPath = 'mealitem';
   static const _ingredientInfoPath = 'ingredientinfo';
-  static const _ingredientSearchPath = 'ingredient/search';
   static const _nutritionDiaryPath = 'nutritiondiary';
 
   final WgerBaseProvider baseProvider;
@@ -50,9 +51,11 @@ class NutritionPlansProvider with ChangeNotifier {
   List<NutritionalPlan> _plans = [];
   List<Ingredient> ingredients = [];
 
-  NutritionPlansProvider(this.baseProvider, List<NutritionalPlan> entries,
-      {IngredientDatabase? database})
-      : _plans = entries {
+  NutritionPlansProvider(
+    this.baseProvider,
+    List<NutritionalPlan> entries, {
+    IngredientDatabase? database,
+  }) : _plans = entries {
     this.database = database ?? locator<IngredientDatabase>();
   }
 
@@ -66,13 +69,21 @@ class NutritionPlansProvider with ChangeNotifier {
     ingredients = [];
   }
 
-  /// Returns the current active nutritional plan. At the moment this is just
-  /// the latest, but this might change in the future.
+  /// Returns the current active nutritional plan.
+  /// A plan is considered active if:
+  /// - Its start date is before now
+  /// - Its end date is after now or not set
+  /// If multiple plans match these criteria, the one with the most recent creation date is returned.
   NutritionalPlan? get currentPlan {
-    if (_plans.isNotEmpty) {
-      return _plans.first;
-    }
-    return null;
+    final now = DateTime.now();
+    return _plans
+        .where(
+          (plan) =>
+              plan.startDate.isBefore(now) && (plan.endDate == null || plan.endDate!.isAfter(now)),
+        )
+        .toList()
+        .sorted((a, b) => b.creationDate.compareTo(a.creationDate))
+        .firstOrNull;
   }
 /*
   NutritionalPlan findById(int id) {
@@ -81,7 +92,7 @@ class NutritionPlansProvider with ChangeNotifier {
       orElse: () => throw const NoSuchEntryException(),
     );
   }
-  
+
 
   Meal? findMealById(int id) {
     for (final plan in _plans) {
@@ -188,10 +199,7 @@ TODO implement:
   Future<Meal> addMeal(Meal meal, String planId) async {
     /*
     final plan = findById(planId);
-    final data = await baseProvider.post(
-      meal.toJson(),
-      baseProvider.makeUrl(_mealPath),
-    );
+    final data = await baseProvider.post(meal.toJson(), baseProvider.makeUrl(_mealPath));
 
     meal = Meal.fromJson(data);
     plan.meals.add(meal);
@@ -239,10 +247,7 @@ TODO implement:
 
   /// Adds a meal item to a meal
   Future<MealItem> addMealItem(MealItem mealItem, Meal meal) async {
-    final data = await baseProvider.post(
-      mealItem.toJson(),
-      baseProvider.makeUrl(_mealItemPath),
-    );
+    final data = await baseProvider.post(mealItem.toJson(), baseProvider.makeUrl(_mealItemPath));
 
     mealItem = MealItem.fromJson(data);
     mealItem.ingredient = await fetchIngredient(mealItem.ingredientId);
@@ -273,6 +278,7 @@ TODO implement:
   }
 
   Future<void> clearIngredientCache() async {
+    ingredients = [];
     await database.deleteEverything();
   }
 
@@ -286,19 +292,20 @@ TODO implement:
     try {
       ingredient = ingredients.firstWhere((e) => e.id == ingredientId);
     } on StateError {
-      final ingredientDb = await (database.select(database.ingredients)
-            ..where((e) => e.id.equals(ingredientId)))
-          .getSingleOrNull();
+      final ingredientDb = await (database.select(
+        database.ingredients,
+      )..where((e) => e.id.equals(ingredientId))).getSingleOrNull();
 
       // Try to fetch from local db
       if (ingredientDb != null) {
         ingredient = Ingredient.fromJson(jsonDecode(ingredientDb.data));
         ingredients.add(ingredient);
-        log("Loaded ingredient '${ingredient.name}' from db cache");
+        _logger.info("Loaded ingredient '${ingredient.name}' from db cache");
 
         // Prune old entries
-        if (DateTime.now()
-            .isAfter(ingredientDb.lastFetched.add(const Duration(days: DAYS_TO_CACHE)))) {
+        if (DateTime.now().isAfter(
+          ingredientDb.lastFetched.add(const Duration(days: DAYS_TO_CACHE)),
+        )) {
           (database.delete(database.ingredients)..where((i) => i.id.equals(ingredientId))).go();
         }
       } else {
@@ -308,14 +315,16 @@ TODO implement:
         ingredient = Ingredient.fromJson(data);
         ingredients.add(ingredient);
 
-        database.into(database.ingredients).insert(
+        database
+            .into(database.ingredients)
+            .insert(
               IngredientsCompanion.insert(
                 id: ingredientId,
                 data: jsonEncode(data),
                 lastFetched: DateTime.now(),
               ),
             );
-        log("Saved ingredient '${ingredient.name}' to db cache");
+        _logger.finer("Saved ingredient '${ingredient.name}' to db cache");
       }
     }
 
@@ -325,14 +334,14 @@ TODO implement:
   /// Loads the available ingredients from the local cache
   Future<void> fetchIngredientsFromCache() async {
     final ingredientDb = await database.select(database.ingredients).get();
-    log('Read ${ingredientDb.length} ingredients from db cache');
+    _logger.info('Read ${ingredientDb.length} ingredients from db cache');
     if (ingredientDb.isNotEmpty) {
       ingredients = ingredientDb.map((e) => Ingredient.fromJson(jsonDecode(e.data))).toList();
     }
   }
 
   /// Searches for an ingredient
-  Future<List<IngredientApiSearchEntry>> searchIngredient(
+  Future<List<Ingredient>> searchIngredient(
     String name, {
     String languageCode = 'en',
     bool searchEnglish = false,
@@ -349,45 +358,46 @@ TODO implement:
     // Send the request
     final response = await baseProvider.fetch(
       baseProvider.makeUrl(
-        _ingredientSearchPath,
-        query: {'term': name, 'language': languages.join(',')},
+        _ingredientInfoPath,
+        query: {
+          'name__search': name,
+          'language__code': languages.join(','),
+          'limit': API_RESULTS_PAGE_SIZE,
+        },
       ),
     );
 
-    // Process the response
-    return IngredientApiSearch.fromJson(response).suggestions;
+    return (response['results'] as List)
+        .map((ingredientData) => Ingredient.fromJson(ingredientData as Map<String, dynamic>))
+        .toList();
   }
 
-  /// Searches for an ingredient with code
-  Future<Ingredient?> searchIngredientWithCode(String code) async {
-    if (code.isEmpty) {
+  /// Searches for an ingredient with bar code
+  Future<Ingredient?> searchIngredientWithBarcode(String barcode) async {
+    if (barcode.isEmpty) {
       return null;
     }
 
     // Send the request
     final data = await baseProvider.fetch(
-      baseProvider.makeUrl(_ingredientInfoPath, query: {'code': code}),
+      baseProvider.makeUrl(_ingredientInfoPath, query: {'code': barcode}),
     );
 
     if (data['count'] == 0) {
       return null;
     }
     // TODO we should probably add it to ingredient cache.
-    // TODO: we could also use the ingredient cache for code searches
     return Ingredient.fromJson(data['results'][0]);
   }
 
   /// Log meal to nutrition diary
-  Future<void> logMealToDiary(Meal meal) async {
+  Future<void> logMealToDiary(Meal meal, DateTime mealDateTime) async {
     /*
     for (final item in meal.mealItems) {
       final plan = findById(meal.planId);
-      final Log log = Log.fromMealItem(item, plan.id!, meal.id);
+      final Log log = Log.fromMealItem(item, plan.id!, meal.id, mealDateTime);
 
-      final data = await baseProvider.post(
-        log.toJson(),
-        baseProvider.makeUrl(_nutritionDiaryPath),
-      );
+      final data = await baseProvider.post(log.toJson(), baseProvider.makeUrl(_nutritionDiaryPath));
       log.id = data['id'];
       plan.diaryEntries.add(log);
     }
@@ -396,14 +406,18 @@ TODO implement:
   }
 
   /// Log custom ingredient to nutrition diary
-  Future<void> logIngredientToDiary(
-    MealItem mealItem,
-    String planId, [
-    DateTime? dateTime,
-  ]) {
+  Future<void> logIngredientToDiary(MealItem mealItem, int planId, [DateTime? dateTime]) async {
     print(
-        'DIETER logIngredientToDiary called ingredient=${mealItem.ingredientId}, planId=$planId, dateTime=$dateTime');
-    return Log.fromMealItem(mealItem, planId, null, dateTime).log();
+        'DIETER logIngredientToDiary called ingredient=${mealItem.ingredientId}, planId=$planId, dateTime=$dateTime'
+    );
+    final plan = findById(planId);
+    mealItem.ingredient = await fetchIngredient(mealItem.ingredientId);
+    final log = Log.fromMealItem(mealItem, plan.id!, null, dateTime);
+
+    final data = await baseProvider.post(log.toJson(), baseProvider.makeUrl(_nutritionDiaryPath));
+    log.id = data['id'];
+    plan.diaryEntries.add(log);
+    notifyListeners();
   }
 
   /// Deletes a log entry
@@ -422,11 +436,7 @@ TODO implement:
     final data = await baseProvider.fetchPaginated(
       baseProvider.makeUrl(
         _nutritionDiaryPath,
-        query: {
-          'plan': plan.id?.toString(),
-          'limit': '999',
-          'ordering': 'datetime',
-        },
+        query: {'plan': plan.id?.toString(), 'limit': API_MAX_PAGE_SIZE, 'ordering': 'datetime'},
       ),
     );
 
diff --git a/lib/providers/plate_weights.dart b/lib/providers/plate_weights.dart
new file mode 100644
index 00000000..55a6e20b
--- /dev/null
+++ b/lib/providers/plate_weights.dart
@@ -0,0 +1,215 @@
+import 'dart:convert';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:logging/logging.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:wger/helpers/consts.dart';
+import 'package:wger/helpers/gym_mode.dart';
+import 'package:wger/helpers/shared_preferences.dart';
+
+const DEFAULT_KG_PLATES = [2.5, 5, 10, 15, 20, 25];
+const DEFAULT_LB_PLATES = [2.5, 5, 10, 25, 35, 45];
+
+const DEFAULT_BAR_WEIGHT_KG = 20;
+const DEFAULT_BAR_WEIGHT_LB = 45;
+
+const PREFS_KEY_PLATES = 'selectedPlates';
+
+final plateCalculatorProvider =
+    StateNotifierProvider<PlateCalculatorNotifier, PlateCalculatorState>((ref) {
+      return PlateCalculatorNotifier();
+    });
+
+class PlateCalculatorState {
+  final _logger = Logger('PlateWeightsState');
+
+  // https://en.wikipedia.org/wiki/Barbell#Bumper_plates
+  final Map<double, Color> plateColorMapKg = {
+    25: Colors.red,
+    20: Colors.blue,
+    15: Colors.yellow,
+    10: Colors.green,
+    5: Colors.white,
+    2.5: Colors.red,
+    2: Colors.blue,
+    1.25: Colors.yellow,
+    1: Colors.green,
+    0.5: Colors.white,
+  };
+  final Map<double, Color> plateColorMapLb = {
+    55: Colors.red,
+    45: Colors.blue,
+    35: Colors.yellow,
+    25: Colors.green,
+    10: Colors.white,
+    5: Colors.blue,
+    2.5: Colors.green,
+    1.25: Colors.white,
+  };
+
+  final bool useColors;
+  final bool isMetric;
+  final num totalWeight;
+  final num barWeight;
+  final List<num> selectedPlates;
+  final List<num> availablePlatesKg = const [0.5, 1, 1.25, 2, 2.5, 5, 10, 15, 20, 25];
+  final List<num> availablePlatesLb = const [2.5, 5, 10, 25, 35, 45];
+
+  final availableBarWeightsKg = [10, 15, 20];
+  final availableBarWeightsLb = [15, 20, 25, 33, 45];
+
+  PlateCalculatorState({
+    this.useColors = true,
+    num? barWeight,
+    this.isMetric = true,
+    this.totalWeight = 0,
+    List<num>? selectedPlates,
+  }) : barWeight = barWeight ?? (isMetric ? DEFAULT_BAR_WEIGHT_KG : DEFAULT_BAR_WEIGHT_LB),
+       selectedPlates =
+           selectedPlates ?? (isMetric ? [...DEFAULT_KG_PLATES] : [...DEFAULT_LB_PLATES]);
+
+  PlateCalculatorState.fromJson(Map<String, dynamic> plateData)
+    : useColors = plateData['useColors'] ?? true,
+      isMetric = plateData['isMetric'] ?? true,
+      selectedPlates = plateData['selectedPlates']?.cast<num>() ?? [...DEFAULT_KG_PLATES],
+      barWeight =
+          plateData['barWeight'] ??
+          ((plateData['isMetric'] ?? true) ? DEFAULT_BAR_WEIGHT_KG : DEFAULT_BAR_WEIGHT_LB),
+      totalWeight = 0;
+
+  PlateCalculatorState copyWith({
+    bool? useColors,
+    bool? isMetric,
+    num? totalWeight,
+    num? barWeight,
+    List<num>? selectedPlates,
+  }) {
+    return PlateCalculatorState(
+      useColors: useColors ?? this.useColors,
+      isMetric: isMetric ?? this.isMetric,
+      totalWeight: totalWeight ?? this.totalWeight,
+      barWeight: barWeight ?? this.barWeight,
+      selectedPlates: selectedPlates ?? this.selectedPlates,
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'useColors': useColors,
+      'isMetric': isMetric,
+      'selectedPlates': selectedPlates,
+      'barWeight': barWeight,
+    };
+  }
+
+  List<num> get availablePlates {
+    return isMetric ? availablePlatesKg : availablePlatesLb;
+  }
+
+  List<num> get availableBarsWeights {
+    return isMetric ? availableBarWeightsKg : availableBarWeightsLb;
+  }
+
+  List<num> get platesList {
+    return plateCalculator(totalWeight, barWeight, selectedPlates);
+  }
+
+  bool get hasPlates {
+    return platesList.isNotEmpty;
+  }
+
+  Map<num, int> get calculatePlates {
+    return groupPlates(plateCalculator(totalWeight, barWeight, selectedPlates));
+  }
+
+  Color getColor(num plate) {
+    if (!useColors) {
+      return Colors.grey;
+    }
+
+    if (isMetric) {
+      return plateColorMapKg[plate.toDouble()] ?? Colors.grey;
+    }
+    return plateColorMapLb[plate.toDouble()] ?? Colors.grey;
+  }
+}
+
+class PlateCalculatorNotifier extends StateNotifier<PlateCalculatorState> {
+  final _logger = Logger('PlateCalculatorNotifier');
+
+  late SharedPreferencesAsync prefs;
+
+  PlateCalculatorNotifier({SharedPreferencesAsync? prefs}) : super(PlateCalculatorState()) {
+    this.prefs = prefs ?? PreferenceHelper.asyncPref;
+    _readDataFromSharedPrefs();
+  }
+
+  Future<void> saveToSharedPrefs() async {
+    _logger.fine('Saving plate data to SharedPreferences');
+    await prefs.setString(PREFS_KEY_PLATES, jsonEncode(state.toJson()));
+  }
+
+  Future<void> _readDataFromSharedPrefs() async {
+    _logger.fine('Reading plate data from SharedPreferences');
+    final prefsData = await prefs.getString(PREFS_KEY_PLATES);
+
+    if (prefsData != null) {
+      try {
+        state = PlateCalculatorState.fromJson(json.decode(prefsData));
+        _logger.fine('Plate data loaded from SharedPreferences: ${state.toJson()}');
+      } catch (e) {
+        _logger.fine('Error decoding plate data from SharedPreferences: $e');
+        state = PlateCalculatorState();
+      }
+    }
+  }
+
+  Future<void> toggleSelection(num x) async {
+    final newSelectedPlates = List.of(state.selectedPlates);
+    if (newSelectedPlates.contains(x)) {
+      newSelectedPlates.remove(x);
+    } else {
+      newSelectedPlates.add(x);
+    }
+    state = state.copyWith(selectedPlates: newSelectedPlates);
+    await saveToSharedPrefs();
+  }
+
+  void setBarWeight(num x) {
+    _logger.fine('Setting bar weight to $x');
+    state = state.copyWith(barWeight: x);
+  }
+
+  void setUseColors(bool value) {
+    state = state.copyWith(useColors: value);
+  }
+
+  void unitChange({WeightUnitEnum? unit}) {
+    final WeightUnitEnum changeTo =
+        unit ?? (state.isMetric ? WeightUnitEnum.lb : WeightUnitEnum.kg);
+
+    if (changeTo == WeightUnitEnum.kg && !state.isMetric) {
+      state = state.copyWith(
+        isMetric: true,
+        totalWeight: 0,
+        barWeight: DEFAULT_BAR_WEIGHT_KG,
+        selectedPlates: [...DEFAULT_KG_PLATES],
+      );
+    }
+
+    if (changeTo == WeightUnitEnum.lb && state.isMetric) {
+      state = state.copyWith(
+        isMetric: false,
+        totalWeight: 0,
+        barWeight: DEFAULT_BAR_WEIGHT_LB,
+        selectedPlates: [...DEFAULT_LB_PLATES],
+      );
+    }
+  }
+
+  void setWeight(num x) {
+    _logger.fine('Setting weight to $x');
+    state = state.copyWith(totalWeight: x);
+  }
+}
diff --git a/lib/providers/routines.dart b/lib/providers/routines.dart
new file mode 100644
index 00000000..ec8e53b9
--- /dev/null
+++ b/lib/providers/routines.dart
@@ -0,0 +1,698 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'dart:convert';
+
+import 'package:flutter/foundation.dart';
+import 'package:logging/logging.dart';
+import 'package:wger/exceptions/http_exception.dart';
+import 'package:wger/helpers/consts.dart';
+import 'package:wger/helpers/shared_preferences.dart';
+import 'package:wger/models/exercises/exercise.dart';
+import 'package:wger/models/workouts/base_config.dart';
+import 'package:wger/models/workouts/day.dart';
+import 'package:wger/models/workouts/day_data.dart';
+import 'package:wger/models/workouts/log.dart';
+import 'package:wger/models/workouts/repetition_unit.dart';
+import 'package:wger/models/workouts/routine.dart';
+import 'package:wger/models/workouts/session.dart';
+import 'package:wger/models/workouts/session_api.dart';
+import 'package:wger/models/workouts/slot.dart';
+import 'package:wger/models/workouts/slot_entry.dart';
+import 'package:wger/models/workouts/weight_unit.dart';
+import 'package:wger/providers/base_provider.dart';
+import 'package:wger/providers/exercises.dart';
+
+class RoutinesProvider with ChangeNotifier {
+  final _logger = Logger('RoutinesProvider');
+
+  static const _routinesUrlPath = 'routine';
+  static const _routinesStructureSubpath = 'structure';
+  static const _routinesLogsSubpath = 'logs';
+  static const _routinesDateSequenceDisplaySubpath = 'date-sequence-display';
+  static const _routinesDateSequenceGymSubpath = 'date-sequence-gym';
+  static const _daysUrlPath = 'day';
+  static const _slotsUrlPath = 'slot';
+  static const _slotEntriesUrlPath = 'slot-entry';
+  static const _logsUrlPath = 'workoutlog';
+  static const _sessionUrlPath = 'workoutsession';
+  static const _weightUnitUrlPath = 'setting-weightunit';
+  static const _repetitionUnitUrlPath = 'setting-repetitionunit';
+  static const _routineConfigSets = 'sets-config';
+  static const _routineConfigMaxSets = 'max-sets-config';
+  static const _routineConfigWeights = 'weight-config';
+  static const _routineConfigMaxWeights = 'max-weight-config';
+  static const _routineConfigRepetitions = 'repetitions-config';
+  static const _routineConfigMaxRepetitions = 'max-repetitions-config';
+  static const _routineConfigRir = 'rir-config';
+  static const _routineConfigMaxRir = 'max-rir-config';
+  static const _routineConfigRestTime = 'rest-config';
+  static const _routineConfigMaxRestTime = 'max-rest-config';
+
+  Routine? activeRoutine;
+  final ExercisesProvider _exerciseProvider;
+  final WgerBaseProvider baseProvider;
+  List<Routine> _routines = [];
+  List<WeightUnit> _weightUnits = [];
+  List<RepetitionUnit> _repetitionUnits = [];
+
+  RoutinesProvider(
+    this.baseProvider,
+    this._exerciseProvider,
+    List<Routine> entries, {
+    List<WeightUnit>? weightUnits,
+    List<RepetitionUnit>? repetitionUnits,
+  }) {
+    _routines = entries;
+    _weightUnits = weightUnits ?? [];
+    _repetitionUnits = repetitionUnits ?? [];
+  }
+
+  /// Returns the current active nutritional plan. At the moment this is just
+  /// the latest, but this might change in the future.
+  Routine? get currentRoutine {
+    if (_routines.isNotEmpty) {
+      return _routines.first;
+    }
+    return null;
+  }
+
+  List<Routine> get items {
+    return [..._routines];
+  }
+
+  List<WeightUnit> get weightUnits {
+    return [..._weightUnits];
+  }
+
+  set weightUnits(List<WeightUnit> weightUnits) {
+    _weightUnits = weightUnits;
+  }
+
+  /// Clears all lists
+  void clear() {
+    _routines = [];
+    _weightUnits = [];
+    _repetitionUnits = [];
+  }
+
+  /// Return the default weight unit (kg)
+  WeightUnit get defaultWeightUnit {
+    return _weightUnits.firstWhere((element) => element.id == WEIGHT_UNIT_KG);
+  }
+
+  WeightUnit findWeightUnitById(int id) => _weightUnits.firstWhere((element) => element.id == id);
+
+  List<RepetitionUnit> get repetitionUnits {
+    return [..._repetitionUnits];
+  }
+
+  set repetitionUnits(List<RepetitionUnit> repetitionUnits) {
+    _repetitionUnits = repetitionUnits;
+  }
+
+  RepetitionUnit findRepetitionUnitById(int id) =>
+      _repetitionUnits.firstWhere((element) => element.id == id);
+
+  /// Return the default weight unit (reps)
+  RepetitionUnit get defaultRepetitionUnit {
+    return _repetitionUnits.firstWhere((element) => element.id == REP_UNIT_REPETITIONS_ID);
+  }
+
+  List<Routine> getPlans() {
+    return _routines;
+  }
+
+  Routine findById(int id) {
+    return _routines.firstWhere((routine) => routine.id == id);
+  }
+
+  int findIndexById(int id) {
+    return _routines.indexWhere((routine) => routine.id == id);
+  }
+
+  /*
+   * Routines
+   */
+
+  /// Fetches and sets all workout plans fully, i.e. with all corresponding child
+  /// attributes
+  Future<void> fetchAndSetAllRoutinesFull() async {
+    _logger.fine('Fetching all routines fully');
+    final data = await baseProvider.fetchPaginated(
+      baseProvider.makeUrl(
+        _routinesUrlPath,
+        query: {'ordering': '-creation_date', 'limit': API_MAX_PAGE_SIZE, 'is_template': 'false'},
+      ),
+    );
+    for (final entry in data) {
+      await fetchAndSetRoutineFull(entry['id']);
+    }
+
+    notifyListeners();
+  }
+
+  /// Fetches all routines sparsely, i.e. only with the data on the object itself
+  /// and no child attributes
+  Future<void> fetchAndSetAllRoutinesSparse() async {
+    _logger.fine('Fetching all routines sparsely');
+    final data = await baseProvider.fetch(
+      baseProvider.makeUrl(
+        _routinesUrlPath,
+        query: {'limit': API_MAX_PAGE_SIZE, 'is_template': 'false'},
+      ),
+    );
+    _routines = [];
+    for (final workoutPlanData in data['results']) {
+      final plan = Routine.fromJson(workoutPlanData);
+      _routines.add(plan);
+    }
+
+    notifyListeners();
+  }
+
+  Future<void> setExercisesAndUnits(List<DayData> entries, {Map<int, Exercise>? exercises}) async {
+    exercises ??= {};
+
+    for (final entry in entries) {
+      for (final slot in entry.slots) {
+        for (final setConfig in slot.setConfigs) {
+          final exerciseId = setConfig.exerciseId;
+          if (!exercises.containsKey(exerciseId)) {
+            _logger.fine('Fetching exercise $exerciseId for routine set config');
+            exercises[exerciseId] = (await _exerciseProvider.fetchAndSetExercise(exerciseId))!;
+          }
+          setConfig.exercise = exercises[exerciseId]!;
+
+          setConfig.repetitionsUnit = _repetitionUnits.firstWhere(
+            (e) => e.id == setConfig.repetitionsUnitId,
+          );
+
+          setConfig.weightUnit = _weightUnits.firstWhere(
+            (e) => e.id == setConfig.weightUnitId,
+          );
+        }
+      }
+    }
+  }
+
+  /// Fetches a routine sparsely, i.e. only with the data on the object itself
+  /// and no child attributes
+  Future<Routine> fetchAndSetRoutineSparse(int planId) async {
+    final fullPlanData = await baseProvider.fetch(
+      baseProvider.makeUrl(_routinesUrlPath, id: planId, query: {'limit': API_MAX_PAGE_SIZE}),
+    );
+    final routine = Routine.fromJson(fullPlanData);
+    _routines.add(routine);
+    _routines.sort((a, b) => b.created.compareTo(a.created));
+
+    notifyListeners();
+    return routine;
+  }
+
+  /// Fetches a workout plan fully, i.e. with all corresponding child attributes
+  Future<Routine> fetchAndSetRoutineFull(int routineId) async {
+    // Fetch structure and computed data
+    final results = await Future.wait([
+      baseProvider.fetch(
+        baseProvider.makeUrl(
+          _routinesUrlPath,
+          objectMethod: _routinesStructureSubpath,
+          id: routineId,
+        ),
+      ),
+      baseProvider.fetch(
+        baseProvider.makeUrl(
+          _routinesUrlPath,
+          id: routineId,
+          objectMethod: _routinesDateSequenceDisplaySubpath,
+        ),
+      ),
+      baseProvider.fetch(
+        baseProvider.makeUrl(
+          _routinesUrlPath,
+          id: routineId,
+          objectMethod: _routinesDateSequenceGymSubpath,
+        ),
+      ),
+      baseProvider.fetch(
+        baseProvider.makeUrl(
+          _routinesUrlPath,
+          id: routineId,
+          objectMethod: _routinesLogsSubpath,
+        ),
+      ),
+    ]);
+
+    final routine = Routine.fromJson(results[0] as Map<String, dynamic>);
+    final dayData = results[1] as List<dynamic>;
+    final dayDataGym = results[2] as List<dynamic>;
+    final sessionData = results[3] as List<dynamic>;
+
+    /*
+     * Set exercise, repetition and weight unit objects
+     *
+     * note that setExercisesAndUnits modifies the list in-place
+     */
+
+    /// Temporary cache to avoid fetching the same exercise multiple times
+    final Map<int, Exercise> exercises = {};
+
+    final dayDataEntriesDisplay = dayData.map((entry) => DayData.fromJson(entry)).toList();
+    await setExercisesAndUnits(dayDataEntriesDisplay, exercises: exercises);
+
+    final dayDataEntriesGym = dayDataGym.map((entry) => DayData.fromJson(entry)).toList();
+    await setExercisesAndUnits(dayDataEntriesGym, exercises: exercises);
+
+    final sessionDataEntries = sessionData
+        .map((entry) => WorkoutSessionApi.fromJson(entry))
+        .toList();
+
+    for (final day in routine.days) {
+      for (final slot in day.slots) {
+        for (final slotEntry in slot.entries) {
+          final exerciseId = slotEntry.exerciseId;
+          if (!exercises.containsKey(exerciseId)) {
+            exercises[exerciseId] = (await _exerciseProvider.fetchAndSetExercise(exerciseId))!;
+          }
+          slotEntry.exerciseObj = exercises[exerciseId]!;
+
+          if (slotEntry.repetitionUnitId != null) {
+            slotEntry.repetitionUnitObj = _repetitionUnits.firstWhere(
+              (e) => e.id == slotEntry.repetitionUnitId,
+            );
+          }
+
+          if (slotEntry.weightUnitId != null) {
+            slotEntry.weightUnitObj = _weightUnits.firstWhere(
+              (e) => e.id == slotEntry.weightUnitId,
+            );
+          }
+        }
+      }
+    }
+
+    routine.dayData = dayDataEntriesDisplay;
+    routine.dayDataGym = dayDataEntriesGym;
+
+    // Logs
+    routine.sessions = List<WorkoutSessionApi>.of(sessionDataEntries);
+    for (final session in routine.sessions) {
+      for (final log in session.logs) {
+        if (log.weightUnitId != null) {
+          log.weightUnit = _weightUnits.firstWhere((e) => e.id == log.weightUnitId);
+        }
+
+        if (log.repetitionsUnitId != null) {
+          log.repetitionUnit = _repetitionUnits.firstWhere((e) => e.id == log.repetitionsUnitId);
+        }
+
+        if (!exercises.containsKey(log.exerciseId)) {
+          exercises[log.exerciseId] = (await _exerciseProvider.fetchAndSetExercise(
+            log.exerciseId,
+          ))!;
+        }
+
+        log.exerciseBase = exercises[log.exerciseId]!;
+      }
+    }
+
+    // ... and done
+    final routineIndex = _routines.indexWhere((r) => r.id == routineId);
+    if (routineIndex != -1) {
+      _routines[routineIndex] = routine;
+    } else {
+      _routines.add(routine);
+    }
+
+    notifyListeners();
+    return routine;
+  }
+
+  Future<Routine> addRoutine(Routine routine) async {
+    final data = await baseProvider.post(
+      routine.toJson(),
+      baseProvider.makeUrl(_routinesUrlPath),
+    );
+    final plan = Routine.fromJson(data);
+    _routines.insert(0, plan);
+    notifyListeners();
+    return plan;
+  }
+
+  Future<void> editRoutine(Routine routine) async {
+    await baseProvider.patch(
+      routine.toJson(),
+      baseProvider.makeUrl(_routinesUrlPath, id: routine.id),
+    );
+    await fetchAndSetRoutineFull(routine.id!);
+  }
+
+  Future<void> deleteRoutine(int id) async {
+    final routineIndex = _routines.indexWhere((element) => element.id == id);
+    final routine = _routines[routineIndex];
+    _routines.removeAt(routineIndex);
+    notifyListeners();
+
+    final response = await baseProvider.deleteRequest(_routinesUrlPath, id);
+
+    if (response.statusCode >= 400) {
+      _routines.insert(routineIndex, routine);
+      notifyListeners();
+      throw WgerHttpException(response.body);
+    }
+  }
+
+  /// Fetch and set weight units for workout (kg, lb, plate, etc.)
+  Future<void> fetchAndSetRepetitionUnits() async {
+    final response = await baseProvider.fetchPaginated(
+      baseProvider.makeUrl(_repetitionUnitUrlPath),
+    );
+    for (final unit in response) {
+      _repetitionUnits.add(RepetitionUnit.fromJson(unit));
+    }
+  }
+
+  /// Fetch and set weight units for workout (kg, lb, plate, etc.)
+  Future<void> fetchAndSetWeightUnits() async {
+    final response = await baseProvider.fetchPaginated(baseProvider.makeUrl(_weightUnitUrlPath));
+    for (final unit in response) {
+      _weightUnits.add(WeightUnit.fromJson(unit));
+    }
+  }
+
+  Future<void> fetchAndSetUnits() async {
+    // Load units from cache, if available
+    final prefs = PreferenceHelper.asyncPref;
+    if (await prefs.containsKey(PREFS_WORKOUT_UNITS)) {
+      final unitData = json.decode((await prefs.getString(PREFS_WORKOUT_UNITS))!);
+      if (DateTime.parse(unitData['expiresIn']).isAfter(DateTime.now())) {
+        unitData['repetitionUnits'].forEach(
+          (e) => _repetitionUnits.add(RepetitionUnit.fromJson(e)),
+        );
+        unitData['weightUnit'].forEach(
+          (e) => _weightUnits.add(WeightUnit.fromJson(e)),
+        );
+        _logger.info("Read workout units data from cache. Valid till ${unitData['expiresIn']}");
+        return;
+      }
+    }
+
+    // Load units
+    await fetchAndSetWeightUnits();
+    await fetchAndSetRepetitionUnits();
+
+    // Save the result to the cache
+    final cacheData = {
+      'date': DateTime.now().toIso8601String(),
+      'expiresIn': DateTime.now().add(const Duration(days: DAYS_TO_CACHE)).toIso8601String(),
+      'repetitionUnits': _repetitionUnits.map((e) => e.toJson()).toList(),
+      'weightUnit': _weightUnits.map((e) => e.toJson()).toList(),
+    };
+    prefs.setString(PREFS_WORKOUT_UNITS, json.encode(cacheData));
+    notifyListeners();
+  }
+
+  /*
+   * Days
+   */
+  Future<Day> addDay(Day day) async {
+    /*
+     * Saves a new day instance to the DB and adds it to the given workout
+     */
+    final data = await baseProvider.post(
+      day.toJson(),
+      baseProvider.makeUrl(_daysUrlPath),
+    );
+    day = Day.fromJson(data);
+
+    fetchAndSetRoutineFull(day.routineId);
+
+    return day;
+  }
+
+  Future<void> editDay(Day day) async {
+    await baseProvider.patch(
+      day.toJson(),
+      baseProvider.makeUrl(_daysUrlPath, id: day.id),
+    );
+
+    fetchAndSetRoutineFull(day.routineId);
+  }
+
+  Future<void> editDays(List<Day> days) async {
+    if (days.isEmpty) {
+      return;
+    }
+
+    for (final day in days) {
+      await baseProvider.patch(
+        day.toJson(),
+        baseProvider.makeUrl(_daysUrlPath, id: day.id),
+      );
+    }
+
+    await fetchAndSetRoutineFull(days.first.routineId);
+  }
+
+  Future<void> deleteDay(int dayId) async {
+    await baseProvider.deleteRequest(_daysUrlPath, dayId);
+    final routine = _routines.firstWhere((routine) => routine.days.any((day) => day.id == dayId));
+
+    fetchAndSetRoutineFull(routine.id!);
+  }
+
+  /*
+   * Sets
+   */
+  Future<Slot> addSlot(Slot slot, int routineId) async {
+    final data = await baseProvider.post(
+      slot.toJson(),
+      baseProvider.makeUrl(_slotsUrlPath),
+    );
+    final newSlot = Slot.fromJson(data);
+
+    await fetchAndSetRoutineFull(routineId);
+
+    return newSlot;
+  }
+
+  Future<void> deleteSlot(int slotId, int routineId) async {
+    await baseProvider.deleteRequest(_slotsUrlPath, slotId);
+
+    await fetchAndSetRoutineFull(routineId);
+  }
+
+  Future<void> editSlot(Slot slot, int routineId) async {
+    await baseProvider.patch(
+      slot.toJson(),
+      baseProvider.makeUrl(_slotsUrlPath, id: slot.id),
+    );
+
+    await fetchAndSetRoutineFull(routineId);
+  }
+
+  Future<void> editSlots(List<Slot> slots, int routineId) async {
+    for (final slot in slots) {
+      await baseProvider.patch(
+        slot.toJson(),
+        baseProvider.makeUrl(_slotsUrlPath, id: slot.id),
+      );
+    }
+
+    await fetchAndSetRoutineFull(routineId);
+  }
+
+  Future<SlotEntry> addSlotEntry(SlotEntry entry, int routineId) async {
+    final data = await baseProvider.post(
+      entry.toJson(),
+      baseProvider.makeUrl(_slotEntriesUrlPath),
+    );
+    final newEntry = SlotEntry.fromJson(data);
+    await fetchAndSetRoutineFull(routineId);
+
+    return newEntry;
+  }
+
+  Future<void> deleteSlotEntry(int id, int routineId) async {
+    await baseProvider.deleteRequest(_slotEntriesUrlPath, id);
+
+    await fetchAndSetRoutineFull(routineId);
+  }
+
+  Future<void> editSlotEntry(SlotEntry entry, int routineId) async {
+    await baseProvider.patch(
+      entry.toJson(),
+      baseProvider.makeUrl(_slotEntriesUrlPath, id: entry.id),
+    );
+
+    await fetchAndSetRoutineFull(routineId);
+  }
+
+  String getConfigUrl(ConfigType type) {
+    switch (type) {
+      case ConfigType.sets:
+        return _routineConfigSets;
+      case ConfigType.maxSets:
+        return _routineConfigMaxSets;
+      case ConfigType.weight:
+        return _routineConfigWeights;
+      case ConfigType.maxWeight:
+        return _routineConfigMaxWeights;
+      case ConfigType.repetitions:
+        return _routineConfigRepetitions;
+      case ConfigType.maxRepetitions:
+        return _routineConfigMaxRepetitions;
+      case ConfigType.rir:
+        return _routineConfigRir;
+      case ConfigType.maxRir:
+        return _routineConfigMaxRir;
+      case ConfigType.rest:
+        return _routineConfigRestTime;
+      case ConfigType.maxRest:
+        return _routineConfigMaxRestTime;
+    }
+  }
+
+  Future<BaseConfig> editConfig(BaseConfig config, ConfigType type) async {
+    final data = await baseProvider.patch(
+      config.toJson(),
+      baseProvider.makeUrl(getConfigUrl(type), id: config.id),
+    );
+
+    notifyListeners();
+    return BaseConfig.fromJson(data);
+  }
+
+  Future<BaseConfig> addConfig(BaseConfig config, ConfigType type) async {
+    final data = await baseProvider.post(
+      config.toJson(),
+      baseProvider.makeUrl(getConfigUrl(type)),
+    );
+    notifyListeners();
+    return BaseConfig.fromJson(data);
+  }
+
+  Future<void> deleteConfig(int id, ConfigType type) async {
+    await baseProvider.deleteRequest(getConfigUrl(type), id);
+    notifyListeners();
+  }
+
+  Future<void> handleConfig(SlotEntry entry, num? value, ConfigType type) async {
+    final configs = entry.getConfigsByType(type);
+    final config = configs.isNotEmpty ? configs.first : null;
+    // final value = input.isNotEmpty ? num.parse(input) : null;
+
+    if (value == null && config != null) {
+      // Value removed, delete entry
+      configs.removeWhere((c) => c.id! == config.id!);
+      await deleteConfig(config.id!, type);
+    } else if (config != null) {
+      // Update existing value
+      configs.first.value = value!;
+      await editConfig(configs.first, type);
+    } else if (value != null && config == null) {
+      // Create new config
+      configs.add(
+        await addConfig(
+          BaseConfig.firstIteration(value, entry.id!),
+          type,
+        ),
+      );
+    }
+  }
+
+  /*
+   * Sessions
+   */
+  Future<List<WorkoutSession>> fetchSessionData() async {
+    final data = await baseProvider.fetchPaginated(
+      baseProvider.makeUrl(_sessionUrlPath, query: {'limit': API_MAX_PAGE_SIZE}),
+    );
+    final sessions = data.map((entry) => WorkoutSession.fromJson(entry)).toList();
+
+    notifyListeners();
+
+    return sessions;
+  }
+
+  Future<WorkoutSession> addSession(WorkoutSession session, int? routineId) async {
+    final data = await baseProvider.post(
+      session.toJson(),
+      baseProvider.makeUrl(_sessionUrlPath),
+    );
+    final newSession = WorkoutSession.fromJson(data);
+
+    if (routineId != null) {
+      final routine = findById(routineId);
+      routine.sessions.add(WorkoutSessionApi(session: newSession));
+    }
+
+    notifyListeners();
+    return newSession;
+  }
+
+  Future<WorkoutSession> editSession(WorkoutSession session) async {
+    final data = await baseProvider.patch(
+      session.toJson(),
+      baseProvider.makeUrl(_sessionUrlPath, id: session.id),
+    );
+    final newSession = WorkoutSession.fromJson(data);
+    notifyListeners();
+    return newSession;
+  }
+
+  /*
+   * Logs
+   */
+  Future<Log> addLog(Log log) async {
+    final data = await baseProvider.post(
+      log.toJson(),
+      baseProvider.makeUrl(_logsUrlPath),
+    );
+    final newLog = Log.fromJson(data);
+
+    newLog.weightUnit = _weightUnits.firstWhere((e) => e.id == log.weightUnitId);
+    newLog.repetitionUnit = _repetitionUnits.firstWhere((e) => e.id == log.weightUnitId);
+    newLog.exerciseBase = (await _exerciseProvider.fetchAndSetExercise(log.exerciseId))!;
+
+    final plan = findById(newLog.routineId);
+
+    // If there is no session known locally, just re-fetch everything
+    try {
+      final session = plan.sessions.firstWhere((element) => element.session.id == newLog.sessionId);
+      session.logs.add(newLog);
+      notifyListeners();
+    } on StateError {
+      await fetchAndSetRoutineFull(newLog.routineId);
+    }
+
+    return newLog;
+  }
+
+  /*Future<void> editLog(Log log) async {
+    await patch(log.toJson(), makeUrl(_logsUrlPath, id: log.id));
+    notifyListeners();
+  }*/
+
+  Future<void> deleteLog(int logId, int routineId) async {
+    _logger.fine('Deleting log ${logId}');
+    await baseProvider.deleteRequest(_logsUrlPath, logId);
+    await fetchAndSetRoutineFull(routineId);
+  }
+}
diff --git a/lib/providers/user.dart b/lib/providers/user.dart
index cb547c49..3765bfe2 100644
--- a/lib/providers/user.dart
+++ b/lib/providers/user.dart
@@ -19,12 +19,21 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:wger/helpers/consts.dart';
+import 'package:wger/helpers/shared_preferences.dart';
 import 'package:wger/models/user/profile.dart';
 import 'package:wger/providers/base_provider.dart';
 
 class UserProvider with ChangeNotifier {
+  ThemeMode themeMode = ThemeMode.system;
   final WgerBaseProvider baseProvider;
-  UserProvider(this.baseProvider);
+  late SharedPreferencesAsync prefs;
+
+  UserProvider(this.baseProvider, {SharedPreferencesAsync? prefs}) {
+    this.prefs = prefs ?? PreferenceHelper.asyncPref;
+    _loadThemeMode();
+  }
 
   static const PROFILE_URL = 'userprofile';
   static const VERIFY_EMAIL = 'verify-email';
@@ -36,6 +45,42 @@ class UserProvider with ChangeNotifier {
     profile = null;
   }
 
+  // // change the unit of plates
+  // void changeUnit({changeTo = 'kg'}) {
+  //   if (changeTo == 'kg') {
+  //     profile?.weightUnitStr = 'lb';
+  //   } else {
+  //     profile?.weightUnitStr = 'kg';
+  //   }
+  // }
+
+  // Load theme mode from SharedPreferences
+  Future<void> _loadThemeMode() async {
+    final prefsDarkMode = await prefs.getBool(PREFS_USER_DARK_THEME);
+
+    if (prefsDarkMode == null) {
+      themeMode = ThemeMode.system;
+    } else {
+      themeMode = prefsDarkMode ? ThemeMode.dark : ThemeMode.light;
+    }
+
+    notifyListeners();
+  }
+
+  //  Change mode on switch button click
+  void setThemeMode(ThemeMode mode) async {
+    themeMode = mode;
+
+    // Save to SharedPreferences
+    if (themeMode == ThemeMode.system) {
+      await prefs.remove(PREFS_USER_DARK_THEME);
+    } else {
+      await prefs.setBool(PREFS_USER_DARK_THEME, themeMode == ThemeMode.dark);
+    }
+
+    notifyListeners();
+  }
+
   /// Fetch the current user's profile
   Future<void> fetchAndSetProfile() async {
     final userData = await baseProvider.fetch(baseProvider.makeUrl(PROFILE_URL));
@@ -48,7 +93,7 @@ class UserProvider with ChangeNotifier {
 
   /// Save the user's profile to the server
   Future<void> saveProfile() async {
-    final data = await baseProvider.post(
+    await baseProvider.post(
       profile!.toJson(),
       baseProvider.makeUrl(PROFILE_URL),
     );
@@ -56,10 +101,12 @@ class UserProvider with ChangeNotifier {
 
   /// Verify the user's email
   Future<void> verifyEmail() async {
-    final verificationData = await baseProvider.fetch(baseProvider.makeUrl(
-      PROFILE_URL,
-      objectMethod: VERIFY_EMAIL,
-    ));
+    await baseProvider.fetch(
+      baseProvider.makeUrl(
+        PROFILE_URL,
+        objectMethod: VERIFY_EMAIL,
+      ),
+    );
     //log(verificationData.toString());
   }
 }
diff --git a/lib/providers/workout_plans.dart b/lib/providers/workout_plans.dart
deleted file mode 100644
index 04aab0bc..00000000
--- a/lib/providers/workout_plans.dart
+++ /dev/null
@@ -1,549 +0,0 @@
-/*
- * This file is part of wger Workout Manager <https://github.com/wger-project>.
- * Copyright (C) 2020, 2021 wger Team
- *
- * wger Workout Manager is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import 'dart:convert';
-import 'dart:developer' as dev;
-
-import 'package:flutter/material.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-import 'package:wger/exceptions/http_exception.dart';
-import 'package:wger/helpers/consts.dart';
-import 'package:wger/models/exercises/exercise.dart';
-import 'package:wger/models/exercises/translation.dart';
-import 'package:wger/models/workouts/day.dart';
-import 'package:wger/models/workouts/log.dart';
-import 'package:wger/models/workouts/repetition_unit.dart';
-import 'package:wger/models/workouts/session.dart';
-import 'package:wger/models/workouts/set.dart';
-import 'package:wger/models/workouts/setting.dart';
-import 'package:wger/models/workouts/weight_unit.dart';
-import 'package:wger/models/workouts/workout_plan.dart';
-import 'package:wger/providers/base_provider.dart';
-import 'package:wger/providers/exercises.dart';
-
-class WorkoutPlansProvider with ChangeNotifier {
-  static const _workoutPlansUrlPath = 'workout';
-  static const _daysUrlPath = 'day';
-  static const _setsUrlPath = 'set';
-  static const _settingsUrlPath = 'setting';
-  static const _logsUrlPath = 'workoutlog';
-  static const _sessionUrlPath = 'workoutsession';
-  static const _weightUnitUrlPath = 'setting-weightunit';
-  static const _repetitionUnitUrlPath = 'setting-repetitionunit';
-
-  WorkoutPlan? _currentPlan;
-  final ExercisesProvider _exercises;
-  final WgerBaseProvider baseProvider;
-  List<WorkoutPlan> _workoutPlans = [];
-  List<WeightUnit> _weightUnits = [];
-  List<RepetitionUnit> _repetitionUnit = [];
-
-  WorkoutPlansProvider(
-    this.baseProvider,
-    ExercisesProvider exercises,
-    List<WorkoutPlan> entries,
-  )   : _exercises = exercises,
-        _workoutPlans = entries;
-
-  List<WorkoutPlan> get items {
-    return [..._workoutPlans];
-  }
-
-  List<WeightUnit> get weightUnits {
-    return [..._weightUnits];
-  }
-
-  /// Clears all lists
-  void clear() {
-    _currentPlan = null;
-    _workoutPlans = [];
-    _weightUnits = [];
-    _repetitionUnit = [];
-  }
-
-  /// Return the default weight unit (kg)
-  WeightUnit get defaultWeightUnit {
-    return _weightUnits.firstWhere((element) => element.id == DEFAULT_WEIGHT_UNIT);
-  }
-
-  List<RepetitionUnit> get repetitionUnits {
-    return [..._repetitionUnit];
-  }
-
-  /// Return the default weight unit (reps)
-  RepetitionUnit get defaultRepetitionUnit {
-    return _repetitionUnit.firstWhere((element) => element.id == REP_UNIT_REPETITIONS);
-  }
-
-  List<WorkoutPlan> getPlans() {
-    return _workoutPlans;
-  }
-
-  WorkoutPlan findById(int id) {
-    return _workoutPlans.firstWhere((workoutPlan) => workoutPlan.id == id);
-  }
-
-  int findIndexById(int id) {
-    return _workoutPlans.indexWhere((workoutPlan) => workoutPlan.id == id);
-  }
-
-  /// Set the currently "active" workout plan
-  void setCurrentPlan(int id) {
-    _currentPlan = findById(id);
-  }
-
-  /// Returns the currently "active" workout plan
-  WorkoutPlan? get currentPlan {
-    return _currentPlan;
-  }
-
-  /// Reset the currently "active" workout plan to null
-  void resetCurrentPlan() {
-    _currentPlan = null;
-  }
-
-  /// Returns the current active workout plan. At the moment this is just
-  /// the latest, but this might change in the future.
-  WorkoutPlan? get activePlan {
-    if (_workoutPlans.isNotEmpty) {
-      return _workoutPlans.first;
-    }
-    return null;
-  }
-
-  /*
-   * Workouts
-   */
-
-  /// Fetches and sets all workout plans fully, i.e. with all corresponding child
-  /// attributes
-  Future<void> fetchAndSetAllPlansFull() async {
-    final data = await baseProvider.fetch(
-      baseProvider.makeUrl(
-        _workoutPlansUrlPath,
-        query: {'ordering': '-creation_date', 'limit': '1000'},
-      ),
-    );
-    for (final entry in data['results']) {
-      await fetchAndSetWorkoutPlanFull(entry['id']);
-    }
-
-    notifyListeners();
-  }
-
-  /// Fetches all workout plan sparsely, i.e. only with the data on the plan
-  /// object itself and no child attributes
-  Future<void> fetchAndSetAllPlansSparse() async {
-    final data = await baseProvider.fetch(
-      baseProvider.makeUrl(_workoutPlansUrlPath, query: {'limit': '1000'}),
-    );
-    _workoutPlans = [];
-    for (final workoutPlanData in data['results']) {
-      final plan = WorkoutPlan.fromJson(workoutPlanData);
-      _workoutPlans.add(plan);
-    }
-
-    _workoutPlans.sort((a, b) => b.creationDate.compareTo(a.creationDate));
-    notifyListeners();
-  }
-
-  /// Fetches a workout plan sparsely, i.e. only with the data on the plan
-  /// object itself and no child attributes
-  Future<WorkoutPlan> fetchAndSetPlanSparse(int planId) async {
-    final fullPlanData = await baseProvider.fetch(
-      baseProvider.makeUrl(_workoutPlansUrlPath, id: planId),
-    );
-    final plan = WorkoutPlan.fromJson(fullPlanData);
-    _workoutPlans.add(plan);
-    _workoutPlans.sort((a, b) => b.creationDate.compareTo(a.creationDate));
-
-    notifyListeners();
-    return plan;
-  }
-
-  /// Fetches a workout plan fully, i.e. with all corresponding child attributes
-  Future<WorkoutPlan> fetchAndSetWorkoutPlanFull(int workoutId) async {
-    // Load a list of all settings so that we can search through it
-    //
-    // This is a bit ugly, but saves us sending lots of requests later on
-    final allSettingsData = await baseProvider.fetch(
-      baseProvider.makeUrl(_settingsUrlPath, query: {'limit': '1000'}),
-    );
-
-    WorkoutPlan plan;
-    try {
-      plan = findById(workoutId);
-    } on StateError {
-      plan = await fetchAndSetPlanSparse(workoutId);
-    }
-
-    // Days
-    final List<Day> days = [];
-    final daysData = await baseProvider.fetch(
-      baseProvider.makeUrl(_daysUrlPath, query: {'training': plan.id.toString()}),
-    );
-    for (final dayEntry in daysData['results']) {
-      final day = Day.fromJson(dayEntry);
-
-      // Sets
-      final List<Set> sets = [];
-      final setData = await baseProvider.fetch(
-        baseProvider.makeUrl(_setsUrlPath, query: {'exerciseday': day.id.toString()}),
-      );
-      for (final setEntry in setData['results']) {
-        final workoutSet = Set.fromJson(setEntry);
-
-        fetchComputedSettings(workoutSet); // request!
-
-        final List<Setting> settings = [];
-        final settingData = allSettingsData['results'].where((s) => s['set'] == workoutSet.id);
-
-        for (final settingEntry in settingData) {
-          final workoutSetting = Setting.fromJson(settingEntry);
-
-          workoutSetting.exercise = await _exercises.fetchAndSetExercise(workoutSetting.exerciseId);
-          workoutSetting.weightUnit = _weightUnits.firstWhere(
-            (e) => e.id == workoutSetting.weightUnitId,
-          );
-          workoutSetting.repetitionUnit = _repetitionUnit.firstWhere(
-            (e) => e.id == workoutSetting.repetitionUnitId,
-          );
-          if (!workoutSet.exerciseBasesIds.contains(workoutSetting.exerciseId)) {
-            workoutSet.addExerciseBase(workoutSetting.exerciseObj);
-          }
-
-          settings.add(workoutSetting);
-        }
-        workoutSet.settings = settings;
-        sets.add(workoutSet);
-      }
-      day.sets = sets;
-      days.add(day);
-    }
-    plan.days = days;
-
-    // Logs
-    plan.logs = [];
-
-    final logData = await baseProvider.fetchPaginated(baseProvider.makeUrl(
-      _logsUrlPath,
-      query: {'workout': workoutId.toString(), 'limit': '100'},
-    ));
-    for (final logEntry in logData) {
-      try {
-        final log = Log.fromJson(logEntry);
-        log.weightUnit = _weightUnits.firstWhere((e) => e.id == log.weightUnitId);
-        log.repetitionUnit = _repetitionUnit.firstWhere((e) => e.id == log.weightUnitId);
-        log.exerciseBase = await _exercises.fetchAndSetExercise(log.exerciseBaseId);
-        plan.logs.add(log);
-      } catch (e) {
-        dev.log('fire! fire!');
-        dev.log(e.toString());
-      }
-    }
-
-    // ... and done
-    notifyListeners();
-    return plan;
-  }
-
-  Future<WorkoutPlan> addWorkout(WorkoutPlan workout) async {
-    final data = await baseProvider.post(
-      workout.toJson(),
-      baseProvider.makeUrl(_workoutPlansUrlPath),
-    );
-    final plan = WorkoutPlan.fromJson(data);
-    _workoutPlans.insert(0, plan);
-    notifyListeners();
-    return plan;
-  }
-
-  Future<void> editWorkout(WorkoutPlan workout) async {
-    await baseProvider.patch(
-      workout.toJson(),
-      baseProvider.makeUrl(_workoutPlansUrlPath, id: workout.id),
-    );
-    notifyListeners();
-  }
-
-  Future<void> deleteWorkout(int id) async {
-    final existingWorkoutIndex = _workoutPlans.indexWhere((element) => element.id == id);
-    final existingWorkout = _workoutPlans[existingWorkoutIndex];
-    _workoutPlans.removeAt(existingWorkoutIndex);
-    notifyListeners();
-
-    final response = await baseProvider.deleteRequest(_workoutPlansUrlPath, id);
-
-    if (response.statusCode >= 400) {
-      _workoutPlans.insert(existingWorkoutIndex, existingWorkout);
-      notifyListeners();
-      throw WgerHttpException(response.body);
-    }
-  }
-
-  Future<Map<String, dynamic>> fetchLogData(
-    WorkoutPlan workout,
-    Exercise base,
-  ) async {
-    final data = await baseProvider.fetch(
-      baseProvider.makeUrl(
-        _workoutPlansUrlPath,
-        id: workout.id,
-        objectMethod: 'log_data',
-        query: {'id': base.id.toString()},
-      ),
-    );
-    return data;
-  }
-
-  /// Fetch and set weight units for workout (kg, lb, plate, etc.)
-  Future<void> fetchAndSetRepetitionUnits() async {
-    final response =
-        await baseProvider.fetchPaginated(baseProvider.makeUrl(_repetitionUnitUrlPath));
-    for (final unit in response) {
-      _repetitionUnit.add(RepetitionUnit.fromJson(unit));
-    }
-  }
-
-  /// Fetch and set weight units for workout (kg, lb, plate, etc.)
-  Future<void> fetchAndSetWeightUnits() async {
-    final response = await baseProvider.fetchPaginated(baseProvider.makeUrl(_weightUnitUrlPath));
-    for (final unit in response) {
-      _weightUnits.add(WeightUnit.fromJson(unit));
-    }
-  }
-
-  Future<void> fetchAndSetUnits() async {
-    // Load units from cache, if available
-    final prefs = await SharedPreferences.getInstance();
-    if (prefs.containsKey(PREFS_WORKOUT_UNITS)) {
-      final unitData = json.decode(prefs.getString(PREFS_WORKOUT_UNITS)!);
-      if (DateTime.parse(unitData['expiresIn']).isAfter(DateTime.now())) {
-        unitData['repetitionUnits'].forEach(
-          (e) => _repetitionUnit.add(RepetitionUnit.fromJson(e)),
-        );
-        unitData['weightUnit'].forEach(
-          (e) => _weightUnits.add(WeightUnit.fromJson(e)),
-        );
-        dev.log(
-          "Read workout units data from cache. Valid till ${unitData['expiresIn']}",
-        );
-        return;
-      }
-    }
-
-    // Load units
-    await fetchAndSetWeightUnits();
-    await fetchAndSetRepetitionUnits();
-
-    // Save the result to the cache
-    final exerciseData = {
-      'date': DateTime.now().toIso8601String(),
-      'expiresIn': DateTime.now().add(const Duration(days: DAYS_TO_CACHE)).toIso8601String(),
-      'repetitionUnits': _repetitionUnit.map((e) => e.toJson()).toList(),
-      'weightUnit': _weightUnits.map((e) => e.toJson()).toList(),
-    };
-    prefs.setString(PREFS_WORKOUT_UNITS, json.encode(exerciseData));
-    notifyListeners();
-  }
-
-  /*
-   * Days
-   */
-  Future<Day> addDay(Day day, WorkoutPlan workout) async {
-    /*
-     * Saves a new day instance to the DB and adds it to the given workout
-     */
-    day.workoutId = workout.id!;
-    final data = await baseProvider.post(
-      day.toJson(),
-      baseProvider.makeUrl(_daysUrlPath),
-    );
-    day = Day.fromJson(data);
-    day.sets = [];
-    workout.days.insert(0, day);
-    notifyListeners();
-    return day;
-  }
-
-  Future<void> editDay(Day day) async {
-    await baseProvider.patch(
-      day.toJson(),
-      baseProvider.makeUrl(_daysUrlPath, id: day.id),
-    );
-    notifyListeners();
-  }
-
-  Future<void> deleteDay(Day day) async {
-    await baseProvider.deleteRequest(_daysUrlPath, day.id!);
-    for (final workout in _workoutPlans) {
-      workout.days.removeWhere((element) => element.id == day.id);
-    }
-    notifyListeners();
-  }
-
-  /*
-   * Sets
-   */
-  Future<Set> addSet(Set workoutSet) async {
-    final data = await baseProvider.post(
-      workoutSet.toJson(),
-      baseProvider.makeUrl(_setsUrlPath),
-    );
-    final set = Set.fromJson(data);
-    notifyListeners();
-    return set;
-  }
-
-  Future<void> editSet(Set workoutSet) async {
-    await baseProvider.patch(
-      workoutSet.toJson(),
-      baseProvider.makeUrl(_setsUrlPath, id: workoutSet.id),
-    );
-    notifyListeners();
-  }
-
-  Future<List<Set>> reorderSets(List<Set> sets, int startIndex) async {
-    for (int i = startIndex; i < sets.length; i++) {
-      sets[i].order = i;
-      await baseProvider.patch(
-        sets[i].toJson(),
-        baseProvider.makeUrl(_setsUrlPath, id: sets[i].id),
-      );
-    }
-    notifyListeners();
-    return sets;
-  }
-
-  Future<void> fetchComputedSettings(Set workoutSet) async {
-    final data = await baseProvider.fetch(
-      baseProvider.makeUrl(
-        _setsUrlPath,
-        id: workoutSet.id,
-        objectMethod: 'computed_settings',
-      ),
-    );
-
-    final List<Setting> settings = [];
-    data['results'].forEach((e) {
-      final Setting workoutSetting = Setting.fromJson(e);
-
-      workoutSetting.weightUnitObj = _weightUnits.firstWhere(
-        (unit) => unit.id == workoutSetting.weightUnitId,
-      );
-      workoutSetting.repetitionUnitObj = _repetitionUnit.firstWhere(
-        (unit) => unit.id == workoutSetting.repetitionUnitId,
-      );
-      settings.add(workoutSetting);
-    });
-
-    workoutSet.settingsComputed = settings;
-    notifyListeners();
-  }
-
-  Future<String> fetchSmartText(Set workoutSet, Translation exercise) async {
-    final data = await baseProvider.fetch(
-      baseProvider.makeUrl(
-        _setsUrlPath,
-        id: workoutSet.id,
-        objectMethod: 'smart_text',
-        query: {'exercise': exercise.id.toString()},
-      ),
-    );
-
-    return data['results'];
-  }
-
-  Future<void> deleteSet(Set workoutSet) async {
-    await baseProvider.deleteRequest(_setsUrlPath, workoutSet.id!);
-
-    for (final workout in _workoutPlans) {
-      for (final day in workout.days) {
-        day.sets.removeWhere((element) => element.id == workoutSet.id);
-      }
-    }
-    notifyListeners();
-  }
-
-  /*
-   * Setting
-   */
-  Future<Setting> addSetting(Setting workoutSetting) async {
-    final data = await baseProvider.post(
-      workoutSetting.toJson(),
-      baseProvider.makeUrl(_settingsUrlPath),
-    );
-    final setting = Setting.fromJson(data);
-    notifyListeners();
-    return setting;
-  }
-
-  /*
-   * Sessions
-   */
-  Future<dynamic> fetchSessionData() async {
-    final data = await baseProvider.fetch(
-      baseProvider.makeUrl(_sessionUrlPath),
-    );
-    return data;
-  }
-
-  Future<WorkoutSession> addSession(WorkoutSession session) async {
-    final data = await baseProvider.post(
-      session.toJson(),
-      baseProvider.makeUrl(_sessionUrlPath),
-    );
-    final newSession = WorkoutSession.fromJson(data);
-    notifyListeners();
-    return newSession;
-  }
-
-  /*
-   * Logs
-   */
-  Future<Log> addLog(Log log) async {
-    final data = await baseProvider.post(
-      log.toJson(),
-      baseProvider.makeUrl(_logsUrlPath),
-    );
-    final newLog = Log.fromJson(data);
-
-    log.id = newLog.id;
-    log.weightUnit = _weightUnits.firstWhere((e) => e.id == log.weightUnitId);
-    log.repetitionUnit = _repetitionUnit.firstWhere((e) => e.id == log.weightUnitId);
-    log.exerciseBase = await _exercises.fetchAndSetExercise(log.exerciseBaseId);
-
-    final plan = findById(log.workoutPlan);
-    plan.logs.add(log);
-    notifyListeners();
-    return newLog;
-  }
-
-  /*Future<void> editLog(Log log) async {
-    await patch(log.toJson(), makeUrl(_logsUrlPath, id: log.id));
-    notifyListeners();
-  }*/
-
-  Future<void> deleteLog(Log log) async {
-    await baseProvider.deleteRequest(_logsUrlPath, log.id!);
-    for (final workout in _workoutPlans) {
-      workout.logs.removeWhere((element) => element.id == log.id);
-    }
-    notifyListeners();
-  }
-}
diff --git a/lib/screens/add_exercise_screen.dart b/lib/screens/add_exercise_screen.dart
index d8a44be2..83dd447e 100644
--- a/lib/screens/add_exercise_screen.dart
+++ b/lib/screens/add_exercise_screen.dart
@@ -1,16 +1,20 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
+import 'package:wger/exceptions/http_exception.dart';
 import 'package:wger/helpers/consts.dart';
+import 'package:wger/helpers/errors.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/exercises/exercise.dart';
 import 'package:wger/providers/add_exercise.dart';
 import 'package:wger/providers/exercises.dart';
 import 'package:wger/providers/user.dart';
 import 'package:wger/screens/exercise_screen.dart';
-import 'package:wger/widgets/add_exercise/steps/step1basics.dart';
-import 'package:wger/widgets/add_exercise/steps/step2variations.dart';
-import 'package:wger/widgets/add_exercise/steps/step3description.dart';
-import 'package:wger/widgets/add_exercise/steps/step4translations.dart';
-import 'package:wger/widgets/add_exercise/steps/step5images.dart';
+import 'package:wger/widgets/add_exercise/steps/step_1_basics.dart';
+import 'package:wger/widgets/add_exercise/steps/step_2_variations.dart';
+import 'package:wger/widgets/add_exercise/steps/step_3_description.dart';
+import 'package:wger/widgets/add_exercise/steps/step_4_translations.dart';
+import 'package:wger/widgets/add_exercise/steps/step_5_images.dart';
+import 'package:wger/widgets/add_exercise/steps/step_6_overview.dart';
 import 'package:wger/widgets/core/app_bar.dart';
 import 'package:wger/widgets/user/forms.dart';
 
@@ -32,7 +36,7 @@ class AddExerciseScreen extends StatelessWidget {
 class AddExerciseStepper extends StatefulWidget {
   const AddExerciseStepper({super.key});
 
-  static const STEPS_IN_FORM = 5;
+  static const STEPS_IN_FORM = 6;
 
   @override
   _AddExerciseStepperState createState() => _AddExerciseStepperState();
@@ -42,6 +46,7 @@ class _AddExerciseStepperState extends State<AddExerciseStepper> {
   int _currentStep = 0;
   int lastStepIndex = AddExerciseStepper.STEPS_IN_FORM - 1;
   bool _isLoading = false;
+  Widget errorWidget = const SizedBox.shrink();
 
   final List<GlobalKey<FormState>> _keys = [
     GlobalKey<FormState>(),
@@ -49,12 +54,14 @@ class _AddExerciseStepperState extends State<AddExerciseStepper> {
     GlobalKey<FormState>(),
     GlobalKey<FormState>(),
     GlobalKey<FormState>(),
+    GlobalKey<FormState>(),
   ];
 
   Widget _controlsBuilder(BuildContext context, ControlsDetails details) {
     return Column(
       children: [
         const SizedBox(height: 10),
+        if (_currentStep == lastStepIndex) errorWidget,
         Row(
           mainAxisAlignment: MainAxisAlignment.spaceAround,
           children: [
@@ -62,6 +69,8 @@ class _AddExerciseStepperState extends State<AddExerciseStepper> {
               onPressed: details.onStepCancel,
               child: Text(AppLocalizations.of(context).previous),
             ),
+
+            // Submit button on last step
             if (_currentStep == lastStepIndex)
               ElevatedButton(
                 onPressed: _isLoading
@@ -69,21 +78,37 @@ class _AddExerciseStepperState extends State<AddExerciseStepper> {
                     : () async {
                         setState(() {
                           _isLoading = true;
+                          errorWidget = const SizedBox.shrink();
                         });
                         final addExerciseProvider = context.read<AddExerciseProvider>();
                         final exerciseProvider = context.read<ExercisesProvider>();
 
-                        final baseId = await addExerciseProvider.addExercise();
-                        final base = await exerciseProvider.fetchAndSetExercise(baseId);
-                        final name = base
-                            .getExercise(Localizations.localeOf(context).languageCode)
+                        Exercise? exercise;
+                        try {
+                          final exerciseId = await addExerciseProvider.postExerciseToServer();
+                          exercise = await exerciseProvider.fetchAndSetExercise(exerciseId);
+                        } on WgerHttpException catch (error) {
+                          if (context.mounted) {
+                            setState(() {
+                              errorWidget = FormHttpErrorsWidget(error);
+                            });
+                          }
+                        } finally {
+                          if (mounted) {
+                            setState(() {
+                              _isLoading = false;
+                            });
+                          }
+                        }
+
+                        if (exercise == null || !context.mounted) {
+                          return;
+                        }
+
+                        final name = exercise
+                            .getTranslation(Localizations.localeOf(context).languageCode)
                             .name;
 
-                        setState(() {
-                          _isLoading = false;
-                        });
-
-                        if (!context.mounted) return;
                         return showDialog(
                           context: context,
                           builder: (BuildContext context) {
@@ -98,7 +123,7 @@ class _AddExerciseStepperState extends State<AddExerciseStepper> {
                                     Navigator.pushReplacementNamed(
                                       context,
                                       ExerciseDetailScreen.routeName,
-                                      arguments: base,
+                                      arguments: exercise,
                                     );
                                   },
                                 ),
@@ -149,6 +174,7 @@ class _AddExerciseStepperState extends State<AddExerciseStepper> {
             title: Text(AppLocalizations.of(context).images),
             content: Step5Images(formkey: _keys[4]),
           ),
+          Step(title: Text(AppLocalizations.of(context).overview), content: Step6Overview()),
         ],
         currentStep: _currentStep,
         onStepContinue: () {
diff --git a/lib/screens/auth_screen.dart b/lib/screens/auth_screen.dart
index 2145d6a2..2553949a 100644
--- a/lib/screens/auth_screen.dart
+++ b/lib/screens/auth_screen.dart
@@ -18,27 +18,34 @@
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 import 'package:wger/exceptions/http_exception.dart';
 import 'package:wger/helpers/consts.dart';
-import 'package:wger/helpers/misc.dart';
-import 'package:wger/helpers/ui.dart';
+import 'package:wger/helpers/errors.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/screens/update_app_screen.dart';
 import 'package:wger/theme/theme.dart';
+import 'package:wger/widgets/auth/api_token_field.dart';
+import 'package:wger/widgets/auth/email_field.dart';
+import 'package:wger/widgets/auth/password_field.dart';
+import 'package:wger/widgets/auth/server_field.dart';
+import 'package:wger/widgets/auth/username_field.dart';
 
 import '../providers/auth.dart';
 
-enum AuthMode { Signup, Login }
+enum AuthMode {
+  Register,
+  Login,
+}
 
 class AuthScreen extends StatelessWidget {
   const AuthScreen();
+
   static const routeName = '/auth';
 
   @override
   Widget build(BuildContext context) {
-    final deviceSize = MediaQuery.of(context).size;
+    final deviceSize = MediaQuery.sizeOf(context);
     return Scaffold(
       backgroundColor: Theme.of(context).colorScheme.surface,
       body: Stack(
@@ -77,12 +84,6 @@ class AuthScreen extends StatelessWidget {
               ),
             ),
           ),
-          // Positioned(
-          //   top: 0.4 * deviceSize.height,
-          //   left: 15,
-          //   right: 15,
-          //   child: const ,
-          // ),
         ],
       ),
     );
@@ -99,16 +100,18 @@ class AuthCard extends StatefulWidget {
 class _AuthCardState extends State<AuthCard> {
   bool isObscure = true;
   bool confirmIsObscure = true;
+  Widget errorMessage = const SizedBox.shrink();
 
   final GlobalKey<FormState> _formKey = GlobalKey();
-  bool _canRegister = true;
   AuthMode _authMode = AuthMode.Login;
   bool _hideCustomServer = true;
+  bool _useUsernameAndPassword = true;
   final Map<String, String> _authData = {
     'username': '',
     'email': '',
     'password': '',
     'serverUrl': '',
+    'apiToken': '',
   };
   var _isLoading = false;
   final _usernameController = TextEditingController();
@@ -118,6 +121,7 @@ class _AuthCardState extends State<AuthCard> {
   final _serverUrlController = TextEditingController(
     text: kDebugMode ? DEFAULT_SERVER_TEST : DEFAULT_SERVER_PROD,
   );
+  final _apiTokenController = TextEditingController();
 
   @override
   void dispose() {
@@ -126,6 +130,7 @@ class _AuthCardState extends State<AuthCard> {
     _password2Controller.dispose();
     _emailController.dispose();
     _serverUrlController.dispose();
+    _apiTokenController.dispose();
     super.dispose();
   }
 
@@ -136,17 +141,6 @@ class _AuthCardState extends State<AuthCard> {
       _serverUrlController.text = value;
     });
 
-    // Check if the API key is set
-    //
-    // If not, the user will not be able to register via the app
-    try {
-      final metadata = Provider.of<AuthProvider>(context, listen: false).metadata;
-      if (metadata.containsKey(MANIFEST_KEY_API) && metadata[MANIFEST_KEY_API] == '') {
-        _canRegister = false;
-      }
-    } on PlatformException {
-      _canRegister = false;
-    }
     _preFillTextfields();
   }
 
@@ -162,11 +156,11 @@ class _AuthCardState extends State<AuthCard> {
   void _resetTextfields() {
     _usernameController.clear();
     _passwordController.clear();
+    _apiTokenController.clear();
   }
 
   void _submit(BuildContext context) async {
     if (!_formKey.currentState!.validate()) {
-      // Invalid!
       return;
     }
     _formKey.currentState!.save();
@@ -176,12 +170,14 @@ 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']!, _authData['password']!, _authData['serverUrl']!);
+        res = await context.read<AuthProvider>().login(
+          _authData['username']!,
+          _authData['password']!,
+          _authData['serverUrl']!,
+          _authData['apiToken'],
+        );
 
         // Register new user
       } else {
@@ -195,44 +191,35 @@ 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;
+      }
+      if (context.mounted) {
+        setState(() {
+          _isLoading = false;
+        });
       }
-
-      setState(() {
-        _isLoading = false;
-      });
     } on WgerHttpException catch (error) {
-      if (mounted) {
-        showHttpExceptionErrorDialog(error, context);
+      if (context.mounted) {
+        setState(() {
+          errorMessage = FormHttpErrorsWidget(error);
+        });
       }
-      setState(() {
-        _isLoading = false;
-      });
-    } catch (error) {
+    } finally {
       if (mounted) {
-        showErrorDialog(error, context);
+        setState(() => _isLoading = false);
       }
-      setState(() {
-        _isLoading = false;
-      });
     }
   }
 
   void _switchAuthMode() {
-    if (!_canRegister) {
-      launchURL(DEFAULT_SERVER_PROD, context);
-      return;
-    }
-
     if (_authMode == AuthMode.Login) {
       setState(() {
-        _authMode = AuthMode.Signup;
+        _authMode = AuthMode.Register;
+        _useUsernameAndPassword = true;
       });
       _resetTextfields();
     } else {
@@ -245,7 +232,9 @@ class _AuthCardState extends State<AuthCard> {
 
   @override
   Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
     final deviceSize = MediaQuery.of(context).size;
+
     return Card(
       shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(15.0)),
       elevation: 8.0,
@@ -258,111 +247,49 @@ class _AuthCardState extends State<AuthCard> {
             child: AutofillGroup(
               child: Column(
                 children: [
-                  TextFormField(
-                    key: const Key('inputUsername'),
-                    decoration: InputDecoration(
-                      labelText: AppLocalizations.of(context).username,
-                      errorMaxLines: 2,
-                      prefixIcon: const Icon(Icons.account_circle),
+                  errorMessage,
+                  if (_useUsernameAndPassword)
+                    UsernameField(
+                      controller: _apiTokenController,
+                      onSaved: (value) => _authData['username'] = value!,
                     ),
-                    autofillHints: const [AutofillHints.username],
-                    controller: _usernameController,
-                    textInputAction: TextInputAction.next,
-                    keyboardType: TextInputType.emailAddress,
-                    validator: (value) {
-                      if (value == null || value.isEmpty) {
-                        return AppLocalizations.of(context).invalidUsername;
-                      }
-                      if (!RegExp(r'^[\w.@+-]+$').hasMatch(value)) {
-                        return AppLocalizations.of(context).usernameValidChars;
-                      }
-
-                      return null;
-                    },
-                    inputFormatters: [FilteringTextInputFormatter.deny(RegExp(r'\s\b|\b\s'))],
-                    onSaved: (value) {
-                      _authData['username'] = value!;
-                    },
-                  ),
-                  if (_authMode == AuthMode.Signup)
-                    TextFormField(
-                      key: const Key('inputEmail'),
-                      decoration: InputDecoration(
-                        labelText: AppLocalizations.of(context).email,
-                        prefixIcon: const Icon(Icons.mail),
-                      ),
-                      autofillHints: const [AutofillHints.email],
+                  if (_authMode == AuthMode.Register)
+                    EmailField(
                       controller: _emailController,
-                      keyboardType: TextInputType.emailAddress,
-                      textInputAction: TextInputAction.next,
-
-                      // Email is not required
-                      validator: (value) {
-                        if (value!.isNotEmpty && !value.contains('@')) {
-                          return AppLocalizations.of(context).invalidEmail;
-                        }
-                        return null;
-                      },
-                      onSaved: (value) {
-                        _authData['email'] = value!;
-                      },
+                      onSaved: (value) => _authData['email'] = value!,
                     ),
-                  StatefulBuilder(
-                    builder: (context, updateState) {
-                      return TextFormField(
-                        key: const Key('inputPassword'),
-                        decoration: InputDecoration(
-                          labelText: AppLocalizations.of(context).password,
-                          prefixIcon: const Icon(Icons.password),
-                          suffixIcon: IconButton(
-                            icon: Icon(isObscure ? Icons.visibility_off : Icons.visibility),
-                            onPressed: () {
-                              isObscure = !isObscure;
-                              updateState(() {});
-                            },
-                          ),
-                        ),
-                        autofillHints: const [AutofillHints.password],
-                        obscureText: isObscure,
-                        controller: _passwordController,
-                        textInputAction: TextInputAction.next,
-                        validator: (value) {
-                          if (value!.isEmpty || value.length < 8) {
-                            return AppLocalizations.of(context).passwordTooShort;
-                          }
-                          return null;
-                        },
-                        onSaved: (value) {
-                          _authData['password'] = value!;
-                        },
-                      );
-                    },
-                  ),
-                  if (_authMode == AuthMode.Signup)
+                  if (_useUsernameAndPassword)
+                    PasswordField(
+                      controller: _passwordController,
+                      onSaved: (value) => _authData['password'] = value!,
+                    ),
+
+                  if (_authMode == AuthMode.Register)
                     StatefulBuilder(
                       builder: (context, updateState) {
                         return TextFormField(
                           key: const Key('inputPassword2'),
                           decoration: InputDecoration(
-                            labelText: AppLocalizations.of(context).confirmPassword,
+                            labelText: i18n.confirmPassword,
                             prefixIcon: const Icon(Icons.password),
                             suffixIcon: IconButton(
                               icon: Icon(
                                 confirmIsObscure ? Icons.visibility_off : Icons.visibility,
                               ),
                               onPressed: () {
-                                confirmIsObscure = !confirmIsObscure;
-                                updateState(() {});
+                                updateState(() {
+                                  confirmIsObscure = !confirmIsObscure;
+                                });
                               },
                             ),
                           ),
                           controller: _password2Controller,
-                          enabled: _authMode == AuthMode.Signup,
+                          enabled: _authMode == AuthMode.Register,
                           obscureText: confirmIsObscure,
-                          validator: _authMode == AuthMode.Signup
+                          validator: _authMode == AuthMode.Register
                               ? (value) {
                                   if (value != _passwordController.text) {
-                                    return AppLocalizations.of(context).passwordsDontMatch;
+                                    return i18n.passwordsDontMatch;
                                   }
                                   return null;
                                 }
@@ -370,109 +297,81 @@ class _AuthCardState extends State<AuthCard> {
                         );
                       },
                     ),
+
                   // Off-stage widgets are kept in the tree, otherwise the server URL
                   // would not be saved to _authData
+                  if (_authMode == AuthMode.Login && !_useUsernameAndPassword)
+                    ApiTokenField(
+                      controller: _apiTokenController,
+                      onSaved: (value) => _authData['apiToken'] = value!,
+                    ),
                   Offstage(
                     offstage: _hideCustomServer,
-                    child: Row(
-                      children: [
-                        Flexible(
-                          flex: 3,
-                          child: TextFormField(
-                            key: const Key('inputServer'),
-                            decoration: InputDecoration(
-                              labelText: AppLocalizations.of(context).customServerUrl,
-                              helperText: AppLocalizations.of(context).customServerHint,
-                              helperMaxLines: 4,
-                            ),
-                            controller: _serverUrlController,
-                            validator: (value) {
-                              if (Uri.tryParse(value!) == null) {
-                                return AppLocalizations.of(context).invalidUrl;
-                              }
+                    child: ServerField(
+                      controller: _serverUrlController,
+                      onSaved: (value) {
+                        // Remove any trailing slash
+                        if (value!.lastIndexOf('/') == (value.length - 1)) {
+                          value = value.substring(0, value.lastIndexOf('/'));
+                        }
+                        _authData['serverUrl'] = value;
+                      },
+                    ),
+                  ),
+                  if (!_hideCustomServer)
+                    TextButton(
+                      key: const ValueKey('toggleApiTokenButton'),
+                      onPressed: _authMode == AuthMode.Login
+                          ? () => setState(() => _useUsernameAndPassword = !_useUsernameAndPassword)
+                          : null,
+                      child: Text(
+                        _useUsernameAndPassword ? i18n.useApiToken : i18n.useUsernameAndPassword,
+                      ),
+                    ),
 
-                              if (value.isEmpty || !value.contains('http')) {
-                                return AppLocalizations.of(context).invalidUrl;
-                              }
-                              return null;
-                            },
-                            onSaved: (value) {
-                              // Remove any trailing slash
-                              if (value!.lastIndexOf('/') == (value.length - 1)) {
-                                value = value.substring(0, value.lastIndexOf('/'));
-                              }
-                              _authData['serverUrl'] = value;
-                            },
-                          ),
-                        ),
-                        const SizedBox(width: 20),
-                        Column(
-                          mainAxisSize: MainAxisSize.min,
-                          children: [
-                            IconButton(
-                              icon: const Icon(Icons.undo),
-                              onPressed: () {
-                                _serverUrlController.text = kDebugMode
-                                    ? DEFAULT_SERVER_TEST
-                                    : DEFAULT_SERVER_PROD;
-                              },
-                            ),
-                            Text(AppLocalizations.of(context).reset),
-                          ],
-                        ),
-                      ],
-                    ),
-                  ),
                   const SizedBox(height: 20),
-                  GestureDetector(
-                    onTap: () {
-                      if (!_isLoading) {
-                        return _submit(context);
-                      }
-                    },
-                    child: Container(
+                  SizedBox(
+                    width: double.infinity,
+                    height: 45,
+                    child: ElevatedButton(
                       key: const Key('actionButton'),
-                      width: double.infinity,
-                      height: 0.065 * deviceSize.height,
-                      decoration: BoxDecoration(
-                        borderRadius: BorderRadius.circular(30.0),
-                        color: wgerPrimaryColor,
+                      onPressed: () {
+                        if (!_isLoading) {
+                          return _submit(context);
+                        }
+                      },
+                      style: ElevatedButton.styleFrom(
+                        backgroundColor: Theme.of(context).colorScheme.primary,
                       ),
-                      child: Center(
-                        child: _isLoading
-                            ? const CircularProgressIndicator(
-                                valueColor: AlwaysStoppedAnimation(Colors.white),
-                              )
-                            : Text(
-                                _authMode == AuthMode.Login
-                                    ? AppLocalizations.of(context).login
-                                    : AppLocalizations.of(context).register,
-                                style: const TextStyle(
-                                  color: Colors.white,
-                                  fontWeight: FontWeight.w600,
-                                ),
+                      child: _isLoading
+                          ? const CircularProgressIndicator(
+                              valueColor: AlwaysStoppedAnimation(Colors.white),
+                            )
+                          : Text(
+                              _authMode == AuthMode.Login ? i18n.login : i18n.register,
+                              style: const TextStyle(
+                                color: Colors.white,
+                                fontWeight: FontWeight.w600,
                               ),
-                      ),
+                            ),
                     ),
                   ),
-                  SizedBox(height: 0.025 * deviceSize.height),
+
+                  const SizedBox(height: 20),
                   Builder(
                     key: const Key('toggleActionButton'),
                     builder: (context) {
-                      final String text = _authMode != AuthMode.Signup
-                          ? AppLocalizations.of(context).registerInstead
-                          : AppLocalizations.of(context).loginInstead;
+                      final String text = _authMode != AuthMode.Register
+                          ? i18n.registerInstead
+                          : i18n.loginInstead;
 
                       return GestureDetector(
-                        onTap: () {
-                          _switchAuthMode();
-                        },
+                        onTap: () => _switchAuthMode(),
                         child: Container(
                           color: Colors.transparent,
-                          child: Row(
-                            mainAxisAlignment: MainAxisAlignment.center,
+                          child: Column(
                             children: [
-                              Text(text.substring(0, text.lastIndexOf('?') + 1)),
+                              // TODO: i18n!
                               Text(
                                 text.substring(text.lastIndexOf('?') + 1, text.length),
                                 style: const TextStyle(
@@ -486,18 +385,19 @@ class _AuthCardState extends State<AuthCard> {
                       );
                     },
                   ),
-
+                  const SizedBox(height: 15),
                   TextButton(
                     key: const Key('toggleCustomServerButton'),
                     onPressed: () {
                       setState(() {
                         _hideCustomServer = !_hideCustomServer;
+                        if (_hideCustomServer) {
+                          _useUsernameAndPassword = true;
+                        }
                       });
                     },
                     child: Text(
-                      _hideCustomServer
-                          ? AppLocalizations.of(context).useCustomServer
-                          : AppLocalizations.of(context).useDefaultServer,
+                      _hideCustomServer ? i18n.useCustomServer : i18n.useDefaultServer,
                     ),
                   ),
                 ],
diff --git a/lib/screens/configure_plates_screen.dart b/lib/screens/configure_plates_screen.dart
new file mode 100644
index 00000000..d31f1a38
--- /dev/null
+++ b/lib/screens/configure_plates_screen.dart
@@ -0,0 +1,19 @@
+import 'package:flutter/material.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/widgets/routines/plate_calculator.dart';
+
+class ConfigurePlatesScreen extends StatelessWidget {
+  static const routeName = '/ConfigureAvailablePlates';
+
+  const ConfigurePlatesScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
+
+    return Scaffold(
+      appBar: AppBar(title: Text(i18n.selectAvailablePlates)),
+      body: const ConfigureAvailablePlates(),
+    );
+  }
+}
diff --git a/lib/screens/dashboard.dart b/lib/screens/dashboard.dart
index 5b50fdd8..42f554e4 100644
--- a/lib/screens/dashboard.dart
+++ b/lib/screens/dashboard.dart
@@ -19,22 +19,20 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import 'package:wger/l10n/generatedapp_localizations.dart';
 import 'package:wger/models/muscle.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/widgets/core/app_bar.dart';
 import 'package:wger/widgets/dashboard/calendar.dart';
-import 'package:wger/widgets/dashboard/widgets.dart';
+import 'package:wger/widgets/dashboard/widgets/measurements.dart';
+import 'package:wger/widgets/dashboard/widgets/nutrition.dart';
+import 'package:wger/widgets/dashboard/widgets/routines.dart';
+import 'package:wger/widgets/dashboard/widgets/weight.dart';
 
-class DashboardScreen extends StatefulWidget {
+class DashboardScreen extends StatelessWidget {
   const DashboardScreen();
+
   static const routeName = '/dashboard';
 
-  @override
-  _DashboardScreenState createState() => _DashboardScreenState();
-}
-
-class _DashboardScreenState extends State<DashboardScreen> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -43,7 +41,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
         padding: EdgeInsets.all(10),
         child: Column(
           children: [
-            DashboardWorkoutWidget(),
+            DashboardRoutineWidget(),
             DashboardNutritionWidget(),
             DashboardWeightWidget(),
             DashboardMeasurementWidget(),
diff --git a/lib/screens/exercise_screen.dart b/lib/screens/exercise_screen.dart
index d517f799..3ee0f208 100644
--- a/lib/screens/exercise_screen.dart
+++ b/lib/screens/exercise_screen.dart
@@ -27,15 +27,15 @@ class ExerciseDetailScreen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final exerciseBase = ModalRoute.of(context)!.settings.arguments as Exercise;
+    final exercise = ModalRoute.of(context)!.settings.arguments as Exercise;
 
     return Scaffold(
       appBar: AppBar(
-        title: Text(exerciseBase.getExercise(Localizations.localeOf(context).languageCode).name),
+        title: Text(exercise.getTranslation(Localizations.localeOf(context).languageCode).name),
       ),
       body: Padding(
         padding: const EdgeInsets.symmetric(horizontal: 10),
-        child: ExerciseDetail(exerciseBase),
+        child: ExerciseDetail(exercise),
       ),
     );
   }
diff --git a/lib/screens/exercises_screen.dart b/lib/screens/exercises_screen.dart
index d12ce9bc..6c335025 100644
--- a/lib/screens/exercises_screen.dart
+++ b/lib/screens/exercises_screen.dart
@@ -9,6 +9,7 @@ import 'package:wger/widgets/exercises/list_tile.dart';
 
 class ExercisesScreen extends StatefulWidget {
   const ExercisesScreen({super.key});
+
   static const routeName = '/exercises';
 
   @override
@@ -16,23 +17,8 @@ class ExercisesScreen extends StatefulWidget {
 }
 
 class _ExercisesScreenState extends State<ExercisesScreen> {
-  late final TextEditingController _exerciseNameController;
-
-  @override
-  void initState() {
-    _exerciseNameController = TextEditingController();
-    super.initState();
-  }
-
-  @override
-  void dispose() {
-    _exerciseNameController.dispose();
-    super.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
-    //final size = MediaQuery.of(context).size;
     final exercisesList = Provider.of<ExercisesProvider>(context).filteredExercises;
 
     return Scaffold(
@@ -43,9 +29,13 @@ class _ExercisesScreenState extends State<ExercisesScreen> {
           Expanded(
             child: exercisesList.isEmpty
                 ? const Center(
-                    child: SizedBox(height: 100, width: 100, child: CircularProgressIndicator()),
+                    child: SizedBox(
+                      height: 30,
+                      width: 30,
+                      child: CircularProgressIndicator(),
+                    ),
                   )
-                : _ExercisesList(exerciseBaseList: exercisesList),
+                : _ExercisesList(exerciseList: exercisesList),
           ),
         ],
       ),
@@ -54,28 +44,18 @@ class _ExercisesScreenState extends State<ExercisesScreen> {
 }
 
 class _ExercisesList extends StatelessWidget {
-  const _ExercisesList({required this.exerciseBaseList});
+  const _ExercisesList({required this.exerciseList});
 
-  final List<Exercise> exerciseBaseList;
+  final List<Exercise> exerciseList;
 
   @override
   Widget build(BuildContext context) {
-    //final size = MediaQuery.of(context).size;
     return ListView.separated(
       separatorBuilder: (context, index) {
         return const Divider(thickness: 1);
       },
-      itemCount: exerciseBaseList.length,
-      itemBuilder: (context, index) {
-        return ExerciseListTile(exerciseBase: exerciseBaseList[index]);
-
-        /*
-        return Container(
-          height: size.height * 0.175,
-          child: ExerciseListTile(exercise: exercise),
-        );
-        */
-      },
+      itemCount: exerciseList.length,
+      itemBuilder: (context, index) => ExerciseListTile(exercise: exerciseList[index]),
     );
   }
 }
diff --git a/lib/screens/gym_mode.dart b/lib/screens/gym_mode.dart
index cdbcb5b8..8e28b527 100644
--- a/lib/screens/gym_mode.dart
+++ b/lib/screens/gym_mode.dart
@@ -18,22 +18,41 @@
 
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import 'package:wger/models/workouts/day.dart';
-import 'package:wger/providers/workout_plans.dart';
-import 'package:wger/widgets/workouts/gym_mode.dart';
+import 'package:wger/providers/routines.dart';
+import 'package:wger/widgets/routines/gym_mode/gym_mode.dart';
+
+class GymModeArguments {
+  final int routineId;
+  final int dayId;
+  final int iteration;
+
+  const GymModeArguments(this.routineId, this.dayId, this.iteration);
+}
 
 class GymModeScreen extends StatelessWidget {
   const GymModeScreen();
+
   static const routeName = '/gym-mode';
 
   @override
   Widget build(BuildContext context) {
-    final day = ModalRoute.of(context)!.settings.arguments as Day;
+    final args = ModalRoute.of(context)!.settings.arguments as GymModeArguments;
+
+    final routinesProvider = context.read<RoutinesProvider>();
+    final routine = routinesProvider.findById(args.routineId);
+    final dayDataDisplay = routine.dayData.firstWhere(
+      (e) => e.iteration == args.iteration && e.day?.id == args.dayId,
+    );
+    final dayDataGym = routine.dayDataGym
+        .where((e) => e.iteration == args.iteration && e.day?.id == args.dayId)
+        .first;
 
     return Scaffold(
+      // backgroundColor: Theme.of(context).cardColor,
+      // primary: false,
       body: SafeArea(
-        child: Consumer<WorkoutPlansProvider>(
-          builder: (context, value, child) => GymMode(day),
+        child: Consumer<RoutinesProvider>(
+          builder: (context, value, child) => GymMode(dayDataGym, dayDataDisplay, args.iteration),
         ),
       ),
     );
diff --git a/lib/screens/home_tabs_screen.dart b/lib/screens/home_tabs_screen.dart
index efacb409..f19ca63d 100644
--- a/lib/screens/home_tabs_screen.dart
+++ b/lib/screens/home_tabs_screen.dart
@@ -29,16 +29,18 @@ import 'package:wger/providers/exercises.dart';
 import 'package:wger/providers/gallery.dart';
 import 'package:wger/providers/measurement.dart';
 import 'package:wger/providers/nutrition.dart';
+import 'package:wger/providers/routines.dart';
 import 'package:wger/providers/user.dart';
-import 'package:wger/providers/workout_plans.dart';
 import 'package:wger/screens/dashboard.dart';
 import 'package:wger/screens/gallery_screen.dart';
 import 'package:wger/screens/nutritional_plans_screen.dart';
+import 'package:wger/screens/routine_list_screen.dart';
 import 'package:wger/screens/weight_screen.dart';
-import 'package:wger/screens/workout_plans_screen.dart';
 
 class HomeTabsScreen extends StatefulWidget {
-  const HomeTabsScreen();
+  final _logger = Logger('HomeTabsScreen');
+
+  HomeTabsScreen();
 
   static const routeName = '/dashboard2';
 
@@ -48,6 +50,7 @@ class HomeTabsScreen extends StatefulWidget {
 
 class _HomeTabsScreenState extends State<HomeTabsScreen> with SingleTickerProviderStateMixin {
   late Future<void> _initialData;
+  bool _errorHandled = false;
   int _selectedIndex = 0;
 
   @override
@@ -69,7 +72,7 @@ class _HomeTabsScreenState extends State<HomeTabsScreen> with SingleTickerProvid
 
   final _screenList = [
     const DashboardScreen(),
-    const WorkoutPlansScreen(),
+    const RoutineListScreen(),
     const NutritionalPlansScreen(),
     const WeightScreen(),
     const GalleryScreen(),
@@ -99,7 +102,7 @@ class _HomeTabsScreenState extends State<HomeTabsScreen> with SingleTickerProvid
     final authProvider = context.read<AuthProvider>();
 
     if (!authProvider.dataInit) {
-      final workoutPlansProvider = context.read<WorkoutPlansProvider>();
+      final routinesProvider = context.read<RoutinesProvider>();
       final nutritionPlansProvider = context.read<NutritionPlansProvider>();
       final exercisesProvider = context.read<ExercisesProvider>();
       final galleryProvider = context.read<GalleryProvider>();
@@ -107,41 +110,53 @@ class _HomeTabsScreenState extends State<HomeTabsScreen> with SingleTickerProvid
       final measurementProvider = context.read<MeasurementProvider>();
       final userProvider = context.read<UserProvider>();
 
+      //
       // Base data
-      log.log(Level.FINER, Level.FINER, 'Loading base data');
-      try {
-        await Future.wait([
-          authProvider.setServerVersion(),
-          userProvider.fetchAndSetProfile(),
-          workoutPlansProvider.fetchAndSetUnits(),
-          nutritionPlansProvider.fetchIngredientsFromCache(),
-          exercisesProvider.fetchAndSetInitialData(),
-        ]);
-      } catch (e) {
-        log.log(Level.FINER, 'Exception loading base data');
-        log.log(Level.FINER, e.toString());
+      widget._logger.info('Loading base data');
+      await Future.wait([
+        authProvider.setServerVersion(),
+        userProvider.fetchAndSetProfile(),
+        routinesProvider.fetchAndSetUnits(),
+        nutritionPlansProvider.fetchIngredientsFromCache(),
+        exercisesProvider.fetchAndSetInitialData(),
+      ]);
+      exercisesProvider.fetchAndSetAllExercises();
+
+      // Workaround for https://github.com/wger-project/flutter/issues/901
+      // It seems that it can happen that sometimes the units were not loaded properly
+      // so now we check and try again if necessary. We might need a better general
+      // solution since this could potentially happen with other data as well.
+      if (routinesProvider.repetitionUnits.isEmpty || routinesProvider.weightUnits.isEmpty) {
+        widget._logger.info('Routine units are empty, fetching again');
+        await routinesProvider.fetchAndSetUnits();
       }
 
+      //
       // Plans, weight and gallery
-      log.log(Level.FINER, 'Loading workouts, weight, measurements and gallery');
-      try {
-        await Future.wait([
-          galleryProvider.fetchAndSetGallery(),
-          workoutPlansProvider.fetchAndSetAllPlansSparse(),
-          weightProvider.fetchAndSetEntries(),
-          measurementProvider.fetchAndSetAllCategoriesAndEntries(),
-        ]);
-      } catch (e) {
-        log.log(Level.FINER, 'Exception loading plans, weight, measurements and gallery');
-        log.log(Level.FINER, e.toString());
+      widget._logger.info('Loading routines, weight, measurements and gallery');
+      await Future.wait([
+        galleryProvider.fetchAndSetGallery(),
+        nutritionPlansProvider.fetchAndSetAllPlansSparse(),
+        routinesProvider.fetchAndSetAllRoutinesSparse(),
+        // routinesProvider.fetchAndSetAllRoutinesFull(),
+        weightProvider.fetchAndSetEntries(),
+        measurementProvider.fetchAndSetAllCategoriesAndEntries(),
+      ]);
+
+      //
+      // Current nutritional plan
+      widget._logger.info('Loading current nutritional plan');
+      if (nutritionPlansProvider.currentPlan != null) {
+        final plan = nutritionPlansProvider.currentPlan!;
+        await nutritionPlansProvider.fetchAndSetPlanFull(plan.id!);
       }
 
-      // Current workout plan
-      log.log(Level.FINER, 'Loading current workout plan');
-      if (workoutPlansProvider.activePlan != null) {
-        final planId = workoutPlansProvider.activePlan!.id!;
-        await workoutPlansProvider.fetchAndSetWorkoutPlanFull(planId);
-        workoutPlansProvider.setCurrentPlan(planId);
+      //
+      // Current routine
+      widget._logger.info('Loading current routine');
+      if (routinesProvider.currentRoutine != null) {
+        final planId = routinesProvider.currentRoutine!.id!;
+        await routinesProvider.fetchAndSetRoutineFull(planId);
       }
     }
 
@@ -153,62 +168,95 @@ class _HomeTabsScreenState extends State<HomeTabsScreen> with SingleTickerProvid
     return FutureBuilder<void>(
       future: _initialData,
       builder: (context, snapshot) {
+        if (snapshot.hasError) {
+          // Throw the original error with the original stack trace, otherwise
+          // the error will only point to these lines here
+          if (!_errorHandled) {
+            _errorHandled = true;
+            final error = snapshot.error;
+            final stackTrace = snapshot.stackTrace;
+
+            WidgetsBinding.instance.addPostFrameCallback((_) {
+              if (mounted) {
+                if (error != null && stackTrace != null) {
+                  throw Error.throwWithStackTrace(error, stackTrace);
+                }
+                throw error!;
+              }
+            });
+          }
+
+          // Note that we continue to show the app, even if there was an error.
+          // return const Scaffold(body: LoadingWidget());
+        }
+
         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,
-                  ),
-                ],
-              ),
-            ),
-          );
-        } else {
-          return Scaffold(
-            body: _screenList.elementAt(_selectedIndex),
-            bottomNavigationBar: NavigationBar(
-              destinations: [
-                NavigationDestination(
-                  icon: const Icon(Icons.home),
-                  label: AppLocalizations.of(context).labelDashboard,
-                ),
-                NavigationDestination(
-                  icon: const Icon(Icons.fitness_center),
-                  label: AppLocalizations.of(context).labelBottomNavWorkout,
-                ),
-                NavigationDestination(
-                  icon: const Icon(Icons.restaurant),
-                  label: AppLocalizations.of(context).labelBottomNavNutrition,
-                ),
-                NavigationDestination(
-                  icon: const FaIcon(FontAwesomeIcons.weightScale, size: 20),
-                  label: AppLocalizations.of(context).weight,
-                ),
-                NavigationDestination(
-                  icon: const Icon(Icons.photo_library),
-                  label: AppLocalizations.of(context).gallery,
-                ),
-              ],
-              onDestinationSelected: _onItemTapped,
-              selectedIndex: _selectedIndex,
-              labelBehavior: NavigationDestinationLabelBehavior.alwaysHide,
-            ),
+          return const Scaffold(
+            body: LoadingWidget(),
           );
         }
+
+        return Scaffold(
+          body: _screenList.elementAt(_selectedIndex),
+          bottomNavigationBar: NavigationBar(
+            destinations: [
+              NavigationDestination(
+                icon: const Icon(Icons.home),
+                label: AppLocalizations.of(context).labelDashboard,
+              ),
+              NavigationDestination(
+                icon: const Icon(Icons.fitness_center),
+                label: AppLocalizations.of(context).labelBottomNavWorkout,
+              ),
+              NavigationDestination(
+                icon: const Icon(Icons.restaurant),
+                label: AppLocalizations.of(context).labelBottomNavNutrition,
+              ),
+              NavigationDestination(
+                icon: const FaIcon(FontAwesomeIcons.weightScale, size: 20),
+                label: AppLocalizations.of(context).weight,
+              ),
+              NavigationDestination(
+                icon: const Icon(Icons.photo_library),
+                label: AppLocalizations.of(context).gallery,
+              ),
+            ],
+            onDestinationSelected: _onItemTapped,
+            selectedIndex: _selectedIndex,
+            labelBehavior: NavigationDestinationLabelBehavior.alwaysHide,
+          ),
+        );
       },
     );
   }
 }
+
+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/log_meal_screen.dart b/lib/screens/log_meal_screen.dart
index 7cdef487..0f2566d2 100644
--- a/lib/screens/log_meal_screen.dart
+++ b/lib/screens/log_meal_screen.dart
@@ -18,6 +18,8 @@
 
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
+import 'package:wger/helpers/date.dart';
+import 'package:wger/helpers/json.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/models/nutrition/meal.dart';
 import 'package:wger/providers/nutrition.dart';
@@ -33,6 +35,7 @@ class LogMealArguments {
 
 class LogMealScreen extends StatefulWidget {
   const LogMealScreen();
+
   static const routeName = '/log-meal';
 
   @override
@@ -41,6 +44,23 @@ class LogMealScreen extends StatefulWidget {
 
 class _LogMealScreenState extends State<LogMealScreen> {
   double portionPct = 100;
+  final _dateController = TextEditingController();
+  final _timeController = TextEditingController();
+
+  @override
+  void initState() {
+    super.initState();
+
+    _dateController.text = dateToYYYYMMDD(DateTime.now())!;
+    _timeController.text = timeToString(TimeOfDay.now())!;
+  }
+
+  @override
+  void dispose() {
+    _dateController.dispose();
+    _timeController.dispose();
+    super.dispose();
+  }
 
   @override
   Widget build(BuildContext context) {
@@ -51,17 +71,22 @@ class _LogMealScreenState extends State<LogMealScreen> {
           .toList(),
     );
 
+    final i18n = AppLocalizations.of(context);
+
     return Scaffold(
-      appBar: AppBar(title: Text(AppLocalizations.of(context).logMeal)),
+      appBar: AppBar(title: Text(i18n.logMeal)),
       body: Consumer<NutritionPlansProvider>(
         builder: (context, nutritionProvider, child) => SingleChildScrollView(
           child: Padding(
             padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 16),
             child: Column(
               children: [
-                Text(meal.name, style: Theme.of(context).textTheme.headlineSmall),
+                Text(
+                  meal.name,
+                  style: Theme.of(context).textTheme.headlineSmall,
+                ),
                 if (meal.mealItems.isEmpty)
-                  ListTile(title: Text(AppLocalizations.of(context).noIngredientsDefined))
+                  ListTile(title: Text(i18n.noIngredientsDefined))
                 else
                   Column(
                     children: [
@@ -83,35 +108,99 @@ class _LogMealScreenState extends State<LogMealScreen> {
                       ),
                     ],
                   ),
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceAround,
+                  children: [
+                    const Padding(padding: EdgeInsets.symmetric(horizontal: 12)),
+                    Expanded(
+                      child: TextFormField(
+                        key: const ValueKey('field-date'),
+                        readOnly: true,
+                        decoration: InputDecoration(labelText: i18n.date),
+                        enableInteractiveSelection: false,
+                        controller: _dateController,
+                        onTap: () async {
+                          final pickedDate = await showDatePicker(
+                            context: context,
+                            initialDate: DateTime.now(),
+                            firstDate: DateTime(DateTime.now().year - 10),
+                            lastDate: DateTime.now(),
+                          );
+
+                          if (pickedDate != null) {
+                            _dateController.text = dateToYYYYMMDD(pickedDate)!;
+                          }
+                        },
+                        onSaved: (newValue) {
+                          _dateController.text = newValue!;
+                        },
+                      ),
+                    ),
+                    const Padding(padding: EdgeInsets.symmetric(horizontal: 12)),
+                    Expanded(
+                      child: TextFormField(
+                        key: const ValueKey('field-time'),
+                        readOnly: true,
+                        decoration: InputDecoration(labelText: i18n.time),
+                        controller: _timeController,
+                        onTap: () async {
+                          // Open time picker
+                          final pickedTime = await showTimePicker(
+                            context: context,
+                            initialTime: TimeOfDay.fromDateTime(DateTime.now()),
+                          );
+
+                          if (pickedTime != null) {
+                            _timeController.text = timeToString(pickedTime)!;
+                          }
+                        },
+                        onSaved: (newValue) {
+                          _timeController.text = newValue!;
+                        },
+                      ),
+                    ),
+                    const Padding(padding: EdgeInsets.symmetric(horizontal: 12)),
+                  ],
+                ),
+                const Padding(padding: EdgeInsets.symmetric(horizontal: 12, vertical: 8)),
                 Row(
                   mainAxisAlignment: MainAxisAlignment.end,
                   children: [
                     if (meal.mealItems.isNotEmpty)
                       TextButton(
-                        child: const Text('Log'),
+                        child: Text(i18n.save),
                         onPressed: () async {
+                          final loggedTime = getDateTimeFromDateAndTime(
+                            _dateController.text,
+                            _timeController.text,
+                          );
+
                           await Provider.of<NutritionPlansProvider>(
                             context,
                             listen: false,
-                          ).logMealToDiary(meal);
-                          // ignore: use_build_context_synchronously
-                          ScaffoldMessenger.of(context).showSnackBar(
-                            SnackBar(
-                              content: Text(
-                                // ignore: use_build_context_synchronously
-                                AppLocalizations.of(context).mealLogged,
-                                textAlign: TextAlign.center,
+                          ).logMealToDiary(meal, loggedTime);
+
+                          if (context.mounted) {
+                            ScaffoldMessenger.of(context).showSnackBar(
+                              SnackBar(
+                                content: Text(
+                                  i18n.mealLogged,
+                                  textAlign: TextAlign.center,
+                                ),
                               ),
-                            ),
-                          );
-                          Navigator.of(context).pop();
-                          if (args.popTwice) {
+                            );
+
                             Navigator.of(context).pop();
+                            if (args.popTwice) {
+                              Navigator.of(context).pop();
+                            }
                           }
                         },
                       ),
                     TextButton(
-                      child: Text(MaterialLocalizations.of(context).cancelButtonLabel),
+                      child: Text(
+                        MaterialLocalizations.of(context).cancelButtonLabel,
+                      ),
                       onPressed: () => Navigator.of(context).pop(),
                     ),
                   ],
diff --git a/lib/screens/log_meals_screen.dart b/lib/screens/log_meals_screen.dart
index c241d1d9..45b8ae4f 100644
--- a/lib/screens/log_meals_screen.dart
+++ b/lib/screens/log_meals_screen.dart
@@ -19,10 +19,12 @@
 import 'package:flutter/material.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/models/nutrition/nutritional_plan.dart';
+import 'package:wger/screens/nutritional_plan_screen.dart';
 import 'package:wger/widgets/nutrition/meal.dart';
 
 class LogMealsScreen extends StatefulWidget {
   const LogMealsScreen();
+
   static const routeName = '/log-meals';
 
   @override
@@ -37,11 +39,58 @@ class _LogMealsScreenState extends State<LogMealsScreen> {
     final nutritionalPlan = ModalRoute.of(context)!.settings.arguments as NutritionalPlan;
 
     return Scaffold(
-      appBar: AppBar(title: Text(AppLocalizations.of(context).selectMealToLog)),
-      body: ListView.builder(
-        itemCount: nutritionalPlan.meals.length,
-        itemBuilder: (context, index) =>
-            MealWidget(nutritionalPlan.meals[index], nutritionalPlan.dedupMealItems, true, true),
+      appBar: AppBar(
+        title: Text(AppLocalizations.of(context).selectMealToLog),
+      ),
+      body: Column(
+        children: [
+          // Meals list or empty state
+          Expanded(
+            child: nutritionalPlan.meals.isEmpty
+                ? Center(
+                    child: Padding(
+                      padding: const EdgeInsets.all(16.0),
+                      child: Text(
+                        AppLocalizations.of(context).yourCurrentNutritionPlanHasNoMealsDefinedYet,
+                        textAlign: TextAlign.center,
+                        style: Theme.of(context).textTheme.titleMedium,
+                      ),
+                    ),
+                  )
+                : ListView.builder(
+                    itemCount: nutritionalPlan.meals.length,
+                    itemBuilder: (context, index) => MealWidget(
+                      nutritionalPlan.meals[index],
+                      nutritionalPlan.dedupMealItems,
+                      true,
+                      true,
+                    ),
+                  ),
+          ),
+          const SizedBox(height: 16),
+          Padding(
+            padding: const EdgeInsets.only(left: 16.0, right: 16.0, top: 8.0, bottom: 32.0),
+            child: Column(
+              children: [
+                Text(
+                  AppLocalizations.of(context).toAddMealsToThePlanGoToNutritionalPlanDetails,
+                  textAlign: TextAlign.center,
+                  style: Theme.of(context).textTheme.bodyMedium,
+                ),
+                const SizedBox(height: 8),
+                TextButton(
+                  child: Text(AppLocalizations.of(context).goToDetailPage),
+                  onPressed: () {
+                    Navigator.of(context).pushReplacementNamed(
+                      NutritionalPlanScreen.routeName,
+                      arguments: nutritionalPlan,
+                    );
+                  },
+                ),
+              ],
+            ),
+          ),
+        ],
       ),
     );
   }
diff --git a/lib/screens/measurement_categories_screen.dart b/lib/screens/measurement_categories_screen.dart
index e65fda11..e336dfed 100644
--- a/lib/screens/measurement_categories_screen.dart
+++ b/lib/screens/measurement_categories_screen.dart
@@ -26,6 +26,7 @@ import 'package:wger/widgets/measurements/forms.dart';
 
 class MeasurementCategoriesScreen extends StatelessWidget {
   const MeasurementCategoriesScreen();
+
   static const routeName = '/measurement-categories';
 
   @override
diff --git a/lib/screens/measurement_entries_screen.dart b/lib/screens/measurement_entries_screen.dart
index 492b8195..9ed535fe 100644
--- a/lib/screens/measurement_entries_screen.dart
+++ b/lib/screens/measurement_entries_screen.dart
@@ -28,6 +28,7 @@ enum MeasurementOptions { edit, delete }
 
 class MeasurementEntriesScreen extends StatelessWidget {
   const MeasurementEntriesScreen();
+
   static const routeName = '/measurement-entries';
 
   @override
diff --git a/lib/screens/nutritional_plan_screen.dart b/lib/screens/nutritional_plan_screen.dart
index 0cd36bd7..29c5b456 100644
--- a/lib/screens/nutritional_plan_screen.dart
+++ b/lib/screens/nutritional_plan_screen.dart
@@ -33,6 +33,7 @@ enum NutritionalPlanOptions { edit, delete }
 
 class NutritionalPlanScreen extends StatefulWidget {
   const NutritionalPlanScreen();
+
   static const routeName = '/nutritional-plan-detail';
 
   @override
@@ -75,140 +76,144 @@ class _NutritionalPlanScreenState extends State<NutritionalPlanScreen> {
 
     return Scaffold(
       //appBar: getAppBar(nutritionalPlan),
-      floatingActionButton: _plan == null
-          ? const Offstage()
-          : Row(
-              mainAxisAlignment: MainAxisAlignment.end,
-              children: [
-                FloatingActionButton(
-                  heroTag: null,
-                  tooltip: AppLocalizations.of(context).logIngredient,
+      floatingActionButton: Row(
+        mainAxisAlignment: MainAxisAlignment.end,
+        children: [
+          FloatingActionButton(
+            heroTag: null,
+            tooltip: AppLocalizations.of(context).logIngredient,
+            onPressed: () {
+              Navigator.pushNamed(
+                context,
+                FormScreen.routeName,
+                arguments: FormScreenArguments(
+                  AppLocalizations.of(context).logIngredient,
+                  getIngredientLogForm(nutritionalPlan),
+                  hasListView: true,
+                ),
+              );
+            },
+            child: const SvgIcon(
+              icon: SvgIconData('assets/icons/ingredient-diary.svg'),
+              color: Colors.white,
+            ),
+          ),
+          const SizedBox(width: 8),
+          FloatingActionButton(
+            heroTag: null,
+            tooltip: AppLocalizations.of(context).logMeal,
+            onPressed: () {
+              Navigator.of(context).pushNamed(
+                LogMealsScreen.routeName,
+                arguments: nutritionalPlan,
+              );
+            },
+            child: const SvgIcon(
+              icon: SvgIconData('assets/icons/meal-diary.svg'),
+              color: Colors.white,
+            ),
+          ),
+        ],
+      ),
+      body: CustomScrollView(
+        slivers: [
+          SliverAppBar(
+            foregroundColor: appBarForeground,
+            pinned: true,
+            iconTheme: const IconThemeData(color: appBarForeground),
+            actions: [
+              if (!nutritionalPlan.onlyLogging)
+                IconButton(
+                  icon: const SvgIcon(
+                    icon: SvgIconData('assets/icons/meal-add.svg'),
+                  ),
                   onPressed: () {
                     Navigator.pushNamed(
                       context,
                       FormScreen.routeName,
                       arguments: FormScreenArguments(
-                        AppLocalizations.of(context).logIngredient,
-                        IngredientLogForm(_plan!),
-                        hasListView: true,
+                        AppLocalizations.of(context).addMeal,
+                        MealForm(nutritionalPlan.id!),
                       ),
                     );
                   },
-                  child: const SvgIcon(
-                    icon: SvgIconData('assets/icons/ingredient-diary.svg'),
-                    color: Colors.white,
-                  ),
                 ),
-                const SizedBox(width: 8),
-                FloatingActionButton(
-                  heroTag: null,
-                  tooltip: AppLocalizations.of(context).logMeal,
-                  onPressed: () {
-                    Navigator.of(context).pushNamed(LogMealsScreen.routeName, arguments: _plan);
-                  },
-                  child: const SvgIcon(
-                    icon: SvgIconData('assets/icons/meal-diary.svg'),
-                    color: Colors.white,
-                  ),
-                ),
-              ],
-            ),
-      body: _plan == null
-          ? const Text('plan not found')
-          : CustomScrollView(
-              slivers: [
-                SliverAppBar(
-                  foregroundColor: appBarForeground,
-                  pinned: true,
-                  iconTheme: const IconThemeData(color: appBarForeground),
-                  actions: [
-                    if (!_plan!.onlyLogging)
-                      IconButton(
-                        icon: const SvgIcon(icon: SvgIconData('assets/icons/meal-add.svg')),
-                        onPressed: () {
-                          Navigator.pushNamed(
-                            context,
-                            FormScreen.routeName,
-                            arguments: FormScreenArguments(
-                              AppLocalizations.of(context).addMeal,
-                              MealForm(_plan!.id!),
-                            ),
-                          );
-                        },
-                      ),
-                    PopupMenuButton<NutritionalPlanOptions>(
-                      icon: const Icon(Icons.more_vert, color: appBarForeground),
-                      onSelected: (value) {
-                        switch (value) {
-                          case NutritionalPlanOptions.edit:
-                            Navigator.pushNamed(
-                              context,
-                              FormScreen.routeName,
-                              arguments: FormScreenArguments(
-                                AppLocalizations.of(context).edit,
-                                PlanForm(_plan),
-                                hasListView: true,
-                              ),
-                            );
-                            break;
-                          case NutritionalPlanOptions.delete:
-                            Provider.of<NutritionPlansProvider>(
-                              context,
-                              listen: false,
-                            ).deletePlan(_plan!.id!);
-                            Navigator.of(context).pop();
-                            break;
-                        }
-                      },
-                      itemBuilder: (BuildContext context) {
-                        return [
-                          PopupMenuItem<NutritionalPlanOptions>(
-                            value: NutritionalPlanOptions.edit,
-                            child: ListTile(
-                              leading: const Icon(Icons.edit),
-                              title: Text(AppLocalizations.of(context).edit),
-                            ),
-                          ),
-                          const PopupMenuDivider(),
-                          PopupMenuItem<NutritionalPlanOptions>(
-                            value: NutritionalPlanOptions.delete,
-                            child: ListTile(
-                              leading: const Icon(Icons.delete),
-                              title: Text(AppLocalizations.of(context).delete),
-                            ),
-                          ),
-                        ];
-                      },
-                    ),
-                  ],
-                  flexibleSpace: FlexibleSpaceBar(
-                    titlePadding: const EdgeInsets.fromLTRB(56, 0, 56, 16),
-                    title: Text(
-                      _plan!.getLabel(context),
-                      style: Theme.of(
+              PopupMenuButton<NutritionalPlanOptions>(
+                icon: const Icon(Icons.more_vert, color: appBarForeground),
+                onSelected: (value) {
+                  switch (value) {
+                    case NutritionalPlanOptions.edit:
+                      Navigator.pushNamed(
                         context,
-                      ).textTheme.titleLarge?.copyWith(color: appBarForeground),
-                    ),
-                  ),
-                ),
-                FutureBuilder(
-                  future: NutritionalPlan.read(_plan!.id!),
-                  builder: (context, AsyncSnapshot<NutritionalPlan> snapshot) =>
-                      snapshot.connectionState == ConnectionState.waiting
-                      ? SliverList(
-                          delegate: SliverChildListDelegate([
-                            const SizedBox(
-                              height: 200,
-                              child: Center(child: CircularProgressIndicator()),
-                            ),
-                          ]),
-                        )
-                      : Consumer<NutritionPlansProvider>(
-                          builder: (context, value, child) => NutritionalPlanDetailWidget(_plan!),
+                        FormScreen.routeName,
+                        arguments: FormScreenArguments(
+                          AppLocalizations.of(context).edit,
+                          PlanForm(nutritionalPlan),
+                          hasListView: true,
                         ),
-                ),
-              ],
+                      );
+                      break;
+                    case NutritionalPlanOptions.delete:
+                      Provider.of<NutritionPlansProvider>(
+                        context,
+                        listen: false,
+                      ).deletePlan(nutritionalPlan.id!);
+                      Navigator.of(context).pop();
+                      break;
+                  }
+                },
+                itemBuilder: (BuildContext context) {
+                  return [
+                    PopupMenuItem<NutritionalPlanOptions>(
+                      value: NutritionalPlanOptions.edit,
+                      child: ListTile(
+                        leading: const Icon(Icons.edit),
+                        title: Text(AppLocalizations.of(context).edit),
+                      ),
+                    ),
+                    const PopupMenuDivider(),
+                    PopupMenuItem<NutritionalPlanOptions>(
+                      value: NutritionalPlanOptions.delete,
+                      child: ListTile(
+                        leading: const Icon(Icons.delete),
+                        title: Text(AppLocalizations.of(context).delete),
+                      ),
+                    ),
+                  ];
+                },
+              ),
+            ],
+            flexibleSpace: FlexibleSpaceBar(
+              titlePadding: const EdgeInsets.fromLTRB(56, 0, 56, 16),
+              title: Text(
+                nutritionalPlan.getLabel(context),
+                style: Theme.of(context).textTheme.titleLarge?.copyWith(color: appBarForeground),
+              ),
             ),
+          ),
+          FutureBuilder(
+            future: _loadFullPlan(context, nutritionalPlan.id!),
+            builder: (context, AsyncSnapshot<NutritionalPlan> snapshot) =>
+                snapshot.connectionState == ConnectionState.waiting
+                ? SliverList(
+                    delegate: SliverChildListDelegate(
+                      [
+                        const SizedBox(
+                          height: 200,
+                          child: Center(
+                            child: CircularProgressIndicator(),
+                          ),
+                        ),
+                      ],
+                    ),
+                  )
+                : Consumer<NutritionPlansProvider>(
+                    builder: (context, value, child) =>
+                        NutritionalPlanDetailWidget(nutritionalPlan),
+                  ),
+          ),
+        ],
+      ),
     );
   }
 }
diff --git a/lib/screens/nutritional_plans_screen.dart b/lib/screens/nutritional_plans_screen.dart
index f15592c8..030757f5 100644
--- a/lib/screens/nutritional_plans_screen.dart
+++ b/lib/screens/nutritional_plans_screen.dart
@@ -27,6 +27,7 @@ import 'package:wger/widgets/nutrition/nutritional_plans_list.dart';
 
 class NutritionalPlansScreen extends StatelessWidget {
   const NutritionalPlansScreen();
+
   static const routeName = '/nutrition';
 
   @override
diff --git a/test/other/extensions_test.dart b/lib/screens/routine_edit_screen.dart
similarity index 57%
rename from test/other/extensions_test.dart
rename to lib/screens/routine_edit_screen.dart
index c3140fca..a858a509 100644
--- a/test/other/extensions_test.dart
+++ b/lib/screens/routine_edit_screen.dart
@@ -17,20 +17,24 @@
  */
 
 import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:wger/helpers/misc.dart';
+import 'package:provider/provider.dart';
+import 'package:wger/providers/routines.dart';
+import 'package:wger/widgets/core/app_bar.dart';
+import 'package:wger/widgets/routines/routine_edit.dart';
 
-void main() {
-  test('Test the TimeOfDayExtension', () {
-    const time1 = TimeOfDay(hour: 00, minute: 00);
-    const time2 = TimeOfDay(hour: 23, minute: 59);
+class RoutineEditScreen extends StatelessWidget {
+  const RoutineEditScreen();
 
-    expect(time2.toMinutes(), 23 * 60 + 59);
-    expect(time1.isAfter(time2), false);
-    expect(time1.isBefore(time2), true);
-    expect(time2.isAfter(time1), true);
-    expect(time2.isBefore(time1), false);
-    expect(time1.isAfter(time1), false);
-    expect(time2.isBefore(time2), false);
-  });
+  static const routeName = '/routine-edit';
+
+  @override
+  Widget build(BuildContext context) {
+    final routineId = ModalRoute.of(context)!.settings.arguments as int;
+    final routine = Provider.of<RoutinesProvider>(context).findById(routineId);
+
+    return Scaffold(
+      appBar: EmptyAppBar(routine.name),
+      body: RoutineEdit(routine),
+    );
+  }
 }
diff --git a/lib/screens/workout_plans_screen.dart b/lib/screens/routine_list_screen.dart
similarity index 68%
rename from lib/screens/workout_plans_screen.dart
rename to lib/screens/routine_list_screen.dart
index fe55020f..4400c5ff 100644
--- a/lib/screens/workout_plans_screen.dart
+++ b/lib/screens/routine_list_screen.dart
@@ -19,36 +19,38 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
-import 'package:wger/models/workouts/workout_plan.dart';
-import 'package:wger/providers/workout_plans.dart';
+import 'package:wger/models/workouts/routine.dart';
+import 'package:wger/providers/routines.dart';
 import 'package:wger/screens/form_screen.dart';
-import 'package:wger/widgets/workouts/app_bar.dart';
-import 'package:wger/widgets/workouts/forms.dart';
-import 'package:wger/widgets/workouts/workout_plans_list.dart';
+import 'package:wger/widgets/routines/app_bar.dart';
+import 'package:wger/widgets/routines/forms/routine.dart';
+import 'package:wger/widgets/routines/routines_list.dart';
+
+class RoutineListScreen extends StatelessWidget {
+  const RoutineListScreen();
 
-class WorkoutPlansScreen extends StatelessWidget {
-  const WorkoutPlansScreen();
   static const routeName = '/workout-plans-list';
 
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: const WorkoutOverviewAppBar(),
+      appBar: const RoutineListAppBar(),
       floatingActionButton: FloatingActionButton(
         onPressed: () {
           Navigator.pushNamed(
             context,
             FormScreen.routeName,
             arguments: FormScreenArguments(
-              AppLocalizations.of(context).newWorkout,
-              WorkoutForm(WorkoutPlan.empty()),
+              AppLocalizations.of(context).newRoutine,
+              RoutineForm(Routine.empty(), useListView: true),
+              hasListView: true,
             ),
           );
         },
         child: const Icon(Icons.add, color: Colors.white),
       ),
-      body: Consumer<WorkoutPlansProvider>(
-        builder: (context, workoutProvider, child) => WorkoutPlansList(workoutProvider),
+      body: Consumer<RoutinesProvider>(
+        builder: (context, workoutProvider, child) => RoutinesList(workoutProvider),
       ),
     );
   }
diff --git a/lib/screens/routine_logs_screen.dart b/lib/screens/routine_logs_screen.dart
new file mode 100644
index 00000000..ab97ebe4
--- /dev/null
+++ b/lib/screens/routine_logs_screen.dart
@@ -0,0 +1,40 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:wger/providers/routines.dart';
+import 'package:wger/widgets/core/app_bar.dart';
+import 'package:wger/widgets/routines/workout_logs.dart';
+
+class WorkoutLogsScreen extends StatelessWidget {
+  const WorkoutLogsScreen();
+
+  static const routeName = '/workout-logs';
+
+  @override
+  Widget build(BuildContext context) {
+    final routineId = ModalRoute.of(context)!.settings.arguments as int;
+    final routine = Provider.of<RoutinesProvider>(context).findById(routineId);
+
+    return Scaffold(
+      appBar: EmptyAppBar(routine.name),
+      body: WorkoutLogs(routine),
+    );
+  }
+}
diff --git a/lib/screens/routine_screen.dart b/lib/screens/routine_screen.dart
new file mode 100644
index 00000000..d5a3eb11
--- /dev/null
+++ b/lib/screens/routine_screen.dart
@@ -0,0 +1,46 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:wger/providers/routines.dart';
+import 'package:wger/widgets/routines/app_bar.dart';
+import 'package:wger/widgets/routines/routine_detail.dart';
+
+class RoutineScreen extends StatelessWidget {
+  const RoutineScreen({super.key});
+
+  static const routeName = '/routine-detail';
+
+  @override
+  Widget build(BuildContext context) {
+    final routineId = ModalRoute.of(context)!.settings.arguments as int;
+    final provider = context.read<RoutinesProvider>();
+
+    final routine = provider.findById(routineId);
+
+    return Scaffold(
+      appBar: RoutineDetailAppBar(routine),
+      body: SingleChildScrollView(
+        child: Consumer<RoutinesProvider>(
+          builder: (context, value, child) => RoutineDetail(routine),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/screens/update_app_screen.dart b/lib/screens/update_app_screen.dart
index 2e2cc156..2b01eeec 100644
--- a/lib/screens/update_app_screen.dart
+++ b/lib/screens/update_app_screen.dart
@@ -21,6 +21,7 @@ import 'package:wger/l10n/generated/app_localizations.dart';
 
 class UpdateAppScreen extends StatelessWidget {
   const UpdateAppScreen();
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -29,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/lib/screens/weight_screen.dart b/lib/screens/weight_screen.dart
index 64d48111..6c91935c 100644
--- a/lib/screens/weight_screen.dart
+++ b/lib/screens/weight_screen.dart
@@ -27,30 +27,29 @@ import 'package:wger/widgets/weight/weight_overview.dart';
 
 class WeightScreen extends StatelessWidget {
   const WeightScreen();
+
   static const routeName = '/weight';
 
   @override
   Widget build(BuildContext context) {
-    final lastWeightEntry = context.read<BodyWeightProvider>().getNewestEntry();
-
     return Scaffold(
       appBar: EmptyAppBar(AppLocalizations.of(context).weight),
       floatingActionButton: FloatingActionButton(
         child: const Icon(Icons.add, color: Colors.white),
-        onPressed: () async {
+        onPressed: () {
           Navigator.pushNamed(
             context,
             FormScreen.routeName,
             arguments: FormScreenArguments(
               AppLocalizations.of(context).newEntry,
-              WeightForm(lastWeightEntry?.copyWith(id: null, date: DateTime.now())),
+              WeightForm(),
             ),
           );
         },
       ),
       body: SingleChildScrollView(
         child: Consumer<BodyWeightProvider>(
-          builder: (context, workoutProvider, child) => const WeightOverview(),
+          builder: (context, provider, child) => WeightOverview(provider),
         ),
       ),
     );
diff --git a/lib/screens/workout_plan_screen.dart b/lib/screens/workout_plan_screen.dart
deleted file mode 100644
index f07bdfc8..00000000
--- a/lib/screens/workout_plan_screen.dart
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * This file is part of wger Workout Manager <https://github.com/wger-project>.
- * Copyright (C) 2020, 2021 wger Team
- *
- * wger Workout Manager is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * wger Workout Manager is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import 'package:wger/l10n/generated/app_localizations.dart';
-import 'package:wger/models/workouts/workout_plan.dart';
-import 'package:wger/providers/workout_plans.dart';
-import 'package:wger/screens/form_screen.dart';
-import 'package:wger/theme/theme.dart';
-import 'package:wger/widgets/workouts/forms.dart';
-import 'package:wger/widgets/workouts/workout_logs.dart';
-import 'package:wger/widgets/workouts/workout_plan_detail.dart';
-
-enum WorkoutScreenMode { workout, log }
-
-enum WorkoutOptions { edit, delete }
-
-class WorkoutPlanScreen extends StatefulWidget {
-  const WorkoutPlanScreen();
-  static const routeName = '/workout-plan-detail';
-
-  @override
-  _WorkoutPlanScreenState createState() => _WorkoutPlanScreenState();
-}
-
-class _WorkoutPlanScreenState extends State<WorkoutPlanScreen> {
-  WorkoutScreenMode _mode = WorkoutScreenMode.workout;
-
-  void _changeMode(WorkoutScreenMode newMode) {
-    setState(() {
-      _mode = newMode;
-    });
-  }
-
-  Future<WorkoutPlan> _loadFullWorkout(BuildContext context, int planId) {
-    return Provider.of<WorkoutPlansProvider>(
-      context,
-      listen: false,
-    ).fetchAndSetWorkoutPlanFull(planId);
-  }
-
-  Widget getBody(WorkoutPlan plan) {
-    switch (_mode) {
-      case WorkoutScreenMode.workout:
-        return WorkoutPlanDetail(plan, _changeMode);
-
-      case WorkoutScreenMode.log:
-        return WorkoutLogs(plan, _changeMode);
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    const appBarForeground = Colors.white;
-    final workoutPlan = ModalRoute.of(context)!.settings.arguments as WorkoutPlan;
-
-    return Scaffold(
-      body: CustomScrollView(
-        slivers: [
-          SliverAppBar(
-            pinned: true,
-            iconTheme: const IconThemeData(color: appBarForeground),
-            backgroundColor: wgerPrimaryColor,
-            flexibleSpace: FlexibleSpaceBar(
-              titlePadding: const EdgeInsets.fromLTRB(56, 0, 56, 16),
-              title: Text(
-                workoutPlan.name,
-                style: Theme.of(context).textTheme.titleLarge?.copyWith(color: appBarForeground),
-              ),
-            ),
-            actions: [
-              PopupMenuButton<WorkoutOptions>(
-                icon: const Icon(Icons.more_vert, color: appBarForeground),
-                onSelected: (value) {
-                  // Edit
-                  if (value == WorkoutOptions.edit) {
-                    Navigator.pushNamed(
-                      context,
-                      FormScreen.routeName,
-                      arguments: FormScreenArguments(
-                        AppLocalizations.of(context).edit,
-                        WorkoutForm(workoutPlan),
-                      ),
-                    );
-
-                    // Delete
-                  } else if (value == WorkoutOptions.delete) {
-                    Provider.of<WorkoutPlansProvider>(
-                      context,
-                      listen: false,
-                    ).deleteWorkout(workoutPlan.id!);
-                    Navigator.of(context).pop();
-
-                    // Toggle Mode
-                  }
-                },
-                itemBuilder: (BuildContext context) {
-                  return [
-                    PopupMenuItem<WorkoutOptions>(
-                      value: WorkoutOptions.edit,
-                      child: Text(AppLocalizations.of(context).edit),
-                    ),
-                    const PopupMenuDivider(),
-                    PopupMenuItem<WorkoutOptions>(
-                      value: WorkoutOptions.delete,
-                      child: Text(AppLocalizations.of(context).delete),
-                    ),
-                  ];
-                },
-              ),
-            ],
-          ),
-          FutureBuilder(
-            future: _loadFullWorkout(context, workoutPlan.id!),
-            builder: (context, AsyncSnapshot<WorkoutPlan> snapshot) => SliverList(
-              delegate: SliverChildListDelegate([
-                if (snapshot.connectionState == ConnectionState.waiting)
-                  const SizedBox(height: 200, child: Center(child: CircularProgressIndicator()))
-                else
-                  Consumer<WorkoutPlansProvider>(
-                    builder: (context, value, child) => getBody(workoutPlan),
-                  ),
-              ]),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}
diff --git a/lib/theme/theme.dart b/lib/theme/theme.dart
index ba0706e7..6a78e3bd 100644
--- a/lib/theme/theme.dart
+++ b/lib/theme/theme.dart
@@ -35,7 +35,7 @@ const FlexSubThemesData wgerSubThemeData = FlexSubThemesData(
   fabSchemeColor: SchemeColor.secondary,
   inputDecoratorBorderType: FlexInputBorderType.underline,
   inputDecoratorIsFilled: false,
-  useTextTheme: true,
+  useMaterial3Typography: true,
   appBarScrolledUnderElevation: 4,
   navigationBarIndicatorOpacity: 0.24,
   navigationBarHeight: 56,
diff --git a/lib/widgets/add_exercise/add_exercise_multiselect_button.dart b/lib/widgets/add_exercise/add_exercise_multiselect_button.dart
index 6af8a684..ae854471 100644
--- a/lib/widgets/add_exercise/add_exercise_multiselect_button.dart
+++ b/lib/widgets/add_exercise/add_exercise_multiselect_button.dart
@@ -33,8 +33,9 @@ class _AddExerciseMultiselectButtonState<T> extends State<AddExerciseMultiselect
       child: MultiSelectDialogField(
         initialValue: widget.initialItems,
         onSaved: widget.onSaved,
-        items:
-            widget.items.map((item) => MultiSelectItem<T>(item, widget.displayName(item))).toList(),
+        items: widget.items
+            .map((item) => MultiSelectItem<T>(item, widget.displayName(item)))
+            .toList(),
         onConfirm: (value) {
           setState(() {
             _selectedItems = value.cast<T>();
diff --git a/lib/widgets/add_exercise/add_exercise_text_area.dart b/lib/widgets/add_exercise/add_exercise_text_area.dart
index 7bad7be6..03579a1b 100644
--- a/lib/widgets/add_exercise/add_exercise_text_area.dart
+++ b/lib/widgets/add_exercise/add_exercise_text_area.dart
@@ -1,22 +1,22 @@
 import 'package:flutter/material.dart';
 
 class AddExerciseTextArea extends StatelessWidget {
-  const AddExerciseTextArea({
+  AddExerciseTextArea({
     super.key,
-    required this.onChange,
     required this.title,
+    ValueChanged<String>? onChange,
     this.helperText = '',
-    this.isRequired = true,
     this.isMultiline = false,
+    this.initialValue = '',
     this.validator,
     this.onSaved,
-  });
+  }) : onChange = onChange ?? ((String value) {});
 
   final ValueChanged<String> onChange;
-  final bool isRequired;
   final bool isMultiline;
   final String title;
   final String helperText;
+  final String? initialValue;
   final FormFieldValidator<String?>? validator;
   final FormFieldSetter<String?>? onSaved;
 
@@ -28,6 +28,7 @@ class AddExerciseTextArea extends StatelessWidget {
     return Padding(
       padding: const EdgeInsets.all(8.0),
       child: TextFormField(
+        initialValue: initialValue,
         keyboardType: isMultiline ? TextInputType.multiline : TextInputType.text,
         maxLines: isMultiline ? null : DEFAULT_LINES,
         minLines: isMultiline ? MULTILINE_MIN_LINES : DEFAULT_LINES,
@@ -35,12 +36,11 @@ class AddExerciseTextArea extends StatelessWidget {
         onSaved: onSaved,
         decoration: InputDecoration(
           contentPadding: const EdgeInsets.symmetric(horizontal: 10, vertical: 10),
-          border: const OutlineInputBorder(
-            borderRadius: BorderRadius.all(Radius.circular(10)),
-          ),
+          border: const OutlineInputBorder(borderRadius: BorderRadius.all(Radius.circular(10))),
           labelText: title,
           alignLabelWithHint: true,
           helperText: helperText,
+          helperMaxLines: 3,
         ),
         onChanged: onChange,
       ),
diff --git a/lib/widgets/add_exercise/image_details_form.dart b/lib/widgets/add_exercise/image_details_form.dart
new file mode 100644
index 00000000..e9462845
--- /dev/null
+++ b/lib/widgets/add_exercise/image_details_form.dart
@@ -0,0 +1,261 @@
+import 'dart:io';
+
+import 'package:flutter/material.dart';
+import 'package:wger/core/validators.dart';
+import 'package:wger/helpers/exercises/validators.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/exercises/exercise_submission_images.dart';
+import 'package:wger/widgets/add_exercise/license_info_widget.dart';
+
+import 'add_exercise_text_area.dart';
+
+/// Form for collecting CC BY-SA 4.0 license metadata for exercise images
+///
+/// This form is displayed after image selection in Step 5 of exercise creation.
+/// It collects all required and optional license attribution fields:
+///
+/// Required by CC BY-SA 4.0:
+/// - Author name
+/// - License type (implicitly CC BY-SA 4.0)
+///
+/// Optional but recommended:
+/// - Title (helps identify the image)
+/// - Source URL (where image was found)
+/// - Author URL (author's website/profile)
+/// - Derivative source URL (if modified from another work)
+/// - Image style (PHOTO, 3D, LINE, LOW-POLY, OTHER)
+///
+/// All metadata is sent to the API's /exerciseimage endpoint along with
+/// the image file when the exercise is submitted.
+class ImageDetailsForm extends StatefulWidget {
+  final Function(ExerciseSubmissionImage image) onAdd;
+  final VoidCallback onCancel;
+  final ExerciseSubmissionImage submissionImage;
+
+  const ImageDetailsForm({
+    super.key,
+    required this.submissionImage,
+    required this.onAdd,
+    required this.onCancel,
+  });
+
+  @override
+  State<ImageDetailsForm> createState() => _ImageDetailsFormState();
+}
+
+class _ImageDetailsFormState extends State<ImageDetailsForm> {
+  final _formKey = GlobalKey<FormState>();
+
+  /// Currently selected image type
+  ImageType _selectedImageType = ImageType.photo;
+
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
+
+    return SingleChildScrollView(
+      child: Form(
+        key: _formKey,
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(
+              AppLocalizations.of(context).imageDetailsTitle,
+              style: Theme.of(context).textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold),
+            ),
+
+            const SizedBox(height: 8),
+            ImagePreview(imageFile: widget.submissionImage.imageFile),
+            const SizedBox(height: 8),
+
+            // Author name - required for proper CC BY-SA attribution
+            AddExerciseTextArea(
+              title: '${AppLocalizations.of(context).author}*',
+              initialValue: widget.submissionImage.author,
+              onSaved: (value) => widget.submissionImage.author = value,
+              validator: (name) => validateAuthorName(name, context),
+            ),
+
+            // License title field - helps identify the image
+            AddExerciseTextArea(
+              title: AppLocalizations.of(context).imageDetailsLicenseTitle,
+              helperText: AppLocalizations.of(context).imageDetailsLicenseTitleHint,
+              initialValue: widget.submissionImage.title,
+              onSaved: (value) => widget.submissionImage.title = value,
+            ),
+
+            // Source URL - where the image was found (license_object_url in API)
+            AddExerciseTextArea(
+              title: AppLocalizations.of(context).imageDetailsSourceLink,
+              initialValue: widget.submissionImage.sourceUrl,
+              onSaved: (value) => widget.submissionImage.sourceUrl = value,
+              validator: (value) => validateUrl(value, i18n, required: false),
+            ),
+
+            // Author's website/profile URL
+            AddExerciseTextArea(
+              title: AppLocalizations.of(context).imageDetailsAuthorLink,
+              initialValue: widget.submissionImage.authorUrl,
+              onSaved: (value) => widget.submissionImage.authorUrl = value,
+              validator: (value) => validateUrl(value, i18n, required: false),
+            ),
+
+            // Original source if this is a derivative work (modified from another image)
+            AddExerciseTextArea(
+              title: AppLocalizations.of(context).imageDetailsDerivativeSource,
+              helperText: AppLocalizations.of(context).imageDetailsDerivativeHelp,
+              initialValue: widget.submissionImage.derivativeSourceUrl,
+              onSaved: (value) => widget.submissionImage.derivativeSourceUrl = value,
+              validator: (value) => validateUrl(value, i18n, required: false),
+            ),
+
+            ImageTypeSelector(
+              selectedType: _selectedImageType,
+              onTypeSelected: (type) {
+                setState(() {
+                  _selectedImageType = type;
+                });
+              },
+            ),
+            const SizedBox(height: 16),
+
+            // License info as separate widget for better optimization
+            const LicenseInfoWidget(),
+            const SizedBox(height: 8),
+
+            _buildButtons(),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildButtons() {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.end,
+      children: [
+        TextButton(
+          onPressed: widget.onCancel,
+          child: Text(MaterialLocalizations.of(context).cancelButtonLabel),
+        ),
+        const SizedBox(width: 8),
+        ElevatedButton(
+          onPressed: () {
+            if (!_formKey.currentState!.validate()) {
+              return;
+            }
+            _formKey.currentState?.save();
+
+            // Pass image and metadata back to parent
+            widget.onAdd(widget.submissionImage);
+          },
+          style: ElevatedButton.styleFrom(
+            backgroundColor: Theme.of(context).primaryColor,
+            foregroundColor: Colors.white,
+            padding: const EdgeInsets.symmetric(horizontal: 32, vertical: 12),
+          ),
+          child: Text(
+            AppLocalizations.of(context).add,
+            style: const TextStyle(fontWeight: FontWeight.bold, color: Colors.white),
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+class ImagePreview extends StatelessWidget {
+  final File imageFile;
+
+  const ImagePreview({super.key, required this.imageFile});
+
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      child: Container(
+        constraints: const BoxConstraints(maxWidth: 300, maxHeight: 200),
+        decoration: BoxDecoration(
+          borderRadius: BorderRadius.circular(8),
+          border: Border.all(color: Colors.grey.shade300),
+        ),
+        child: ClipRRect(
+          borderRadius: BorderRadius.circular(8),
+          child: Image.file(imageFile, fit: BoxFit.contain),
+        ),
+      ),
+    );
+  }
+}
+
+class ImageTypeSelector extends StatelessWidget {
+  final ImageType selectedType;
+  final ValueChanged<ImageType> onTypeSelected;
+
+  const ImageTypeSelector({super.key, required this.selectedType, required this.onTypeSelected});
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final i18n = AppLocalizations.of(context);
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          i18n.imageDetailsImageType,
+          style: const TextStyle(fontSize: 14, fontWeight: FontWeight.w500),
+        ),
+        const SizedBox(height: 12),
+        Wrap(
+          spacing: 8,
+          runSpacing: 8,
+          children: ImageType.values.map((type) {
+            final isSelected = selectedType == type;
+            return InkWell(
+              onTap: () => onTypeSelected(type),
+              borderRadius: BorderRadius.circular(4),
+              child: Container(
+                width: 90,
+                height: 90,
+                decoration: BoxDecoration(
+                  color: isSelected
+                      ? theme.buttonTheme.colorScheme!.primary
+                      : theme.buttonTheme.colorScheme!.primaryContainer,
+                  borderRadius: BorderRadius.circular(4),
+                ),
+                child: Column(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    Icon(
+                      type.icon,
+                      size: 32,
+                      color: isSelected
+                          ? theme.buttonTheme.colorScheme!.onPrimary
+                          : theme.buttonTheme.colorScheme!.primary,
+                    ),
+                    const SizedBox(height: 8),
+                    Text(
+                      type.label,
+                      style: TextStyle(
+                        fontSize: 11,
+                        color: isSelected
+                            ? theme.buttonTheme.colorScheme!.onPrimary
+                            : theme.buttonTheme.colorScheme!.primary,
+                        fontWeight: isSelected ? FontWeight.bold : FontWeight.normal,
+                      ),
+                      textAlign: TextAlign.center,
+                    ),
+                  ],
+                ),
+              ),
+            );
+          }).toList(),
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/widgets/add_exercise/license_info_widget.dart b/lib/widgets/add_exercise/license_info_widget.dart
new file mode 100644
index 00000000..59e9609b
--- /dev/null
+++ b/lib/widgets/add_exercise/license_info_widget.dart
@@ -0,0 +1,67 @@
+import 'package:flutter/material.dart';
+import 'package:url_launcher/url_launcher.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+/// Static widget displaying CC BY-SA 4.0 license notice for image uploads
+///
+/// This widget informs users that by uploading images, they agree to release
+/// them under the CC BY-SA 4.0 license. The license name is clickable and
+/// opens the Creative Commons license page.
+///
+/// Being a separate widget allows Flutter to optimize rendering since
+/// this content never changes.
+class LicenseInfoWidget extends StatelessWidget {
+  const LicenseInfoWidget({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return Container(
+      padding: const EdgeInsets.all(12),
+      decoration: BoxDecoration(
+        color: colorScheme.surfaceContainerHighest,
+        borderRadius: BorderRadius.circular(4),
+        border: Border.all(color: colorScheme.outline),
+      ),
+      child: Row(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Icon(Icons.info_outline, size: 20, color: colorScheme.onSurfaceVariant),
+          const SizedBox(width: 8),
+
+          Expanded(
+            child: RichText(
+              text: TextSpan(
+                style: TextStyle(fontSize: 12, color: colorScheme.onSurfaceVariant),
+                children: [
+                  TextSpan(text: i18n.imageDetailsLicenseNotice),
+                  WidgetSpan(
+                    child: GestureDetector(
+                      onTap: () async {
+                        final url = Uri.parse('https://creativecommons.org/licenses/by-sa/4.0/');
+                        if (await canLaunchUrl(url)) {
+                          await launchUrl(url, mode: LaunchMode.externalApplication);
+                        }
+                      },
+                      child: Text(
+                        i18n.imageDetailsLicenseNoticeLinkToLicense,
+                        style: TextStyle(
+                          fontSize: 12,
+                          color: colorScheme.primary,
+                          fontWeight: FontWeight.bold,
+                          decoration: TextDecoration.underline,
+                        ),
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/add_exercise/mixins/image_picker_mixin.dart b/lib/widgets/add_exercise/mixins/image_picker_mixin.dart
index d98a235e..1f58548a 100644
--- a/lib/widgets/add_exercise/mixins/image_picker_mixin.dart
+++ b/lib/widgets/add_exercise/mixins/image_picker_mixin.dart
@@ -3,6 +3,7 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:provider/provider.dart';
+import 'package:wger/models/exercises/exercise_submission_images.dart';
 import 'package:wger/providers/add_exercise.dart';
 
 const validFileExtensions = ['jpg', 'jpeg', 'png', 'webp'];
@@ -31,19 +32,21 @@ mixin ExerciseImagePickerMixin {
       images = await imagePicker.pickMultiImage();
     }
 
-    final selectedImages = <File>[];
+    final selectedImages = <ExerciseSubmissionImage>[];
     if (images != null) {
-      selectedImages.addAll(images.map((e) => File(e.path)).toList());
+      selectedImages.addAll(
+        images.map((e) => ExerciseSubmissionImage(imageFile: File(e.path))).toList(),
+      );
 
       for (final image in selectedImages) {
         bool isFileValid = true;
         String errorMessage = '';
 
-        if (!_validateFileType(image)) {
+        if (!_validateFileType(image.imageFile)) {
           isFileValid = false;
           errorMessage = "Select only 'jpg', 'jpeg', 'png', 'webp' files";
         }
-        if (_validateFileSize(image.lengthSync())) {
+        if (_validateFileSize(image.imageFile.lengthSync())) {
           isFileValid = true;
           errorMessage = 'File Size should not be greater than 20 mb';
         }
diff --git a/lib/widgets/add_exercise/preview_images.dart b/lib/widgets/add_exercise/preview_images.dart
index 894fe321..3da95b58 100644
--- a/lib/widgets/add_exercise/preview_images.dart
+++ b/lib/widgets/add_exercise/preview_images.dart
@@ -2,68 +2,103 @@ import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-
+import 'package:wger/models/exercises/exercise_submission_images.dart';
 import 'package:wger/providers/add_exercise.dart';
-import 'mixins/image_picker_mixin.dart';
 
-class PreviewExerciseImages extends StatelessWidget with ExerciseImagePickerMixin {
-  const PreviewExerciseImages({super.key, required this.selectedImages});
+/// Widget to preview selected exercise images
+///
+/// Displays images in a horizontal scrollable list with thumbnails.
+/// Each image shows a preview thumbnail and optionally a delete button.
+/// Can optionally include an "add more" button at the end of the list.
+class PreviewExerciseImages extends StatelessWidget {
+  final List<ExerciseSubmissionImage> selectedImages;
+  final VoidCallback? onAddMore;
+  final bool allowEdit;
+
+  const PreviewExerciseImages({
+    super.key,
+    required this.selectedImages,
+    this.onAddMore,
+    this.allowEdit = true,
+  });
 
-  final List<File> selectedImages;
   @override
   Widget build(BuildContext context) {
+    // Calculate item count: images + optional "add more" button
+    final itemCount = selectedImages.length + (allowEdit && onAddMore != null ? 1 : 0);
+
     return SizedBox(
-      height: 300,
-      child: ListView(scrollDirection: Axis.horizontal, children: [
-        ...selectedImages.map(
-          (file) => SizedBox(
-            height: 200,
-            child: Padding(
-              padding: const EdgeInsets.all(8.0),
-              child: Stack(
-                children: [
-                  Image.file(file),
-                  Positioned(
-                    bottom: 0,
-                    right: 0,
-                    child: Padding(
-                      padding: const EdgeInsets.all(3.0),
-                      child: Container(
-                        decoration: BoxDecoration(
-                          color: Colors.grey.withOpacity(0.5),
-                          borderRadius: const BorderRadius.all(Radius.circular(20)),
-                        ),
-                        child: IconButton(
-                          iconSize: 20,
-                          onPressed: () =>
-                              context.read<AddExerciseProvider>().removeExercise(file.path),
-                          color: Colors.white,
-                          icon: const Icon(Icons.delete),
-                        ),
-                      ),
-                    ),
-                  ),
-                ],
-              ),
-            ),
+      height: 120,
+      child: ListView.builder(
+        scrollDirection: Axis.horizontal,
+        itemCount: itemCount,
+        itemBuilder: (context, index) {
+          // Show "add more" button at the end (only if editing is allowed)
+          if (index == selectedImages.length) {
+            return _buildAddMoreButton(context);
+          }
+
+          // Show image thumbnail
+          final image = selectedImages[index];
+          return _buildImageCard(context, image.imageFile);
+        },
+      ),
+    );
+  }
+
+  Widget _buildImageCard(BuildContext context, File image) {
+    return Container(
+      width: 120,
+      margin: const EdgeInsets.only(right: 8),
+      child: Stack(
+        children: [
+          // Image thumbnail
+          ClipRRect(
+            borderRadius: BorderRadius.circular(8),
+            child: Image.file(image, width: 120, height: 120, fit: BoxFit.cover),
           ),
-        ),
-        const SizedBox(width: 10),
-        Padding(
-          padding: const EdgeInsets.all(8.0),
-          child: Container(
-            color: Colors.grey,
-            height: 200,
-            width: 100,
-            child: Center(
+
+          // Delete button overlay (only shown if editing is allowed)
+          if (allowEdit)
+            Positioned(
+              top: 4,
+              right: 4,
               child: IconButton(
-                icon: const Icon(Icons.add),
-                onPressed: () => pickImages(context),
+                icon: const Icon(Icons.close),
+                color: Colors.white,
+                iconSize: 20,
+                style: IconButton.styleFrom(
+                  backgroundColor: Colors.black.withOpacity(0.6),
+                  padding: const EdgeInsets.all(4),
+                ),
+                onPressed: () {
+                  context.read<AddExerciseProvider>().removeImage(image.path);
+                },
               ),
             ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildAddMoreButton(BuildContext context) {
+    return GestureDetector(
+      onTap: onAddMore,
+      child: Container(
+        width: 120,
+        height: 120,
+        margin: const EdgeInsets.only(right: 8),
+        decoration: BoxDecoration(
+          color: Theme.of(context).colorScheme.surfaceVariant,
+          borderRadius: BorderRadius.circular(8),
+          border: Border.all(
+            color: Theme.of(context).colorScheme.outline,
+            width: 2,
+            style: BorderStyle.solid,
           ),
         ),
-      ]),
+        child: Icon(Icons.add, size: 48, color: Theme.of(context).colorScheme.onSurfaceVariant),
+      ),
     );
   }
 }
diff --git a/lib/widgets/add_exercise/steps/step1basics.dart b/lib/widgets/add_exercise/steps/step1basics.dart
deleted file mode 100644
index 3c2a260e..00000000
--- a/lib/widgets/add_exercise/steps/step1basics.dart
+++ /dev/null
@@ -1,116 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import 'package:wger/helpers/exercises/forms.dart';
-import 'package:wger/helpers/i18n.dart';
-import 'package:wger/l10n/generated/app_localizations.dart';
-import 'package:wger/models/exercises/category.dart';
-import 'package:wger/models/exercises/equipment.dart';
-import 'package:wger/models/exercises/muscle.dart';
-import 'package:wger/providers/add_exercise.dart';
-import 'package:wger/providers/exercises.dart';
-import 'package:wger/widgets/add_exercise/add_exercise_multiselect_button.dart';
-import 'package:wger/widgets/add_exercise/add_exercise_text_area.dart';
-import 'package:wger/widgets/exercises/exercises.dart';
-import 'package:wger/widgets/exercises/forms.dart';
-
-class Step1Basics extends StatelessWidget {
-  final GlobalKey<FormState> formkey;
-  const Step1Basics({required this.formkey});
-
-  @override
-  Widget build(BuildContext context) {
-    final addExerciseProvider = context.read<AddExerciseProvider>();
-    final exerciseProvider = context.read<ExercisesProvider>();
-    final categories = exerciseProvider.categories;
-    final muscles = exerciseProvider.muscles;
-    final equipment = exerciseProvider.equipment;
-
-    return Form(
-      key: formkey,
-      child: Column(
-        children: [
-          AddExerciseTextArea(
-            onChange: (value) => {},
-            title: '${AppLocalizations.of(context).name}*',
-            helperText: AppLocalizations.of(context).baseNameEnglish,
-            isRequired: true,
-            validator: (name) => validateName(name, context),
-            onSaved: (String? name) => addExerciseProvider.exerciseNameEn = name!,
-          ),
-          AddExerciseTextArea(
-            onChange: (value) => {},
-            title: AppLocalizations.of(context).alternativeNames,
-            isMultiline: true,
-            helperText: AppLocalizations.of(context).oneNamePerLine,
-            onSaved: (String? alternateName) =>
-                addExerciseProvider.alternateNamesEn = alternateName!.split('\n'),
-          ),
-          ExerciseCategoryInputWidget<ExerciseCategory>(
-            key: const Key('category-dropdown'),
-            entries: categories,
-            title: '${AppLocalizations.of(context).category}*',
-            callback: (ExerciseCategory newValue) {
-              addExerciseProvider.category = newValue;
-            },
-            validator: (ExerciseCategory? category) {
-              if (category == null) {
-                return AppLocalizations.of(context).selectEntry;
-              }
-            },
-            displayName: (ExerciseCategory c) => getTranslation(c.name, context),
-          ),
-          AddExerciseMultiselectButton<Equipment>(
-            key: const Key('equipment-multiselect'),
-            title: AppLocalizations.of(context).equipment,
-            items: equipment,
-            initialItems: addExerciseProvider.equipment,
-            onChange: (dynamic entries) {
-              addExerciseProvider.equipment = entries.cast<Equipment>();
-            },
-            onSaved: (dynamic entries) {
-              addExerciseProvider.equipment = entries.cast<Equipment>();
-            },
-            displayName: (Equipment e) => getTranslation(e.name, context),
-          ),
-          AddExerciseMultiselectButton<Muscle>(
-            key: const Key('primary-muscles-multiselect'),
-            title: AppLocalizations.of(context).muscles,
-            items: muscles,
-            initialItems: addExerciseProvider.primaryMuscles,
-            onChange: (dynamic muscles) {
-              addExerciseProvider.primaryMuscles = muscles.cast<Muscle>();
-            },
-            onSaved: (dynamic muscles) {
-              addExerciseProvider.primaryMuscles = muscles.cast<Muscle>();
-            },
-            displayName: (Muscle e) =>
-                e.name + (e.nameEn.isNotEmpty ? '\n(${getTranslation(e.nameEn, context)})' : ''),
-          ),
-          AddExerciseMultiselectButton<Muscle>(
-            key: const Key('secondary-muscles-multiselect'),
-            title: AppLocalizations.of(context).musclesSecondary,
-            items: muscles,
-            initialItems: addExerciseProvider.secondaryMuscles,
-            onChange: (dynamic muscles) {
-              addExerciseProvider.secondaryMuscles = muscles.cast<Muscle>();
-            },
-            onSaved: (dynamic muscles) {
-              addExerciseProvider.secondaryMuscles = muscles.cast<Muscle>();
-            },
-            displayName: (Muscle e) =>
-                e.name + (e.nameEn.isNotEmpty ? '\n(${getTranslation(e.nameEn, context)})' : ''),
-          ),
-          Consumer<AddExerciseProvider>(
-            builder: (context, value, child) => MuscleRowWidget(
-              muscles: value.primaryMuscles,
-              musclesSecondary: value.secondaryMuscles,
-            ),
-          ),
-          const MuscleColorHelper(main: true),
-          const SizedBox(height: 5),
-          const MuscleColorHelper(main: false),
-        ],
-      ),
-    );
-  }
-}
diff --git a/lib/widgets/add_exercise/steps/step5images.dart b/lib/widgets/add_exercise/steps/step5images.dart
deleted file mode 100644
index e029585e..00000000
--- a/lib/widgets/add_exercise/steps/step5images.dart
+++ /dev/null
@@ -1,52 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import 'package:wger/l10n/generated/app_localizations.dart';
-import 'package:wger/providers/add_exercise.dart';
-import 'package:wger/widgets/add_exercise/mixins/image_picker_mixin.dart';
-import 'package:wger/widgets/add_exercise/preview_images.dart';
-
-class Step5Images extends StatefulWidget {
-  final GlobalKey<FormState> formkey;
-  const Step5Images({required this.formkey});
-
-  @override
-  State<Step5Images> createState() => _Step5ImagesState();
-}
-
-class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin {
-  @override
-  Widget build(BuildContext context) {
-    return Form(
-      key: widget.formkey,
-      child: Column(
-        children: [
-          Text(
-            AppLocalizations.of(context).add_exercise_image_license,
-            style: Theme.of(context).textTheme.bodySmall,
-          ),
-          Consumer<AddExerciseProvider>(
-            builder: (ctx, provider, __) => provider.exerciseImages.isNotEmpty
-                ? PreviewExerciseImages(selectedImages: provider.exerciseImages)
-                : Row(
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    children: [
-                      IconButton(
-                        onPressed: () => pickImages(context, pickFromCamera: true),
-                        icon: const Icon(Icons.camera_alt),
-                      ),
-                      IconButton(
-                        onPressed: () => pickImages(context),
-                        icon: const Icon(Icons.collections),
-                      ),
-                    ],
-                  ),
-          ),
-          Text(
-            'Only JPEG, PNG and WEBP files below 20 MB are supported',
-            style: Theme.of(context).textTheme.bodySmall,
-          ),
-        ],
-      ),
-    );
-  }
-}
diff --git a/lib/widgets/add_exercise/steps/step_1_basics.dart b/lib/widgets/add_exercise/steps/step_1_basics.dart
new file mode 100644
index 00000000..12eb38dd
--- /dev/null
+++ b/lib/widgets/add_exercise/steps/step_1_basics.dart
@@ -0,0 +1,129 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:wger/helpers/consts.dart';
+import 'package:wger/helpers/exercises/validators.dart';
+import 'package:wger/helpers/i18n.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/exercises/category.dart';
+import 'package:wger/models/exercises/equipment.dart';
+import 'package:wger/models/exercises/muscle.dart';
+import 'package:wger/providers/add_exercise.dart';
+import 'package:wger/providers/exercises.dart';
+import 'package:wger/providers/user.dart';
+import 'package:wger/widgets/add_exercise/add_exercise_multiselect_button.dart';
+import 'package:wger/widgets/add_exercise/add_exercise_text_area.dart';
+import 'package:wger/widgets/exercises/exercises.dart';
+import 'package:wger/widgets/exercises/forms.dart';
+
+class Step1Basics extends StatelessWidget {
+  final GlobalKey<FormState> formkey;
+
+  const Step1Basics({required this.formkey});
+
+  @override
+  Widget build(BuildContext context) {
+    final userProvider = context.read<UserProvider>();
+    final addExerciseProvider = context.read<AddExerciseProvider>();
+    final exerciseProvider = context.read<ExercisesProvider>();
+    final categories = exerciseProvider.categories;
+    final muscles = exerciseProvider.muscles;
+    final equipment = exerciseProvider.equipment;
+
+    // There mus be a better way to ensure this...
+    addExerciseProvider.languageEn = exerciseProvider.languages.firstWhere(
+      (l) => l.shortName == LANGUAGE_SHORT_ENGLISH,
+    );
+
+    return Form(
+      key: formkey,
+      child: Consumer<AddExerciseProvider>(
+        builder: (context, provider, child) => Column(
+          children: [
+            AddExerciseTextArea(
+              title: '${AppLocalizations.of(context).name}*',
+              helperText: AppLocalizations.of(context).baseNameEnglish,
+              validator: (name) => validateName(name, context),
+              onSaved: (String? name) => addExerciseProvider.exerciseNameEn = name,
+            ),
+            AddExerciseTextArea(
+              title: AppLocalizations.of(context).alternativeNames,
+              isMultiline: true,
+              helperText: AppLocalizations.of(context).oneNamePerLine,
+              onSaved: (String? alternateName) =>
+                  addExerciseProvider.alternateNamesEn = alternateName!.split('\n'),
+            ),
+            AddExerciseTextArea(
+              title: '${AppLocalizations.of(context).author}*',
+              isMultiline: false,
+              validator: (name) => validateAuthorName(name, context),
+              initialValue: userProvider.profile!.username,
+              onSaved: (String? author) => addExerciseProvider.author = author!,
+            ),
+            ExerciseCategoryInputWidget<ExerciseCategory>(
+              key: const Key('category-dropdown'),
+              entries: categories,
+              title: '${AppLocalizations.of(context).category}*',
+              callback: (ExerciseCategory newValue) {
+                addExerciseProvider.category = newValue;
+              },
+              validator: (ExerciseCategory? category) {
+                if (category == null) {
+                  return AppLocalizations.of(context).selectEntry;
+                }
+              },
+              displayName: (ExerciseCategory c) => getTranslation(c.name, context),
+            ),
+            AddExerciseMultiselectButton<Equipment>(
+              key: const Key('equipment-multiselect'),
+              title: AppLocalizations.of(context).equipment,
+              items: equipment,
+              initialItems: addExerciseProvider.equipment,
+              onChange: (dynamic entries) {
+                addExerciseProvider.equipment = entries.cast<Equipment>();
+              },
+              onSaved: (dynamic entries) {
+                addExerciseProvider.equipment = entries.cast<Equipment>();
+              },
+              displayName: (Equipment e) => getTranslation(e.name, context),
+            ),
+            AddExerciseMultiselectButton<Muscle>(
+              key: const Key('primary-muscles-multiselect'),
+              title: AppLocalizations.of(context).muscles,
+              items: muscles,
+              initialItems: addExerciseProvider.primaryMuscles,
+              onChange: (dynamic muscles) {
+                addExerciseProvider.primaryMuscles = muscles.cast<Muscle>();
+              },
+              onSaved: (dynamic muscles) {
+                addExerciseProvider.primaryMuscles = muscles.cast<Muscle>();
+              },
+              displayName: (Muscle e) =>
+                  e.name + (e.nameEn.isNotEmpty ? '\n(${getTranslation(e.nameEn, context)})' : ''),
+            ),
+            AddExerciseMultiselectButton<Muscle>(
+              key: const Key('secondary-muscles-multiselect'),
+              title: AppLocalizations.of(context).musclesSecondary,
+              items: muscles,
+              initialItems: addExerciseProvider.secondaryMuscles,
+              onChange: (dynamic muscles) {
+                addExerciseProvider.secondaryMuscles = muscles.cast<Muscle>();
+              },
+              onSaved: (dynamic muscles) {
+                addExerciseProvider.secondaryMuscles = muscles.cast<Muscle>();
+              },
+              displayName: (Muscle e) =>
+                  e.name + (e.nameEn.isNotEmpty ? '\n(${getTranslation(e.nameEn, context)})' : ''),
+            ),
+            MuscleRowWidget(
+              muscles: provider.primaryMuscles,
+              musclesSecondary: provider.secondaryMuscles,
+            ),
+            const MuscleColorHelper(main: true),
+            const SizedBox(height: 5),
+            const MuscleColorHelper(main: false),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/add_exercise/steps/step2variations.dart b/lib/widgets/add_exercise/steps/step_2_variations.dart
similarity index 84%
rename from lib/widgets/add_exercise/steps/step2variations.dart
rename to lib/widgets/add_exercise/steps/step_2_variations.dart
index 73d84fd7..4fcb639b 100644
--- a/lib/widgets/add_exercise/steps/step2variations.dart
+++ b/lib/widgets/add_exercise/steps/step_2_variations.dart
@@ -28,7 +28,7 @@ class Step2Variations extends StatelessWidget {
               child: Column(
                 children: [
                   // Exercise bases with variations
-                  ...exerciseProvider.exerciseBasesByVariation.keys.map(
+                  ...exerciseProvider.exerciseByVariation.keys.map(
                     (key) => Row(
                       mainAxisAlignment: MainAxisAlignment.spaceBetween,
                       children: [
@@ -37,10 +37,10 @@ class Step2Variations extends StatelessWidget {
                             crossAxisAlignment: CrossAxisAlignment.start,
                             //mainAxisSize: MainAxisSize.max,
                             children: [
-                              ...exerciseProvider.exerciseBasesByVariation[key]!.map(
+                              ...exerciseProvider.exerciseByVariation[key]!.map(
                                 (base) => Text(
                                   base
-                                      .getExercise(Localizations.localeOf(context).languageCode)
+                                      .getTranslation(Localizations.localeOf(context).languageCode)
                                       .name,
                                   overflow: TextOverflow.ellipsis,
                                 ),
@@ -72,7 +72,9 @@ class Step2Variations extends StatelessWidget {
                                 children: [
                                   Text(
                                     base
-                                        .getExercise(Localizations.localeOf(context).languageCode)
+                                        .getTranslation(
+                                          Localizations.localeOf(context).languageCode,
+                                        )
                                         .name,
                                     overflow: TextOverflow.ellipsis,
                                   ),
@@ -82,8 +84,8 @@ class Step2Variations extends StatelessWidget {
                             ),
                             Consumer<AddExerciseProvider>(
                               builder: (ctx, provider, __) => Switch(
-                                value: provider.newVariationForExercise == base.id,
-                                onChanged: (state) => provider.newVariationForExercise = base.id,
+                                value: provider.variationConnectToExercise == base.id,
+                                onChanged: (state) => provider.variationConnectToExercise = base.id,
                               ),
                             ),
                           ],
diff --git a/lib/widgets/add_exercise/steps/step3description.dart b/lib/widgets/add_exercise/steps/step_3_description.dart
similarity index 72%
rename from lib/widgets/add_exercise/steps/step3description.dart
rename to lib/widgets/add_exercise/steps/step_3_description.dart
index 8df2b743..2905df17 100644
--- a/lib/widgets/add_exercise/steps/step3description.dart
+++ b/lib/widgets/add_exercise/steps/step_3_description.dart
@@ -1,17 +1,19 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import 'package:wger/helpers/exercises/forms.dart';
+import 'package:wger/helpers/exercises/validators.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/providers/add_exercise.dart';
 import 'package:wger/widgets/add_exercise/add_exercise_text_area.dart';
 
 class Step3Description extends StatelessWidget {
   final GlobalKey<FormState> formkey;
+
   const Step3Description({required this.formkey});
 
   @override
   Widget build(BuildContext context) {
     final addExerciseProvider = context.read<AddExerciseProvider>();
+    final i18n = AppLocalizations.of(context);
 
     return Form(
       key: formkey,
@@ -19,11 +21,11 @@ class Step3Description extends StatelessWidget {
         children: [
           AddExerciseTextArea(
             onChange: (value) => {},
-            title: '${AppLocalizations.of(context).description}*',
-            isRequired: true,
+            title: '${i18n.description}*',
+            helperText: i18n.enterTextInLanguage,
             isMultiline: true,
-            validator: (name) => validateDescription(name, context),
-            onSaved: (String? description) => addExerciseProvider.descriptionEn = description!,
+            validator: (name) => validateExerciseDescription(name, context),
+            onSaved: (String? description) => addExerciseProvider.descriptionEn = description,
           ),
         ],
       ),
diff --git a/lib/widgets/add_exercise/steps/step4translations.dart b/lib/widgets/add_exercise/steps/step_4_translations.dart
similarity index 68%
rename from lib/widgets/add_exercise/steps/step4translations.dart
rename to lib/widgets/add_exercise/steps/step_4_translations.dart
index 876013c4..d8f4a778 100644
--- a/lib/widgets/add_exercise/steps/step4translations.dart
+++ b/lib/widgets/add_exercise/steps/step_4_translations.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import 'package:wger/helpers/exercises/forms.dart';
+import 'package:wger/helpers/exercises/validators.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/models/exercises/language.dart';
 import 'package:wger/providers/add_exercise.dart';
@@ -10,6 +10,7 @@ import 'package:wger/widgets/exercises/forms.dart';
 
 class Step4Translation extends StatefulWidget {
   final GlobalKey<FormState> formkey;
+
   const Step4Translation({required this.formkey});
 
   @override
@@ -21,6 +22,7 @@ class _Step4TranslationState extends State<Step4Translation> {
 
   @override
   Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
     final addExerciseProvider = context.read<AddExerciseProvider>();
     final exerciseProvider = context.read<ExercisesProvider>();
     final languages = exerciseProvider.languages;
@@ -30,8 +32,8 @@ class _Step4TranslationState extends State<Step4Translation> {
       child: Column(
         children: [
           SwitchListTile(
-            title: Text(AppLocalizations.of(context).translation),
-            subtitle: Text(AppLocalizations.of(context).translateExercise),
+            title: Text(i18n.translation),
+            subtitle: Text(i18n.translateExercise),
             value: translate,
             onChanged: (_) {
               setState(() {
@@ -45,38 +47,36 @@ class _Step4TranslationState extends State<Step4Translation> {
                 ExerciseCategoryInputWidget<Language>(
                   key: const Key('language-dropdown'),
                   entries: languages,
-                  title: '${AppLocalizations.of(context).language}*',
+                  title: '${i18n.language}*',
                   displayName: (Language l) => l.fullName,
                   callback: (Language newValue) {
-                    addExerciseProvider.language = newValue;
+                    addExerciseProvider.languageTranslation = newValue;
                   },
                   validator: (Language? language) {
                     if (language == null) {
-                      return AppLocalizations.of(context).selectEntry;
+                      return i18n.selectEntry;
                     }
                   },
                 ),
                 AddExerciseTextArea(
-                  onChange: (value) => {},
-                  title: '${AppLocalizations.of(context).name}*',
-                  isRequired: true,
+                  title: '${i18n.name}*',
                   validator: (name) => validateName(name, context),
                   onSaved: (String? name) => addExerciseProvider.exerciseNameTrans = name!,
                 ),
                 AddExerciseTextArea(
-                  onChange: (value) => {},
-                  title: AppLocalizations.of(context).alternativeNames,
+                  title: i18n.alternativeNames,
                   isMultiline: true,
-                  helperText: AppLocalizations.of(context).oneNamePerLine,
+                  helperText: i18n.oneNamePerLine,
                   validator: (alternateNames) {
                     // check that each line (name) is at least MIN_CHARACTERS_NAME long
                     if (alternateNames?.isNotEmpty == true) {
                       final names = alternateNames!.split('\n');
                       for (final name in names) {
                         if (name.length < MIN_CHARS_NAME || name.length > MAX_CHARS_NAME) {
-                          return AppLocalizations.of(
-                            context,
-                          ).enterCharacters(MIN_CHARS_NAME, MAX_CHARS_NAME);
+                          return i18n.enterCharacters(
+                            MIN_CHARS_NAME.toString(),
+                            MAX_CHARS_NAME.toString(),
+                          );
                         }
                       }
                     }
@@ -85,14 +85,16 @@ class _Step4TranslationState extends State<Step4Translation> {
                   onSaved: (String? alternateName) =>
                       addExerciseProvider.alternateNamesTrans = alternateName!.split('\n'),
                 ),
-                AddExerciseTextArea(
-                  onChange: (value) => {},
-                  title: '${AppLocalizations.of(context).description}*',
-                  isRequired: true,
-                  isMultiline: true,
-                  validator: (name) => validateDescription(name, context),
-                  onSaved: (String? description) =>
-                      addExerciseProvider.descriptionTrans = description!,
+                Consumer<AddExerciseProvider>(
+                  builder: (ctx, provider, __) => AddExerciseTextArea(
+                    onChange: (value) => {},
+                    title: '${i18n.description}*',
+                    helperText: i18n.enterTextInLanguage,
+                    isMultiline: true,
+                    validator: (name) => validateExerciseDescription(name, context),
+                    onSaved: (String? description) =>
+                        addExerciseProvider.descriptionTrans = description!,
+                  ),
                 ),
               ],
             ),
diff --git a/lib/widgets/add_exercise/steps/step_5_images.dart b/lib/widgets/add_exercise/steps/step_5_images.dart
new file mode 100644
index 00000000..6d436122
--- /dev/null
+++ b/lib/widgets/add_exercise/steps/step_5_images.dart
@@ -0,0 +1,256 @@
+import 'dart:io';
+
+import 'package:flutter/material.dart';
+import 'package:image_picker/image_picker.dart';
+import 'package:provider/provider.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/exercises/exercise_submission_images.dart';
+import 'package:wger/providers/add_exercise.dart';
+import 'package:wger/providers/user.dart';
+import 'package:wger/widgets/add_exercise/image_details_form.dart';
+import 'package:wger/widgets/add_exercise/mixins/image_picker_mixin.dart';
+import 'package:wger/widgets/add_exercise/preview_images.dart';
+
+/// Step 5 of exercise creation wizard - Image upload with license metadata
+///
+/// This step allows users to add exercise images with proper CC BY-SA 4.0 license
+/// attribution. Unlike the previous implementation that uploaded images directly,
+/// this version collects license metadata (title, author, URLs) before adding images.
+///
+/// Flow:
+/// 1. User picks image from camera/gallery
+/// 2. ImageDetailsForm is shown to collect license metadata
+/// 3. Image + metadata is stored in AddExerciseProvider
+/// 4. Final upload happens in Step 6 when user clicks "Submit"
+class Step5Images extends StatefulWidget {
+  final GlobalKey<FormState> formkey;
+
+  const Step5Images({required this.formkey});
+
+  @override
+  State<Step5Images> createState() => _Step5ImagesState();
+}
+
+class _Step5ImagesState extends State<Step5Images> with ExerciseImagePickerMixin {
+  /// Currently selected image waiting for metadata input
+  /// When non-null, ImageDetailsForm is displayed instead of image picker
+  ExerciseSubmissionImage? _currentImageToAdd;
+
+  /// Show dialog to choose between Camera and Gallery
+  Future<void> _showImageSourceDialog(BuildContext context) async {
+    showDialog(
+      context: context,
+      builder: (BuildContext context) {
+        return AlertDialog(
+          title: Text(AppLocalizations.of(context).selectImage),
+          content: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              ListTile(
+                leading: const Icon(Icons.camera_alt),
+                title: Text(AppLocalizations.of(context).takePicture),
+                onTap: () {
+                  Navigator.of(context).pop();
+                  _pickAndShowImageDetails(context, pickFromCamera: true);
+                },
+              ),
+              ListTile(
+                leading: const Icon(Icons.collections),
+                title: Text(AppLocalizations.of(context).gallery),
+                onTap: () {
+                  Navigator.of(context).pop();
+                  _pickAndShowImageDetails(context, pickFromCamera: false);
+                },
+              ),
+            ],
+          ),
+        );
+      },
+    );
+  }
+
+  /// Pick image from camera or gallery and show metadata collection form
+  ///
+  /// Validates file format (jpg, jpeg, png, webp) and size (<20MB) before
+  /// showing the form. Invalid files are rejected with a snackbar message.
+  ///
+  /// [pickFromCamera] - If true, opens camera; otherwise opens gallery
+  void _pickAndShowImageDetails(BuildContext context, {bool pickFromCamera = false}) async {
+    final userProvider = context.read<UserProvider>();
+    final imagePicker = ImagePicker();
+
+    XFile? selectedImage;
+    if (pickFromCamera) {
+      selectedImage = await imagePicker.pickImage(source: ImageSource.camera);
+    } else {
+      selectedImage = await imagePicker.pickImage(source: ImageSource.gallery);
+    }
+
+    if (selectedImage != null) {
+      final imageFile = File(selectedImage.path);
+
+      // Validate file type - only common image formats accepted
+      bool isFileValid = true;
+      String errorMessage = '';
+
+      final extension = imageFile.path.split('.').last;
+      const validFileExtensions = ['jpg', 'jpeg', 'png', 'webp'];
+      if (!validFileExtensions.any((ext) => extension.toLowerCase() == ext)) {
+        isFileValid = false;
+        errorMessage = "Select only 'jpg', 'jpeg', 'png', 'webp' files";
+      }
+
+      // Validate file size - 20MB limit matches server-side restriction
+      final fileSizeInMB = imageFile.lengthSync() / 1024 / 1024;
+      if (fileSizeInMB > 20) {
+        isFileValid = false;
+        errorMessage = 'File Size should not be greater than 20 MB';
+      }
+
+      if (!isFileValid) {
+        if (context.mounted) {
+          ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(errorMessage)));
+        }
+        return;
+      }
+
+      // Show metadata collection form for valid image
+      setState(() {
+        _currentImageToAdd = ExerciseSubmissionImage(
+          imageFile: imageFile,
+          author: userProvider.profile?.username ?? '',
+        );
+      });
+    }
+  }
+
+  /// Add image with its license metadata to the provider
+  ///
+  /// Called when user clicks "ADD" in ImageDetailsForm. The image and metadata
+  /// are stored locally in AddExerciseProvider and will be uploaded together
+  /// when the exercise is submitted in Step 6.
+  ///
+  /// [image] - The image file to add
+  /// [details] - Map containing license fields (license_title, license_author, etc.)
+  void _addImageWithDetails(ExerciseSubmissionImage image) {
+    final provider = context.read<AddExerciseProvider>();
+
+    // Store image with metadata - actual upload happens in addExercise()
+    provider.addExerciseImages([image]);
+
+    // Reset form state - image is now visible in preview list
+    setState(() {
+      _currentImageToAdd = null;
+    });
+  }
+
+  /// Cancel metadata input and return to image picker
+  void _cancelImageAdd() {
+    setState(() {
+      _currentImageToAdd = null;
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Form(
+      key: widget.formkey,
+      child: Column(
+        children: [
+          // License notice - shown when not entering metadata
+          if (_currentImageToAdd == null)
+            Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
+              child: Text(
+                AppLocalizations.of(context).add_exercise_image_license,
+                style: Theme.of(context).textTheme.bodySmall,
+                textAlign: TextAlign.center,
+              ),
+            ),
+
+          // Metadata collection form - shown when image is selected
+          if (_currentImageToAdd != null)
+            ImageDetailsForm(
+              submissionImage: _currentImageToAdd!,
+              onAdd: _addImageWithDetails,
+              onCancel: _cancelImageAdd,
+            ),
+
+          // Image picker or preview - shown when not entering metadata
+          if (_currentImageToAdd == null)
+            Consumer<AddExerciseProvider>(
+              builder: (ctx, provider, __) {
+                if (provider.exerciseImages.isNotEmpty) {
+                  // Show preview of images that have been added with metadata
+                  return Column(
+                    children: [
+                      PreviewExerciseImages(
+                        selectedImages: provider.exerciseImages,
+                        onAddMore: () => _showImageSourceDialog(context),
+                      ),
+                      const SizedBox(height: 16),
+                      ElevatedButton.icon(
+                        onPressed: () => _showImageSourceDialog(context),
+                        icon: const Icon(Icons.add_photo_alternate),
+                        label: Text(AppLocalizations.of(context).addImage),
+                      ),
+                    ],
+                  );
+                }
+
+                // Empty state - no images added yet
+                return Column(
+                  children: [
+                    const SizedBox(height: 20),
+                    Icon(Icons.add_photo_alternate, size: 80, color: Colors.grey.shade400),
+                    const SizedBox(height: 16),
+                    Text(
+                      'No images selected',
+                      style: Theme.of(
+                        context,
+                      ).textTheme.titleMedium?.copyWith(color: Colors.grey.shade600),
+                    ),
+                    const SizedBox(height: 24),
+                    // Camera and Gallery buttons
+                    Row(
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      children: [
+                        ElevatedButton.icon(
+                          onPressed: () => _pickAndShowImageDetails(context, pickFromCamera: true),
+                          icon: const Icon(Icons.camera_alt),
+                          label: Text(AppLocalizations.of(context).takePicture),
+                          style: ElevatedButton.styleFrom(
+                            padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 12),
+                          ),
+                        ),
+                        const SizedBox(width: 16),
+                        ElevatedButton.icon(
+                          onPressed: () => _pickAndShowImageDetails(context),
+                          icon: const Icon(Icons.collections),
+                          label: Text(AppLocalizations.of(context).gallery),
+                          style: ElevatedButton.styleFrom(
+                            padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 12),
+                          ),
+                        ),
+                      ],
+                    ),
+                    const SizedBox(height: 16),
+                    Padding(
+                      padding: const EdgeInsets.symmetric(horizontal: 16.0),
+                      child: Text(
+                        'Only JPEG, PNG and WEBP files below 20 MB are supported',
+                        style: Theme.of(
+                          context,
+                        ).textTheme.bodySmall?.copyWith(color: Colors.grey.shade600),
+                        textAlign: TextAlign.center,
+                      ),
+                    ),
+                  ],
+                );
+              },
+            ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/add_exercise/steps/step_6_overview.dart b/lib/widgets/add_exercise/steps/step_6_overview.dart
new file mode 100644
index 00000000..dda2f6c8
--- /dev/null
+++ b/lib/widgets/add_exercise/steps/step_6_overview.dart
@@ -0,0 +1,112 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/providers/add_exercise.dart';
+import 'package:wger/widgets/add_exercise/preview_images.dart';
+import 'package:wger/widgets/core/cards.dart';
+
+class Step6Overview extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
+
+    return Consumer<AddExerciseProvider>(
+      builder: (ctx, provider, _) => Column(
+        spacing: 8,
+        children: [
+          Text(i18n.baseData, style: Theme.of(context).textTheme.headlineSmall),
+          Table(
+            columnWidths: const {0: FlexColumnWidth(2), 1: FlexColumnWidth(3)},
+            children: [
+              TableRow(children: [Text(i18n.author), Text(provider.author)]),
+              TableRow(children: [Text(i18n.name), Text(provider.exerciseNameEn ?? '...')]),
+              TableRow(
+                children: [
+                  Text(i18n.alternativeNames),
+                  Text(
+                    provider.alternateNamesEn.isNotEmpty
+                        ? provider.alternateNamesEn.join('\n')
+                        : '...',
+                  ),
+                ],
+              ),
+              TableRow(children: [Text(i18n.description), Text(provider.descriptionEn ?? '...')]),
+              TableRow(children: [Text(i18n.category), Text(provider.category?.name ?? '...')]),
+              TableRow(
+                children: [
+                  Text(i18n.muscles),
+                  Text(
+                    provider.primaryMuscles.isNotEmpty
+                        ? provider.primaryMuscles.map((m) => m.name).join('\n')
+                        : '...',
+                  ),
+                ],
+              ),
+              TableRow(
+                children: [
+                  Text(i18n.musclesSecondary),
+                  Text(
+                    provider.secondaryMuscles.isNotEmpty
+                        ? provider.secondaryMuscles.map((m) => m.name).join('\n')
+                        : '...',
+                  ),
+                ],
+              ),
+              TableRow(
+                children: [
+                  Text(i18n.equipment),
+                  Text(
+                    provider.equipment.isNotEmpty
+                        ? provider.equipment.map((m) => m.name).join('\n')
+                        : '...',
+                  ),
+                ],
+              ),
+              TableRow(
+                children: [
+                  Text(i18n.variations),
+                  Text(
+                    provider.variationId != null
+                        ? 'Using variation ID ${provider.variationId}'
+                        : provider.variationConnectToExercise != null
+                        ? 'Connecting to exercise ${provider.variationConnectToExercise}'
+                        : '',
+                  ),
+                ],
+              ),
+            ],
+          ),
+          Text(i18n.translation, style: Theme.of(context).textTheme.headlineSmall),
+          Table(
+            columnWidths: const {0: FlexColumnWidth(2), 1: FlexColumnWidth(3)},
+            children: [
+              TableRow(children: [Text(i18n.name), Text(provider.exerciseNameTrans ?? '...')]),
+              TableRow(
+                children: [
+                  Text(i18n.alternativeNames),
+                  Text(
+                    provider.alternateNamesTrans.isNotEmpty
+                        ? provider.alternateNamesTrans.join('\n')
+                        : '...',
+                  ),
+                ],
+              ),
+              TableRow(
+                children: [Text(i18n.description), Text(provider.descriptionTrans ?? '...')],
+              ),
+              TableRow(
+                children: [
+                  Text(i18n.language),
+                  Text(provider.languageTranslation?.fullName ?? '...'),
+                ],
+              ),
+            ],
+          ),
+          if (provider.exerciseImages.isNotEmpty)
+            PreviewExerciseImages(selectedImages: provider.exerciseImages, allowEdit: false),
+          InfoCard(text: i18n.checkInformationBeforeSubmitting),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/auth/api_token_field.dart b/lib/widgets/auth/api_token_field.dart
new file mode 100644
index 00000000..48bb2c0f
--- /dev/null
+++ b/lib/widgets/auth/api_token_field.dart
@@ -0,0 +1,63 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+class ApiTokenField extends StatefulWidget {
+  final TextEditingController controller;
+  final Function(String?) onSaved;
+
+  const ApiTokenField({
+    required this.controller,
+    required this.onSaved,
+    super.key,
+  });
+
+  @override
+  State<ApiTokenField> createState() => _ApiTokenFieldState();
+}
+
+class _ApiTokenFieldState extends State<ApiTokenField> {
+  bool isObscure = true;
+
+  @override
+  Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
+
+    return TextFormField(
+      key: const ValueKey('inputApiToken'),
+      decoration: InputDecoration(
+        labelText: i18n.apiToken,
+        helperText:
+            'Only needed when using an authentication proxy for the backend, please consult the documentation',
+        errorMaxLines: 2,
+        helperMaxLines: 2,
+        prefixIcon: const Icon(Icons.password),
+        suffixIcon: IconButton(
+          icon: Icon(isObscure ? Icons.visibility_off : Icons.visibility),
+          onPressed: () {
+            setState(() {
+              isObscure = !isObscure;
+            });
+          },
+        ),
+      ),
+      obscureText: isObscure,
+      controller: widget.controller,
+      textInputAction: TextInputAction.next,
+      keyboardType: TextInputType.emailAddress,
+      validator: (value) {
+        if (value == null || value.isEmpty) {
+          return i18n.invalidApiToken;
+        }
+        if (!RegExp(r'^[a-f0-9]{40}$').hasMatch(value)) {
+          return i18n.apiTokenValidChars;
+        }
+        return null;
+      },
+      inputFormatters: [
+        FilteringTextInputFormatter.deny(RegExp(r'\s\b|\b\s')),
+      ],
+      onSaved: widget.onSaved,
+    );
+  }
+}
diff --git a/lib/widgets/auth/email_field.dart b/lib/widgets/auth/email_field.dart
new file mode 100644
index 00000000..e20a45c1
--- /dev/null
+++ b/lib/widgets/auth/email_field.dart
@@ -0,0 +1,40 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+class EmailField extends StatelessWidget {
+  final TextEditingController controller;
+  final Function(String?) onSaved;
+
+  const EmailField({
+    required this.controller,
+    required this.onSaved,
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return TextFormField(
+      key: const Key('inputEmail'),
+      decoration: InputDecoration(
+        labelText: AppLocalizations.of(context).email,
+        errorMaxLines: 2,
+        prefixIcon: const Icon(Icons.email),
+      ),
+      controller: controller,
+      textInputAction: TextInputAction.next,
+      keyboardType: TextInputType.emailAddress,
+      // Email is not required
+      validator: (value) {
+        if (value!.isNotEmpty && !value.contains('@')) {
+          return AppLocalizations.of(context).invalidEmail;
+        }
+        return null;
+      },
+      inputFormatters: [
+        FilteringTextInputFormatter.deny(RegExp(r'\s\b|\b\s')),
+      ],
+      onSaved: onSaved,
+    );
+  }
+}
diff --git a/lib/widgets/auth/password_field.dart b/lib/widgets/auth/password_field.dart
new file mode 100644
index 00000000..c9955a5d
--- /dev/null
+++ b/lib/widgets/auth/password_field.dart
@@ -0,0 +1,49 @@
+import 'package:flutter/material.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+class PasswordField extends StatefulWidget {
+  final TextEditingController controller;
+  final Function(String?) onSaved;
+
+  const PasswordField({
+    required this.controller,
+    required this.onSaved,
+    super.key,
+  });
+
+  @override
+  _PasswordFieldState createState() => _PasswordFieldState();
+}
+
+class _PasswordFieldState extends State<PasswordField> {
+  bool isObscure = true;
+
+  @override
+  Widget build(BuildContext context) {
+    return TextFormField(
+      key: const Key('inputPassword'),
+      decoration: InputDecoration(
+        labelText: AppLocalizations.of(context).password,
+        prefixIcon: const Icon(Icons.password),
+        suffixIcon: IconButton(
+          icon: Icon(isObscure ? Icons.visibility_off : Icons.visibility),
+          onPressed: () {
+            setState(() {
+              isObscure = !isObscure;
+            });
+          },
+        ),
+      ),
+      obscureText: isObscure,
+      controller: widget.controller,
+      textInputAction: TextInputAction.next,
+      validator: (value) {
+        if (value == null || value.isEmpty || value.length < 8) {
+          return AppLocalizations.of(context).passwordTooShort;
+        }
+        return null;
+      },
+      onSaved: widget.onSaved,
+    );
+  }
+}
diff --git a/lib/widgets/auth/server_field.dart b/lib/widgets/auth/server_field.dart
new file mode 100644
index 00000000..6a7fb39f
--- /dev/null
+++ b/lib/widgets/auth/server_field.dart
@@ -0,0 +1,27 @@
+import 'package:flutter/material.dart';
+import 'package:wger/core/validators.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+class ServerField extends StatelessWidget {
+  final TextEditingController controller;
+  final Function(String?) onSaved;
+
+  const ServerField({required this.controller, required this.onSaved, super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
+
+    return TextFormField(
+      key: const Key('inputServer'),
+      decoration: InputDecoration(
+        labelText: i18n.customServerUrl,
+        helperText: i18n.customServerHint,
+        helperMaxLines: 4,
+      ),
+      controller: controller,
+      validator: (value) => validateUrl(value, i18n, required: true),
+      onSaved: onSaved,
+    );
+  }
+}
diff --git a/lib/widgets/auth/username_field.dart b/lib/widgets/auth/username_field.dart
new file mode 100644
index 00000000..32a5bc27
--- /dev/null
+++ b/lib/widgets/auth/username_field.dart
@@ -0,0 +1,43 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+class UsernameField extends StatelessWidget {
+  final TextEditingController controller;
+  final Function(String?) onSaved;
+
+  const UsernameField({
+    required this.controller,
+    required this.onSaved,
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return TextFormField(
+      key: const Key('inputUsername'),
+      decoration: InputDecoration(
+        labelText: AppLocalizations.of(context).username,
+        errorMaxLines: 2,
+        prefixIcon: const Icon(Icons.account_circle),
+      ),
+      autofillHints: const [AutofillHints.username],
+      controller: controller,
+      textInputAction: TextInputAction.next,
+      keyboardType: TextInputType.emailAddress,
+      validator: (value) {
+        if (value == null || value.isEmpty) {
+          return AppLocalizations.of(context).invalidUsername;
+        }
+        if (!RegExp(r'^[\w.@+-]+$').hasMatch(value)) {
+          return AppLocalizations.of(context).usernameValidChars;
+        }
+        return null;
+      },
+      inputFormatters: [
+        FilteringTextInputFormatter.deny(RegExp(r'\s\b|\b\s')),
+      ],
+      onSaved: onSaved,
+    );
+  }
+}
diff --git a/lib/widgets/core/about.dart b/lib/widgets/core/about.dart
index 3adca94c..86348269 100644
--- a/lib/widgets/core/about.dart
+++ b/lib/widgets/core/about.dart
@@ -1,6 +1,6 @@
 /*
  * This file is part of wger Workout Manager <https://github.com/wger-project>.
- * Copyright (C) 2020, 2021 wger Team
+ * Copyright (C) 2020, 2025 wger Team
  *
  * wger Workout Manager is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -19,141 +19,176 @@
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:provider/provider.dart';
+import 'package:wger/helpers/consts.dart';
 import 'package:wger/helpers/misc.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/providers/auth.dart';
+import 'package:wger/screens/add_exercise_screen.dart';
 
-class AboutEntry extends StatelessWidget {
-  final String url;
-  final String title;
-  final String content;
-  final Icon icon;
-
-  const AboutEntry({
-    required this.title,
-    required this.content,
-    required this.url,
-    required this.icon,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return ListTile(
-      leading: icon,
-      title: Text(title),
-      subtitle: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Text(content),
-          Text(url, style: const TextStyle(color: Colors.blue)),
-        ],
-      ),
-      contentPadding: EdgeInsets.zero,
-      onTap: () async => launchURL(url, context),
-    );
-  }
-}
+import 'log_overview.dart';
 
 class AboutPage extends StatelessWidget {
   static String routeName = '/AboutPage';
 
   const AboutPage({super.key});
 
+  Widget _buildSectionSpacer() => const SizedBox(height: 24.0);
+
+  // Helper function for section headers
+  Widget _buildSectionHeader(BuildContext context, String title) {
+    return Padding(
+      padding: const EdgeInsets.only(bottom: 8.0),
+      child: Text(
+        title,
+        style: Theme.of(context).textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold),
+      ),
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
-    final deviceSize = MediaQuery.of(context).size;
     final authProvider = Provider.of<AuthProvider>(context, listen: false);
+    final i18n = AppLocalizations.of(context);
     final today = DateTime.now();
 
     return Scaffold(
-      appBar: AppBar(title: Text(AppLocalizations.of(context).aboutPageTitle)),
+      appBar: AppBar(title: Text(i18n.aboutPageTitle)),
       body: SingleChildScrollView(
         padding: const EdgeInsets.all(20.0),
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            SizedBox(
-              width: double.infinity,
-              height: 0.125 * deviceSize.height,
-              // color: Colors.red,
-              child: Row(
-                // mainAxisAlignment: MainAxisAlignment.center,
+            Row(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                Image.asset(
+                  'assets/images/logo.png',
+                  width: 60,
+                  semanticLabel: 'wger logo',
+                ),
+                const SizedBox(width: 20),
+                Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    const Text(
+                      'wger',
+                      style: TextStyle(
+                        fontSize: 23,
+                        fontWeight: FontWeight.w600,
+                      ),
+                    ),
+                    Text(
+                      'App: ${authProvider.applicationVersion?.version ?? 'N/A'}\n'
+                      'Server: ${authProvider.serverVersion ?? 'N/A'}',
+                      style: Theme.of(context).textTheme.bodySmall,
+                    ),
+                    Padding(
+                      padding: const EdgeInsets.only(top: 4.0),
+                      child: Text(
+                        '\u{a9} ${today.year} wger contributors',
+                        style: Theme.of(context).textTheme.bodySmall,
+                      ),
+                    ),
+                  ],
+                ),
+              ],
+            ),
+
+            _buildSectionSpacer(),
+            _buildSectionHeader(context, i18n.aboutWhySupportTitle),
+            Text(i18n.aboutDescription),
+
+            _buildSectionSpacer(),
+            _buildSectionHeader(context, i18n.aboutContributeTitle),
+            Text(i18n.aboutContributeText),
+            ListTile(
+              leading: const Icon(Icons.bug_report),
+              title: Text(i18n.aboutBugsListTitle),
+              contentPadding: EdgeInsets.zero,
+              onTap: () => launchURL(GITHUB_ISSUES_URL, context),
+            ),
+            ListTile(
+              leading: const Icon(Icons.translate),
+              title: Text(i18n.aboutTranslationListTitle),
+              contentPadding: EdgeInsets.zero,
+              onTap: () => launchURL(WEBLATE_URL, context),
+            ),
+            ListTile(
+              leading: const Icon(Icons.code),
+              title: Text(i18n.aboutSourceListTitle),
+              contentPadding: EdgeInsets.zero,
+              onTap: () => launchURL(GITHUB_PROJECT_URL, context),
+            ),
+            ListTile(
+              leading: const FaIcon(FontAwesomeIcons.dumbbell, size: 18),
+              title: Text(i18n.contributeExercise),
+              contentPadding: EdgeInsets.zero,
+              onTap: () => Navigator.of(context).pushNamed(AddExerciseScreen.routeName),
+            ),
+
+            _buildSectionSpacer(),
+            _buildSectionHeader(context, i18n.aboutDonateTitle),
+            Text(i18n.aboutDonateText),
+            const SizedBox(height: 15),
+            // Using Wrap for buttons to handle different screen sizes potentially
+            Center(
+              child: Wrap(
+                spacing: 10.0,
+                runSpacing: 10.0,
+                alignment: WrapAlignment.center,
                 children: [
-                  Image.asset('assets/images/logo.png', width: 75),
-                  const SizedBox(width: 20),
-                  Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    children: [
-                      const Text(
-                        'Wger',
-                        style: TextStyle(fontSize: 23, fontWeight: FontWeight.w600),
-                      ),
-                      Text(
-                        'App: ${authProvider.applicationVersion!.version}\n'
-                        'Server: ${authProvider.serverVersion}',
-                      ),
-                    ],
+                  ElevatedButton.icon(
+                    icon: const FaIcon(FontAwesomeIcons.mugHot, size: 18),
+                    label: const Text('Buy me a coffee'),
+                    onPressed: () => launchURL(BUY_ME_A_COFFEE_URL, context),
+                  ),
+                  ElevatedButton.icon(
+                    icon: const FaIcon(FontAwesomeIcons.solidHeart, size: 18),
+                    label: const Text('Liberapay'),
+                    onPressed: () => launchURL(LIBERAPAY_URL, context),
+                  ),
+                  ElevatedButton.icon(
+                    icon: const FaIcon(FontAwesomeIcons.github, size: 18),
+                    label: const Text('GitHub Sponsors'),
+                    onPressed: () => launchURL(GITHUB_SPONSORS_URL, context),
                   ),
                 ],
               ),
             ),
-            Padding(
-              padding: EdgeInsets.only(left: 0.225 * deviceSize.width),
-              child: Text(
-                '\u{a9} 2020 - ${today.year} contributors',
-                style: Theme.of(context).textTheme.bodySmall,
-              ),
+
+            _buildSectionSpacer(),
+            _buildSectionHeader(context, i18n.aboutJoinCommunityTitle),
+            ListTile(
+              leading: const FaIcon(FontAwesomeIcons.discord),
+              trailing: const Icon(Icons.arrow_outward),
+              title: Text(i18n.aboutDiscordTitle),
+              contentPadding: EdgeInsets.zero,
+              onTap: () => launchURL(DISCORD_URL, context),
             ),
-            SizedBox(height: 0.025 * deviceSize.height),
-            Text(
-              AppLocalizations.of(context).aboutDescription,
-              style: Theme.of(context).textTheme.bodyMedium!.copyWith(fontSize: 16),
+            ListTile(
+              leading: const FaIcon(FontAwesomeIcons.mastodon),
+              trailing: const Icon(Icons.arrow_outward),
+              title: Text(i18n.aboutMastodonTitle),
+              contentPadding: EdgeInsets.zero,
+              onTap: () => launchURL(MASTODON_URL, context),
             ),
-            const SizedBox(height: 10),
-            AboutEntry(
-              title: AppLocalizations.of(context).aboutSourceTitle,
-              content: AppLocalizations.of(context).aboutSourceText,
-              url: 'https://github.com/wger-project',
-              icon: const Icon(Icons.code),
-            ),
-            const SizedBox(height: 10),
-            AboutEntry(
-              title: AppLocalizations.of(context).aboutBugsTitle,
-              content: AppLocalizations.of(context).aboutBugsText,
-              url: 'https://github.com/wger-project/flutter/issues/new/choose',
-              icon: const Icon(Icons.bug_report),
-            ),
-            const SizedBox(height: 10),
-            AboutEntry(
-              title: AppLocalizations.of(context).aboutContactUsTitle,
-              content: AppLocalizations.of(context).aboutContactUsText,
-              url: 'https://discord.gg/rPWFv6W',
-              icon: const Icon(FontAwesomeIcons.discord),
-            ),
-            const SizedBox(height: 10),
-            AboutEntry(
-              title: AppLocalizations.of(context).aboutMastodonTitle,
-              content: AppLocalizations.of(context).aboutMastodonText,
-              url: 'https://fosstodon.org/@wger',
-              icon: const Icon(FontAwesomeIcons.mastodon),
-            ),
-            const SizedBox(height: 10),
-            AboutEntry(
-              title: AppLocalizations.of(context).aboutTranslationTitle,
-              content: AppLocalizations.of(context).aboutTranslationText,
-              url: 'https://hosted.weblate.org/engage/wger',
-              icon: const Icon(Icons.translate),
-            ),
-            const SizedBox(height: 10),
-            AboutEntry(
-              title: AppLocalizations.of(context).aboutDonateTitle,
-              content: AppLocalizations.of(context).aboutDonateText,
-              url: 'https://www.buymeacoffee.com/wger',
-              icon: const Icon(FontAwesomeIcons.moneyBill1),
+
+            _buildSectionSpacer(),
+            _buildSectionHeader(context, i18n.others),
+
+            ListTile(
+              leading: const Icon(Icons.article),
+              trailing: const Icon(Icons.chevron_right),
+              title: Text(i18n.applicationLogs),
+              contentPadding: EdgeInsets.zero,
+              onTap: () {
+                Navigator.of(context).pushNamed(LogOverviewPage.routeName);
+              },
             ),
             ListTile(
               leading: const Icon(Icons.article),
+              trailing: const Icon(Icons.chevron_right),
               title: const Text('View Licenses'),
               contentPadding: EdgeInsets.zero,
               onTap: () {
@@ -161,12 +196,16 @@ class AboutPage extends StatelessWidget {
                   context: context,
                   applicationName: 'wger',
                   applicationVersion:
-                      'App: ${authProvider.applicationVersion!.version}\n'
-                      'Server: ${authProvider.serverVersion}',
-                  applicationLegalese: '\u{a9} 2020 - 2021 contributors',
+                      'App: ${authProvider.applicationVersion?.version ?? 'N/A'} '
+                      'Server: ${authProvider.serverVersion ?? 'N/A'}',
+                  applicationLegalese: '\u{a9} ${today.year} wger contributors',
                   applicationIcon: Padding(
                     padding: const EdgeInsets.only(top: 10),
-                    child: Image.asset('assets/images/logo.png', width: 60),
+                    child: Image.asset(
+                      'assets/images/logo.png',
+                      width: 60,
+                      semanticLabel: 'wger logo',
+                    ),
                   ),
                 );
               },
diff --git a/lib/widgets/core/app_bar.dart b/lib/widgets/core/app_bar.dart
index 0cb659bf..b047c875 100644
--- a/lib/widgets/core/app_bar.dart
+++ b/lib/widgets/core/app_bar.dart
@@ -23,8 +23,8 @@ import 'package:wger/providers/auth.dart';
 import 'package:wger/providers/body_weight.dart';
 import 'package:wger/providers/gallery.dart';
 import 'package:wger/providers/nutrition.dart';
+import 'package:wger/providers/routines.dart';
 import 'package:wger/providers/user.dart';
-import 'package:wger/providers/workout_plans.dart';
 import 'package:wger/screens/form_screen.dart';
 import 'package:wger/widgets/core/about.dart';
 import 'package:wger/widgets/core/settings.dart';
@@ -88,7 +88,7 @@ class MainAppBar extends StatelessWidget implements PreferredSizeWidget {
                         title: Text(AppLocalizations.of(context).logout),
                         onTap: () {
                           context.read<AuthProvider>().logout();
-                          context.read<WorkoutPlansProvider>().clear();
+                          context.read<RoutinesProvider>().clear();
                           context.read<NutritionPlansProvider>().clear();
                           context.read<BodyWeightProvider>().clear();
                           context.read<GalleryProvider>().clear();
diff --git a/lib/widgets/core/cards.dart b/lib/widgets/core/cards.dart
new file mode 100644
index 00000000..f95b3f2f
--- /dev/null
+++ b/lib/widgets/core/cards.dart
@@ -0,0 +1,38 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+
+class InfoCard extends StatelessWidget {
+  final String text;
+
+  const InfoCard({super.key, this.text = ''});
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+
+    return Card(
+      color: theme.colorScheme.primaryContainer,
+      child: ListTile(
+        leading: Icon(Icons.info, color: theme.colorScheme.primary),
+        subtitle: Text(text),
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/core/image.dart b/lib/widgets/core/image.dart
new file mode 100644
index 00000000..49466b58
--- /dev/null
+++ b/lib/widgets/core/image.dart
@@ -0,0 +1,21 @@
+import 'package:flutter/material.dart';
+
+class ImageFormatNotSupported extends StatelessWidget {
+  final String title;
+
+  const ImageFormatNotSupported(this.title, {super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+
+    return Container(
+      color: theme.colorScheme.errorContainer,
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.center,
+        spacing: 8,
+        children: [const Icon(Icons.broken_image), Text(title)],
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/core/log_overview.dart b/lib/widgets/core/log_overview.dart
new file mode 100644
index 00000000..2e335ebb
--- /dev/null
+++ b/lib/widgets/core/log_overview.dart
@@ -0,0 +1,66 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:logging/logging.dart';
+import 'package:wger/helpers/logs.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+class LogOverviewPage extends StatelessWidget {
+  static String routeName = '/LogOverviewPage';
+
+  const LogOverviewPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
+    final logs = InMemoryLogStore().logs.reversed.toList();
+
+    return Scaffold(
+      appBar: AppBar(title: Text(i18n.applicationLogs)),
+      body: logs.isEmpty
+          ? const Center(child: Text('No logs available.'))
+          : ListView.builder(
+              itemCount: logs.length,
+              itemBuilder: (context, index) {
+                final log = logs[index];
+                return ListTile(
+                  dense: true,
+                  leading: Icon(_iconForLevel(log.level)),
+                  title: Text('[${log.level.name}] ${log.message}'),
+                  subtitle: Text('${log.loggerName}\n${log.time.toIso8601String()}'),
+                  isThreeLine: true,
+                );
+              },
+            ),
+    );
+  }
+}
+
+IconData _iconForLevel(Level level) {
+  if (level >= Level.SEVERE) {
+    return Icons.priority_high;
+  }
+  if (level >= Level.WARNING) {
+    return Icons.warning;
+  }
+  if (level >= Level.INFO) {
+    return Icons.info;
+  }
+  return Icons.bug_report;
+}
diff --git a/lib/widgets/core/progress_indicator.dart b/lib/widgets/core/progress_indicator.dart
new file mode 100644
index 00000000..826c8b05
--- /dev/null
+++ b/lib/widgets/core/progress_indicator.dart
@@ -0,0 +1,28 @@
+import 'package:flutter/material.dart';
+
+class BoxedProgressIndicator extends StatelessWidget {
+  const BoxedProgressIndicator({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return const SizedBox(
+      height: 200,
+      child: Center(child: CircularProgressIndicator()),
+    );
+  }
+}
+
+class FormProgressIndicator extends StatelessWidget {
+  const FormProgressIndicator({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return const SizedBox(
+      height: 20,
+      width: 20,
+      child: CircularProgressIndicator(
+        valueColor: AlwaysStoppedAnimation<Color>(Colors.white),
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/core/settings.dart b/lib/widgets/core/settings.dart
index e036810d..e310ab03 100644
--- a/lib/widgets/core/settings.dart
+++ b/lib/widgets/core/settings.dart
@@ -18,10 +18,11 @@
 
 //import 'package:drift/drift.dart';
 import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
-import 'package:wger/providers/exercises.dart';
-import 'package:wger/providers/nutrition.dart';
+import 'package:wger/screens/configure_plates_screen.dart';
+import 'package:wger/widgets/core/settings/exercise_cache.dart';
+import 'package:wger/widgets/core/settings/ingredient_cache.dart';
+import 'package:wger/widgets/core/settings/theme.dart';
 
 class SettingsPage extends StatelessWidget {
   static String routeName = '/SettingsPage';
@@ -30,48 +31,25 @@ class SettingsPage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final exerciseProvider = Provider.of<ExercisesProvider>(context, listen: false);
-    final nutritionProvider = Provider.of<NutritionPlansProvider>(context, listen: false);
+    final i18n = AppLocalizations.of(context);
 
     return Scaffold(
-      appBar: AppBar(title: Text(AppLocalizations.of(context).settingsTitle)),
+      appBar: AppBar(title: Text(i18n.settingsTitle)),
       body: ListView(
         children: [
           ListTile(
-            title: Text(AppLocalizations.of(context).settingsExerciseCacheDescription),
-            trailing: IconButton(
-              key: const ValueKey('cacheIconExercises'),
-              icon: const Icon(Icons.delete),
-              onPressed: () async {
-                await exerciseProvider.clearAllCachesAndPrefs();
-
-                if (context.mounted) {
-                  final snackBar = SnackBar(
-                    content: Text(AppLocalizations.of(context).settingsCacheDeletedSnackbar),
-                  );
-
-                  ScaffoldMessenger.of(context).showSnackBar(snackBar);
-                }
-              },
-            ),
+            title: Text(i18n.settingsCacheTitle, style: Theme.of(context).textTheme.headlineSmall),
           ),
+          const SettingsExerciseCache(),
+          const SettingsIngredientCache(),
+          ListTile(title: Text(i18n.others, style: Theme.of(context).textTheme.headlineSmall)),
+          const SettingsTheme(),
           ListTile(
-            title: Text(AppLocalizations.of(context).settingsIngredientCacheDescription),
-            trailing: IconButton(
-              key: const ValueKey('cacheIconIngredients'),
-              icon: const Icon(Icons.delete),
-              onPressed: () async {
-                await nutritionProvider.clearIngredientCache();
-
-                if (context.mounted) {
-                  final snackBar = SnackBar(
-                    content: Text(AppLocalizations.of(context).settingsCacheDeletedSnackbar),
-                  );
-
-                  ScaffoldMessenger.of(context).showSnackBar(snackBar);
-                }
-              },
-            ),
+            title: Text(i18n.selectAvailablePlates),
+            onTap: () {
+              Navigator.of(context).pushNamed(ConfigurePlatesScreen.routeName);
+            },
+            trailing: const Icon(Icons.chevron_right),
           ),
         ],
       ),
diff --git a/lib/widgets/core/settings/exercise_cache.dart b/lib/widgets/core/settings/exercise_cache.dart
new file mode 100644
index 00000000..cb48efe1
--- /dev/null
+++ b/lib/widgets/core/settings/exercise_cache.dart
@@ -0,0 +1,92 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/providers/exercises.dart';
+
+class SettingsExerciseCache extends StatefulWidget {
+  const SettingsExerciseCache({super.key});
+
+  @override
+  State<SettingsExerciseCache> createState() => _SettingsExerciseCacheState();
+}
+
+class _SettingsExerciseCacheState extends State<SettingsExerciseCache> {
+  bool _isRefreshLoading = false;
+  String _subtitle = '';
+
+  @override
+  Widget build(BuildContext context) {
+    final exerciseProvider = Provider.of<ExercisesProvider>(context, listen: false);
+    final i18n = AppLocalizations.of(context);
+
+    return ListTile(
+      enabled: !_isRefreshLoading,
+      title: Text(i18n.settingsExerciseCacheDescription),
+      subtitle: _subtitle.isNotEmpty
+          ? Text(_subtitle)
+          : Text('${exerciseProvider.exercises.length} cached exercises'),
+      trailing: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          IconButton(
+            key: const ValueKey('cacheIconExercisesRefresh'),
+            icon: _isRefreshLoading
+                ? const SizedBox(
+                    width: 24,
+                    height: 24,
+                    child: CircularProgressIndicator(strokeWidth: 2),
+                  )
+                : const Icon(Icons.refresh),
+            onPressed: _isRefreshLoading
+                ? null
+                : () async {
+                    setState(() => _isRefreshLoading = true);
+
+                    // Note: status messages are currently left in English on purpose
+                    try {
+                      setState(() => _subtitle = 'Clearing cache...');
+                      await exerciseProvider.clearAllCachesAndPrefs();
+
+                      if (mounted) {
+                        setState(() => _subtitle = 'Loading languages and units...');
+                      }
+                      await exerciseProvider.fetchAndSetInitialData();
+
+                      if (mounted) {
+                        setState(() => _subtitle = 'Loading all exercises from server...');
+                      }
+                      await exerciseProvider.fetchAndSetAllExercises();
+
+                      if (mounted) {
+                        setState(() => _subtitle = '');
+                      }
+                    } finally {
+                      if (mounted) {
+                        setState(() => _isRefreshLoading = false);
+                      }
+                      if (context.mounted) {
+                        ScaffoldMessenger.of(
+                          context,
+                        ).showSnackBar(SnackBar(content: Text(i18n.success)));
+                      }
+                    }
+                  },
+          ),
+          IconButton(
+            key: const ValueKey('cacheIconExercisesDelete'),
+            icon: const Icon(Icons.delete),
+            onPressed: () async {
+              await exerciseProvider.clearAllCachesAndPrefs();
+
+              if (context.mounted) {
+                final snackBar = SnackBar(content: Text(i18n.settingsCacheDeletedSnackbar));
+
+                ScaffoldMessenger.of(context).showSnackBar(snackBar);
+              }
+            },
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/core/settings/ingredient_cache.dart b/lib/widgets/core/settings/ingredient_cache.dart
new file mode 100644
index 00000000..c183fd97
--- /dev/null
+++ b/lib/widgets/core/settings/ingredient_cache.dart
@@ -0,0 +1,32 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/providers/nutrition.dart';
+
+class SettingsIngredientCache extends StatelessWidget {
+  const SettingsIngredientCache({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
+    final nutritionProvider = Provider.of<NutritionPlansProvider>(context, listen: false);
+
+    return ListTile(
+      title: Text(i18n.settingsIngredientCacheDescription),
+      subtitle: Text('${nutritionProvider.ingredients.length} cached ingredients'),
+      trailing: IconButton(
+        key: const ValueKey('cacheIconIngredients'),
+        icon: const Icon(Icons.delete),
+        onPressed: () async {
+          await nutritionProvider.clearIngredientCache();
+
+          if (context.mounted) {
+            final snackBar = SnackBar(content: Text(i18n.settingsCacheDeletedSnackbar));
+
+            ScaffoldMessenger.of(context).showSnackBar(snackBar);
+          }
+        },
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/core/settings/theme.dart b/lib/widgets/core/settings/theme.dart
new file mode 100644
index 00000000..901c2ff4
--- /dev/null
+++ b/lib/widgets/core/settings/theme.dart
@@ -0,0 +1,41 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/providers/user.dart';
+
+class SettingsTheme extends StatelessWidget {
+  const SettingsTheme({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
+    final userProvider = Provider.of<UserProvider>(context);
+
+    return ListTile(
+      title: Text(i18n.themeMode),
+      trailing: DropdownButton<ThemeMode>(
+        key: const ValueKey('themeModeDropdown'),
+        value: userProvider.themeMode,
+        onChanged: (ThemeMode? newValue) {
+          if (newValue != null) {
+            userProvider.setThemeMode(newValue);
+          }
+        },
+        items: ThemeMode.values.map<DropdownMenuItem<ThemeMode>>((ThemeMode value) {
+          final label = (() {
+            switch (value) {
+              case ThemeMode.system:
+                return i18n.systemMode;
+              case ThemeMode.light:
+                return i18n.lightMode;
+              case ThemeMode.dark:
+                return i18n.darkMode;
+            }
+          })();
+
+          return DropdownMenuItem<ThemeMode>(value: value, child: Text(label));
+        }).toList(),
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/core/text_prompt.dart b/lib/widgets/core/text_prompt.dart
index 72cc3ff7..f42ba4cf 100644
--- a/lib/widgets/core/text_prompt.dart
+++ b/lib/widgets/core/text_prompt.dart
@@ -3,6 +3,7 @@ import 'package:wger/l10n/generated/app_localizations.dart';
 
 class TextPrompt extends StatelessWidget {
   const TextPrompt();
+
   @override
   Widget build(BuildContext context) {
     return Center(
diff --git a/lib/widgets/dashboard/calendar.dart b/lib/widgets/dashboard/calendar.dart
index 4451cc97..af81ca08 100644
--- a/lib/widgets/dashboard/calendar.dart
+++ b/lib/widgets/dashboard/calendar.dart
@@ -17,17 +17,17 @@
  */
 
 import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 import 'package:table_calendar/table_calendar.dart';
 import 'package:wger/helpers/consts.dart';
+import 'package:wger/helpers/date.dart';
 import 'package:wger/helpers/json.dart';
-import 'package:wger/helpers/misc.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
-import 'package:wger/models/workouts/session.dart';
 import 'package:wger/providers/body_weight.dart';
 import 'package:wger/providers/measurement.dart';
 import 'package:wger/providers/nutrition.dart';
-import 'package:wger/providers/workout_plans.dart';
+import 'package:wger/providers/routines.dart';
 import 'package:wger/theme/theme.dart';
 
 /// Types of events
@@ -74,15 +74,34 @@ class _DashboardCalendarWidgetState extends State<DashboardCalendarWidget>
     _events = <String, List<Event>>{};
     _selectedDay = _focusedDay;
     _selectedEvents = ValueNotifier(_getEventsForDay(_selectedDay!));
-    loadEvents();
+    //Fix: Defer context-dependent loadEvents() until after build
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      loadEvents();
+    });
   }
 
+  /// Loads and organizes all events from various providers into the calendar.
+  ///
+  /// This method asynchronously fetches and processes data from multiple sources:
+  /// - **Weight entries**: Retrieves weight measurements from [BodyWeightProvider]
+  /// - **Measurements**: Retrieves body measurements from [MeasurementProvider]
+  /// - **Workout sessions**: Fetches workout session data from [RoutinesProvider]
+  /// - **Nutritional plans**: Retrieves calorie diary entries from [NutritionPlansProvider]
+  ///
+  /// Each event is formatted according to the current locale and stored in the
+  /// [_events] map, keyed by date. The date format is determined by [DateFormatLists.format].
+  ///
+  /// After loading all events, the [_selectedEvents] value is updated with events
+  /// for the currently selected day, if any.
+  ///
+  /// **Note**: This method checks if the widget is still mounted before updating
+  /// the state after the async workout session fetch operation.
   void loadEvents() async {
+    final numberFormat = NumberFormat.decimalPattern(Localizations.localeOf(context).toString());
+    final i18n = AppLocalizations.of(context);
+
     // Process weight entries
-    final BodyWeightProvider weightProvider = Provider.of<BodyWeightProvider>(
-      context,
-      listen: false,
-    );
+    final weightProvider = context.read<BodyWeightProvider>();
     for (final entry in weightProvider.items) {
       final date = DateFormatLists.format(entry.date);
 
@@ -91,14 +110,11 @@ class _DashboardCalendarWidgetState extends State<DashboardCalendarWidget>
       }
 
       // Add events to lists
-      _events[date]!.add(Event(EventType.weight, '${entry.weight} kg'));
+      _events[date]?.add(Event(EventType.weight, '${numberFormat.format(entry.weight)} kg'));
     }
 
     // Process measurements
-    final MeasurementProvider measurementProvider = Provider.of<MeasurementProvider>(
-      context,
-      listen: false,
-    );
+    final measurementProvider = context.read<MeasurementProvider>();
     for (final category in measurementProvider.categories) {
       for (final entry in category.entries) {
         final date = DateFormatLists.format(entry.date);
@@ -107,17 +123,19 @@ class _DashboardCalendarWidgetState extends State<DashboardCalendarWidget>
           _events[date] = [];
         }
 
-        _events[date]!.add(
-          Event(EventType.measurement, '${category.name}: ${entry.value} ${category.unit}'),
+        _events[date]?.add(
+          Event(
+            EventType.measurement,
+            '${category.name}: ${numberFormat.format(entry.value)} ${category.unit}',
+          ),
         );
       }
     }
 
     // Process workout sessions
-    final WorkoutPlansProvider plans = Provider.of<WorkoutPlansProvider>(context, listen: false);
-    await plans.fetchSessionData().then((entries) {
-      for (final entry in entries['results']) {
-        final session = WorkoutSession.fromJson(entry);
+    final routinesProvider = context.read<RoutinesProvider>();
+    await routinesProvider.fetchSessionData().then((sessions) {
+      for (final session in sessions) {
         final date = DateFormatLists.format(session.date);
         if (!_events.containsKey(date)) {
           _events[date] = [];
@@ -126,14 +144,14 @@ class _DashboardCalendarWidgetState extends State<DashboardCalendarWidget>
         time = '(${timeToString(session.timeStart)} - ${timeToString(session.timeEnd)})';
 
         // Add events to lists
-        _events[date]!.add(
-          Event(
-            EventType.session,
-            '${AppLocalizations.of(context).impression}: ${session.impressionAsString} $time',
-          ),
+        _events[date]?.add(
+          Event(EventType.session, '${i18n.impression}: ${session.impressionAsString} $time'),
         );
       }
     });
+    if (!mounted) {
+      return;
+    }
 
     // Process nutritional plans
     final NutritionPlansProvider nutritionProvider = Provider.of<NutritionPlansProvider>(
@@ -148,14 +166,14 @@ class _DashboardCalendarWidgetState extends State<DashboardCalendarWidget>
         }
 
         // Add events to lists
-        _events[date]!.add(
-          Event(EventType.caloriesDiary, '${entry.value.energy.toStringAsFixed(0)} kcal'),
+        _events[date]?.add(
+          Event(EventType.caloriesDiary, i18n.kcalValue(entry.value.energy.toStringAsFixed(0))),
         );
       }
     }
 
     // Add initial selected day to events list
-    _selectedEvents.value = _getEventsForDay(_selectedDay!);
+    _selectedEvents.value = _selectedDay != null ? _getEventsForDay(_selectedDay!) : [];
   }
 
   @override
@@ -225,7 +243,7 @@ class _DashboardCalendarWidgetState extends State<DashboardCalendarWidget>
           TableCalendar<Event>(
             locale: Localizations.localeOf(context).languageCode,
             firstDay: DateTime.now().subtract(const Duration(days: 1000)),
-            lastDay: DateTime.now(),
+            lastDay: DateTime.now().add(const Duration(days: 365)),
             focusedDay: _focusedDay,
             selectedDayPredicate: (day) => isSameDay(_selectedDay, day),
             rangeStartDay: _rangeStart,
diff --git a/lib/widgets/dashboard/widgets.dart b/lib/widgets/dashboard/widgets.dart
deleted file mode 100644
index 6140d2a7..00000000
--- a/lib/widgets/dashboard/widgets.dart
+++ /dev/null
@@ -1,561 +0,0 @@
-/*
- * This file is part of wger Workout Manager <https://github.com/wger-project>.
- * Copyright (C) 2020, 2021 wger Team
- *
- * wger Workout Manager is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * wger Workout Manager is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import 'dart:async';
-
-import 'package:carousel_slider/carousel_slider.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_svg_icons/flutter_svg_icons.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:intl/intl.dart';
-import 'package:provider/provider.dart';
-import 'package:wger/l10n/generated/app_localizations.dart';
-import 'package:wger/models/nutrition/nutritional_plan.dart';
-import 'package:wger/models/workouts/workout_plan.dart';
-import 'package:wger/providers/body_weight.dart';
-import 'package:wger/providers/measurement.dart';
-import 'package:wger/providers/nutrition.dart';
-import 'package:wger/providers/user.dart';
-import 'package:wger/providers/workout_plans.dart';
-import 'package:wger/screens/form_screen.dart';
-import 'package:wger/screens/gym_mode.dart';
-import 'package:wger/screens/log_meals_screen.dart';
-import 'package:wger/screens/measurement_categories_screen.dart';
-import 'package:wger/screens/nutritional_plan_screen.dart';
-import 'package:wger/screens/weight_screen.dart';
-import 'package:wger/screens/workout_plan_screen.dart';
-import 'package:wger/theme/theme.dart';
-import 'package:wger/widgets/core/core.dart';
-import 'package:wger/widgets/measurements/categories_card.dart';
-import 'package:wger/widgets/measurements/charts.dart';
-import 'package:wger/widgets/measurements/forms.dart';
-import 'package:wger/widgets/measurements/helpers.dart';
-import 'package:wger/widgets/nutrition/charts.dart';
-import 'package:wger/widgets/nutrition/forms.dart';
-import 'package:wger/widgets/weight/forms.dart';
-import 'package:wger/widgets/workouts/forms.dart';
-
-class DashboardNutritionWidget extends StatefulWidget {
-  const DashboardNutritionWidget();
-
-  @override
-  _DashboardNutritionWidgetState createState() => _DashboardNutritionWidgetState();
-}
-
-class _DashboardNutritionWidgetState extends State<DashboardNutritionWidget> {
-  NutritionalPlan? _plan;
-  StreamSubscription? _subscription;
-
-  bool _hasContent = false;
-
-  @override
-  void initState() {
-    super.initState();
-    final stream = Provider.of<NutritionPlansProvider>(
-      context,
-      listen: false,
-    ).watchNutritionPlanLast();
-    _subscription = stream.listen((plan) {
-      if (!context.mounted) {
-        return;
-      }
-      setState(() {
-        _plan = plan;
-        _hasContent = _plan != null;
-      });
-    });
-  }
-
-  @override
-  void dispose() {
-    _subscription?.cancel();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Card(
-      child: Column(
-        children: [
-          ListTile(
-            title: Text(
-              _hasContent ? _plan!.description : AppLocalizations.of(context).nutritionalPlan,
-              style: Theme.of(context).textTheme.headlineSmall,
-            ),
-            subtitle: Text(
-              _hasContent
-                  ? DateFormat.yMd(
-                      Localizations.localeOf(context).languageCode,
-                    ).format(_plan!.creationDate)
-                  : '',
-            ),
-            leading: Icon(
-              Icons.restaurant,
-              color: Theme.of(context).textTheme.headlineSmall!.color,
-            ),
-          ),
-          if (_hasContent)
-            Padding(
-              padding: const EdgeInsets.symmetric(horizontal: 10),
-              child: Container(
-                padding: const EdgeInsets.symmetric(horizontal: 5, vertical: 15),
-                child: FlNutritionalPlanGoalWidget(nutritionalPlan: _plan!),
-              ),
-            )
-          else
-            NothingFound(
-              AppLocalizations.of(context).noNutritionalPlans,
-              AppLocalizations.of(context).newNutritionalPlan,
-              PlanForm(),
-            ),
-          if (_hasContent)
-            Row(
-              mainAxisAlignment: MainAxisAlignment.end,
-              children: [
-                TextButton(
-                  child: Text(AppLocalizations.of(context).goToDetailPage),
-                  onPressed: () {
-                    Navigator.of(
-                      context,
-                    ).pushNamed(NutritionalPlanScreen.routeName, arguments: _plan!.id);
-                  },
-                ),
-                Expanded(child: Container()),
-                IconButton(
-                  icon: const SvgIcon(icon: SvgIconData('assets/icons/ingredient-diary.svg')),
-                  tooltip: AppLocalizations.of(context).logIngredient,
-                  onPressed: () {
-                    Navigator.pushNamed(
-                      context,
-                      FormScreen.routeName,
-                      arguments: FormScreenArguments(
-                        AppLocalizations.of(context).logIngredient,
-                        IngredientLogForm(_plan!),
-                        hasListView: true,
-                      ),
-                    );
-                  },
-                ),
-                IconButton(
-                  icon: const SvgIcon(icon: SvgIconData('assets/icons/meal-diary.svg')),
-                  tooltip: AppLocalizations.of(context).logMeal,
-                  onPressed: () {
-                    Navigator.of(context).pushNamed(LogMealsScreen.routeName, arguments: _plan);
-                  },
-                ),
-              ],
-            ),
-        ],
-      ),
-    );
-  }
-}
-
-class DashboardWeightWidget extends StatefulWidget {
-  const DashboardWeightWidget();
-
-  @override
-  _DashboardWeightWidgetState createState() => _DashboardWeightWidgetState();
-}
-
-class _DashboardWeightWidgetState extends State<DashboardWeightWidget> {
-  @override
-  Widget build(BuildContext context) {
-    final profile = context.read<UserProvider>().profile;
-    final weightProvider = context.read<BodyWeightProvider>();
-
-    final (entriesAll, entries7dAvg) = sensibleRange(
-      weightProvider.items.map((e) => MeasurementChartEntry(e.weight, e.date)).toList(),
-    );
-
-    return Consumer<BodyWeightProvider>(
-      builder: (context, workoutProvider, child) => Card(
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            ListTile(
-              title: Text(
-                AppLocalizations.of(context).weight,
-                style: Theme.of(context).textTheme.headlineSmall,
-              ),
-              leading: FaIcon(
-                FontAwesomeIcons.weightScale,
-                color: Theme.of(context).textTheme.headlineSmall!.color,
-              ),
-            ),
-            Column(
-              children: [
-                if (weightProvider.items.isNotEmpty)
-                  Column(
-                    children: [
-                      SizedBox(
-                        height: 200,
-                        child: MeasurementChartWidgetFl(
-                          entriesAll,
-                          weightUnit(profile!.isMetric, context),
-                          avgs: entries7dAvg,
-                        ),
-                      ),
-                      if (entries7dAvg.isNotEmpty)
-                        MeasurementOverallChangeWidget(
-                          entries7dAvg.first,
-                          entries7dAvg.last,
-                          weightUnit(profile.isMetric, context),
-                        ),
-                      Row(
-                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                        children: [
-                          TextButton(
-                            child: Text(AppLocalizations.of(context).goToDetailPage),
-                            onPressed: () {
-                              Navigator.of(context).pushNamed(WeightScreen.routeName);
-                            },
-                          ),
-                          IconButton(
-                            icon: const Icon(Icons.add),
-                            onPressed: () {
-                              Navigator.pushNamed(
-                                context,
-                                FormScreen.routeName,
-                                arguments: FormScreenArguments(
-                                  AppLocalizations.of(context).newEntry,
-                                  WeightForm(
-                                    weightProvider.getNewestEntry()?.copyWith(
-                                      id: null,
-                                      date: DateTime.now(),
-                                    ),
-                                  ),
-                                ),
-                              );
-                            },
-                          ),
-                        ],
-                      ),
-                    ],
-                  )
-                else
-                  NothingFound(
-                    AppLocalizations.of(context).noWeightEntries,
-                    AppLocalizations.of(context).newEntry,
-                    WeightForm(),
-                  ),
-              ],
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
-
-class DashboardMeasurementWidget extends StatefulWidget {
-  const DashboardMeasurementWidget();
-
-  @override
-  _DashboardMeasurementWidgetState createState() => _DashboardMeasurementWidgetState();
-}
-
-class _DashboardMeasurementWidgetState extends State<DashboardMeasurementWidget> {
-  int _current = 0;
-  final _controller = CarouselSliderController();
-
-  @override
-  Widget build(BuildContext context) {
-    final provider = Provider.of<MeasurementProvider>(context, listen: false);
-
-    final items = provider.categories
-        .map<Widget>((item) => CategoriesCard(item, elevation: 0))
-        .toList();
-    if (items.isNotEmpty) {
-      items.add(
-        NothingFound(
-          AppLocalizations.of(context).moreMeasurementEntries,
-          AppLocalizations.of(context).newEntry,
-          MeasurementCategoryForm(),
-        ),
-      );
-    }
-    return Consumer<MeasurementProvider>(
-      builder: (context, workoutProvider, child) => Card(
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            ListTile(
-              title: Text(
-                AppLocalizations.of(context).measurements,
-                style: Theme.of(context).textTheme.headlineSmall,
-              ),
-              leading: FaIcon(
-                FontAwesomeIcons.chartLine,
-                color: Theme.of(context).textTheme.headlineSmall!.color,
-              ),
-              // TODO: this icon feels out of place and inconsistent with all
-              // other dashboard widgets.
-              // maybe we should just add a "Go to all" at the bottom of the widget
-              trailing: IconButton(
-                icon: const Icon(Icons.arrow_forward),
-                onPressed: () =>
-                    Navigator.pushNamed(context, MeasurementCategoriesScreen.routeName),
-              ),
-            ),
-            Column(
-              children: [
-                if (items.isNotEmpty)
-                  Column(
-                    children: [
-                      CarouselSlider(
-                        items: items,
-                        carouselController: _controller,
-                        options: CarouselOptions(
-                          autoPlay: false,
-                          enlargeCenterPage: false,
-                          viewportFraction: 1,
-                          enableInfiniteScroll: false,
-                          aspectRatio: 1.1,
-                          onPageChanged: (index, reason) {
-                            setState(() {
-                              _current = index;
-                            });
-                          },
-                        ),
-                      ),
-                      Padding(
-                        padding: const EdgeInsets.only(bottom: 10),
-                        child: Row(
-                          mainAxisAlignment: MainAxisAlignment.center,
-                          children: items.asMap().entries.map((entry) {
-                            return GestureDetector(
-                              onTap: () => _controller.animateToPage(entry.key),
-                              child: Container(
-                                width: 12.0,
-                                height: 12.0,
-                                margin: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 4.0),
-                                decoration: BoxDecoration(
-                                  shape: BoxShape.circle,
-                                  color: Theme.of(context).textTheme.headlineSmall!.color!
-                                      .withOpacity(_current == entry.key ? 0.9 : 0.4),
-                                ),
-                              ),
-                            );
-                          }).toList(),
-                        ),
-                      ),
-                    ],
-                  )
-                else
-                  NothingFound(
-                    AppLocalizations.of(context).noMeasurementEntries,
-                    AppLocalizations.of(context).newEntry,
-                    MeasurementCategoryForm(),
-                  ),
-              ],
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
-
-class DashboardWorkoutWidget extends StatefulWidget {
-  const DashboardWorkoutWidget();
-
-  @override
-  _DashboardWorkoutWidgetState createState() => _DashboardWorkoutWidgetState();
-}
-
-class _DashboardWorkoutWidgetState extends State<DashboardWorkoutWidget> {
-  var _showDetail = false;
-  bool _hasContent = false;
-
-  WorkoutPlan? _workoutPlan;
-
-  @override
-  void initState() {
-    super.initState();
-    _workoutPlan = context.read<WorkoutPlansProvider>().activePlan;
-    _hasContent = _workoutPlan != null;
-  }
-
-  List<Widget> getContent() {
-    final List<Widget> out = [];
-
-    if (!_hasContent) {
-      return out;
-    }
-
-    for (final day in _workoutPlan!.days) {
-      out.add(
-        SizedBox(
-          width: double.infinity,
-          child: Row(
-            children: [
-              Expanded(
-                child: Text(
-                  day.description,
-                  style: const TextStyle(fontWeight: FontWeight.bold),
-                  overflow: TextOverflow.ellipsis,
-                ),
-              ),
-              Expanded(child: MutedText(day.getDaysText, textAlign: TextAlign.right)),
-              IconButton(
-                icon: const Icon(Icons.play_arrow),
-                color: wgerPrimaryButtonColor,
-                onPressed: () {
-                  Navigator.of(context).pushNamed(GymModeScreen.routeName, arguments: day);
-                },
-              ),
-            ],
-          ),
-        ),
-      );
-
-      for (final set in day.sets) {
-        out.add(
-          SizedBox(
-            width: double.infinity,
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                ...set.settingsFiltered.map((s) {
-                  return _showDetail
-                      ? Column(
-                          children: [
-                            Row(
-                              crossAxisAlignment: CrossAxisAlignment.start,
-                              children: [
-                                Text(
-                                  s.exerciseObj
-                                      .getExercise(Localizations.localeOf(context).languageCode)
-                                      .name,
-                                ),
-                                const SizedBox(width: 10),
-                                MutedText(set.getSmartRepr(s.exerciseObj).join('\n')),
-                              ],
-                            ),
-                            const SizedBox(height: 10),
-                          ],
-                        )
-                      : Container();
-                }),
-              ],
-            ),
-          ),
-        );
-      }
-      out.add(const Divider());
-    }
-
-    return out;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Card(
-      child: Column(
-        children: [
-          ListTile(
-            title: Text(
-              _hasContent ? _workoutPlan!.name : AppLocalizations.of(context).labelWorkoutPlan,
-              style: Theme.of(context).textTheme.headlineSmall,
-            ),
-            subtitle: Text(
-              _hasContent
-                  ? DateFormat.yMd(
-                      Localizations.localeOf(context).languageCode,
-                    ).format(_workoutPlan!.creationDate)
-                  : '',
-            ),
-            leading: Icon(
-              Icons.fitness_center,
-              color: Theme.of(context).textTheme.headlineSmall!.color,
-            ),
-            trailing: _hasContent
-                ? Tooltip(
-                    message: AppLocalizations.of(context).toggleDetails,
-                    child: _showDetail ? const Icon(Icons.info) : const Icon(Icons.info_outline),
-                  )
-                : const SizedBox(),
-            onTap: () {
-              setState(() {
-                _showDetail = !_showDetail;
-              });
-            },
-          ),
-          if (_hasContent)
-            Padding(
-              padding: const EdgeInsets.symmetric(horizontal: 10),
-              child: Column(children: [...getContent()]),
-            )
-          else
-            NothingFound(
-              AppLocalizations.of(context).noWorkoutPlans,
-              AppLocalizations.of(context).newWorkout,
-              WorkoutForm(WorkoutPlan.empty()),
-            ),
-          if (_hasContent)
-            Row(
-              mainAxisAlignment: MainAxisAlignment.start,
-              children: [
-                TextButton(
-                  child: Text(AppLocalizations.of(context).goToDetailPage),
-                  onPressed: () {
-                    Navigator.of(
-                      context,
-                    ).pushNamed(WorkoutPlanScreen.routeName, arguments: _workoutPlan);
-                  },
-                ),
-              ],
-            ),
-        ],
-      ),
-    );
-  }
-}
-
-class NothingFound extends StatelessWidget {
-  final String _title;
-  final String _titleForm;
-  final Widget _form;
-
-  const NothingFound(this._title, this._titleForm, this._form);
-
-  @override
-  Widget build(BuildContext context) {
-    return SizedBox(
-      height: 150,
-      child: Column(
-        mainAxisAlignment: MainAxisAlignment.center,
-        children: [
-          Text(_title),
-          IconButton(
-            iconSize: 30,
-            icon: const Icon(Icons.add_box, color: wgerPrimaryButtonColor),
-            onPressed: () {
-              Navigator.pushNamed(
-                context,
-                FormScreen.routeName,
-                arguments: FormScreenArguments(_titleForm, hasListView: true, _form),
-              );
-            },
-          ),
-        ],
-      ),
-    );
-  }
-}
diff --git a/lib/widgets/dashboard/widgets/measurements.dart b/lib/widgets/dashboard/widgets/measurements.dart
new file mode 100644
index 00000000..ed7fbd8f
--- /dev/null
+++ b/lib/widgets/dashboard/widgets/measurements.dart
@@ -0,0 +1,144 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:carousel_slider/carousel_slider.dart';
+import 'package:flutter/material.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:provider/provider.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/providers/measurement.dart';
+import 'package:wger/screens/measurement_categories_screen.dart';
+import 'package:wger/widgets/dashboard/widgets/nothing_found.dart';
+import 'package:wger/widgets/measurements/categories_card.dart';
+import 'package:wger/widgets/measurements/forms.dart';
+
+class DashboardMeasurementWidget extends StatefulWidget {
+  const DashboardMeasurementWidget();
+
+  @override
+  _DashboardMeasurementWidgetState createState() => _DashboardMeasurementWidgetState();
+}
+
+class _DashboardMeasurementWidgetState extends State<DashboardMeasurementWidget> {
+  int _current = 0;
+  final _controller = CarouselSliderController();
+
+  @override
+  Widget build(BuildContext context) {
+    final provider = Provider.of<MeasurementProvider>(context, listen: false);
+
+    final items = provider.categories
+        .map<Widget>((item) => CategoriesCard(item, elevation: 0))
+        .toList();
+    if (items.isNotEmpty) {
+      items.add(
+        NothingFound(
+          AppLocalizations.of(context).moreMeasurementEntries,
+          AppLocalizations.of(context).newEntry,
+          MeasurementCategoryForm(),
+        ),
+      );
+    }
+    return Consumer<MeasurementProvider>(
+      builder: (context, _, __) => Card(
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            ListTile(
+              title: Text(
+                AppLocalizations.of(context).measurements,
+                style: Theme.of(context).textTheme.headlineSmall,
+              ),
+              leading: FaIcon(
+                FontAwesomeIcons.chartLine,
+                color: Theme.of(context).textTheme.headlineSmall!.color,
+              ),
+              // TODO: this icon feels out of place and inconsistent with all
+              // other dashboard widgets.
+              // maybe we should just add a "Go to all" at the bottom of the widget
+              trailing: IconButton(
+                icon: const Icon(Icons.arrow_forward),
+                onPressed: () => Navigator.pushNamed(
+                  context,
+                  MeasurementCategoriesScreen.routeName,
+                ),
+              ),
+            ),
+            Column(
+              children: [
+                if (items.isNotEmpty)
+                  Column(
+                    children: [
+                      CarouselSlider(
+                        items: items,
+                        carouselController: _controller,
+                        options: CarouselOptions(
+                          autoPlay: false,
+                          enlargeCenterPage: false,
+                          viewportFraction: 1,
+                          enableInfiniteScroll: false,
+                          aspectRatio: 1.1,
+                          onPageChanged: (index, reason) {
+                            setState(() {
+                              _current = index;
+                            });
+                          },
+                        ),
+                      ),
+                      Padding(
+                        padding: const EdgeInsets.only(bottom: 10),
+                        child: Row(
+                          mainAxisAlignment: MainAxisAlignment.center,
+                          children: items.asMap().entries.map((entry) {
+                            return GestureDetector(
+                              onTap: () => _controller.animateToPage(entry.key),
+                              child: Container(
+                                width: 12.0,
+                                height: 12.0,
+                                margin: const EdgeInsets.symmetric(
+                                  vertical: 8.0,
+                                  horizontal: 4.0,
+                                ),
+                                decoration: BoxDecoration(
+                                  shape: BoxShape.circle,
+                                  color: Theme.of(context).textTheme.headlineSmall!.color!
+                                      .withOpacity(
+                                        _current == entry.key ? 0.9 : 0.4,
+                                      ),
+                                ),
+                              ),
+                            );
+                          }).toList(),
+                        ),
+                      ),
+                    ],
+                  )
+                else
+                  NothingFound(
+                    AppLocalizations.of(context).noMeasurementEntries,
+                    AppLocalizations.of(context).newEntry,
+                    MeasurementCategoryForm(),
+                  ),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/dashboard/widgets/nothing_found.dart b/lib/widgets/dashboard/widgets/nothing_found.dart
new file mode 100644
index 00000000..326d3417
--- /dev/null
+++ b/lib/widgets/dashboard/widgets/nothing_found.dart
@@ -0,0 +1,57 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:wger/screens/form_screen.dart';
+import 'package:wger/theme/theme.dart';
+
+class NothingFound extends StatelessWidget {
+  final String _title;
+  final String _titleForm;
+  final Widget _form;
+
+  const NothingFound(this._title, this._titleForm, this._form);
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      height: 150,
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: [
+          Text(_title),
+          IconButton(
+            iconSize: 30,
+            icon: const Icon(Icons.add_box, color: wgerPrimaryButtonColor),
+            onPressed: () {
+              Navigator.pushNamed(
+                context,
+                FormScreen.routeName,
+                arguments: FormScreenArguments(
+                  _titleForm,
+                  hasListView: true,
+                  _form,
+                ),
+              );
+            },
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/dashboard/widgets/nutrition.dart b/lib/widgets/dashboard/widgets/nutrition.dart
new file mode 100644
index 00000000..ee611ba4
--- /dev/null
+++ b/lib/widgets/dashboard/widgets/nutrition.dart
@@ -0,0 +1,133 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:flutter_svg_icons/flutter_svg_icons.dart';
+import 'package:intl/intl.dart';
+import 'package:provider/provider.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/nutrition/nutritional_plan.dart';
+import 'package:wger/providers/nutrition.dart';
+import 'package:wger/screens/form_screen.dart';
+import 'package:wger/screens/log_meals_screen.dart';
+import 'package:wger/screens/nutritional_plan_screen.dart';
+import 'package:wger/widgets/dashboard/widgets/nothing_found.dart';
+import 'package:wger/widgets/nutrition/charts.dart';
+import 'package:wger/widgets/nutrition/forms.dart';
+
+class DashboardNutritionWidget extends StatefulWidget {
+  const DashboardNutritionWidget();
+
+  @override
+  _DashboardNutritionWidgetState createState() => _DashboardNutritionWidgetState();
+}
+
+class _DashboardNutritionWidgetState extends State<DashboardNutritionWidget> {
+  NutritionalPlan? _plan;
+  bool _hasContent = false;
+
+  @override
+  void initState() {
+    super.initState();
+    _plan = Provider.of<NutritionPlansProvider>(context, listen: false).currentPlan;
+    _hasContent = _plan != null;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Card(
+      child: Column(
+        children: [
+          ListTile(
+            title: Text(
+              _hasContent ? _plan!.description : AppLocalizations.of(context).nutritionalPlan,
+              style: Theme.of(context).textTheme.headlineSmall,
+            ),
+            subtitle: Text(
+              _hasContent
+                  ? DateFormat.yMd(
+                      Localizations.localeOf(context).languageCode,
+                    ).format(_plan!.creationDate)
+                  : '',
+            ),
+            leading: Icon(
+              Icons.restaurant,
+              color: Theme.of(context).textTheme.headlineSmall!.color,
+            ),
+          ),
+          if (_hasContent)
+            Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 10),
+              child: Container(
+                padding: const EdgeInsets.symmetric(horizontal: 5, vertical: 15),
+                child: FlNutritionalPlanGoalWidget(nutritionalPlan: _plan!),
+              ),
+            )
+          else
+            NothingFound(
+              AppLocalizations.of(context).noNutritionalPlans,
+              AppLocalizations.of(context).newNutritionalPlan,
+              PlanForm(),
+            ),
+          if (_hasContent)
+            Row(
+              mainAxisAlignment: MainAxisAlignment.end,
+              children: [
+                TextButton(
+                  child: Text(AppLocalizations.of(context).goToDetailPage),
+                  onPressed: () {
+                    Navigator.of(context).pushNamed(
+                      NutritionalPlanScreen.routeName,
+                      arguments: _plan,
+                    );
+                  },
+                ),
+                Expanded(child: Container()),
+                IconButton(
+                  icon: const SvgIcon(
+                    icon: SvgIconData('assets/icons/ingredient-diary.svg'),
+                  ),
+                  tooltip: AppLocalizations.of(context).logIngredient,
+                  onPressed: () {
+                    Navigator.pushNamed(
+                      context,
+                      FormScreen.routeName,
+                      arguments: FormScreenArguments(
+                        AppLocalizations.of(context).logIngredient,
+                        getIngredientLogForm(_plan!),
+                        hasListView: true,
+                      ),
+                    );
+                  },
+                ),
+                IconButton(
+                  icon: const SvgIcon(
+                    icon: SvgIconData('assets/icons/meal-diary.svg'),
+                  ),
+                  tooltip: AppLocalizations.of(context).logMeal,
+                  onPressed: () {
+                    Navigator.of(context).pushNamed(LogMealsScreen.routeName, arguments: _plan);
+                  },
+                ),
+              ],
+            ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/dashboard/widgets/routines.dart b/lib/widgets/dashboard/widgets/routines.dart
new file mode 100644
index 00000000..5077d905
--- /dev/null
+++ b/lib/widgets/dashboard/widgets/routines.dart
@@ -0,0 +1,210 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+import 'package:provider/provider.dart';
+import 'package:wger/helpers/date.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/workouts/day_data.dart';
+import 'package:wger/models/workouts/routine.dart';
+import 'package:wger/providers/routines.dart';
+import 'package:wger/screens/gym_mode.dart';
+import 'package:wger/screens/routine_screen.dart';
+import 'package:wger/theme/theme.dart';
+import 'package:wger/widgets/core/core.dart';
+import 'package:wger/widgets/dashboard/widgets/nothing_found.dart';
+import 'package:wger/widgets/routines/forms/routine.dart';
+
+class DashboardRoutineWidget extends StatefulWidget {
+  const DashboardRoutineWidget();
+
+  @override
+  _DashboardRoutineWidgetState createState() => _DashboardRoutineWidgetState();
+}
+
+class _DashboardRoutineWidgetState extends State<DashboardRoutineWidget> {
+  var _showDetail = false;
+  bool _hasContent = false;
+
+  @override
+  Widget build(BuildContext context) {
+    final routine = context.watch<RoutinesProvider>().currentRoutine;
+    _hasContent = routine != null;
+    final dateFormat = DateFormat.yMd(Localizations.localeOf(context).languageCode);
+
+    return Card(
+      child: Column(
+        children: [
+          ListTile(
+            title: Text(
+              _hasContent ? routine!.name : AppLocalizations.of(context).labelWorkoutPlan,
+              style: Theme.of(context).textTheme.headlineSmall,
+            ),
+            subtitle: Text(
+              _hasContent
+                  ? '${dateFormat.format(routine!.start)} - ${dateFormat.format(routine!.end)}'
+                  : '',
+            ),
+            leading: Icon(
+              Icons.fitness_center,
+              color: Theme.of(context).textTheme.headlineSmall!.color,
+            ),
+            trailing: _hasContent
+                ? Tooltip(
+                    message: AppLocalizations.of(context).toggleDetails,
+                    child: _showDetail ? const Icon(Icons.info) : const Icon(Icons.info_outline),
+                  )
+                : const SizedBox(),
+            onTap: () {
+              setState(() {
+                _showDetail = !_showDetail;
+              });
+            },
+          ),
+          if (_hasContent) ...[
+            Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 10),
+              child: DetailContentWidget(routine!.dayDataCurrentIteration, _showDetail),
+            ),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.start,
+              children: [
+                TextButton(
+                  child: Text(AppLocalizations.of(context).goToDetailPage),
+                  onPressed: () {
+                    Navigator.of(context).pushNamed(
+                      RoutineScreen.routeName,
+                      arguments: routine.id,
+                    );
+                  },
+                ),
+              ],
+            ),
+          ] else
+            NothingFound(
+              AppLocalizations.of(context).noRoutines,
+              AppLocalizations.of(context).newRoutine,
+              RoutineForm(Routine.empty()),
+            ),
+        ],
+      ),
+    );
+  }
+}
+
+class DetailContentWidget extends StatelessWidget {
+  final List<DayData> dayDataList;
+  final bool showDetail;
+
+  const DetailContentWidget(this.dayDataList, this.showDetail, {super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      children: [
+        ...dayDataList.where((dayData) => dayData.day != null).map((dayData) {
+          return Column(
+            children: [
+              SizedBox(
+                width: double.infinity,
+                child: Row(
+                  children: [
+                    if (dayData.date.isSameDayAs(DateTime.now())) const Icon(Icons.today),
+                    Expanded(
+                      child: Text(
+                        dayData.day == null || dayData.day!.isRest
+                            ? AppLocalizations.of(context).restDay
+                            : dayData.day!.nameWithType,
+                        style: const TextStyle(fontWeight: FontWeight.bold),
+                        overflow: TextOverflow.ellipsis,
+                      ),
+                    ),
+                    Expanded(
+                      child: MutedText(
+                        dayData.day != null ? dayData.day!.description : '',
+                        textAlign: TextAlign.right,
+                        overflow: TextOverflow.ellipsis,
+                      ),
+                    ),
+                    if (dayData.day == null || dayData.day!.isRest)
+                      const Icon(Icons.hotel)
+                    else
+                      IconButton(
+                        icon: const Icon(Icons.play_arrow),
+                        color: wgerPrimaryButtonColor,
+                        onPressed: () {
+                          Navigator.of(context).pushNamed(
+                            GymModeScreen.routeName,
+                            arguments: GymModeArguments(
+                              dayData.day!.routineId,
+                              dayData.day!.id!,
+                              dayData.iteration,
+                            ),
+                          );
+                        },
+                      ),
+                  ],
+                ),
+              ),
+              ...dayData.slots.map(
+                (slotData) => SizedBox(
+                  width: double.infinity,
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      ...slotData.setConfigs.map(
+                        (s) => showDetail
+                            ? Column(
+                                children: [
+                                  Row(
+                                    crossAxisAlignment: CrossAxisAlignment.start,
+                                    children: [
+                                      Text(
+                                        s.exercise
+                                            .getTranslation(
+                                              Localizations.localeOf(context).languageCode,
+                                            )
+                                            .name,
+                                      ),
+                                      const SizedBox(width: 10),
+                                      Expanded(
+                                        child: MutedText(
+                                          s.textRepr,
+                                          overflow: TextOverflow.ellipsis,
+                                        ),
+                                      ),
+                                    ],
+                                  ),
+                                  const SizedBox(height: 10),
+                                ],
+                              )
+                            : Container(),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+              const Divider(),
+            ],
+          );
+        }),
+      ],
+    );
+  }
+}
diff --git a/lib/widgets/dashboard/widgets/weight.dart b/lib/widgets/dashboard/widgets/weight.dart
new file mode 100644
index 00000000..dd568dc0
--- /dev/null
+++ b/lib/widgets/dashboard/widgets/weight.dart
@@ -0,0 +1,124 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:provider/provider.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/providers/body_weight.dart';
+import 'package:wger/providers/user.dart';
+import 'package:wger/screens/form_screen.dart';
+import 'package:wger/screens/weight_screen.dart';
+import 'package:wger/widgets/dashboard/widgets/nothing_found.dart';
+import 'package:wger/widgets/measurements/charts.dart';
+import 'package:wger/widgets/measurements/helpers.dart';
+import 'package:wger/widgets/weight/forms.dart';
+
+class DashboardWeightWidget extends StatelessWidget {
+  const DashboardWeightWidget();
+
+  @override
+  Widget build(BuildContext context) {
+    final profile = context.read<UserProvider>().profile;
+    final weightProvider = context.read<BodyWeightProvider>();
+
+    final (entriesAll, entries7dAvg) = sensibleRange(
+      weightProvider.items.map((e) => MeasurementChartEntry(e.weight, e.date)).toList(),
+    );
+
+    return Consumer<BodyWeightProvider>(
+      builder: (context, _, __) => Card(
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            ListTile(
+              title: Text(
+                AppLocalizations.of(context).weight,
+                style: Theme.of(context).textTheme.headlineSmall,
+              ),
+              leading: FaIcon(
+                FontAwesomeIcons.weightScale,
+                color: Theme.of(context).textTheme.headlineSmall!.color,
+              ),
+            ),
+            Column(
+              children: [
+                if (weightProvider.items.isNotEmpty)
+                  Column(
+                    children: [
+                      SizedBox(
+                        height: 200,
+                        child: MeasurementChartWidgetFl(
+                          entriesAll,
+                          weightUnit(profile!.isMetric, context),
+                          avgs: entries7dAvg,
+                        ),
+                      ),
+                      if (entries7dAvg.isNotEmpty)
+                        MeasurementOverallChangeWidget(
+                          entries7dAvg.first,
+                          entries7dAvg.last,
+                          weightUnit(profile.isMetric, context),
+                        ),
+                      Row(
+                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                        children: [
+                          TextButton(
+                            child: Text(
+                              AppLocalizations.of(context).goToDetailPage,
+                            ),
+                            onPressed: () {
+                              Navigator.of(context).pushNamed(WeightScreen.routeName);
+                            },
+                          ),
+                          IconButton(
+                            icon: const Icon(Icons.add),
+                            onPressed: () {
+                              Navigator.pushNamed(
+                                context,
+                                FormScreen.routeName,
+                                arguments: FormScreenArguments(
+                                  AppLocalizations.of(context).newEntry,
+                                  WeightForm(
+                                    weightProvider.getNewestEntry()?.copyWith(
+                                      id: null,
+                                      date: DateTime.now(),
+                                    ),
+                                  ),
+                                ),
+                              );
+                            },
+                          ),
+                        ],
+                      ),
+                    ],
+                  )
+                else
+                  NothingFound(
+                    AppLocalizations.of(context).noWeightEntries,
+                    AppLocalizations.of(context).newEntry,
+                    WeightForm(),
+                  ),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/exercises/autocompleter.dart b/lib/widgets/exercises/autocompleter.dart
new file mode 100644
index 00000000..e333045a
--- /dev/null
+++ b/lib/widgets/exercises/autocompleter.dart
@@ -0,0 +1,158 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_typeahead/flutter_typeahead.dart';
+import 'package:provider/provider.dart';
+import 'package:wger/helpers/consts.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/exercises/exercise.dart';
+import 'package:wger/providers/exercises.dart';
+import 'package:wger/screens/add_exercise_screen.dart';
+import 'package:wger/widgets/exercises/images.dart';
+
+typedef ExerciseSelectedCallback = void Function(Exercise exercise);
+
+class ExerciseAutocompleter extends StatefulWidget {
+  final ExerciseSelectedCallback onExerciseSelected;
+
+  const ExerciseAutocompleter({required this.onExerciseSelected});
+
+  @override
+  State<ExerciseAutocompleter> createState() => _ExerciseAutocompleterState();
+}
+
+class _ExerciseAutocompleterState extends State<ExerciseAutocompleter> {
+  bool _searchEnglish = true;
+  final _exercisesController = TextEditingController();
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      // mainAxisSize: MainAxisSize.min,
+      children: [
+        TypeAheadField<Exercise>(
+          key: const Key('field-typeahead'),
+          debounceDuration: const Duration(milliseconds: 500),
+          decorationBuilder: (context, child) {
+            return Material(
+              type: MaterialType.card,
+              elevation: 4,
+              borderRadius: BorderRadius.circular(8),
+              child: child,
+            );
+          },
+          controller: _exercisesController,
+          builder: (context, controller, focusNode) {
+            return TextFormField(
+              controller: controller,
+              focusNode: focusNode,
+              decoration: InputDecoration(
+                labelText: AppLocalizations.of(context).searchExercise,
+                prefixIcon: const Icon(Icons.search),
+                // suffixIcon: IconButton(
+                //   icon: const Icon(Icons.help),
+                //   onPressed: () {
+                //     showDialog(
+                //       context: context,
+                //       builder: (context) => AlertDialog(
+                //         content: Column(
+                //           mainAxisSize: MainAxisSize.min,
+                //           children: [
+                //             Text(AppLocalizations.of(context).selectExercises),
+                //             const SizedBox(height: 10),
+                //             Text(AppLocalizations.of(context).sameRepetitions),
+                //           ],
+                //         ),
+                //         actions: [
+                //           TextButton(
+                //             child: Text(
+                //               MaterialLocalizations.of(context).closeButtonLabel,
+                //             ),
+                //             onPressed: () {
+                //               Navigator.of(context).pop();
+                //             },
+                //           ),
+                //         ],
+                //       ),
+                //     );
+                //   },
+                // ),
+                errorMaxLines: 2,
+                border: InputBorder.none,
+              ),
+            );
+          },
+          suggestionsCallback: (pattern) {
+            if (pattern == '') {
+              return null;
+            }
+            return context.read<ExercisesProvider>().searchExercise(
+              pattern,
+              languageCode: Localizations.localeOf(context).languageCode,
+              searchEnglish: _searchEnglish,
+            );
+          },
+          itemBuilder:
+              (
+                BuildContext context,
+                Exercise exerciseSuggestion,
+              ) => ListTile(
+                key: Key('exercise-${exerciseSuggestion.id}'),
+                leading: SizedBox(
+                  width: 45,
+                  child: ExerciseImageWidget(
+                    image: exerciseSuggestion.getMainImage,
+                  ),
+                ),
+                title: Text(
+                  exerciseSuggestion
+                      .getTranslation(Localizations.localeOf(context).languageCode)
+                      .name,
+                ),
+                subtitle: Text(
+                  '${exerciseSuggestion.category!.name} / ${exerciseSuggestion.equipment.map((e) => e.name).join(', ')}',
+                ),
+              ),
+          emptyBuilder: (context) {
+            return Column(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                ListTile(
+                  title: Text(AppLocalizations.of(context).noMatchingExerciseFound),
+                ),
+                ListTile(
+                  title: OutlinedButton(
+                    onPressed: () {
+                      Navigator.of(context).pushNamed(AddExerciseScreen.routeName);
+                    },
+                    child: Text(AppLocalizations.of(context).contributeExercise),
+                  ),
+                ),
+              ],
+            );
+          },
+          transitionBuilder: (context, animation, child) => FadeTransition(
+            opacity: CurvedAnimation(
+              parent: animation,
+              curve: Curves.fastOutSlowIn,
+            ),
+            child: child,
+          ),
+          onSelected: (Exercise exerciseSuggestion) {
+            widget.onExerciseSelected(exerciseSuggestion);
+            _exercisesController.text = '';
+          },
+        ),
+        if (Localizations.localeOf(context).languageCode != LANGUAGE_SHORT_ENGLISH)
+          SwitchListTile(
+            title: Text(AppLocalizations.of(context).searchNamesInEnglish),
+            value: _searchEnglish,
+            onChanged: (_) {
+              setState(() {
+                _searchEnglish = !_searchEnglish;
+              });
+            },
+            dense: true,
+          ),
+      ],
+    );
+  }
+}
diff --git a/lib/widgets/exercises/exercises.dart b/lib/widgets/exercises/exercises.dart
index 61147eb9..373515f0 100644
--- a/lib/widgets/exercises/exercises.dart
+++ b/lib/widgets/exercises/exercises.dart
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import 'package:carousel_slider/carousel_slider.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_html/flutter_html.dart';
 import 'package:flutter_svg/svg.dart';
@@ -25,6 +26,7 @@ import 'package:wger/helpers/i18n.dart';
 import 'package:wger/helpers/platform.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/models/exercises/exercise.dart';
+import 'package:wger/models/exercises/image.dart';
 import 'package:wger/models/exercises/muscle.dart';
 import 'package:wger/models/exercises/translation.dart';
 import 'package:wger/providers/exercises.dart';
@@ -34,15 +36,16 @@ import 'package:wger/widgets/exercises/list_tile.dart';
 import 'package:wger/widgets/exercises/videos.dart';
 
 class ExerciseDetail extends StatelessWidget {
-  final Exercise _exerciseBase;
-  late Translation _exercise;
+  final Exercise _exercise;
+  late Translation _translation;
   static const PADDING = 9.0;
+  final CarouselController carouselController = CarouselController();
 
-  ExerciseDetail(this._exerciseBase);
+  ExerciseDetail(this._exercise);
 
   @override
   Widget build(BuildContext context) {
-    _exercise = _exerciseBase.getExercise(Localizations.localeOf(context).languageCode);
+    _translation = _exercise.getTranslation(Localizations.localeOf(context).languageCode);
 
     return SingleChildScrollView(
       child: Column(
@@ -78,8 +81,14 @@ class ExerciseDetail extends StatelessWidget {
   }
 
   List<Widget> getVariations(BuildContext context) {
+    final variations = Provider.of<ExercisesProvider>(context, listen: false)
+        .findExercisesByVariationId(
+          _exercise.variationId,
+          exerciseIdToExclude: _exercise.id,
+        );
+
     final List<Widget> out = [];
-    if (_exerciseBase.variationId == null) {
+    if (_exercise.variationId == null) {
       return out;
     }
 
@@ -89,14 +98,12 @@ class ExerciseDetail extends StatelessWidget {
         style: Theme.of(context).textTheme.headlineSmall,
       ),
     );
-    Provider.of<ExercisesProvider>(context, listen: false)
-        .findExercisesByVariationId(
-          _exerciseBase.variationId!,
-          exerciseBaseIdToExclude: _exerciseBase.id,
-        )
-        .forEach((element) {
-          out.add(ExerciseListTile(exerciseBase: element));
-        });
+    for (final element in variations) {
+      out.add(ExerciseListTile(exercise: element));
+    }
+    if (variations.isEmpty) {
+      out.add(const Text('-/-'));
+    }
 
     out.add(const SizedBox(height: PADDING));
     return out;
@@ -104,11 +111,14 @@ class ExerciseDetail extends StatelessWidget {
 
   List<Widget> getNotes(BuildContext context) {
     final List<Widget> out = [];
-    if (_exercise.notes.isNotEmpty) {
+    if (_translation.notes.isNotEmpty) {
       out.add(
-        Text(AppLocalizations.of(context).notes, style: Theme.of(context).textTheme.headlineSmall),
+        Text(
+          AppLocalizations.of(context).notes,
+          style: Theme.of(context).textTheme.headlineSmall,
+        ),
       );
-      for (final e in _exercise.notes) {
+      for (final e in _translation.notes) {
         out.add(Text(e.comment));
       }
       out.add(const SizedBox(height: PADDING));
@@ -120,7 +130,10 @@ class ExerciseDetail extends StatelessWidget {
   List<Widget> getMuscles(BuildContext context) {
     final List<Widget> out = [];
     out.add(
-      Text(AppLocalizations.of(context).muscles, style: Theme.of(context).textTheme.headlineSmall),
+      Text(
+        AppLocalizations.of(context).muscles,
+        style: Theme.of(context).textTheme.headlineSmall,
+      ),
     );
     out.add(
       Row(
@@ -131,8 +144,8 @@ class ExerciseDetail extends StatelessWidget {
             child: Padding(
               padding: const EdgeInsets.symmetric(horizontal: PADDING),
               child: MuscleWidget(
-                muscles: _exerciseBase.muscles,
-                musclesSecondary: _exerciseBase.musclesSecondary,
+                muscles: _exercise.muscles,
+                musclesSecondary: _exercise.musclesSecondary,
                 isFront: true,
               ),
             ),
@@ -141,8 +154,8 @@ class ExerciseDetail extends StatelessWidget {
             child: Padding(
               padding: const EdgeInsets.symmetric(horizontal: PADDING),
               child: MuscleWidget(
-                muscles: _exerciseBase.muscles,
-                musclesSecondary: _exerciseBase.musclesSecondary,
+                muscles: _exercise.muscles,
+                musclesSecondary: _exercise.musclesSecondary,
                 isFront: false,
               ),
             ),
@@ -156,7 +169,7 @@ class ExerciseDetail extends StatelessWidget {
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           const MuscleColorHelper(main: true),
-          ..._exerciseBase.muscles.map((e) => Text(e.nameTranslated(context))),
+          ..._exercise.muscles.map((e) => Text(e.nameTranslated(context))),
         ],
       ),
     );
@@ -166,7 +179,7 @@ class ExerciseDetail extends StatelessWidget {
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           const MuscleColorHelper(main: false),
-          ..._exerciseBase.musclesSecondary.map((e) => Text(e.name)),
+          ..._exercise.musclesSecondary.map((e) => Text(e.name)),
         ],
       ),
     );
@@ -184,16 +197,24 @@ class ExerciseDetail extends StatelessWidget {
         style: Theme.of(context).textTheme.headlineSmall,
       ),
     );
-    out.add(Html(data: _exercise.description));
+    out.add(Html(data: _translation.description));
 
     return out;
   }
 
   List<Widget> getImages() {
-    // TODO: add carousel for the other images
     final List<Widget> out = [];
-    if (_exerciseBase.getMainImage != null) {
-      out.add(ExerciseImageWidget(image: _exerciseBase.getMainImage));
+    if (_exercise.images.isNotEmpty) {
+      out.add(
+        CarouselImages(
+          images: _exercise.images,
+        ),
+      );
+
+      // out.add(ExerciseImageWidget(
+      //   image: _exercise.getMainImage,
+      //   height: 250,
+      // ));
       out.add(const SizedBox(height: PADDING));
     }
 
@@ -208,14 +229,14 @@ class ExerciseDetail extends StatelessWidget {
       Padding(
         padding: const EdgeInsets.symmetric(horizontal: 4),
         child: Chip(
-          label: Text(getTranslation(_exerciseBase.category!.name, context)),
+          label: Text(getTranslation(_exercise.category!.name, context)),
           padding: EdgeInsets.zero,
           backgroundColor: theme.splashColor,
         ),
       ),
     );
-    if (_exerciseBase.equipment.isNotEmpty) {
-      _exerciseBase.equipment
+    if (_exercise.equipment.isNotEmpty) {
+      _exercise.equipment
           .map(
             (e) => Padding(
               padding: const EdgeInsets.symmetric(horizontal: 4),
@@ -235,8 +256,8 @@ class ExerciseDetail extends StatelessWidget {
   List<Widget> getVideos() {
     // TODO: add carousel for the other videos
     final List<Widget> out = [];
-    if (_exerciseBase.videos.isNotEmpty && !isDesktop) {
-      _exerciseBase.videos.map((v) => ExerciseVideoWidget(video: v)).forEach((element) {
+    if (_exercise.videos.isNotEmpty && !isDesktop) {
+      _exercise.videos.map((v) => ExerciseVideoWidget(video: v)).forEach((element) {
         out.add(element);
       });
 
@@ -247,12 +268,12 @@ class ExerciseDetail extends StatelessWidget {
 
   List<Widget> getAliases(BuildContext context) {
     final List<Widget> out = [];
-    if (_exercise.aliases.isNotEmpty) {
+    if (_translation.aliases.isNotEmpty) {
       out.add(
         MutedText(
-          AppLocalizations.of(
-            context,
-          ).alsoKnownAs(_exercise.aliases.map((e) => e.alias).toList().join(', ')),
+          AppLocalizations.of(context).alsoKnownAs(
+            _translation.aliases.map((e) => e.alias).toList().join(', '),
+          ),
         ),
       );
       out.add(const SizedBox(height: PADDING));
@@ -292,7 +313,10 @@ class MuscleRowWidget extends StatelessWidget {
   final List<Muscle> muscles;
   final List<Muscle> musclesSecondary;
 
-  const MuscleRowWidget({required this.muscles, required this.musclesSecondary});
+  const MuscleRowWidget({
+    required this.muscles,
+    required this.musclesSecondary,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -347,10 +371,70 @@ class MuscleWidget extends StatelessWidget {
       children: [
         SvgPicture.asset('assets/images/muscles/$background.svg'),
         ...muscles.map((m) => SvgPicture.asset('assets/images/muscles/main/muscle-${m.id}.svg')),
-        ...musclesSecondary.map(
-          (m) => SvgPicture.asset('assets/images/muscles/secondary/muscle-${m.id}.svg'),
-        ),
+        ...musclesSecondary
+            .where((m) => !muscles.contains(m))
+            .map(
+              (m) => SvgPicture.asset(
+                'assets/images/muscles/secondary/muscle-${m.id}.svg',
+              ),
+            ),
       ],
     );
   }
 }
+
+class CarouselImages extends StatefulWidget {
+  final List<ExerciseImage> images;
+
+  const CarouselImages({super.key, required this.images});
+
+  @override
+  State<CarouselImages> createState() => _CarouselImagesState();
+}
+
+class _CarouselImagesState extends State<CarouselImages> {
+  int pageIndex = 0;
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      height: 250,
+      child: Stack(
+        children: [
+          CarouselSlider(
+            options: CarouselOptions(
+              onPageChanged: (index, _) => setState(() => pageIndex = index),
+            ),
+            items: List.generate(
+              widget.images.length,
+              (index) => Padding(
+                padding: const EdgeInsets.only(top: 15),
+                child: ExerciseImageWidget(
+                  image: widget.images[index],
+                  height: 260,
+                ),
+              ),
+            ),
+          ),
+          Row(
+            crossAxisAlignment: CrossAxisAlignment.center,
+            mainAxisAlignment: MainAxisAlignment.center,
+            spacing: 5,
+            children: List.generate(
+              widget.images.length,
+              (index) => AnimatedContainer(
+                duration: const Duration(milliseconds: 500),
+                height: 8,
+                width: 8,
+                decoration: BoxDecoration(
+                  color: pageIndex == index ? Colors.black : Colors.black26,
+                  shape: BoxShape.circle,
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/exercises/filter_modal.dart b/lib/widgets/exercises/filter_modal.dart
index 9ac88ad0..eb6758c7 100644
--- a/lib/widgets/exercises/filter_modal.dart
+++ b/lib/widgets/exercises/filter_modal.dart
@@ -48,7 +48,7 @@ class _ExerciseFilterModalBodyState extends State<ExerciseFilterModalBody> {
           dividerColor: Colors.transparent,
           expansionCallback: (panelIndex, isExpanded) {
             setState(() {
-              filters.filterCategories[panelIndex].isExpanded = !isExpanded;
+              filters.filterCategories[panelIndex].isExpanded = isExpanded;
             });
           },
           elevation: 0,
diff --git a/lib/widgets/exercises/images.dart b/lib/widgets/exercises/images.dart
index 45f02b8d..66a54686 100644
--- a/lib/widgets/exercises/images.dart
+++ b/lib/widgets/exercises/images.dart
@@ -16,26 +16,41 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import 'package:flutter/widgets.dart';
+import 'package:flutter/material.dart';
+import 'package:logging/logging.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/models/exercises/image.dart';
+import 'package:wger/widgets/core/image.dart';
 
 class ExerciseImageWidget extends StatelessWidget {
-  const ExerciseImageWidget({this.image});
+  ExerciseImageWidget({this.image, this.height});
 
+  final _logger = Logger('ExerciseImageWidget');
   final ExerciseImage? image;
+  final double? height;
 
   @override
   Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
+
     return image != null
-        ? FadeInImage(
-            placeholder: const AssetImage('assets/images/placeholder.png'),
-            image: NetworkImage(image!.url),
-            fit: BoxFit.cover,
+        ? Image.network(
+            image!.url,
+            semanticLabel: 'Exercise image',
+            errorBuilder: (context, error, stackTrace) {
+              _logger.warning('Failed to load image ${image!.url}: $error, $stackTrace');
+              final imageFormat = image!.url.split('.').last.toUpperCase();
+
+              return ImageFormatNotSupported(
+                i18n.imageFormatNotSupported(imageFormat),
+              );
+            },
           )
         : const Image(
             image: AssetImage('assets/images/placeholder.png'),
             color: Color.fromRGBO(255, 255, 255, 0.3),
             colorBlendMode: BlendMode.modulate,
+            semanticLabel: 'Placeholder',
           );
   }
 }
diff --git a/lib/widgets/exercises/list_tile.dart b/lib/widgets/exercises/list_tile.dart
index f1574b45..c49bfe93 100644
--- a/lib/widgets/exercises/list_tile.dart
+++ b/lib/widgets/exercises/list_tile.dart
@@ -23,9 +23,9 @@ import 'package:wger/screens/exercise_screen.dart';
 import 'package:wger/widgets/exercises/images.dart';
 
 class ExerciseListTile extends StatelessWidget {
-  const ExerciseListTile({super.key, required this.exerciseBase});
+  const ExerciseListTile({super.key, required this.exercise});
 
-  final Exercise exerciseBase;
+  final Exercise exercise;
 
   @override
   Widget build(BuildContext context) {
@@ -43,22 +43,21 @@ class ExerciseListTile extends StatelessWidget {
             child: SizedBox(
               height: IMG_SIZE,
               width: IMG_SIZE,
-              child: ExerciseImageWidget(image: exerciseBase.getMainImage),
+              child: ExerciseImageWidget(image: exercise.getMainImage),
             ),
           ),
         ),
       ),
       title: Text(
-        exerciseBase.getExercise(Localizations.localeOf(context).languageCode).name,
-        //style: theme.textTheme.titleLarge,
+        exercise.getTranslation(Localizations.localeOf(context).languageCode).name,
         overflow: TextOverflow.ellipsis,
         maxLines: 2,
       ),
       subtitle: Text(
-        '${getTranslation(exerciseBase.category!.name, context)} / ${exerciseBase.equipment.map((e) => getTranslation(e.name, context)).toList().join(', ')}',
+        '${getTranslation(exercise.category!.name, context)} / ${exercise.equipment.map((e) => getTranslation(e.name, context)).toList().join(', ')}',
       ),
       onTap: () {
-        Navigator.pushNamed(context, ExerciseDetailScreen.routeName, arguments: exerciseBase);
+        Navigator.pushNamed(context, ExerciseDetailScreen.routeName, arguments: exercise);
       },
     );
   }
diff --git a/lib/widgets/exercises/videos.dart b/lib/widgets/exercises/videos.dart
index aad1ebd9..8f38da56 100644
--- a/lib/widgets/exercises/videos.dart
+++ b/lib/widgets/exercises/videos.dart
@@ -17,7 +17,10 @@
  */
 
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:logging/logging.dart';
 import 'package:video_player/video_player.dart';
+import 'package:wger/helpers/errors.dart';
 import 'package:wger/models/exercises/video.dart';
 
 class ExerciseVideoWidget extends StatefulWidget {
@@ -31,33 +34,54 @@ class ExerciseVideoWidget extends StatefulWidget {
 
 class _ExerciseVideoWidgetState extends State<ExerciseVideoWidget> {
   late VideoPlayerController _controller;
+  bool hasError = false;
+  final logger = Logger('ExerciseVideoWidgetState');
 
   @override
   void initState() {
     super.initState();
-    _controller = VideoPlayerController.network(widget.video.url);
-    _controller.addListener(() {
+    _controller = VideoPlayerController.networkUrl(widget.video.uri);
+    _initializeVideo();
+  }
+
+  Future<void> _initializeVideo() async {
+    try {
+      await _controller.initialize();
       setState(() {});
-    });
-    _controller.initialize().then((_) => setState(() {}));
+    } on PlatformException catch (e) {
+      if (mounted) {
+        setState(() => hasError = true);
+      }
+
+      logger.warning('PlatformException while initializing video: ${e.message}');
+    }
   }
 
   @override
   void dispose() {
-    super.dispose();
     _controller.dispose();
+    super.dispose();
   }
 
   @override
   Widget build(BuildContext context) {
-    return _controller.value.isInitialized
+    return hasError
+        ? const GeneralErrorsWidget(
+            [
+              'An error happened while loading the video. If you can, please check the application logs.',
+            ],
+          )
+        : _controller.value.isInitialized
         ? AspectRatio(
             aspectRatio: _controller.value.aspectRatio,
-            child: Stack(alignment: Alignment.bottomCenter, children: [
-              VideoPlayer(_controller),
-              _ControlsOverlay(controller: _controller),
-              VideoProgressIndicator(_controller, allowScrubbing: true),
-            ]),
+            child: Stack(
+              alignment: Alignment.bottomCenter,
+              children: [
+                VideoPlayer(_controller),
+                _ControlsOverlay(controller: _controller),
+                VideoProgressIndicator(_controller, allowScrubbing: true),
+              ],
+            ),
           )
         : Container();
   }
diff --git a/lib/widgets/gallery/forms.dart b/lib/widgets/gallery/forms.dart
index 418afedf..104e1614 100644
--- a/lib/widgets/gallery/forms.dart
+++ b/lib/widgets/gallery/forms.dart
@@ -57,7 +57,7 @@ class _ImageFormState extends State<ImageForm> {
   void initState() {
     super.initState();
 
-    dateController.text = toDate(widget._image.date)!;
+    dateController.text = dateToYYYYMMDD(widget._image.date)!;
     descriptionController.text = widget._image.description;
   }
 
@@ -143,7 +143,8 @@ class _ImageFormState extends State<ImageForm> {
               labelText: AppLocalizations.of(context).date,
               suffixIcon: const Icon(Icons.calendar_today),
             ),
-            readOnly: true, // Stop keyboard from appearing
+            readOnly: true,
+            // Stop keyboard from appearing
             controller: dateController,
             onTap: () async {
               // Stop keyboard from appearing
@@ -157,7 +158,7 @@ class _ImageFormState extends State<ImageForm> {
                 lastDate: DateTime.now(),
               );
 
-              dateController.text = toDate(pickedDate)!;
+              dateController.text = dateToYYYYMMDD(pickedDate)!;
             },
             onSaved: (newValue) {
               widget._image.date = DateTime.parse(newValue!);
diff --git a/lib/widgets/gallery/overview.dart b/lib/widgets/gallery/overview.dart
index 468f4a29..0900ffa5 100644
--- a/lib/widgets/gallery/overview.dart
+++ b/lib/widgets/gallery/overview.dart
@@ -22,8 +22,10 @@ import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 import 'package:wger/helpers/platform.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/gallery/image.dart' as gallery;
 import 'package:wger/providers/gallery.dart';
 import 'package:wger/screens/form_screen.dart';
+import 'package:wger/widgets/core/image.dart';
 import 'package:wger/widgets/core/text_prompt.dart';
 
 import 'forms.dart';
@@ -34,6 +36,8 @@ class Gallery extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final provider = Provider.of<GalleryProvider>(context);
+    final i18n = AppLocalizations.of(context);
+    final theme = Theme.of(context);
 
     return Padding(
       padding: const EdgeInsets.all(5),
@@ -52,63 +56,33 @@ class Gallery extends StatelessWidget {
                   return GestureDetector(
                     onTap: () {
                       showModalBottomSheet(
-                        builder: (context) => Container(
-                          key: Key('image-${currentImage.id}-detail'),
-                          padding: const EdgeInsets.all(10),
-                          child: Column(
-                            children: [
-                              Text(
-                                DateFormat.yMd(
-                                  Localizations.localeOf(context).languageCode,
-                                ).format(currentImage.date),
-                                style: Theme.of(context).textTheme.headlineSmall,
-                              ),
-                              Expanded(child: Image.network(currentImage.url!)),
-                              Padding(
-                                padding: const EdgeInsets.symmetric(vertical: 8),
-                                child: Text(currentImage.description),
-                              ),
-                              Row(
-                                mainAxisAlignment: MainAxisAlignment.center,
-                                children: [
-                                  IconButton(
-                                    icon: const Icon(Icons.delete),
-                                    onPressed: () {
-                                      Provider.of<GalleryProvider>(
-                                        context,
-                                        listen: false,
-                                      ).deleteImage(currentImage);
-                                      Navigator.of(context).pop();
-                                    },
-                                  ),
-                                  if (!isDesktop)
-                                    IconButton(
-                                      icon: const Icon(Icons.edit),
-                                      onPressed: () {
-                                        Navigator.pushNamed(
-                                          context,
-                                          FormScreen.routeName,
-                                          arguments: FormScreenArguments(
-                                            AppLocalizations.of(context).edit,
-                                            ImageForm(currentImage),
-                                            hasListView: true,
-                                          ),
-                                        );
-                                      },
-                                    ),
-                                ],
-                              ),
-                            ],
-                          ),
-                        ),
+                        builder: (context) => ImageDetail(image: currentImage),
                         context: context,
                       );
                     },
                     child: FadeInImage(
-                      key: Key('image-${currentImage.id}'),
+                      key: Key('image-${currentImage.id!}'),
                       placeholder: const AssetImage('assets/images/placeholder.png'),
                       image: NetworkImage(currentImage.url!),
                       fit: BoxFit.cover,
+                      imageSemanticLabel: currentImage.description,
+                      imageErrorBuilder: (context, error, stackTrace) {
+                        final imageFormat = currentImage.url!.split('.').last.toUpperCase();
+                        return AspectRatio(
+                          aspectRatio: 1,
+                          child: Container(
+                            color: theme.colorScheme.errorContainer,
+                            child: Row(
+                              mainAxisAlignment: MainAxisAlignment.center,
+                              spacing: 8,
+                              children: [
+                                const Icon(Icons.broken_image),
+                                Text(i18n.imageFormatNotSupported(imageFormat)),
+                              ],
+                            ),
+                          ),
+                        );
+                      },
                     ),
                   );
                 },
@@ -117,3 +91,76 @@ class Gallery extends StatelessWidget {
     );
   }
 }
+
+class ImageDetail extends StatelessWidget {
+  const ImageDetail({
+    super.key,
+    required this.image,
+  });
+
+  final gallery.Image image;
+
+  @override
+  Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
+    return Container(
+      key: Key('image-${image.id!}-detail'),
+      padding: const EdgeInsets.all(10),
+      child: Column(
+        children: [
+          Text(
+            DateFormat.yMd(Localizations.localeOf(context).languageCode).format(image.date),
+            style: Theme.of(context).textTheme.headlineSmall,
+          ),
+          Expanded(
+            child: Image.network(
+              image.url!,
+              semanticLabel: image.description,
+              errorBuilder: (context, error, stackTrace) {
+                final imageFormat = image.url!.split('.').last.toUpperCase();
+
+                return ImageFormatNotSupported(
+                  i18n.imageFormatNotSupported(imageFormat),
+                );
+              },
+            ),
+          ),
+          Padding(
+            padding: const EdgeInsets.symmetric(vertical: 8),
+            child: Text(image.description),
+          ),
+          Row(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              IconButton(
+                icon: const Icon(Icons.delete),
+                onPressed: () {
+                  Provider.of<GalleryProvider>(
+                    context,
+                    listen: false,
+                  ).deleteImage(image);
+                  Navigator.of(context).pop();
+                },
+              ),
+              if (!isDesktop)
+                IconButton(
+                  icon: const Icon(Icons.edit),
+                  onPressed: () {
+                    Navigator.pushNamed(
+                      context,
+                      FormScreen.routeName,
+                      arguments: FormScreenArguments(
+                        AppLocalizations.of(context).edit,
+                        ImageForm(image),
+                        hasListView: true,
+                      ),
+                    );
+                  },
+                ),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/measurements/categories_card.dart b/lib/widgets/measurements/categories_card.dart
index c4a86465..32fa04b8 100644
--- a/lib/widgets/measurements/categories_card.dart
+++ b/lib/widgets/measurements/categories_card.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/models/measurements/measurement_category.dart';
 import 'package:wger/screens/form_screen.dart';
 import 'package:wger/screens/measurement_entries_screen.dart';
@@ -22,53 +22,63 @@ class CategoriesCard extends StatelessWidget {
 
     return Card(
       elevation: elevation,
-      child: Column(
-        children: [
-          Padding(
-            padding: const EdgeInsets.only(top: 5),
-            child: Text(currentCategory.name, style: Theme.of(context).textTheme.titleLarge),
-          ),
-          Container(
-            padding: const EdgeInsets.all(10),
-            height: 220,
-            child: MeasurementChartWidgetFl(entriesAll, currentCategory.unit, avgs: entries7dAvg),
-          ),
-          if (entries7dAvg.isNotEmpty)
-            MeasurementOverallChangeWidget(
-              entries7dAvg.first,
-              entries7dAvg.last,
-              currentCategory.unit,
+      child: SingleChildScrollView(
+        scrollDirection: Axis.vertical,
+        child: Column(
+          children: [
+            Padding(
+              padding: const EdgeInsets.only(top: 5),
+              child: Text(
+                currentCategory.name,
+                style: Theme.of(context).textTheme.titleLarge,
+              ),
             ),
-          const Divider(),
-          Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: [
-              TextButton(
-                child: Text(AppLocalizations.of(context).goToDetailPage),
-                onPressed: () {
-                  Navigator.pushNamed(
-                    context,
-                    MeasurementEntriesScreen.routeName,
-                    arguments: currentCategory.id,
-                  );
-                },
+            Container(
+              padding: const EdgeInsets.all(10),
+              height: 220,
+              child: MeasurementChartWidgetFl(
+                entriesAll,
+                currentCategory.unit,
+                avgs: entries7dAvg,
               ),
-              IconButton(
-                onPressed: () async {
-                  await Navigator.pushNamed(
-                    context,
-                    FormScreen.routeName,
-                    arguments: FormScreenArguments(
-                      AppLocalizations.of(context).newEntry,
-                      MeasurementEntryForm(currentCategory.id!),
-                    ),
-                  );
-                },
-                icon: const Icon(Icons.add),
+            ),
+            if (entries7dAvg.isNotEmpty)
+              MeasurementOverallChangeWidget(
+                entries7dAvg.first,
+                entries7dAvg.last,
+                currentCategory.unit,
               ),
-            ],
-          ),
-        ],
+            const Divider(),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                TextButton(
+                  child: Text(AppLocalizations.of(context).goToDetailPage),
+                  onPressed: () {
+                    Navigator.pushNamed(
+                      context,
+                      MeasurementEntriesScreen.routeName,
+                      arguments: currentCategory.id,
+                    );
+                  },
+                ),
+                IconButton(
+                  onPressed: () async {
+                    await Navigator.pushNamed(
+                      context,
+                      FormScreen.routeName,
+                      arguments: FormScreenArguments(
+                        AppLocalizations.of(context).newEntry,
+                        MeasurementEntryForm(currentCategory.id!),
+                      ),
+                    );
+                  },
+                  icon: const Icon(Icons.add),
+                ),
+              ],
+            ),
+          ],
+        ),
       ),
     );
   }
diff --git a/lib/widgets/measurements/charts.dart b/lib/widgets/measurements/charts.dart
index 614684ce..407b1a9f 100644
--- a/lib/widgets/measurements/charts.dart
+++ b/lib/widgets/measurements/charts.dart
@@ -20,24 +20,31 @@ import 'package:fl_chart/fl_chart.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:wger/helpers/charts.dart';
+import 'package:wger/helpers/consts.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 
 class MeasurementOverallChangeWidget extends StatelessWidget {
   final MeasurementChartEntry _first;
   final MeasurementChartEntry _last;
   final String _unit;
+
   const MeasurementOverallChangeWidget(this._first, this._last, this._unit);
 
   @override
   Widget build(BuildContext context) {
     final delta = _last.value - _first.value;
-    final prefix = delta > 0
-        ? '+'
-        : delta < 0
-        ? '-'
-        : '';
+    String prefix = '';
+    if (delta > 0) {
+      prefix = '+';
+    } else if (delta < 0) {
+      prefix = '-';
+    }
 
-    return Text('overall change $prefix ${delta.abs().toStringAsFixed(1)} $_unit');
+    // ignore: prefer_interpolation_to_compose_strings
+    return Text(
+      AppLocalizations.of(context).overallChangeWeight +
+          ' $prefix${delta.abs().toStringAsFixed(1)} $_unit',
+    );
   }
 }
 
@@ -61,7 +68,10 @@ class _MeasurementChartWidgetFlState extends State<MeasurementChartWidgetFl> {
   Widget build(BuildContext context) {
     return AspectRatio(
       aspectRatio: 1.70,
-      child: Padding(padding: const EdgeInsets.all(4), child: LineChart(mainData())),
+      child: Padding(
+        padding: const EdgeInsets.all(4),
+        child: LineChart(mainData()),
+      ),
     );
   }
 
@@ -70,15 +80,24 @@ class _MeasurementChartWidgetFlState extends State<MeasurementChartWidgetFl> {
       touchTooltipData: LineTouchTooltipData(
         getTooltipColor: (touchedSpot) => Theme.of(context).colorScheme.primaryContainer,
         getTooltipItems: (touchedSpots) {
+          final numberFormat = NumberFormat.decimalPattern(
+            Localizations.localeOf(context).toString(),
+          );
+
           return touchedSpots.map((touchedSpot) {
+            final msSinceEpoch = touchedSpot.x.toInt();
             final DateTime date = DateTime.fromMillisecondsSinceEpoch(touchedSpot.x.toInt());
             final dateStr = DateFormat.Md(
               Localizations.localeOf(context).languageCode,
             ).format(date);
 
+            // Check if this is an interpolated point (milliseconds ending with 123)
+            final bool isInterpolated = msSinceEpoch % 1000 == INTERPOLATION_MARKER;
+            final String interpolatedMarker = isInterpolated ? ' (interpolated)' : '';
+
             return LineTooltipItem(
-              '$dateStr: ${touchedSpot.y.toStringAsFixed(1)} ${widget._unit}',
-              TextStyle(color: touchedSpot.bar.color, fontWeight: FontWeight.bold),
+              '$dateStr: ${numberFormat.format(touchedSpot.y)} ${widget._unit}$interpolatedMarker',
+              TextStyle(color: touchedSpot.bar.color),
             );
           }).toList();
         },
@@ -87,6 +106,8 @@ class _MeasurementChartWidgetFlState extends State<MeasurementChartWidgetFl> {
   }
 
   LineChartData mainData() {
+    final numberFormat = NumberFormat.decimalPattern(Localizations.localeOf(context).toString());
+
     return LineChartData(
       lineTouchData: tooltipData(),
       gridData: FlGridData(
@@ -103,8 +124,12 @@ class _MeasurementChartWidgetFlState extends State<MeasurementChartWidgetFl> {
       ),
       titlesData: FlTitlesData(
         show: true,
-        rightTitles: const AxisTitles(sideTitles: SideTitles(showTitles: false)),
-        topTitles: const AxisTitles(sideTitles: SideTitles(showTitles: false)),
+        rightTitles: const AxisTitles(
+          sideTitles: SideTitles(showTitles: false),
+        ),
+        topTitles: const AxisTitles(
+          sideTitles: SideTitles(showTitles: false),
+        ),
         bottomTitles: AxisTitles(
           sideTitles: SideTitles(
             showTitles: true,
@@ -123,11 +148,16 @@ class _MeasurementChartWidgetFlState extends State<MeasurementChartWidgetFl> {
                   DateFormat.yMd(Localizations.localeOf(context).languageCode).format(date),
                 );
               }
-              return Text(DateFormat.Md(Localizations.localeOf(context).languageCode).format(date));
+              return Text(
+                DateFormat.Md(Localizations.localeOf(context).languageCode).format(date),
+              );
             },
             interval: widget._entries.isNotEmpty
-                ? chartGetInterval(widget._entries.last.date, widget._entries.first.date)
-                : 1000,
+                ? chartGetInterval(
+                    widget._entries.last.date,
+                    widget._entries.first.date,
+                  )
+                : CHART_MILLISECOND_FACTOR,
           ),
         ),
         leftTitles: AxisTitles(
@@ -142,7 +172,7 @@ class _MeasurementChartWidgetFlState extends State<MeasurementChartWidgetFl> {
                 return const Text('');
               }
 
-              return Text('$value ${widget._unit}');
+              return Text('${numberFormat.format(value)} ${widget._unit}');
             },
           ),
         ),
@@ -154,7 +184,12 @@ class _MeasurementChartWidgetFlState extends State<MeasurementChartWidgetFl> {
       lineBarsData: [
         LineChartBarData(
           spots: widget._entries
-              .map((e) => FlSpot(e.date.millisecondsSinceEpoch.toDouble(), e.value.toDouble()))
+              .map(
+                (e) => FlSpot(
+                  e.date.millisecondsSinceEpoch.toDouble(),
+                  e.value.toDouble(),
+                ),
+              )
               .toList(),
           isCurved: false,
           color: Theme.of(context).colorScheme.primary,
@@ -165,7 +200,12 @@ class _MeasurementChartWidgetFlState extends State<MeasurementChartWidgetFl> {
         if (widget.avgs != null)
           LineChartBarData(
             spots: widget.avgs!
-                .map((e) => FlSpot(e.date.millisecondsSinceEpoch.toDouble(), e.value.toDouble()))
+                .map(
+                  (e) => FlSpot(
+                    e.date.millisecondsSinceEpoch.toDouble(),
+                    e.value.toDouble(),
+                  ),
+                )
                 .toList(),
             isCurved: false,
             color: Theme.of(context).colorScheme.tertiary,
@@ -184,7 +224,7 @@ class MeasurementChartEntry {
   MeasurementChartEntry(this.value, this.date);
 }
 
-// for each point, return the average of all the points in the 7 days preceeding it
+// for each point, return the average of all the points in the 7 days preceding it
 List<MeasurementChartEntry> moving7dAverage(List<MeasurementChartEntry> vals) {
   var start = 0;
   var end = 0;
@@ -233,6 +273,7 @@ class Indicator extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Row(
+      mainAxisSize: MainAxisSize.min,
       children: [
         Container(
           width: size,
diff --git a/lib/widgets/measurements/entries.dart b/lib/widgets/measurements/entries.dart
index b20b623a..6573375f 100644
--- a/lib/widgets/measurements/entries.dart
+++ b/lib/widgets/measurements/entries.dart
@@ -36,7 +36,9 @@ class EntriesList extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final plan = Provider.of<NutritionPlansProvider>(context, listen: false).currentPlan;
+    final plans = Provider.of<NutritionPlansProvider>(context, listen: false).items;
+    final numberFormat = NumberFormat.decimalPattern(Localizations.localeOf(context).toString());
+    final provider = Provider.of<MeasurementProvider>(context, listen: false);
 
     final entriesAll = _category.entries
         .map((e) => MeasurementChartEntry(e.value, e.date))
@@ -49,7 +51,7 @@ class EntriesList extends StatelessWidget {
           _category.name,
           entriesAll,
           entries7dAvg,
-          plan,
+          plans,
           _category.unit,
           context,
         ),
@@ -60,11 +62,10 @@ class EntriesList extends StatelessWidget {
             itemCount: _category.entries.length,
             itemBuilder: (context, index) {
               final currentEntry = _category.entries[index];
-              final provider = Provider.of<MeasurementProvider>(context, listen: false);
 
               return Card(
                 child: ListTile(
-                  title: Text('${currentEntry.value} ${_category.unit}'),
+                  title: Text('${numberFormat.format(currentEntry.value)} ${_category.unit}'),
                   subtitle: Text(
                     DateFormat.yMd(
                       Localizations.localeOf(context).languageCode,
@@ -80,7 +81,10 @@ class EntriesList extends StatelessWidget {
                             FormScreen.routeName,
                             arguments: FormScreenArguments(
                               AppLocalizations.of(context).edit,
-                              MeasurementEntryForm(currentEntry.category, currentEntry),
+                              MeasurementEntryForm(
+                                currentEntry.category,
+                                currentEntry,
+                              ),
                             ),
                           ),
                         ),
@@ -88,7 +92,10 @@ class EntriesList extends StatelessWidget {
                           child: Text(AppLocalizations.of(context).delete),
                           onTap: () async {
                             // Delete entry from DB
-                            await provider.deleteEntry(currentEntry.id!, currentEntry.category);
+                            await provider.deleteEntry(
+                              currentEntry.id!,
+                              currentEntry.category,
+                            );
 
                             // and inform the user
                             if (context.mounted) {
diff --git a/lib/widgets/measurements/forms.dart b/lib/widgets/measurements/forms.dart
index 4beb7bc9..41a2ea09 100644
--- a/lib/widgets/measurements/forms.dart
+++ b/lib/widgets/measurements/forms.dart
@@ -17,10 +17,10 @@
  */
 
 import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
-import 'package:wger/exceptions/http_exception.dart';
+import 'package:wger/helpers/consts.dart';
 import 'package:wger/helpers/json.dart';
-import 'package:wger/helpers/ui.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/models/measurements/measurement_category.dart';
 import 'package:wger/models/measurements/measurement_entry.dart';
@@ -31,7 +31,11 @@ class MeasurementCategoryForm extends StatelessWidget {
   final nameController = TextEditingController();
   final unitController = TextEditingController();
 
-  final Map<String, dynamic> categoryData = {'id': null, 'name': '', 'unit': ''};
+  final Map<String, dynamic> categoryData = {
+    'id': null,
+    'name': '',
+    'unit': '',
+  };
 
   MeasurementCategoryForm([MeasurementCategory? category]) {
     //this._category = category ?? MeasurementCategory();
@@ -97,29 +101,26 @@ class MeasurementCategoryForm extends StatelessWidget {
               _form.currentState!.save();
 
               // Save the entry on the server
-              try {
-                categoryData['id'] == null
-                    ? await Provider.of<MeasurementProvider>(context, listen: false).addCategory(
-                        MeasurementCategory(
-                          id: categoryData['id'],
-                          name: categoryData['name'],
-                          unit: categoryData['unit'],
-                        ),
-                      )
-                    : await Provider.of<MeasurementProvider>(context, listen: false).editCategory(
-                        categoryData['id'],
-                        categoryData['name'],
-                        categoryData['unit'],
-                      );
-              } on WgerHttpException catch (error) {
-                if (context.mounted) {
-                  showHttpExceptionErrorDialog(error, context);
-                }
-              } catch (error) {
-                if (context.mounted) {
-                  showErrorDialog(error, context);
-                }
-              }
+              categoryData['id'] == null
+                  ? await Provider.of<MeasurementProvider>(
+                      context,
+                      listen: false,
+                    ).addCategory(
+                      MeasurementCategory(
+                        id: categoryData['id'],
+                        name: categoryData['name'],
+                        unit: categoryData['unit'],
+                      ),
+                    )
+                  : await Provider.of<MeasurementProvider>(
+                      context,
+                      listen: false,
+                    ).editCategory(
+                      categoryData['id'],
+                      categoryData['name'],
+                      categoryData['unit'],
+                    );
+
               if (context.mounted) {
                 Navigator.of(context).pop();
               }
@@ -157,8 +158,8 @@ class MeasurementEntryForm extends StatelessWidget {
       _entryData['notes'] = entry.notes;
     }
 
-    _dateController.text = toDate(_entryData['date'])!;
-    _valueController.text = _entryData['value']!.toString();
+    _dateController.text = dateToYYYYMMDD(_entryData['date'])!;
+    _valueController.text = '';
     _notesController.text = _entryData['notes']!;
   }
 
@@ -169,13 +170,27 @@ class MeasurementEntryForm extends StatelessWidget {
       (category) => category.id == _categoryId,
     );
 
+    final numberFormat = NumberFormat.decimalPattern(Localizations.localeOf(context).toString());
+
+    // If the value is not empty, format it
+    if (_valueController.text.isEmpty && _entryData['value'] != null && _entryData['value'] != '') {
+      _valueController.text = numberFormat.format(_entryData['value']);
+    }
+
     return Form(
       key: _form,
       child: Column(
         children: [
           TextFormField(
-            decoration: InputDecoration(labelText: AppLocalizations.of(context).date),
-            readOnly: true, // Hide text cursor
+            decoration: InputDecoration(
+              labelText: AppLocalizations.of(context).date,
+              suffixIcon: const Icon(
+                Icons.calendar_today,
+                key: Key('calendarIcon'),
+              ),
+            ),
+            readOnly: true,
+            // Hide text cursor
             controller: _dateController,
             onTap: () async {
               // Stop keyboard from appearing
@@ -198,7 +213,7 @@ class MeasurementEntryForm extends StatelessWidget {
                 },
               );
 
-              _dateController.text = toDate(pickedDate)!;
+              _dateController.text = pickedDate == null ? '' : dateToYYYYMMDD(pickedDate)!;
             },
             onSaved: (newValue) {
               _entryData['date'] = DateTime.parse(newValue!);
@@ -218,20 +233,20 @@ class MeasurementEntryForm extends StatelessWidget {
               suffixIconConstraints: const BoxConstraints(minWidth: 0, minHeight: 0),
             ),
             controller: _valueController,
-            keyboardType: TextInputType.number,
+            keyboardType: textInputTypeDecimal,
             validator: (value) {
               if (value!.isEmpty) {
                 return AppLocalizations.of(context).enterValue;
               }
               try {
-                double.parse(value);
+                numberFormat.parse(value);
               } catch (error) {
                 return AppLocalizations.of(context).enterValidNumber;
               }
               return null;
             },
             onSaved: (newValue) {
-              _entryData['value'] = double.parse(newValue!);
+              _entryData['value'] = numberFormat.parse(newValue!);
             },
           ),
           // Value
@@ -245,7 +260,10 @@ class MeasurementEntryForm extends StatelessWidget {
               const minLength = 0;
               const maxLength = 100;
               if (value!.isNotEmpty && (value.length < minLength || value.length > maxLength)) {
-                return AppLocalizations.of(context).enterCharacters(minLength, maxLength);
+                return AppLocalizations.of(context).enterCharacters(
+                  minLength.toString(),
+                  maxLength.toString(),
+                );
               }
               return null;
             },
@@ -262,33 +280,30 @@ class MeasurementEntryForm extends StatelessWidget {
               _form.currentState!.save();
 
               // Save the entry on the server
-              try {
-                _entryData['id'] == null
-                    ? await Provider.of<MeasurementProvider>(context, listen: false).addEntry(
-                        MeasurementEntry(
-                          id: _entryData['id'],
-                          category: _entryData['category'],
-                          date: _entryData['date'],
-                          value: _entryData['value'],
-                          notes: _entryData['notes'],
-                        ),
-                      )
-                    : await Provider.of<MeasurementProvider>(context, listen: false).editEntry(
-                        _entryData['id'],
-                        _entryData['category'],
-                        _entryData['value'],
-                        _entryData['notes'],
-                        _entryData['date'],
-                      );
-              } on WgerHttpException catch (error) {
-                if (context.mounted) {
-                  showHttpExceptionErrorDialog(error, context);
-                }
-              } catch (error) {
-                if (context.mounted) {
-                  showErrorDialog(error, context);
-                }
-              }
+              _entryData['id'] == null
+                  ? await Provider.of<MeasurementProvider>(
+                      context,
+                      listen: false,
+                    ).addEntry(
+                      MeasurementEntry(
+                        id: _entryData['id'],
+                        category: _entryData['category'],
+                        date: _entryData['date'],
+                        value: _entryData['value'],
+                        notes: _entryData['notes'],
+                      ),
+                    )
+                  : await Provider.of<MeasurementProvider>(
+                      context,
+                      listen: false,
+                    ).editEntry(
+                      _entryData['id'],
+                      _entryData['category'],
+                      _entryData['value'],
+                      _entryData['notes'],
+                      _entryData['date'],
+                    );
+
               if (context.mounted) {
                 Navigator.of(context).pop();
               }
diff --git a/lib/widgets/measurements/helpers.dart b/lib/widgets/measurements/helpers.dart
index 63dfd9a7..bc8954da 100644
--- a/lib/widgets/measurements/helpers.dart
+++ b/lib/widgets/measurements/helpers.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:wger/helpers/measurements.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/models/nutrition/nutritional_plan.dart';
 import 'package:wger/widgets/measurements/charts.dart';
@@ -15,7 +16,16 @@ List<Widget> getOverviewWidgets(
     Container(
       padding: const EdgeInsets.all(15),
       height: 220,
-      child: MeasurementChartWidgetFl(raw, unit, avgs: avg),
+      child: raw.isEmpty
+          ? Center(
+              child: Text(
+                'No data available',
+                style: Theme.of(context).textTheme.bodyLarge?.copyWith(
+                  color: Theme.of(context).colorScheme.secondary.withValues(alpha: 0.7),
+                ),
+              ),
+            )
+          : MeasurementChartWidgetFl(raw, unit, avgs: avg),
     ),
     if (avg.isNotEmpty) MeasurementOverallChangeWidget(avg.first, avg.last, unit),
     const SizedBox(height: 8),
@@ -26,13 +36,11 @@ List<Widget> getOverviewWidgetsSeries(
   String name,
   List<MeasurementChartEntry> entriesAll,
   List<MeasurementChartEntry> entries7dAvg,
-  NutritionalPlan? plan,
+  List<NutritionalPlan> plans,
   String unit,
   BuildContext context,
 ) {
   final monthAgo = DateTime.now().subtract(const Duration(days: 30));
-  final showPlan = plan != null && entriesAll.any((e) => e.date.isAfter(plan.creationDate));
-
   return [
     ...getOverviewWidgets(
       AppLocalizations.of(context).chartAllTimeTitle(name),
@@ -41,31 +49,25 @@ List<Widget> getOverviewWidgetsSeries(
       unit,
       context,
     ),
-    if (showPlan)
+    // Show overview widgets for each plan in plans
+    for (final plan in plans)
       ...getOverviewWidgets(
         AppLocalizations.of(context).chartDuringPlanTitle(name, plan.description),
-        entriesAll.where((e) => e.date.isAfter(plan.creationDate)).toList(),
-        entries7dAvg.where((e) => e.date.isAfter(plan.creationDate)).toList(),
+        entriesAll.whereDateWithInterpolation(plan.startDate, plan.endDate),
+        entries7dAvg.whereDateWithInterpolation(plan.startDate, plan.endDate),
         unit,
         context,
       ),
     // if all time is significantly longer than 30 days (let's say > 75 days)
-    // and any plan was also > 75 days,
     // then let's show a separate chart just focusing on the last 30 days,
     // if there is data for it.
     if (entriesAll.isNotEmpty &&
         entriesAll.first.date.isBefore(entriesAll.last.date.subtract(const Duration(days: 75))) &&
-        (plan == null ||
-            (showPlan &&
-                entriesAll
-                    .firstWhere((e) => e.date.isAfter(plan.creationDate))
-                    .date
-                    .isBefore(entriesAll.last.date.subtract(const Duration(days: 30))))) &&
         entriesAll.any((e) => e.date.isAfter(monthAgo)))
       ...getOverviewWidgets(
         AppLocalizations.of(context).chart30DaysTitle(name),
-        entriesAll.where((e) => e.date.isAfter(monthAgo)).toList(),
-        entries7dAvg.where((e) => e.date.isAfter(monthAgo)).toList(),
+        entriesAll.whereDateWithInterpolation(monthAgo, null),
+        entries7dAvg.whereDateWithInterpolation(monthAgo, null),
         unit,
         context,
       ),
@@ -73,14 +75,22 @@ List<Widget> getOverviewWidgetsSeries(
     Row(
       mainAxisAlignment: MainAxisAlignment.center,
       children: [
-        Indicator(color: Theme.of(context).colorScheme.primary, text: 'raw', isSquare: true),
-        Indicator(color: Theme.of(context).colorScheme.tertiary, text: 'avg', isSquare: true),
+        Indicator(
+          color: Theme.of(context).colorScheme.primary,
+          text: AppLocalizations.of(context).indicatorRaw,
+          isSquare: true,
+        ),
+        Indicator(
+          color: Theme.of(context).colorScheme.tertiary,
+          text: AppLocalizations.of(context).indicatorAvg,
+          isSquare: true,
+        ),
       ],
     ),
   ];
 }
 
-// return the raw and average meaasurements for a "sensible range"
+// return the raw and average measurements for a "sensible range"
 // a sensible range is something relatively recent, which is most relevant
 // for the user to track their progress, but a range should always include
 // at least 5 points, and if not we chose a bigger one.
@@ -92,16 +102,16 @@ List<Widget> getOverviewWidgetsSeries(
   final twoMonthsAgo = DateTime.now().subtract(const Duration(days: 61));
   final fourMonthsAgo = DateTime.now().subtract(const Duration(days: 122));
 
-  if (entriesAll.where((e) => e.date.isAfter(twoMonthsAgo)).length > 4) {
+  if (entriesAll.whereDate(twoMonthsAgo, null).length > 4) {
     return (
-      entriesAll.where((e) => e.date.isAfter(twoMonthsAgo)).toList(),
-      entries7dAvg.where((e) => e.date.isAfter(twoMonthsAgo)).toList(),
+      entriesAll.whereDate(twoMonthsAgo, null),
+      entries7dAvg.whereDate(twoMonthsAgo, null),
     );
   }
-  if (entriesAll.where((e) => e.date.isAfter(fourMonthsAgo)).length > 4) {
+  if (entriesAll.whereDate(fourMonthsAgo, null).length > 4) {
     return (
-      entriesAll.where((e) => e.date.isAfter(fourMonthsAgo)).toList(),
-      entries7dAvg.where((e) => e.date.isAfter(fourMonthsAgo)).toList(),
+      entriesAll.whereDate(fourMonthsAgo, null),
+      entries7dAvg.whereDate(fourMonthsAgo, null),
     );
   }
   return (entriesAll, entries7dAvg);
diff --git a/lib/widgets/nutrition/charts.dart b/lib/widgets/nutrition/charts.dart
index a1463b43..13e9ca18 100644
--- a/lib/widgets/nutrition/charts.dart
+++ b/lib/widgets/nutrition/charts.dart
@@ -34,8 +34,10 @@ import 'package:wger/widgets/measurements/charts.dart';
 // * here we draw our own simple gauges that can go beyond 100%,
 //   and support multiple segments
 class FlNutritionalPlanGoalWidget extends StatelessWidget {
-  const FlNutritionalPlanGoalWidget({super.key, required NutritionalPlan nutritionalPlan})
-    : _nutritionalPlan = nutritionalPlan;
+  const FlNutritionalPlanGoalWidget({
+    super.key,
+    required NutritionalPlan nutritionalPlan,
+  }) : _nutritionalPlan = nutritionalPlan;
 
   final NutritionalPlan _nutritionalPlan;
 
@@ -45,12 +47,20 @@ class FlNutritionalPlanGoalWidget extends StatelessWidget {
   // why don't we just handle this inside this function? because it might be
   // *another* gauge that's in surplus and we want to have consistent widths
   // between all gauges
-  Widget _diyGauge(BuildContext context, double normWidth, double? plan, double val) {
+  Widget _diyGauge(
+    BuildContext context,
+    double normWidth,
+    double? plan,
+    double val,
+  ) {
     Container segment(double width, Color color) {
       return Container(
         height: 16,
         width: width,
-        decoration: BoxDecoration(color: color, borderRadius: BorderRadius.circular(15.0)),
+        decoration: BoxDecoration(
+          color: color,
+          borderRadius: BorderRadius.circular(15.0),
+        ),
       );
     }
 
@@ -141,7 +151,12 @@ class FlNutritionalPlanGoalWidget extends StatelessWidget {
               ),
             ),
             const SizedBox(height: 2),
-            _diyGauge(context, normWidth, goals.carbohydrates, today.carbohydrates),
+            _diyGauge(
+              context,
+              normWidth,
+              goals.carbohydrates,
+              today.carbohydrates,
+            ),
             const SizedBox(height: 8),
             Text(
               fmtMacro(
@@ -272,8 +287,10 @@ class FlNutritionalPlanPieChartState extends State<FlNutritionalPlanPieChartWidg
 
 /// Shows results vs plan of common macros, for today and last 7 days, as barchart
 class NutritionalDiaryChartWidgetFl extends StatefulWidget {
-  const NutritionalDiaryChartWidgetFl({super.key, required NutritionalPlan nutritionalPlan})
-    : _nutritionalPlan = nutritionalPlan;
+  const NutritionalDiaryChartWidgetFl({
+    super.key,
+    required NutritionalPlan nutritionalPlan,
+  }) : _nutritionalPlan = nutritionalPlan;
 
   final NutritionalPlan _nutritionalPlan;
 
@@ -294,7 +311,7 @@ class NutritionalDiaryChartWidgetFlState extends State<NutritionalDiaryChartWidg
       _ => '',
     };
     return SideTitleWidget(
-      axisSide: meta.axisSide,
+      meta: meta,
       child: Text(text, style: style),
     );
   }
@@ -303,8 +320,9 @@ class NutritionalDiaryChartWidgetFlState extends State<NutritionalDiaryChartWidg
     if (value == meta.max) {
       return Container();
     }
+
     return SideTitleWidget(
-      axisSide: meta.axisSide,
+      meta: meta,
       child: Text(
         AppLocalizations.of(context).gValue(meta.formattedValue),
         style: const TextStyle(fontSize: 10),
@@ -320,7 +338,12 @@ class NutritionalDiaryChartWidgetFlState extends State<NutritionalDiaryChartWidg
 
     final [colorPlanned, colorLoggedToday, colorLogged7Day] = LIST_OF_COLORS3;
 
-    BarChartGroupData barchartGroup(int x, double barsSpace, double barsWidth, String prop) {
+    BarChartGroupData barchartGroup(
+      int x,
+      double barsSpace,
+      double barsWidth,
+      String prop,
+    ) {
       final plan = planned.prop(prop);
 
       BarChartRodData barChartRodData(double? plan, double val, Color color) {
@@ -391,14 +414,20 @@ class NutritionalDiaryChartWidgetFlState extends State<NutritionalDiaryChartWidg
                         getTitlesWidget: leftTitles,
                       ),
                     ),
-                    topTitles: const AxisTitles(sideTitles: SideTitles(showTitles: false)),
-                    rightTitles: const AxisTitles(sideTitles: SideTitles(showTitles: false)),
+                    topTitles: const AxisTitles(
+                      sideTitles: SideTitles(showTitles: false),
+                    ),
+                    rightTitles: const AxisTitles(
+                      sideTitles: SideTitles(showTitles: false),
+                    ),
                   ),
                   gridData: FlGridData(
                     show: true,
                     checkToShowHorizontalLine: (value) => value % 10 == 0,
-                    getDrawingHorizontalLine: (value) =>
-                        const FlLine(color: Colors.black, strokeWidth: 1),
+                    getDrawingHorizontalLine: (value) => const FlLine(
+                      color: Colors.black,
+                      strokeWidth: 1,
+                    ),
                     drawVerticalLine: false,
                   ),
                   borderData: FlBorderData(show: false),
@@ -406,7 +435,12 @@ class NutritionalDiaryChartWidgetFlState extends State<NutritionalDiaryChartWidg
                   barGroups: [
                     barchartGroup(0, barsSpace, barsWidth, 'protein'),
                     barchartGroup(1, barsSpace, barsWidth, 'carbohydrates'),
-                    barchartGroup(2, barsSpace, barsWidth, 'carbohydratesSugar'),
+                    barchartGroup(
+                      2,
+                      barsSpace,
+                      barsWidth,
+                      'carbohydratesSugar',
+                    ),
                     barchartGroup(3, barsSpace, barsWidth, 'fat'),
                     barchartGroup(4, barsSpace, barsWidth, 'fatSaturated'),
                     if (widget._nutritionalPlan.nutritionalGoals.fiber != null)
@@ -417,8 +451,10 @@ class NutritionalDiaryChartWidgetFlState extends State<NutritionalDiaryChartWidg
             ),
             Padding(
               padding: const EdgeInsets.only(bottom: 40, left: 25, right: 25),
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              child: Wrap(
+                spacing: 10.0,
+                runSpacing: 10.0,
+                alignment: WrapAlignment.center,
                 children:
                     [
                           (AppLocalizations.of(context).deficit, colorPlanned),
@@ -427,7 +463,12 @@ class NutritionalDiaryChartWidgetFlState extends State<NutritionalDiaryChartWidg
                           (AppLocalizations.of(context).weekAverage, colorLogged7Day),
                         ]
                         .map(
-                          (e) => Indicator(color: e.$2, text: e.$1, isSquare: true, marginRight: 0),
+                          (e) => Indicator(
+                            text: e.$1,
+                            color: e.$2,
+                            isSquare: true,
+                            marginRight: 0,
+                          ),
                         )
                         .toList(),
               ),
@@ -465,13 +506,13 @@ class MealDiaryBarChartWidgetState extends State<MealDiaryBarChartWidget> {
       _ => '',
     };
     return SideTitleWidget(
-      axisSide: meta.axisSide,
+      meta: meta,
       child: Text(text, style: const TextStyle(fontSize: 10)),
     );
   }
 
   Widget leftTitles(double value, TitleMeta meta) => SideTitleWidget(
-    axisSide: meta.axisSide,
+    meta: meta,
     child: Text(
       AppLocalizations.of(context).percentValue(value.toStringAsFixed(0)),
       style: const TextStyle(fontSize: 10),
@@ -508,13 +549,19 @@ class MealDiaryBarChartWidgetState extends State<MealDiaryBarChartWidget> {
                       getTitlesWidget: leftTitles,
                     ),
                   ),
-                  topTitles: const AxisTitles(sideTitles: SideTitles(showTitles: false)),
-                  rightTitles: const AxisTitles(sideTitles: SideTitles(showTitles: false)),
+                  topTitles: const AxisTitles(
+                    sideTitles: SideTitles(showTitles: false),
+                  ),
+                  rightTitles: const AxisTitles(
+                    sideTitles: SideTitles(showTitles: false),
+                  ),
                 ),
                 gridData: FlGridData(
                   show: true,
-                  getDrawingHorizontalLine: (value) =>
-                      const FlLine(color: Colors.black, strokeWidth: 1),
+                  getDrawingHorizontalLine: (value) => const FlLine(
+                    color: Colors.black,
+                    strokeWidth: 1,
+                  ),
                   drawVerticalLine: false,
                 ),
                 borderData: FlBorderData(show: false),
diff --git a/lib/widgets/nutrition/forms.dart b/lib/widgets/nutrition/forms.dart
index 2c4d89b4..54956783 100644
--- a/lib/widgets/nutrition/forms.dart
+++ b/lib/widgets/nutrition/forms.dart
@@ -17,11 +17,11 @@
  */
 
 import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
-import 'package:wger/exceptions/http_exception.dart';
 import 'package:wger/helpers/consts.dart';
+import 'package:wger/helpers/date.dart';
 import 'package:wger/helpers/json.dart';
-import 'package:wger/helpers/ui.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/models/nutrition/ingredient.dart';
 import 'package:wger/models/nutrition/log.dart';
@@ -71,7 +71,7 @@ class MealForm extends StatelessWidget {
                 }
               },
               onSaved: (newValue) {
-                _meal.time = stringToTime(newValue);
+                _meal.time = stringToTimeNull(newValue);
               },
             ),
             TextFormField(
@@ -86,24 +86,22 @@ class MealForm extends StatelessWidget {
             ElevatedButton(
               key: const Key(SUBMIT_BUTTON_KEY_NAME),
               child: Text(AppLocalizations.of(context).save),
-              onPressed: () async {
+              onPressed: () {
                 if (!_form.currentState!.validate()) {
                   return;
                 }
                 _form.currentState!.save();
 
-                try {
-                  _meal.id == null
-                      ? Provider.of<NutritionPlansProvider>(
-                          context,
-                          listen: false,
-                        ).addMeal(_meal, _planId)
-                      : Provider.of<NutritionPlansProvider>(context, listen: false).editMeal(_meal);
-                } on WgerHttpException catch (error) {
-                  showHttpExceptionErrorDialog(error, context);
-                } catch (error) {
-                  showErrorDialog(error, context);
-                }
+                _meal.id == null
+                    ? Provider.of<NutritionPlansProvider>(
+                        context,
+                        listen: false,
+                      ).addMeal(_meal, _planId)
+                    : Provider.of<NutritionPlansProvider>(
+                        context,
+                        listen: false,
+                      ).editMeal(_meal);
+
                 Navigator.of(context).pop();
               },
             ),
@@ -114,7 +112,12 @@ class MealForm extends StatelessWidget {
   }
 }
 
-Widget MealItemForm(Meal meal, List<MealItem> recent, [String? barcode, bool? test]) {
+Widget getMealItemForm(
+  Meal meal,
+  List<MealItem> recent, [
+  String? barcode,
+  bool? test,
+]) {
   return IngredientForm(
     // TODO we use planId 0 here cause we don't have one and we don't need it I think?
     recent: recent.map((e) => Log.fromMealItem(e, "0", e.mealId)).toList(),
@@ -128,7 +131,7 @@ Widget MealItemForm(Meal meal, List<MealItem> recent, [String? barcode, bool? te
   );
 }
 
-Widget IngredientLogForm(NutritionalPlan plan) {
+Widget getIngredientLogForm(NutritionalPlan plan) {
   return IngredientForm(
     recent: plan.dedupDiaryEntries,
     onSave: (BuildContext context, MealItem mealItem, DateTime? dt) {
@@ -181,7 +184,7 @@ class IngredientFormState extends State<IngredientForm> {
   void initState() {
     super.initState();
     final now = DateTime.now();
-    _dateController.text = toDate(now)!;
+    _dateController.text = dateToYYYYMMDD(now)!;
     _timeController.text = timeToString(TimeOfDay.fromDateTime(now))!;
   }
 
@@ -232,6 +235,8 @@ class IngredientFormState extends State<IngredientForm> {
     final suggestions = widget.recent
         .where((e) => e.ingredient.name.toLowerCase().contains(queryLower))
         .toList();
+    final numberFormat = NumberFormat.decimalPattern(Localizations.localeOf(context).toString());
+
     return Container(
       margin: const EdgeInsets.all(20),
       child: Form(
@@ -244,17 +249,20 @@ class IngredientFormState extends State<IngredientForm> {
               barcode: widget.barcode,
               test: widget.test,
               selectIngredient: selectIngredient,
-              unSelectIngredient: unSelectIngredient,
-              updateSearchQuery: updateSearchQuery,
+              onDeselectIngredient: unSelectIngredient,
+              onUpdateSearchQuery: updateSearchQuery,
             ),
             Row(
               children: [
                 Expanded(
                   child: TextFormField(
-                    key: const Key('field-weight'), // needed ?
-                    decoration: InputDecoration(labelText: AppLocalizations.of(context).weight),
+                    key: const Key('field-weight'),
+                    // needed ?
+                    decoration: InputDecoration(
+                      labelText: AppLocalizations.of(context).weight,
+                    ),
                     controller: _amountController,
-                    keyboardType: TextInputType.number,
+                    keyboardType: textInputTypeDecimal,
                     onChanged: (value) {
                       setState(() {
                         final v = double.tryParse(value);
@@ -264,11 +272,11 @@ class IngredientFormState extends State<IngredientForm> {
                       });
                     },
                     onSaved: (value) {
-                      _mealItem.amount = double.parse(value!);
+                      _mealItem.amount = numberFormat.parse(value!);
                     },
                     validator: (value) {
                       try {
-                        double.parse(value!);
+                        numberFormat.parse(value!);
                       } catch (error) {
                         return AppLocalizations.of(context).enterValidNumber;
                       }
@@ -297,7 +305,7 @@ class IngredientFormState extends State<IngredientForm> {
                         );
 
                         if (pickedDate != null) {
-                          _dateController.text = toDate(pickedDate)!;
+                          _dateController.text = dateToYYYYMMDD(pickedDate)!;
                         }
                       },
                       onSaved: (newValue) {
@@ -348,28 +356,32 @@ class IngredientFormState extends State<IngredientForm> {
                         context,
                         listen: false,
                       ).fetchIngredient(_mealItem.ingredientId),
-                      builder: (BuildContext context, AsyncSnapshot<Ingredient> snapshot) {
-                        if (snapshot.hasData) {
-                          _mealItem.ingredient = snapshot.data!;
-                          return MealItemValuesTile(
-                            ingredient: _mealItem.ingredient,
-                            nutritionalValues: _mealItem.nutritionalValues,
-                          );
-                        } else if (snapshot.hasError) {
-                          return Padding(
-                            padding: const EdgeInsets.only(top: 16),
-                            child: Text(
-                              'Ingredient lookup error: ${snapshot.error}',
-                              style: const TextStyle(color: Colors.red),
-                            ),
-                          );
-                        }
-                        return const SizedBox(
-                          width: 20,
-                          height: 20,
-                          child: CircularProgressIndicator(),
-                        );
-                      },
+                      builder:
+                          (
+                            BuildContext context,
+                            AsyncSnapshot<Ingredient> snapshot,
+                          ) {
+                            if (snapshot.hasData) {
+                              _mealItem.ingredient = snapshot.data!;
+                              return MealItemValuesTile(
+                                ingredient: _mealItem.ingredient,
+                                nutritionalValues: _mealItem.nutritionalValues,
+                              );
+                            } else if (snapshot.hasError) {
+                              return Padding(
+                                padding: const EdgeInsets.only(top: 16),
+                                child: Text(
+                                  'Ingredient lookup error: ${snapshot.error}',
+                                  style: const TextStyle(color: Colors.red),
+                                ),
+                              );
+                            }
+                            return const SizedBox(
+                              width: 20,
+                              height: 20,
+                              child: CircularProgressIndicator(),
+                            );
+                          },
                     ),
                   ],
                 ),
@@ -384,16 +396,12 @@ class IngredientFormState extends State<IngredientForm> {
                 _form.currentState!.save();
                 _mealItem.ingredientId = int.parse(_ingredientIdController.text);
 
-                try {
-                  var date = DateTime.parse(_dateController.text);
-                  final tod = stringToTime(_timeController.text);
-                  date = DateTime(date.year, date.month, date.day, tod.hour, tod.minute);
-                  widget.onSave(context, _mealItem, date);
-                } on WgerHttpException catch (error) {
-                  showHttpExceptionErrorDialog(error, context);
-                } catch (error) {
-                  showErrorDialog(error, context);
-                }
+                final loggedDate = getDateTimeFromDateAndTime(
+                  _dateController.text,
+                  _timeController.text,
+                );
+                widget.onSave(context, _mealItem, loggedDate);
+
                 Navigator.of(context).pop();
               },
             ),
@@ -459,7 +467,19 @@ enum GoalType {
   advanced('Advanced');
 
   const GoalType(this.label);
+
   final String label;
+
+  String getI18nLabel(BuildContext context) {
+    switch (this) {
+      case GoalType.meals:
+        return AppLocalizations.of(context).goalTypeMeals;
+      case GoalType.basic:
+        return AppLocalizations.of(context).goalTypeBasic;
+      case GoalType.advanced:
+        return AppLocalizations.of(context).goalTypeAdvanced;
+    }
+  }
 }
 
 class PlanForm extends StatefulWidget {
@@ -476,20 +496,13 @@ class PlanForm extends StatefulWidget {
 class _PlanFormState extends State<PlanForm> {
   final _form = GlobalKey<FormState>();
 
-  bool _onlyLogging = true;
   GoalType _goalType = GoalType.meals;
-
-  final _descriptionController = TextEditingController();
-  final TextEditingController colorController = TextEditingController();
-
   GoalType? selectedGoal;
 
   @override
   void initState() {
     super.initState();
 
-    _onlyLogging = widget._plan.onlyLogging;
-    _descriptionController.text = widget._plan.description;
     if (widget._plan.hasAnyAdvancedGoals) {
       _goalType = GoalType.advanced;
     } else if (widget._plan.hasAnyGoals) {
@@ -499,15 +512,10 @@ class _PlanFormState extends State<PlanForm> {
     }
   }
 
-  @override
-  void dispose() {
-    _descriptionController.dispose();
-    colorController.dispose();
-    super.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
+    final dateFormat = DateFormat.yMd(Localizations.localeOf(context).languageCode);
+
     return Form(
       key: _form,
       child: ListView(
@@ -515,21 +523,119 @@ class _PlanFormState extends State<PlanForm> {
           // Description
           TextFormField(
             key: const Key('field-description'),
-            decoration: InputDecoration(labelText: AppLocalizations.of(context).description),
-            controller: _descriptionController,
+            decoration: InputDecoration(
+              labelText: AppLocalizations.of(context).description,
+            ),
+            controller: TextEditingController(
+              text: widget._plan.description,
+            ),
             onSaved: (newValue) {
               widget._plan.description = newValue!;
             },
           ),
+          // Start Date
+          TextFormField(
+            key: const Key('field-start-date'),
+            decoration: InputDecoration(
+              labelText: AppLocalizations.of(context).startDate,
+              suffixIcon: const Icon(
+                Icons.calendar_today,
+                key: Key('calendarIcon'),
+              ),
+            ),
+            controller: TextEditingController(
+              text: dateFormat.format(widget._plan.startDate),
+            ),
+            readOnly: true,
+            onTap: () async {
+              // Stop keyboard from appearing
+              FocusScope.of(context).requestFocus(FocusNode());
+
+              // Open date picker
+              final pickedDate = await showDatePicker(
+                context: context,
+                initialDate: widget._plan.startDate,
+                firstDate: DateTime(2000),
+                lastDate: DateTime(2100),
+              );
+
+              if (pickedDate != null) {
+                setState(() {
+                  widget._plan.startDate = pickedDate;
+                });
+              }
+            },
+            validator: (value) {
+              if (widget._plan.endDate != null &&
+                  widget._plan.endDate!.isBefore(widget._plan.startDate)) {
+                return 'End date must be after start date';
+              }
+
+              return null;
+            },
+          ),
+          // End Date
+          Row(
+            children: [
+              Expanded(
+                child: TextFormField(
+                  key: const Key('field-end-date'),
+                  decoration: InputDecoration(
+                    labelText: AppLocalizations.of(context).endDate,
+                    helperText:
+                        'Tip: only for athletes with contest deadlines.  Most users benefit from flexibility',
+                    suffixIcon: widget._plan.endDate == null
+                        ? const Icon(
+                            Icons.calendar_today,
+                            key: Key('calendarIcon'),
+                          )
+                        : IconButton(
+                            icon: const Icon(Icons.clear),
+                            tooltip: 'Clear end date',
+                            onPressed: () {
+                              setState(() {
+                                widget._plan.endDate = null;
+                              });
+                            },
+                          ),
+                  ),
+                  controller: TextEditingController(
+                    text: widget._plan.endDate == null
+                        ? ''
+                        : dateFormat.format(widget._plan.endDate!),
+                  ),
+                  readOnly: true,
+                  onTap: () async {
+                    // Stop keyboard from appearing
+                    FocusScope.of(context).requestFocus(FocusNode());
+
+                    // Open date picker
+                    final pickedDate = await showDatePicker(
+                      context: context,
+                      initialDate: widget._plan.endDate,
+                      // end must be after start
+                      firstDate: widget._plan.startDate.add(const Duration(days: 1)),
+                      lastDate: DateTime(2100),
+                    );
+
+                    if (pickedDate != null) {
+                      setState(() {
+                        widget._plan.endDate = pickedDate;
+                      });
+                    }
+                  },
+                ),
+              ),
+            ],
+          ),
           SwitchListTile(
             title: Text(AppLocalizations.of(context).onlyLogging),
             subtitle: Text(AppLocalizations.of(context).onlyLoggingHelpText),
-            value: _onlyLogging,
+            value: widget._plan.onlyLogging,
             onChanged: (value) {
               setState(() {
-                _onlyLogging = !_onlyLogging;
+                widget._plan.onlyLogging = value;
               });
-              widget._plan.onlyLogging = value;
             },
           ),
           Row(
@@ -541,9 +647,14 @@ class _PlanFormState extends State<PlanForm> {
               const SizedBox(width: 8),
               Expanded(
                 child: DropdownButtonFormField<GoalType>(
-                  value: _goalType,
+                  initialValue: _goalType,
                   items: GoalType.values
-                      .map((e) => DropdownMenuItem<GoalType>(value: e, child: Text(e.label)))
+                      .map(
+                        (e) => DropdownMenuItem<GoalType>(
+                          value: e,
+                          child: Text(e.getI18nLabel(context)),
+                        ),
+                      )
                       .toList(),
                   onChanged: (GoalType? g) {
                     setState(() {
@@ -624,37 +735,24 @@ class _PlanFormState extends State<PlanForm> {
               _form.currentState!.save();
 
               // Save to DB
-              try {
-                if (widget._plan.id != null) {
-                  await Provider.of<NutritionPlansProvider>(
-                    context,
-                    listen: false,
-                  ).editPlan(widget._plan);
-                  if (context.mounted) {
-                    Navigator.of(context).pop();
-                  }
-                } else {
-                  widget._plan = await Provider.of<NutritionPlansProvider>(
-                    context,
-                    listen: false,
-                  ).addPlan(widget._plan);
-                  if (context.mounted) {
-                    Navigator.of(context).pushReplacementNamed(
-                      NutritionalPlanScreen.routeName,
-                      arguments: widget._plan.id,
-                    );
-                  }
-                }
-
-                // Saving was successful, reset the data
-                _descriptionController.clear();
-              } on WgerHttpException catch (error) {
+              if (widget._plan.id != null) {
+                await Provider.of<NutritionPlansProvider>(
+                  context,
+                  listen: false,
+                ).editPlan(widget._plan);
                 if (context.mounted) {
-                  showHttpExceptionErrorDialog(error, context);
+                  Navigator.of(context).pop();
                 }
-              } catch (error) {
+              } else {
+                widget._plan = await Provider.of<NutritionPlansProvider>(
+                  context,
+                  listen: false,
+                ).addPlan(widget._plan);
                 if (context.mounted) {
-                  showErrorDialog(error, context);
+                  Navigator.of(context).pushReplacementNamed(
+                    NutritionalPlanScreen.routeName,
+                    arguments: widget._plan,
+                  );
                 }
               }
             },
@@ -681,22 +779,24 @@ class GoalMacros extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final numberFormat = NumberFormat.decimalPattern(Localizations.localeOf(context).toString());
+
     return TextFormField(
       initialValue: val ?? '',
       decoration: InputDecoration(labelText: label, suffixText: suffix),
-      keyboardType: TextInputType.number,
+      keyboardType: textInputTypeDecimal,
       onSaved: (newValue) {
         if (newValue == null || newValue == '') {
           return;
         }
-        onSave(double.parse(newValue));
+        onSave(numberFormat.parse(newValue) as double);
       },
       validator: (value) {
         if (value == '') {
           return null;
         }
         try {
-          double.parse(value!);
+          numberFormat.parse(value!);
         } catch (error) {
           return AppLocalizations.of(context).enterValidNumber;
         }
diff --git a/lib/widgets/nutrition/helpers.dart b/lib/widgets/nutrition/helpers.dart
index a588c754..95cd543a 100644
--- a/lib/widgets/nutrition/helpers.dart
+++ b/lib/widgets/nutrition/helpers.dart
@@ -51,7 +51,13 @@ List<int> getNutritionColumnFlexes(BuildContext context) {
 }
 
 List<Widget> muted(List<String> children) => children
-    .map((e) => MutedText(e, textAlign: TextAlign.right, overflow: TextOverflow.ellipsis))
+    .map(
+      (e) => MutedText(
+        e,
+        textAlign: TextAlign.right,
+        overflow: TextOverflow.ellipsis,
+      ),
+    )
     .toList();
 
 // return a row of elements in the standard macros spacing
diff --git a/lib/widgets/nutrition/ingredient_dialogs.dart b/lib/widgets/nutrition/ingredient_dialogs.dart
index 933c6d98..7c79d533 100644
--- a/lib/widgets/nutrition/ingredient_dialogs.dart
+++ b/lib/widgets/nutrition/ingredient_dialogs.dart
@@ -1,3 +1,5 @@
+import 'dart:ui';
+
 import 'package:flutter/material.dart';
 import 'package:wger/helpers/misc.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
@@ -10,18 +12,68 @@ Widget ingredientImage(String url, BuildContext context) {
   final height = MediaQuery.sizeOf(context).height;
   final width = MediaQuery.sizeOf(context).width;
   final smallest = height < width ? height : width;
-  if (smallest < 400) {
-    radius = smallest / 4;
+  if (smallest > 400) {
+    radius = smallest / 2.5;
   }
+
+  final imageProvider = NetworkImage(url);
+
   return Padding(
     padding: const EdgeInsets.only(bottom: 12),
-    child: CircleAvatar(backgroundImage: NetworkImage(url), radius: radius),
+    child: ClipRRect(
+      borderRadius: BorderRadius.circular(15),
+      child: Container(
+        height: radius,
+        width: width,
+        decoration: BoxDecoration(
+          borderRadius: BorderRadius.circular(15),
+        ),
+        child: Stack(
+          children: [
+            Image(
+              image: imageProvider,
+              height: radius,
+              width: width,
+              fit: BoxFit.cover,
+            ),
+            BackdropFilter(
+              filter: ImageFilter.blur(
+                sigmaY: 5,
+                sigmaX: 5,
+              ),
+              child: Container(
+                height: radius,
+                width: width,
+                color: Colors.transparent,
+              ),
+            ),
+            Center(
+              child: Padding(
+                padding: const EdgeInsets.all(10),
+                child: Container(
+                  clipBehavior: Clip.hardEdge,
+                  decoration: const BoxDecoration(shape: BoxShape.circle),
+                  child: Image(
+                    image: imageProvider,
+                    height: radius,
+                    width: width,
+                    fit: BoxFit.contain,
+                  ),
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    ),
   );
+  // CircleAvatar(backgroundImage: NetworkImage(url), radius: radius)
 }
 
 class IngredientDetails extends StatelessWidget {
   final AsyncSnapshot<Ingredient> snapshot;
   final void Function()? onSelect;
+
   const IngredientDetails(this.snapshot, {super.key, this.onSelect});
 
   @override
@@ -49,8 +101,7 @@ class IngredientDetails extends StatelessWidget {
                   'Ingredient lookup error: ${snapshot.error ?? 'unknown error'}',
                   style: const TextStyle(color: Colors.red),
                 ),
-              if (ingredient?.image?.image != null)
-                ingredientImage(ingredient!.image!.image, context),
+              if (ingredient?.image?.url != null) ingredientImage(ingredient!.image!.url, context),
               if (!snapshot.hasData && !snapshot.hasError) const CircularProgressIndicator(),
               if (snapshot.hasData)
                 ConstrainedBox(
@@ -152,8 +203,7 @@ class IngredientScanResultDialog extends StatelessWidget {
                     AppLocalizations.of(context).productFoundDescription(ingredient.name),
                   ),
                 ),
-              if (ingredient?.image?.image != null)
-                ingredientImage(ingredient!.image!.image, context),
+              if (ingredient?.image?.url != null) ingredientImage(ingredient!.image!.url, context),
               if (snapshot.connectionState != ConnectionState.done && !snapshot.hasError)
                 const CircularProgressIndicator(),
               if (goals != null)
diff --git a/lib/widgets/nutrition/meal.dart b/lib/widgets/nutrition/meal.dart
index 7f829ff8..bf3a715b 100644
--- a/lib/widgets/nutrition/meal.dart
+++ b/lib/widgets/nutrition/meal.dart
@@ -111,7 +111,7 @@ class _MealWidgetState extends State<MealWidget> {
                           FormScreen.routeName,
                           arguments: FormScreenArguments(
                             AppLocalizations.of(context).addIngredient,
-                            MealItemForm(widget._meal, widget._recentMealItems),
+                            getMealItemForm(widget._meal, widget._recentMealItems),
                             hasListView: true,
                           ),
                         );
@@ -200,7 +200,9 @@ class _MealWidgetState extends State<MealWidget> {
                   ...widget._meal.diaryEntriesToday.map(
                     (item) => Padding(
                       padding: const EdgeInsets.all(8.0),
-                      child: Column(children: [DiaryEntryTile(diaryEntry: item)]),
+                      child: Column(
+                        children: [DiaryEntryTile(diaryEntry: item)],
+                      ),
                     ),
                   ),
                 ],
@@ -234,15 +236,10 @@ class MealItemEditableFullTile extends StatelessWidget {
 
     return NutritionTile(
       leading: IngredientAvatar(ingredient: _item.ingredient),
-      title: Row(
-        mainAxisSize: MainAxisSize.max,
-        children: [
-          Text(
-            '${_item.amount.toStringAsFixed(0)}$unit ${_item.ingredient.name}',
-            overflow: TextOverflow.ellipsis,
-            textAlign: TextAlign.left,
-          ),
-        ],
+      title: Text(
+        '${_item.amount.toStringAsFixed(0)}$unit ${_item.ingredient.name}',
+        overflow: TextOverflow.ellipsis,
+        textAlign: TextAlign.left,
       ),
       subtitle: (_viewMode != viewMode.withAllDetails && !_editing)
           ? null
@@ -297,38 +294,26 @@ class MealHeader extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final subtitleTime = _meal.time != null ? '${_meal.time!.format(context)} / ' : '';
+    final subtitleCalories = _meal.isRealMeal
+        ? getKcalConsumedVsPlanned(_meal, context)
+        : getKcalConsumed(_meal, context);
+    final subtitle = '$subtitleTime $subtitleCalories';
+
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         ListTile(
           contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
-          title: Row(
-            children: [
-              Expanded(
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Text(_meal.name, style: Theme.of(context).textTheme.titleLarge),
-                    Row(
-                      children: [
-                        if (_meal.time != null)
-                          Text(
-                            _meal.time!.format(context),
-                            style: Theme.of(context).textTheme.titleSmall,
-                          ),
-                        if (_meal.time != null) const SizedBox(width: 12),
-                        Text(
-                          _meal.isRealMeal
-                              ? getKcalConsumedVsPlanned(_meal, context)
-                              : getKcalConsumed(_meal, context),
-                          style: Theme.of(context).textTheme.titleSmall,
-                        ),
-                      ],
-                    ),
-                  ],
-                ),
-              ),
-            ],
+          title: Text(
+            _meal.name,
+            style: Theme.of(context).textTheme.titleLarge,
+            overflow: TextOverflow.ellipsis,
+          ),
+          subtitle: Text(
+            subtitle,
+            style: Theme.of(context).textTheme.titleSmall,
+            overflow: TextOverflow.ellipsis,
           ),
           trailing: Row(
             mainAxisSize: MainAxisSize.min,
diff --git a/lib/widgets/nutrition/nutritional_diary_table.dart b/lib/widgets/nutrition/nutritional_diary_table.dart
index f27e719d..43b16963 100644
--- a/lib/widgets/nutrition/nutritional_diary_table.dart
+++ b/lib/widgets/nutrition/nutritional_diary_table.dart
@@ -89,28 +89,23 @@ class NutritionalDiaryTable extends StatelessWidget {
               DateFormat.Md(Localizations.localeOf(context).languageCode).format(date),
             ),
             Text(
-              style: Theme.of(context).textTheme.titleMedium,
               textAlign: TextAlign.end,
               values.energy.toStringAsFixed(0),
             ),
             if (goals.energy != null)
               Text(
-                style: Theme.of(context).textTheme.titleMedium,
                 textAlign: TextAlign.end,
                 (values.energy - goals.energy!).toStringAsFixed(0),
               ),
             Text(
-              style: Theme.of(context).textTheme.titleMedium,
               textAlign: TextAlign.end,
               values.protein.toStringAsFixed(0),
             ),
             Text(
-              style: Theme.of(context).textTheme.titleMedium,
               textAlign: TextAlign.end,
               values.carbohydrates.toStringAsFixed(0),
             ),
             Text(
-              style: Theme.of(context).textTheme.titleMedium,
               textAlign: TextAlign.end,
               values.fat.toStringAsFixed(0),
             ),
@@ -118,7 +113,7 @@ class NutritionalDiaryTable extends StatelessWidget {
             return GestureDetector(
               onTap: () => Navigator.of(context).pushNamed(
                 NutritionalDiaryScreen.routeName,
-                arguments: NutritionalDiaryArguments(plan.id!, date),
+                arguments: NutritionalDiaryArguments(plan, date),
               ),
               child: element,
             );
diff --git a/lib/widgets/nutrition/nutritional_plan_detail.dart b/lib/widgets/nutrition/nutritional_plan_detail.dart
index 9d594288..449e6203 100644
--- a/lib/widgets/nutrition/nutritional_plan_detail.dart
+++ b/lib/widgets/nutrition/nutritional_plan_detail.dart
@@ -17,6 +17,7 @@
  */
 
 import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/models/nutrition/nutritional_plan.dart';
@@ -43,66 +44,99 @@ class NutritionalPlanDetailWidget extends StatelessWidget {
         : null;
 
     return SliverList(
-      delegate: SliverChildListDelegate([
-        SizedBox(
-          width: 300,
-          child: Padding(
-            padding: const EdgeInsets.all(8.0),
-            child: FlNutritionalPlanGoalWidget(nutritionalPlan: _nutritionalPlan),
-          ),
-        ),
-        const SizedBox(height: 10),
-        ..._nutritionalPlan.meals.map(
-          (meal) => MealWidget(meal, _nutritionalPlan.dedupMealItems, false, false),
-        ),
-        MealWidget(
-          _nutritionalPlan.pseudoMealOthers('Other logs'),
-          _nutritionalPlan.dedupMealItems,
-          false,
-          true,
-        ),
-        if (nutritionalGoals.isComplete())
-          Container(
-            padding: const EdgeInsets.all(15),
-            height: 220,
-            child: FlNutritionalPlanPieChartWidget(nutritionalGoals.toValues()),
-          ),
-        Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 10),
-          child: MacronutrientsTable(
-            nutritionalGoals: nutritionalGoals,
-            plannedValuesPercentage: nutritionalGoals.energyPercentage(),
-            nutritionalGoalsGperKg: nutritionalGoalsGperKg,
-          ),
-        ),
-        const Padding(padding: EdgeInsets.all(8.0)),
-        Text(
-          AppLocalizations.of(context).logged,
-          textAlign: TextAlign.center,
-          style: Theme.of(context).textTheme.titleLarge,
-        ),
-        Container(
-          padding: const EdgeInsets.only(top: 16, left: 8, right: 8),
-          height: 300,
-          child: NutritionalDiaryChartWidgetFl(nutritionalPlan: _nutritionalPlan),
-        ),
-        if (_nutritionalPlan.logEntriesValues.isNotEmpty)
+      delegate: SliverChildListDelegate(
+        [
+          const SizedBox(height: 16),
           Padding(
-            padding: const EdgeInsets.only(bottom: 15, left: 15, right: 15),
-            child: Column(
-              children: [
-                Text(
-                  AppLocalizations.of(context).nutritionalDiary,
-                  textAlign: TextAlign.center,
-                  style: Theme.of(context).textTheme.titleLarge,
-                ),
-                SizedBox(
-                  height: 200,
-                  child: SingleChildScrollView(
-                    child: NutritionalDiaryTable(nutritionalPlan: _nutritionalPlan),
+            padding: const EdgeInsets.symmetric(horizontal: 16.0),
+            child: Text(
+              _nutritionalPlan.endDate != null
+                  ? 'from ${DateFormat.yMd(
+                      Localizations.localeOf(context).languageCode,
+                    ).format(_nutritionalPlan.startDate)} to ${DateFormat.yMd(
+                      Localizations.localeOf(context).languageCode,
+                    ).format(_nutritionalPlan.endDate!)}'
+                  : 'from ${DateFormat.yMd(
+                      Localizations.localeOf(context).languageCode,
+                    ).format(_nutritionalPlan.startDate)} (${AppLocalizations.of(context).openEnded})',
+              style: Theme.of(context).textTheme.titleSmall?.copyWith(
+                fontStyle: FontStyle.italic,
+              ),
+              textAlign: TextAlign.center,
+            ),
+          ),
+          const SizedBox(height: 8),
+          SizedBox(
+            width: 300,
+            child: Padding(
+              padding: const EdgeInsets.all(8.0),
+              child: FlNutritionalPlanGoalWidget(
+                nutritionalPlan: _nutritionalPlan,
+              ),
+            ),
+          ),
+          const SizedBox(height: 10),
+          ..._nutritionalPlan.meals.map(
+            (meal) => MealWidget(
+              meal,
+              _nutritionalPlan.dedupMealItems,
+              false,
+              false,
+            ),
+          ),
+          MealWidget(
+            _nutritionalPlan.pseudoMealOthers('Other logs'),
+            _nutritionalPlan.dedupMealItems,
+            false,
+            true,
+          ),
+          if (nutritionalGoals.isComplete())
+            Container(
+              padding: const EdgeInsets.all(15),
+              height: 220,
+              child: FlNutritionalPlanPieChartWidget(nutritionalGoals.toValues()),
+            ),
+          Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 10),
+            child: MacronutrientsTable(
+              nutritionalGoals: nutritionalGoals,
+              plannedValuesPercentage: nutritionalGoals.energyPercentage(),
+              nutritionalGoalsGperKg: nutritionalGoalsGperKg,
+            ),
+          ),
+          const Padding(padding: EdgeInsets.all(8.0)),
+          Text(
+            AppLocalizations.of(context).logged,
+            textAlign: TextAlign.center,
+            style: Theme.of(context).textTheme.titleLarge,
+          ),
+          Container(
+            padding: const EdgeInsets.only(top: 16, left: 8, right: 8),
+            height: 300,
+            child: NutritionalDiaryChartWidgetFl(
+              nutritionalPlan: _nutritionalPlan,
+            ),
+          ),
+          if (_nutritionalPlan.logEntriesValues.isNotEmpty)
+            Padding(
+              padding: const EdgeInsets.only(bottom: 15, left: 15, right: 15),
+              child: Column(
+                children: [
+                  Text(
+                    AppLocalizations.of(context).nutritionalDiary,
+                    textAlign: TextAlign.center,
+                    style: Theme.of(context).textTheme.titleLarge,
                   ),
-                ),
-              ],
+                  SizedBox(
+                    height: 200,
+                    child: SingleChildScrollView(
+                      child: NutritionalDiaryTable(
+                        nutritionalPlan: _nutritionalPlan,
+                      ),
+                    ),
+                  ),
+                ],
+              ),
             ),
           ),
       ]),
diff --git a/lib/widgets/nutrition/nutritional_plans_list.dart b/lib/widgets/nutrition/nutritional_plans_list.dart
index 7e4fde61..f0605c28 100644
--- a/lib/widgets/nutrition/nutritional_plans_list.dart
+++ b/lib/widgets/nutrition/nutritional_plans_list.dart
@@ -21,11 +21,14 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
+import 'package:wger/helpers/measurements.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
-import 'package:wger/models/nutrition/nutritional_plan.dart';
+import 'package:wger/providers/body_weight.dart';
 import 'package:wger/providers/nutrition.dart';
+import 'package:wger/providers/user.dart';
 import 'package:wger/screens/nutritional_plan_screen.dart';
 import 'package:wger/widgets/core/text_prompt.dart';
+import 'package:wger/widgets/measurements/charts.dart';
 
 class NutritionalPlansList extends StatefulWidget {
   @override
@@ -59,79 +62,154 @@ class _NutritionalPlansListState extends State<NutritionalPlansList> {
     super.dispose();
   }
 
+  /// Builds the weight change information for a nutritional plan period
+  Widget _buildWeightChangeInfo(BuildContext context, DateTime startDate, DateTime? endDate) {
+    final provider = Provider.of<BodyWeightProvider>(context, listen: false);
+
+    final entriesAll = provider.items.map((e) => MeasurementChartEntry(e.weight, e.date)).toList();
+    final entries7dAvg = moving7dAverage(entriesAll).whereDateWithInterpolation(startDate, endDate);
+    if (entries7dAvg.length < 2) {
+      return const SizedBox.shrink();
+    }
+
+    // Calculate weight change
+    final firstWeight = entries7dAvg.first;
+    final lastWeight = entries7dAvg.last;
+    final weightDifference = lastWeight.value - firstWeight.value;
+
+    // Format the weight change text and determine color
+    final String weightChangeText;
+    final Color weightChangeColor;
+    final profile = context.read<UserProvider>().profile;
+
+    final unit = weightUnit(profile!.isMetric, context);
+
+    if (weightDifference > 0) {
+      weightChangeText = '+${weightDifference.toStringAsFixed(1)} $unit';
+      weightChangeColor = Colors.red;
+    } else if (weightDifference < 0) {
+      weightChangeText = '${weightDifference.toStringAsFixed(1)} $unit';
+      weightChangeColor = Colors.green;
+    } else {
+      weightChangeText = '0 $unit';
+      weightChangeColor = Colors.grey;
+    }
+
+    return Padding(
+      padding: const EdgeInsets.only(top: 4.0),
+      child: Row(
+        children: [
+          Text(
+            '${AppLocalizations.of(context).weight} change: ',
+            style: Theme.of(context).textTheme.bodySmall,
+          ),
+          Text(
+            weightChangeText,
+            style: Theme.of(context).textTheme.bodySmall?.copyWith(
+              fontWeight: FontWeight.bold,
+              color: weightChangeColor,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
-    final provider = Provider.of<NutritionPlansProvider>(context, listen: false);
-
-    return _plans.isEmpty
-        ? const TextPrompt()
-        : ListView.builder(
-            padding: const EdgeInsets.all(10.0),
-            itemCount: _plans.length,
-            itemBuilder: (context, index) {
-              final currentPlan = _plans[index];
-              return Card(
-                child: ListTile(
-                  onTap: () {
-                    Navigator.of(
-                      context,
-                    ).pushNamed(NutritionalPlanScreen.routeName, arguments: currentPlan.id);
-                  },
-                  title: Text(currentPlan.getLabel(context)),
-                  subtitle: Text(
-                    DateFormat.yMd(
-                      Localizations.localeOf(context).languageCode,
-                    ).format(currentPlan.creationDate),
-                  ),
-                  trailing: Row(
-                    mainAxisSize: MainAxisSize.min,
-                    children: [
-                      const VerticalDivider(),
-                      IconButton(
-                        icon: const Icon(Icons.delete),
-                        tooltip: AppLocalizations.of(context).delete,
-                        onPressed: () async {
-                          await showDialog(
-                            context: context,
-                            builder: (BuildContext contextDialog) {
-                              return AlertDialog(
-                                content: Text(
-                                  AppLocalizations.of(
-                                    context,
-                                  ).confirmDelete(currentPlan.description),
-                                ),
-                                actions: [
-                                  TextButton(
-                                    child: Text(
-                                      MaterialLocalizations.of(context).cancelButtonLabel,
-                                    ),
-                                    onPressed: () => Navigator.of(contextDialog).pop(),
+    return RefreshIndicator(
+      onRefresh: () => _nutritionProvider.fetchAndSetAllPlansSparse(),
+      child: _nutritionProvider.items.isEmpty
+          ? const TextPrompt()
+          : ListView.builder(
+              padding: const EdgeInsets.all(10.0),
+              itemCount: _nutritionProvider.items.length,
+              itemBuilder: (context, index) {
+                final currentPlan = _nutritionProvider.items[index];
+                return Card(
+                  child: ListTile(
+                    onTap: () {
+                      Navigator.of(context).pushNamed(
+                        NutritionalPlanScreen.routeName,
+                        arguments: currentPlan,
+                      );
+                    },
+                    title: Text(currentPlan.getLabel(context)),
+                    subtitle: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Text(
+                          currentPlan.endDate != null
+                              ? 'from ${DateFormat.yMd(
+                                  Localizations.localeOf(context).languageCode,
+                                ).format(currentPlan.startDate)} to ${DateFormat.yMd(
+                                  Localizations.localeOf(context).languageCode,
+                                ).format(currentPlan.endDate!)}'
+                              : 'from ${DateFormat.yMd(
+                                  Localizations.localeOf(context).languageCode,
+                                ).format(currentPlan.startDate)} (open ended)',
+                        ),
+                        _buildWeightChangeInfo(context, currentPlan.startDate, currentPlan.endDate),
+                      ],
+                    ),
+                    trailing: Row(
+                      mainAxisSize: MainAxisSize.min,
+                      children: [
+                        const VerticalDivider(),
+                        IconButton(
+                          icon: const Icon(Icons.delete),
+                          tooltip: AppLocalizations.of(context).delete,
+                          onPressed: () async {
+                            // Delete the plan from DB
+                            await showDialog(
+                              context: context,
+                              builder: (BuildContext contextDialog) {
+                                return AlertDialog(
+                                  content: Text(
+                                    AppLocalizations.of(
+                                      context,
+                                    ).confirmDelete(currentPlan.description),
                                   ),
-                                  TextButton(
-                                    child: Text(
-                                      AppLocalizations.of(context).delete,
-                                      style: TextStyle(color: Theme.of(context).colorScheme.error),
+                                  actions: [
+                                    TextButton(
+                                      child: Text(
+                                        MaterialLocalizations.of(context).cancelButtonLabel,
+                                      ),
+                                      onPressed: () => Navigator.of(contextDialog).pop(),
                                     ),
-                                    onPressed: () {
-                                      provider.deletePlan(currentPlan.id!);
-                                      Navigator.of(contextDialog).pop();
-                                      ScaffoldMessenger.of(context).showSnackBar(
-                                        SnackBar(
-                                          content: Text(
-                                            AppLocalizations.of(context).successfullyDeleted,
-                                            textAlign: TextAlign.center,
-                                          ),
+                                    TextButton(
+                                      child: Text(
+                                        AppLocalizations.of(context).delete,
+                                        style: TextStyle(
+                                          color: Theme.of(context).colorScheme.error,
                                         ),
-                                      );
-                                    },
-                                  ),
-                                ],
-                              );
-                            },
-                          );
-                        },
-                      ),
-                    ],
+                                      ),
+                                      onPressed: () {
+                                        // Confirmed, delete the plan
+                                        _nutritionProvider.deletePlan(currentPlan.id!);
+
+                                        // Close the popup
+                                        Navigator.of(contextDialog).pop();
+
+                                        // and inform the user
+                                        ScaffoldMessenger.of(context).showSnackBar(
+                                          SnackBar(
+                                            content: Text(
+                                              AppLocalizations.of(context).successfullyDeleted,
+                                              textAlign: TextAlign.center,
+                                            ),
+                                          ),
+                                        );
+                                      },
+                                    ),
+                                  ],
+                                );
+                              },
+                            );
+                          },
+                        ),
+                      ],
+                    ),
                   ),
                 ),
               );
diff --git a/lib/widgets/nutrition/widgets.dart b/lib/widgets/nutrition/widgets.dart
index 2141ee88..c44b2bd3 100644
--- a/lib/widgets/nutrition/widgets.dart
+++ b/lib/widgets/nutrition/widgets.dart
@@ -17,17 +17,16 @@
  */
 
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart'; //import 'package:flutter_barcode_scanner/flutter_barcode_scanner.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_typeahead/flutter_typeahead.dart';
 import 'package:flutter_zxing/flutter_zxing.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:logging/logging.dart';
 import 'package:provider/provider.dart';
 import 'package:wger/helpers/consts.dart';
 import 'package:wger/helpers/misc.dart';
 import 'package:wger/helpers/platform.dart';
-import 'package:wger/helpers/ui.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
-import 'package:wger/models/exercises/ingredient_api.dart';
 import 'package:wger/models/nutrition/ingredient.dart';
 import 'package:wger/providers/nutrition.dart';
 import 'package:wger/widgets/core/core.dart';
@@ -36,6 +35,7 @@ import 'package:wger/widgets/nutrition/ingredient_dialogs.dart';
 
 class ScanReader extends StatelessWidget {
   const ScanReader();
+
   @override
   Widget build(BuildContext context) => Scaffold(
     body: ReaderWidget(
@@ -54,26 +54,28 @@ class ScanReader extends StatelessWidget {
 }
 
 class IngredientTypeahead extends StatefulWidget {
+  final _logger = Logger('IngredientTypeahead');
+
   final TextEditingController _ingredientController;
   final TextEditingController _ingredientIdController;
 
   final String barcode;
-  final bool? test;
+  final bool test;
   final bool showScanner;
 
   final Function(int id, String name, num? amount) selectIngredient;
-  final Function() unSelectIngredient;
-  final Function(String query) updateSearchQuery;
+  final Function() onDeselectIngredient;
+  final Function(String query) onUpdateSearchQuery;
 
-  const IngredientTypeahead(
+  IngredientTypeahead(
     this._ingredientIdController,
     this._ingredientController, {
     this.showScanner = true,
     this.test = false,
     this.barcode = '',
     required this.selectIngredient,
-    required this.unSelectIngredient,
-    required this.updateSearchQuery,
+    required this.onDeselectIngredient,
+    required this.onUpdateSearchQuery,
   });
 
   @override
@@ -90,20 +92,22 @@ class _IngredientTypeaheadState extends State<IngredientTypeahead> {
     barcode = widget.barcode; // for unit tests
   }
 
-  Future<String> readerscan(BuildContext context) async {
+  Future<String> openBarcodeScan(BuildContext context) async {
     try {
       final code = await Navigator.of(
         context,
       ).push<String?>(MaterialPageRoute(builder: (context) => const ScanReader()));
+
       if (code == null) {
         return '';
       }
 
-      if (code.compareTo('-1') == 0) {
+      if (code == '-1') {
         return '';
       }
       return code;
-    } on PlatformException {
+    } on PlatformException catch (e) {
+      widget._logger.warning('PlatformException during barcode scan: $e');
       return '';
     }
   }
@@ -112,8 +116,9 @@ class _IngredientTypeaheadState extends State<IngredientTypeahead> {
   Widget build(BuildContext context) {
     return Column(
       children: [
-        TypeAheadField<IngredientApiSearchEntry>(
+        TypeAheadField<Ingredient>(
           controller: widget._ingredientController,
+          debounceDuration: const Duration(milliseconds: 500),
           builder: (context, controller, focusNode) {
             return TextFormField(
               controller: controller,
@@ -125,11 +130,6 @@ class _IngredientTypeaheadState extends State<IngredientTypeahead> {
                 }
                 return null;
               },
-              onChanged: (value) {
-                widget.updateSearchQuery(value);
-                // unselect to start a new search
-                widget.unSelectIngredient();
-              },
               decoration: InputDecoration(
                 prefixIcon: const Icon(Icons.search),
                 labelText: AppLocalizations.of(context).searchIngredient,
@@ -143,28 +143,37 @@ class _IngredientTypeaheadState extends State<IngredientTypeahead> {
               return null;
             }
 
+            widget.onUpdateSearchQuery(pattern);
+            widget.onDeselectIngredient();
+
             return Provider.of<NutritionPlansProvider>(context, listen: false).searchIngredient(
               pattern,
               languageCode: Localizations.localeOf(context).languageCode,
               searchEnglish: _searchEnglish,
             );
           },
-          itemBuilder: (context, suggestion) {
-            final url = context.read<NutritionPlansProvider>().baseProvider.auth.serverUrl;
+          itemBuilder: (context, ingredient) {
             return ListTile(
-              leading: suggestion.data.image != null
-                  ? CircleAvatar(backgroundImage: NetworkImage(url! + suggestion.data.image!))
-                  : const CircleIconAvatar(Icon(Icons.image, color: Colors.grey)),
-              title: Text(suggestion.value),
-              // subtitle: Text(suggestion.data.id.toString()),
+              leading: ingredient.image != null
+                  ? CircleAvatar(
+                      backgroundImage: NetworkImage(ingredient.thumbnails!.medium),
+                    )
+                  : const CircleIconAvatar(
+                      Icon(Icons.image, color: Colors.grey),
+                    ),
+              title: Text(
+                ingredient.name,
+                maxLines: 2,
+                overflow: TextOverflow.ellipsis,
+              ),
               trailing: IconButton(
                 icon: const Icon(Icons.info_outline),
                 onPressed: () {
                   showIngredientDetails(
                     context,
-                    suggestion.data.id,
+                    ingredient.id,
                     select: () {
-                      widget.selectIngredient(suggestion.data.id, suggestion.value, null);
+                      widget.selectIngredient(ingredient.id, ingredient.name, null);
                     },
                   );
                 },
@@ -176,7 +185,7 @@ class _IngredientTypeaheadState extends State<IngredientTypeahead> {
             child: child,
           ),
           onSelected: (suggestion) {
-            widget.selectIngredient(suggestion.data.id, suggestion.value, null);
+            widget.selectIngredient(suggestion.id, suggestion.name, null);
           },
         ),
         if (Localizations.localeOf(context).languageCode != LANGUAGE_SHORT_ENGLISH)
@@ -199,15 +208,10 @@ class _IngredientTypeaheadState extends State<IngredientTypeahead> {
       key: const Key('scan-button'),
       icon: const FaIcon(FontAwesomeIcons.barcode),
       onPressed: () async {
-        try {
-          if (!widget.test!) {
-            barcode = await readerscan(context);
-          }
-        } catch (e) {
-          if (mounted) {
-            showErrorDialog(e, context);
-          }
+        if (!widget.test) {
+          barcode = await openBarcodeScan(context);
         }
+
         if (!mounted) {
           return;
         }
@@ -217,7 +221,7 @@ class _IngredientTypeaheadState extends State<IngredientTypeahead> {
             future: Provider.of<NutritionPlansProvider>(
               context,
               listen: false,
-            ).searchIngredientWithCode(barcode),
+            ).searchIngredientWithBarcode(barcode),
             builder: (BuildContext context, AsyncSnapshot<Ingredient?> snapshot) {
               return IngredientScanResultDialog(snapshot, barcode, widget.selectIngredient);
             },
@@ -237,7 +241,9 @@ class IngredientAvatar extends StatelessWidget {
   Widget build(BuildContext context) {
     return ingredient.image != null
         ? GestureDetector(
-            child: CircleAvatar(backgroundImage: NetworkImage(ingredient.image!.image)),
+            child: CircleAvatar(
+              backgroundImage: NetworkImage(ingredient.image!.url),
+            ),
             onTap: () async {
               if (ingredient.image!.objectUrl != '') {
                 return launchURL(ingredient.image!.objectUrl, context);
diff --git a/lib/widgets/routines/app_bar.dart b/lib/widgets/routines/app_bar.dart
new file mode 100644
index 00000000..6c431742
--- /dev/null
+++ b/lib/widgets/routines/app_bar.dart
@@ -0,0 +1,140 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/workouts/routine.dart';
+import 'package:wger/providers/routines.dart';
+import 'package:wger/screens/add_exercise_screen.dart';
+import 'package:wger/screens/exercises_screen.dart';
+import 'package:wger/screens/routine_edit_screen.dart';
+import 'package:wger/screens/routine_logs_screen.dart';
+
+enum _RoutineAppBarOptions {
+  list,
+  contribute,
+}
+
+enum _RoutineDetailBarOptions {
+  edit,
+  delete,
+  logs,
+}
+
+class RoutineListAppBar extends StatelessWidget implements PreferredSizeWidget {
+  const RoutineListAppBar();
+
+  @override
+  Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
+
+    return AppBar(
+      title: Text(i18n.routines),
+      actions: [
+        PopupMenuButton(
+          itemBuilder: (context) {
+            return [
+              PopupMenuItem<_RoutineAppBarOptions>(
+                value: _RoutineAppBarOptions.list,
+                child: Text(i18n.exerciseList),
+              ),
+              PopupMenuItem<_RoutineAppBarOptions>(
+                value: _RoutineAppBarOptions.contribute,
+                child: Text(i18n.contributeExercise),
+              ),
+            ];
+          },
+          onSelected: (value) {
+            switch (value) {
+              case _RoutineAppBarOptions.contribute:
+                Navigator.of(context).pushNamed(AddExerciseScreen.routeName);
+                break;
+              case _RoutineAppBarOptions.list:
+                Navigator.of(context).pushNamed(ExercisesScreen.routeName);
+                break;
+            }
+          },
+        ),
+      ],
+    );
+  }
+
+  @override
+  Size get preferredSize => const Size.fromHeight(kToolbarHeight);
+}
+
+class RoutineDetailAppBar extends StatelessWidget implements PreferredSizeWidget {
+  final Routine routine;
+
+  const RoutineDetailAppBar(this.routine);
+
+  @override
+  Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
+    final provider = context.read<RoutinesProvider>();
+
+    return AppBar(
+      title: Text(routine.name),
+      actions: [
+        PopupMenuButton(
+          itemBuilder: (context) {
+            return [
+              PopupMenuItem<_RoutineDetailBarOptions>(
+                value: _RoutineDetailBarOptions.logs,
+                child: Text(i18n.labelWorkoutLogs),
+              ),
+              PopupMenuItem<_RoutineDetailBarOptions>(
+                value: _RoutineDetailBarOptions.edit,
+                child: Text(i18n.edit),
+              ),
+              PopupMenuItem<_RoutineDetailBarOptions>(
+                value: _RoutineDetailBarOptions.delete,
+                child: Text(i18n.delete),
+              ),
+            ];
+          },
+          onSelected: (value) {
+            switch (value) {
+              case _RoutineDetailBarOptions.edit:
+                Navigator.pushNamed(
+                  context,
+                  RoutineEditScreen.routeName,
+                  arguments: routine.id,
+                );
+
+              case _RoutineDetailBarOptions.logs:
+                Navigator.pushNamed(
+                  context,
+                  WorkoutLogsScreen.routeName,
+                  arguments: routine.id,
+                );
+
+              case _RoutineDetailBarOptions.delete:
+                provider.deleteRoutine(routine.id!);
+                Navigator.of(context).pop();
+            }
+          },
+        ),
+      ],
+    );
+  }
+
+  @override
+  Size get preferredSize => const Size.fromHeight(kToolbarHeight);
+}
diff --git a/lib/widgets/workouts/charts.dart b/lib/widgets/routines/charts.dart
similarity index 67%
rename from lib/widgets/workouts/charts.dart
rename to lib/widgets/routines/charts.dart
index 60a83461..7d5e3321 100644
--- a/lib/widgets/workouts/charts.dart
+++ b/lib/widgets/routines/charts.dart
@@ -21,10 +21,12 @@ import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:wger/helpers/charts.dart';
 import 'package:wger/helpers/colors.dart';
+import 'package:wger/helpers/misc.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/workouts/log.dart';
 
 class LogChartWidgetFl extends StatefulWidget {
-  final Map _data;
+  final Map<num, List<Log>> _data;
   final DateTime _currentDate;
 
   const LogChartWidgetFl(this._data, this._currentDate);
@@ -50,10 +52,13 @@ class _LogChartWidgetFlState extends State<LogChartWidgetFl> {
       touchTooltipData: LineTouchTooltipData(
         getTooltipItems: (touchedSpots) {
           return touchedSpots.map((touchedSpot) {
-            final reps = widget._data['chart_data'][touchedSpot.barIndex].first['reps'];
+            // Retrieve the repetitions (bit ugly, but it works)
+            final List<num> keys = widget._data.keys.toList();
+            final mapKey = keys[touchedSpot.barIndex];
+            final reps = widget._data[mapKey]?.first.repetitions;
 
             return LineTooltipItem(
-              '$reps × ${touchedSpot.y} kg',
+              '${formatNum(reps!)} × ${touchedSpot.y} kg',
               const TextStyle(color: Colors.white),
             );
           }).toList();
@@ -63,7 +68,7 @@ class _LogChartWidgetFlState extends State<LogChartWidgetFl> {
   }
 
   LineChartData mainData() {
-    final colors = generateChartColors(widget._data['chart_data'].length).iterator;
+    final colors = generateChartColors(widget._data.keys.length).iterator;
 
     return LineChartData(
       lineTouchData: tooltipData(),
@@ -79,8 +84,12 @@ class _LogChartWidgetFlState extends State<LogChartWidgetFl> {
       ),
       titlesData: FlTitlesData(
         show: true,
-        rightTitles: const AxisTitles(sideTitles: SideTitles(showTitles: false)),
-        topTitles: const AxisTitles(sideTitles: SideTitles(showTitles: false)),
+        rightTitles: const AxisTitles(
+          sideTitles: SideTitles(showTitles: false),
+        ),
+        topTitles: const AxisTitles(
+          sideTitles: SideTitles(showTitles: false),
+        ),
         bottomTitles: AxisTitles(
           sideTitles: SideTitles(
             showTitles: true,
@@ -97,8 +106,16 @@ class _LogChartWidgetFlState extends State<LogChartWidgetFl> {
               );
             },
             interval: chartGetInterval(
-              DateTime.parse(widget._data['logs'].keys.first),
-              DateTime.parse(widget._data['logs'].keys.last),
+              widget._data.containsKey(widget._data.keys.first) &&
+                      widget._data[widget._data.keys.first]!.isNotEmpty
+                  ? widget._data[widget._data.keys.first]!.first.date
+                  : DateTime.now(),
+              widget._data.containsKey(widget._data.keys.last) &&
+                      widget._data[widget._data.keys.last]!.isNotEmpty
+                  ? widget._data[widget._data.keys.last]!.last.date
+                  : DateTime.now(),
+              // widget._data[widget._data.keys.first]!.first.date,
+              // widget._data[widget._data.keys.last]!.first.date,
             ),
           ),
         ),
@@ -112,16 +129,19 @@ class _LogChartWidgetFlState extends State<LogChartWidgetFl> {
           ),
         ),
       ),
-      borderData: FlBorderData(show: true, border: Border.all(color: const Color(0xff37434d))),
+      borderData: FlBorderData(
+        show: true,
+        border: Border.all(color: const Color(0xff37434d)),
+      ),
       lineBarsData: [
-        ...widget._data['chart_data'].map((e) {
+        ...widget._data.keys.map((reps) {
           colors.moveNext();
           return LineChartBarData(
             spots: [
-              ...e.map(
+              ...widget._data[reps]!.map(
                 (entry) => FlSpot(
-                  DateTime.parse(entry['date']).millisecondsSinceEpoch.toDouble(),
-                  double.parse(entry['weight']),
+                  entry.date.millisecondsSinceEpoch.toDouble(),
+                  entry.weight!.toDouble(),
                 ),
               ),
             ],
@@ -131,8 +151,11 @@ class _LogChartWidgetFlState extends State<LogChartWidgetFl> {
             isStrokeCapRound: true,
             dotData: FlDotData(
               show: true,
-              getDotPainter: (p0, p1, p2, p3) =>
-                  FlDotCirclePainter(radius: 2, color: Colors.black, strokeWidth: 0),
+              getDotPainter: (p0, p1, p2, p3) => FlDotCirclePainter(
+                radius: 2,
+                color: Colors.black,
+                strokeWidth: 0,
+              ),
             ),
           );
         }),
diff --git a/lib/widgets/routines/day.dart b/lib/widgets/routines/day.dart
new file mode 100644
index 00000000..df007432
--- /dev/null
+++ b/lib/widgets/routines/day.dart
@@ -0,0 +1,171 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:wger/helpers/date.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/exercises/exercise.dart';
+import 'package:wger/models/workouts/day_data.dart';
+import 'package:wger/models/workouts/slot_data.dart';
+import 'package:wger/screens/gym_mode.dart';
+import 'package:wger/widgets/core/core.dart';
+import 'package:wger/widgets/exercises/exercises.dart';
+import 'package:wger/widgets/exercises/images.dart';
+
+class SetConfigDataWidget extends StatelessWidget {
+  final Exercise exercise;
+  final Widget textRepetitionsWidget;
+
+  const SetConfigDataWidget({required this.exercise, required this.textRepetitionsWidget});
+
+  @override
+  Widget build(BuildContext context) {
+    final languageCode = Localizations.localeOf(context).languageCode;
+
+    return ListTile(
+      leading: InkWell(
+        child: SizedBox(width: 45, child: ExerciseImageWidget(image: exercise.getMainImage)),
+        onTap: () {
+          showDialog(
+            context: context,
+            builder: (BuildContext context) {
+              return AlertDialog(
+                title: Text(exercise.getTranslation(languageCode).name),
+                content: ExerciseDetail(exercise),
+                actions: [
+                  TextButton(
+                    child: Text(MaterialLocalizations.of(context).closeButtonLabel),
+                    onPressed: () {
+                      Navigator.of(context).pop();
+                    },
+                  ),
+                ],
+              );
+            },
+          );
+        },
+      ),
+      title: Text(exercise.getTranslation(languageCode).name),
+      subtitle: textRepetitionsWidget,
+    );
+  }
+}
+
+class RoutineDayWidget extends StatelessWidget {
+  final DayData _dayData;
+  final int _routineId;
+  final bool _viewMode;
+
+  const RoutineDayWidget(this._dayData, this._routineId, this._viewMode);
+
+  Widget getSlotDataRow(SlotData slotData, BuildContext context) {
+    return Column(
+      children: [
+        if (slotData.comment.isNotEmpty) MutedText(slotData.comment),
+
+        // If there's a single exercise with different sets, group them all into
+        // the one exercise and don't show separate rows for each one.
+        ...slotData.setConfigs
+            .fold<Map<Exercise, List<String>>>({}, (acc, entry) {
+              acc.putIfAbsent(entry.exercise, () => []).add(entry.textReprWithType);
+              return acc;
+            })
+            .entries
+            .map((entry) {
+              return SetConfigDataWidget(
+                exercise: entry.key,
+                textRepetitionsWidget: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: entry.value.map((text) => Text(text)).toList(),
+                ),
+              );
+            }),
+      ],
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.only(left: 8, right: 8, bottom: 12),
+      child: Card(
+        margin: EdgeInsets.zero,
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            DayHeader(day: _dayData, routineId: _routineId, viewMode: _viewMode),
+            ..._dayData.slots.map((e) => getSlotDataRow(e, context)),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class DayHeader extends StatelessWidget {
+  final DayData _dayData;
+  final int _routineId;
+  final bool _viewMode;
+
+  const DayHeader({required DayData day, required int routineId, bool viewMode = false})
+    : _dayData = day,
+      _viewMode = viewMode,
+      _routineId = routineId;
+
+  @override
+  Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
+
+    if (_dayData.day == null || _dayData.day!.isRest) {
+      return ListTile(
+        tileColor: Theme.of(context).focusColor,
+        contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+        title: Text(
+          i18n.restDay,
+          style: Theme.of(context).textTheme.headlineSmall,
+          overflow: TextOverflow.ellipsis,
+        ),
+        leading: const Icon(Icons.hotel),
+        trailing: _dayData.date.isSameDayAs(DateTime.now()) ? const Icon(Icons.today) : null,
+        minLeadingWidth: 8,
+      );
+    }
+
+    return ListTile(
+      tileColor: Theme.of(context).focusColor,
+      contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+      title: Text(
+        _dayData.day!.nameWithType,
+        style: Theme.of(context).textTheme.headlineSmall,
+        overflow: TextOverflow.ellipsis,
+      ),
+      subtitle: Text(_dayData.day!.description),
+      leading: _viewMode ? null : const Icon(Icons.play_arrow),
+      trailing: _dayData.date.isSameDayAs(DateTime.now()) ? const Icon(Icons.today) : null,
+      minLeadingWidth: 8,
+      onTap: () {
+        if (!_viewMode) {
+          Navigator.of(context).pushNamed(
+            GymModeScreen.routeName,
+            arguments: GymModeArguments(_routineId, _dayData.day!.id!, _dayData.iteration),
+          );
+        }
+      },
+    );
+  }
+}
diff --git a/lib/widgets/routines/forms/day.dart b/lib/widgets/routines/forms/day.dart
new file mode 100644
index 00000000..a0ae3c25
--- /dev/null
+++ b/lib/widgets/routines/forms/day.dart
@@ -0,0 +1,360 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:wger/exceptions/http_exception.dart';
+import 'package:wger/helpers/consts.dart';
+import 'package:wger/helpers/errors.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/workouts/day.dart';
+import 'package:wger/providers/routines.dart';
+import 'package:wger/widgets/core/progress_indicator.dart';
+import 'package:wger/widgets/routines/forms/slot.dart';
+
+class ReorderableDaysList extends StatefulWidget {
+  final int routineId;
+  final List<Day> days;
+  final int? selectedDayId;
+  final ValueChanged<int> onDaySelected;
+
+  const ReorderableDaysList({
+    super.key,
+    required this.routineId,
+    required this.days,
+    required this.selectedDayId,
+    required this.onDaySelected,
+  });
+
+  void _showDeleteConfirmationDialog(BuildContext context, Day day) {
+    final i18n = AppLocalizations.of(context);
+
+    showDialog(
+      context: context,
+      builder: (BuildContext context) {
+        return AlertDialog(
+          title: Text(i18n.delete),
+          content: Text(i18n.confirmDelete(day.isRest ? i18n.restDay : day.name)),
+          actions: [
+            TextButton(
+              onPressed: () {
+                Navigator.of(context).pop();
+              },
+              child: const Text('Cancel'),
+            ),
+            TextButton(
+              onPressed: () async {
+                days.remove(day);
+                await context.read<RoutinesProvider>().deleteDay(day.id!);
+                Navigator.of(context).pop();
+              },
+              child: const Text('Delete'),
+            ),
+          ],
+        );
+      },
+    );
+  }
+
+  @override
+  State<ReorderableDaysList> createState() => _ReorderableDaysListState();
+}
+
+class _ReorderableDaysListState extends State<ReorderableDaysList> {
+  Widget errorMessage = const SizedBox.shrink();
+
+  @override
+  Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
+    final provider = context.read<RoutinesProvider>();
+
+    return Column(
+      children: [
+        errorMessage,
+        ReorderableListView.builder(
+          buildDefaultDragHandles: false,
+          shrinkWrap: true,
+          physics: const NeverScrollableScrollPhysics(),
+          itemCount: widget.days.length,
+          itemBuilder: (context, index) {
+            final day = widget.days[index];
+            final isDaySelected = day.id == widget.selectedDayId;
+
+            return Card(
+              key: ValueKey(day),
+              child: ListTile(
+                //selected: day.id == widget.selectedDayId,
+                tileColor: isDaySelected ? Theme.of(context).highlightColor : null,
+                key: ValueKey(day),
+                title: Text(day.isRest ? i18n.restDay : day.name),
+                leading: ReorderableDragStartListener(
+                  index: index,
+                  child: const Icon(Icons.drag_handle),
+                ),
+                subtitle: Text(
+                  day.description,
+                  style: const TextStyle(overflow: TextOverflow.ellipsis),
+                ),
+                trailing: Row(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    IconButton(
+                      key: ValueKey('edit-day-${day.id}'),
+                      onPressed: () => widget.onDaySelected(day.id!),
+                      icon: isDaySelected ? const Icon(Icons.edit_off) : const Icon(Icons.edit),
+                    ),
+                    IconButton(
+                      icon: const Icon(Icons.delete),
+                      onPressed: () => widget._showDeleteConfirmationDialog(context, day),
+                    ),
+                  ],
+                ),
+              ),
+            );
+          },
+          onReorder: (int oldIndex, int newIndex) {
+            setState(() {
+              if (oldIndex < newIndex) {
+                newIndex -= 1;
+              }
+              final Day item = widget.days.removeAt(oldIndex);
+              widget.days.insert(newIndex, item);
+
+              for (int i = 0; i < widget.days.length; i++) {
+                widget.days[i].order = i + 1;
+              }
+            });
+
+            try {
+              provider.editDays(widget.days);
+              setState(() {
+                errorMessage = const SizedBox.shrink();
+              });
+            } on WgerHttpException catch (error) {
+              if (context.mounted) {
+                setState(() {
+                  errorMessage = FormHttpErrorsWidget(error);
+                });
+              }
+            }
+          },
+        ),
+        Card(
+          child: ListTile(
+            key: const ValueKey('add-day'),
+            // tileColor: Theme.of(context).focusColor,
+            leading: const Icon(Icons.add),
+            title: Text(
+              AppLocalizations.of(context).newDay,
+              style: Theme.of(context).textTheme.titleMedium,
+            ),
+            onTap: () async {
+              final day = Day(
+                routineId: widget.routineId,
+                name: '${i18n.newDay} ${widget.days.length + 1}',
+                order: widget.days.length + 1,
+              );
+              day.name = '${i18n.newDay} ${widget.days.length + 1}';
+              day.routineId = widget.routineId;
+              day.order = widget.days.length + 1;
+              final newDay = await provider.addDay(day);
+
+              widget.onDaySelected(newDay.id!);
+            },
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+class DayFormWidget extends StatefulWidget {
+  late final Day day;
+
+  DayFormWidget({required Day day, super.key}) {
+    this.day = day.copyWith();
+  }
+
+  @override
+  _DayFormWidgetState createState() => _DayFormWidgetState();
+}
+
+class _DayFormWidgetState extends State<DayFormWidget> {
+  Widget errorMessage = const SizedBox.shrink();
+
+  final descriptionController = TextEditingController();
+  final nameController = TextEditingController();
+  bool isSaving = false;
+
+  final _form = GlobalKey<FormState>();
+
+  @override
+  void initState() {
+    super.initState();
+    descriptionController.text = widget.day.description;
+    nameController.text = widget.day.name;
+  }
+
+  @override
+  void dispose() {
+    descriptionController.dispose();
+    nameController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
+
+    return Form(
+      key: _form,
+      child: Column(
+        children: [
+          errorMessage,
+          Text(
+            widget.day.isRest ? i18n.restDay : widget.day.name,
+            style: Theme.of(context).textTheme.titleLarge,
+            key: ValueKey('day-title-${widget.day.id!}'),
+          ),
+          SwitchListTile(
+            key: const Key('field-is-rest-day'),
+            title: Text(i18n.isRestDay),
+            subtitle: Text(i18n.isRestDayHelp),
+            value: widget.day.isRest,
+            contentPadding: const EdgeInsets.all(4),
+            onChanged: (value) {
+              setState(() {
+                widget.day.isRest = value;
+                widget.day.type = DayType.custom;
+                widget.day.needLogsToAdvance = false;
+                nameController.clear();
+                descriptionController.clear();
+              });
+              widget.day.isRest = value;
+            },
+          ),
+          TextFormField(
+            enabled: !widget.day.isRest,
+            key: const Key('field-name'),
+            decoration: InputDecoration(labelText: i18n.name),
+            controller: nameController,
+            onSaved: (value) {
+              widget.day.name = value!;
+            },
+            validator: (value) {
+              if (widget.day.isRest) {
+                return null;
+              }
+
+              if (value!.isEmpty ||
+                  value.length < Day.MIN_LENGTH_NAME ||
+                  value.length > Day.MAX_LENGTH_NAME) {
+                return i18n.enterCharacters(
+                  Day.MIN_LENGTH_NAME.toString(),
+                  Day.MAX_LENGTH_NAME.toString(),
+                );
+              }
+
+              return null;
+            },
+          ),
+
+          TextFormField(
+            key: const Key('field-description'),
+            enabled: !widget.day.isRest,
+            decoration: InputDecoration(labelText: i18n.description),
+            controller: descriptionController,
+            onSaved: (value) {
+              widget.day.description = value!;
+            },
+            minLines: 2,
+            maxLines: 10,
+            validator: (value) {
+              if (widget.day.isRest) {
+                return null;
+              }
+
+              if (value != null && value.length > Day.MAX_LENGTH_DESCRIPTION) {
+                return i18n.enterCharacters('0', Day.MAX_LENGTH_DESCRIPTION.toString());
+              }
+
+              return null;
+            },
+          ),
+          DropdownButtonFormField<DayType>(
+            key: const Key('field-day-type'),
+            initialValue: widget.day.type,
+            decoration: const InputDecoration(labelText: 'Typ'),
+            items: DayType.values.map((type) {
+              return DropdownMenuItem(
+                key: Key('day-type-option-${type.name}'),
+                value: type,
+                child: Text('${type.name.toUpperCase()} - ${type.i18Label(i18n)}'),
+              );
+            }).toList(),
+            onChanged: widget.day.isRest
+                ? null
+                : (value) {
+                    setState(() {
+                      widget.day.type = value!;
+                    });
+                  },
+          ),
+          SwitchListTile(
+            key: const Key('field-need-logs-to-advance'),
+            title: Text(i18n.needsLogsToAdvance),
+            subtitle: Text(i18n.needsLogsToAdvanceHelp),
+            value: widget.day.needLogsToAdvance,
+            contentPadding: const EdgeInsets.all(4),
+            onChanged: widget.day.isRest
+                ? null
+                : (value) {
+                    setState(() {
+                      widget.day.needLogsToAdvance = value;
+                    });
+                  },
+          ),
+          const SizedBox(height: 5),
+          ElevatedButton(
+            key: const Key(SUBMIT_BUTTON_KEY_NAME),
+            onPressed: isSaving
+                ? null
+                : () async {
+                    if (!_form.currentState!.validate()) {
+                      return;
+                    }
+                    _form.currentState!.save();
+                    setState(() => isSaving = true);
+
+                    try {
+                      await Provider.of<RoutinesProvider>(
+                        context,
+                        listen: false,
+                      ).editDay(widget.day);
+                      if (context.mounted) {
+                        setState(() {
+                          errorMessage = const SizedBox.shrink();
+                        });
+                      }
+                    } on WgerHttpException catch (error) {
+                      if (context.mounted) {
+                        setState(() {
+                          errorMessage = FormHttpErrorsWidget(error);
+                        });
+                      }
+                    } finally {
+                      if (mounted) {
+                        setState(() {
+                          isSaving = false;
+                        });
+                      }
+                    }
+                  },
+            child: isSaving
+                ? const FormProgressIndicator()
+                : Text(AppLocalizations.of(context).save),
+          ),
+          const SizedBox(height: 5),
+          ReorderableSlotList(widget.day.slots, widget.day),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/routines/forms/reps_unit.dart b/lib/widgets/routines/forms/reps_unit.dart
new file mode 100644
index 00000000..70e53c3b
--- /dev/null
+++ b/lib/widgets/routines/forms/reps_unit.dart
@@ -0,0 +1,73 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/workouts/repetition_unit.dart';
+import 'package:wger/providers/routines.dart';
+
+/// Input widget for repetition units
+///
+/// Can be used with a Setting or a Log object
+class RepetitionUnitInputWidget extends StatefulWidget {
+  late int? selectedRepetitionUnit;
+  final ValueChanged<int?> onChanged;
+
+  RepetitionUnitInputWidget(initialValue, {required this.onChanged}) {
+    selectedRepetitionUnit = initialValue;
+  }
+
+  @override
+  _RepetitionUnitInputWidgetState createState() => _RepetitionUnitInputWidgetState();
+}
+
+class _RepetitionUnitInputWidgetState extends State<RepetitionUnitInputWidget> {
+  @override
+  Widget build(BuildContext context) {
+    final unitProvider = context.read<RoutinesProvider>();
+
+    RepetitionUnit? selectedWeightUnit = widget.selectedRepetitionUnit != null
+        ? unitProvider.findRepetitionUnitById(widget.selectedRepetitionUnit!)
+        : null;
+
+    return DropdownButtonFormField(
+      value: selectedWeightUnit,
+      decoration: InputDecoration(
+        labelText: AppLocalizations.of(context).repetitionUnit,
+      ),
+      isDense: true,
+      onChanged: (RepetitionUnit? newValue) {
+        setState(() {
+          selectedWeightUnit = newValue!;
+          widget.selectedRepetitionUnit = newValue.id;
+          widget.onChanged(newValue.id);
+        });
+      },
+      items: Provider.of<RoutinesProvider>(context, listen: false).repetitionUnits
+          .map<DropdownMenuItem<RepetitionUnit>>((RepetitionUnit value) {
+            return DropdownMenuItem<RepetitionUnit>(
+              key: Key(value.id.toString()),
+              value: value,
+              child: Text(value.name),
+            );
+          })
+          .toList(),
+    );
+  }
+}
diff --git a/lib/widgets/routines/forms/rir.dart b/lib/widgets/routines/forms/rir.dart
new file mode 100644
index 00000000..254a3603
--- /dev/null
+++ b/lib/widgets/routines/forms/rir.dart
@@ -0,0 +1,96 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/workouts/slot_entry.dart';
+
+/// Input widget for Reps In Reserve
+class RiRInputWidget extends StatefulWidget {
+  final num? _initialValue;
+  final ValueChanged<String> onChanged;
+  late String dropdownValue;
+  late double _currentSetSliderValue;
+
+  static const SLIDER_START = -0.5;
+
+  RiRInputWidget(this._initialValue, {required this.onChanged}) {
+    dropdownValue = _initialValue != null ? _initialValue.toString() : SlotEntry.DEFAULT_RIR;
+
+    // Read string RiR into a double
+    if (_initialValue != null) {
+      _currentSetSliderValue = _initialValue.toDouble();
+    } else {
+      _currentSetSliderValue = SLIDER_START;
+    }
+  }
+
+  @override
+  _RiRInputWidgetState createState() => _RiRInputWidgetState();
+}
+
+class _RiRInputWidgetState extends State<RiRInputWidget> {
+  /// Returns the string used in the slider
+  String getSliderLabel(double value) {
+    if (value < 0) {
+      return AppLocalizations.of(context).rirNotUsed;
+    }
+    if (value > 4) {
+      return '4+ ${AppLocalizations.of(context).rir}';
+    }
+    return '$value ${AppLocalizations.of(context).rir}';
+  }
+
+  String mapDoubleToAllowedRir(double value) {
+    if (value < 0) {
+      return '';
+    }
+
+    // The representation is different (3.0 -> 3) we are on an int, round
+    if (value.toInt() < value) {
+      return value.toString();
+    }
+
+    return value.toInt().toString();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      mainAxisSize: MainAxisSize.max,
+      children: [
+        Text(AppLocalizations.of(context).rir),
+        Expanded(
+          child: Slider(
+            value: widget._currentSetSliderValue,
+            min: RiRInputWidget.SLIDER_START,
+            max: (SlotEntry.POSSIBLE_RIR_VALUES.length - 2) / 2,
+            divisions: SlotEntry.POSSIBLE_RIR_VALUES.length - 1,
+            label: getSliderLabel(widget._currentSetSliderValue),
+            onChanged: (double value) {
+              widget.onChanged(mapDoubleToAllowedRir(value));
+              setState(() {
+                widget._currentSetSliderValue = value;
+              });
+            },
+          ),
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/widgets/routines/forms/routine.dart b/lib/widgets/routines/forms/routine.dart
new file mode 100644
index 00000000..bbdc9bb2
--- /dev/null
+++ b/lib/widgets/routines/forms/routine.dart
@@ -0,0 +1,257 @@
+import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+import 'package:provider/provider.dart';
+import 'package:wger/exceptions/http_exception.dart';
+import 'package:wger/helpers/consts.dart';
+import 'package:wger/helpers/errors.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/workouts/routine.dart';
+import 'package:wger/providers/routines.dart';
+import 'package:wger/screens/routine_edit_screen.dart';
+import 'package:wger/widgets/core/progress_indicator.dart';
+
+class RoutineForm extends StatefulWidget {
+  final Routine _routine;
+  final bool useListView;
+
+  const RoutineForm(this._routine, {this.useListView = false});
+
+  @override
+  State<RoutineForm> createState() => _RoutineFormState();
+}
+
+class _RoutineFormState extends State<RoutineForm> {
+  final _form = GlobalKey<FormState>();
+  Widget errorMessage = const SizedBox.shrink();
+
+  bool isSaving = false;
+  late bool fitInWeek;
+  late DateTime startDate;
+  late DateTime endDate;
+  final workoutNameController = TextEditingController();
+  final workoutDescriptionController = TextEditingController();
+
+  @override
+  void initState() {
+    super.initState();
+    fitInWeek = widget._routine.fitInWeek;
+    workoutNameController.text = widget._routine.name;
+    workoutDescriptionController.text = widget._routine.description;
+    startDate = widget._routine.start;
+    endDate = widget._routine.end;
+  }
+
+  @override
+  void dispose() {
+    workoutNameController.dispose();
+    workoutDescriptionController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
+
+    final children = [
+      errorMessage,
+      TextFormField(
+        key: const Key('field-name'),
+        decoration: InputDecoration(labelText: i18n.name),
+        controller: workoutNameController,
+        validator: (value) {
+          if (value!.isEmpty ||
+              value.length < Routine.MIN_LENGTH_NAME ||
+              value.length > Routine.MAX_LENGTH_NAME) {
+            return i18n.enterCharacters(
+              Routine.MIN_LENGTH_NAME.toString(),
+              Routine.MAX_LENGTH_NAME.toString(),
+            );
+          }
+          return null;
+        },
+        onSaved: (newValue) {
+          widget._routine.name = newValue!;
+        },
+      ),
+      TextFormField(
+        key: const Key('field-description'),
+        decoration: InputDecoration(labelText: i18n.description),
+        minLines: 3,
+        maxLines: 10,
+        controller: workoutDescriptionController,
+        validator: (value) {
+          if (value!.length > Routine.MAX_LENGTH_DESCRIPTION) {
+            return i18n.enterCharacters(
+              Routine.MIN_LENGTH_DESCRIPTION.toString(),
+              Routine.MAX_LENGTH_DESCRIPTION.toString(),
+            );
+          }
+          return null;
+        },
+        onSaved: (newValue) {
+          widget._routine.description = newValue!;
+        },
+      ),
+      TextFormField(
+        key: const Key('field-start-date'),
+        // Stop keyboard from appearing
+        readOnly: true,
+        validator: (value) {
+          if (endDate.isBefore(startDate)) {
+            return 'End date must be after start date';
+          }
+          if (endDate.difference(startDate).inDays < Routine.MIN_DURATION * 7) {
+            return 'Duration of the routine must be more than ${Routine.MIN_DURATION} weeks';
+          }
+          if (endDate.difference(startDate).inDays > Routine.MAX_DURATION * 7) {
+            return 'Duration of the routine must be less than ${Routine.MAX_DURATION} weeks';
+          }
+          return null;
+        },
+        decoration: InputDecoration(
+          labelText: i18n.startDate,
+          suffixIcon: const Icon(
+            Icons.calendar_today,
+            key: Key('calendarIcon'),
+          ),
+        ),
+        enableInteractiveSelection: false,
+        controller: TextEditingController(
+          text: DateFormat.yMd(
+            Localizations.localeOf(context).languageCode,
+          ).format(startDate),
+        ),
+        onTap: () async {
+          final picked = await showDatePicker(
+            context: context,
+            initialDate: startDate,
+            firstDate: DateTime.now().subtract(const Duration(days: 365)),
+            lastDate: DateTime.now().add(const Duration(days: 365)),
+          );
+
+          if (picked == null) {
+            return;
+          }
+
+          widget._routine.start = picked;
+          if (mounted) {
+            setState(() {
+              startDate = picked;
+            });
+          }
+        },
+      ),
+      TextFormField(
+        key: const Key('field-end-date'),
+        // Stop keyboard from appearing
+        readOnly: true,
+        decoration: InputDecoration(
+          labelText: i18n.endDate,
+          suffixIcon: const Icon(
+            Icons.calendar_today,
+            key: Key('calendarIcon'),
+          ),
+        ),
+        enableInteractiveSelection: false,
+        controller: TextEditingController(
+          text: DateFormat.yMd(
+            Localizations.localeOf(context).languageCode,
+          ).format(endDate),
+        ),
+        onTap: () async {
+          final picked = await showDatePicker(
+            context: context,
+            initialDate: endDate,
+            firstDate: DateTime.now().subtract(const Duration(days: 365)),
+            lastDate: DateTime.now().add(const Duration(days: 365)),
+          );
+
+          if (picked == null) {
+            return;
+          }
+
+          widget._routine.end = picked;
+          if (mounted) {
+            setState(() {
+              endDate = picked;
+            });
+          }
+        },
+      ),
+      const SizedBox(height: 5),
+      SwitchListTile(
+        title: Text(i18n.fitInWeek),
+        subtitle: Text(i18n.fitInWeekHelp),
+        isThreeLine: true,
+        value: widget._routine.fitInWeek,
+        contentPadding: const EdgeInsets.all(4),
+        onChanged: (bool? value) {
+          if (value == null) {
+            return;
+          }
+
+          widget._routine.fitInWeek = value;
+          if (mounted) {
+            setState(() {
+              fitInWeek = value;
+            });
+          }
+        },
+      ),
+      const SizedBox(height: 5),
+      ElevatedButton(
+        key: const Key(SUBMIT_BUTTON_KEY_NAME),
+        onPressed: isSaving
+            ? null
+            : () async {
+                // Validate and save
+                final isValid = _form.currentState!.validate();
+                if (!isValid) {
+                  return;
+                }
+                _form.currentState!.save();
+                setState(() {
+                  isSaving = true;
+                });
+
+                // Save to DB
+                try {
+                  final routinesProvider = context.read<RoutinesProvider>();
+
+                  if (widget._routine.id != null) {
+                    await routinesProvider.editRoutine(widget._routine);
+                  } else {
+                    final routine = await routinesProvider.addRoutine(widget._routine);
+                    if (context.mounted) {
+                      Navigator.of(context).pushReplacementNamed(
+                        RoutineEditScreen.routeName,
+                        arguments: routine.id,
+                      );
+                    }
+                  }
+                  setState(() {
+                    errorMessage = const SizedBox.shrink();
+                  });
+                } on WgerHttpException catch (error) {
+                  if (context.mounted) {
+                    setState(() {
+                      errorMessage = FormHttpErrorsWidget(error);
+                    });
+                  }
+                } finally {
+                  if (mounted) {
+                    setState(() {
+                      isSaving = false;
+                    });
+                  }
+                }
+              },
+        child: isSaving ? const FormProgressIndicator() : Text(AppLocalizations.of(context).save),
+      ),
+    ];
+    return Form(
+      key: _form,
+      child: widget.useListView ? ListView(children: children) : Column(children: children),
+    );
+  }
+}
diff --git a/lib/widgets/routines/forms/session.dart b/lib/widgets/routines/forms/session.dart
new file mode 100644
index 00000000..191f3615
--- /dev/null
+++ b/lib/widgets/routines/forms/session.dart
@@ -0,0 +1,265 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:clock/clock.dart';
+import 'package:flutter/material.dart';
+import 'package:logging/logging.dart';
+import 'package:provider/provider.dart';
+import 'package:wger/exceptions/http_exception.dart';
+import 'package:wger/helpers/consts.dart';
+import 'package:wger/helpers/errors.dart';
+import 'package:wger/helpers/json.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/workouts/session.dart';
+import 'package:wger/providers/routines.dart';
+
+class SessionForm extends StatefulWidget {
+  final _logger = Logger('SessionForm');
+  final WorkoutSession _session;
+  final int? _routineId;
+  final Function()? _onSaved;
+
+  static const SLIDER_START = -0.5;
+
+  SessionForm(this._routineId, {Function()? onSaved, WorkoutSession? session, int? dayId})
+    : _onSaved = onSaved,
+      _session =
+          session ??
+          WorkoutSession(
+            routineId: _routineId,
+            dayId: dayId,
+            impression: DEFAULT_IMPRESSION,
+            date: clock.now(),
+            timeEnd: TimeOfDay.fromDateTime(clock.now()),
+            timeStart: null,
+          );
+
+  @override
+  _SessionFormState createState() => _SessionFormState();
+}
+
+class _SessionFormState extends State<SessionForm> {
+  Widget errorMessage = const SizedBox.shrink();
+  final _form = GlobalKey<FormState>();
+
+  final impressionController = TextEditingController();
+  final notesController = TextEditingController();
+  final timeStartController = TextEditingController();
+  final timeEndController = TextEditingController();
+
+  /// Selected impression: bad,  neutral, good
+  var selectedImpression = [false, false, false];
+
+  @override
+  void initState() {
+    super.initState();
+
+    timeStartController.text = widget._session.timeStart == null
+        ? ''
+        : timeToString(widget._session.timeStart)!;
+    timeEndController.text = widget._session.timeEnd == null
+        ? ''
+        : timeToString(widget._session.timeEnd)!;
+    notesController.text = widget._session.notes;
+
+    selectedImpression[widget._session.impression - 1] = true;
+  }
+
+  @override
+  void dispose() {
+    impressionController.dispose();
+    notesController.dispose();
+    timeStartController.dispose();
+    timeEndController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final routinesProvider = context.read<RoutinesProvider>();
+
+    return Form(
+      key: _form,
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: [
+          errorMessage,
+          ToggleButtons(
+            renderBorder: false,
+            onPressed: (int index) {
+              setState(() {
+                for (int buttonIndex = 0; buttonIndex < selectedImpression.length; buttonIndex++) {
+                  widget._session.impression = index + 1;
+
+                  if (buttonIndex == index) {
+                    selectedImpression[buttonIndex] = true;
+                  } else {
+                    selectedImpression[buttonIndex] = false;
+                  }
+                }
+              });
+            },
+            isSelected: selectedImpression,
+            children: const [
+              Icon(Icons.sentiment_very_dissatisfied),
+              Icon(Icons.sentiment_neutral),
+              Icon(Icons.sentiment_very_satisfied),
+            ],
+          ),
+          TextFormField(
+            decoration: InputDecoration(
+              labelText: AppLocalizations.of(context).notes,
+            ),
+            maxLines: 3,
+            controller: notesController,
+            keyboardType: TextInputType.multiline,
+            onFieldSubmitted: (_) {},
+            onSaved: (newValue) {
+              widget._session.notes = newValue!;
+            },
+          ),
+          Row(
+            spacing: 10,
+            children: [
+              Flexible(
+                child: TextFormField(
+                  key: const ValueKey('time-start'),
+                  decoration: InputDecoration(
+                    labelText: AppLocalizations.of(context).timeStart,
+                    errorMaxLines: 2,
+                  ),
+                  controller: timeStartController,
+                  onFieldSubmitted: (_) {},
+                  onTap: () async {
+                    // Stop keyboard from appearing
+                    FocusScope.of(context).requestFocus(FocusNode());
+
+                    // Open time picker
+                    final pickedTime = await showTimePicker(
+                      context: context,
+                      initialTime: widget._session.timeStart ?? TimeOfDay.now(),
+                    );
+
+                    if (pickedTime != null) {
+                      timeStartController.text = timeToString(pickedTime)!;
+                      widget._session.timeStart = pickedTime;
+                    }
+                  },
+                  onSaved: (newValue) {
+                    if (newValue != null && newValue.isNotEmpty) {
+                      widget._session.timeStart = stringToTime(newValue);
+                    }
+                  },
+                  validator: (_) {
+                    if (timeStartController.text.isEmpty && timeEndController.text.isEmpty) {
+                      return null;
+                    }
+
+                    if (timeStartController.text.isNotEmpty && timeEndController.text.isNotEmpty) {
+                      final TimeOfDay startTime = stringToTime(timeStartController.text);
+                      final TimeOfDay endTime = stringToTime(timeEndController.text);
+                      if (startTime.isAfter(endTime)) {
+                        return AppLocalizations.of(context).timeStartAhead;
+                      }
+                    }
+
+                    return null;
+                  },
+                ),
+              ),
+              Flexible(
+                child: TextFormField(
+                  key: const ValueKey('time-end'),
+                  decoration: InputDecoration(
+                    labelText: AppLocalizations.of(context).timeEnd,
+                  ),
+                  controller: timeEndController,
+                  onFieldSubmitted: (_) {},
+                  onTap: () async {
+                    // Stop keyboard from appearing
+                    FocusScope.of(context).requestFocus(FocusNode());
+
+                    // Open time picker
+                    final pickedTime = await showTimePicker(
+                      context: context,
+                      initialTime: widget._session.timeEnd ?? TimeOfDay.now(),
+                    );
+
+                    if (pickedTime != null) {
+                      timeEndController.text = timeToString(pickedTime)!;
+                      widget._session.timeEnd = pickedTime;
+                    }
+                  },
+                  onSaved: (newValue) {
+                    if (newValue != null && newValue.isNotEmpty) {
+                      widget._session.timeEnd = stringToTime(newValue);
+                    }
+                  },
+                ),
+              ),
+            ],
+          ),
+          const SizedBox(height: 5),
+          ElevatedButton(
+            key: const ValueKey('save-button'),
+            child: Text(AppLocalizations.of(context).save),
+            onPressed: () async {
+              // Validate and save the current values to the weightEntry
+              final isValid = _form.currentState!.validate();
+              if (!isValid) {
+                return;
+              }
+              _form.currentState!.save();
+
+              // Reset any previous error message
+              setState(() {
+                errorMessage = const SizedBox.shrink();
+              });
+
+              // Save the entry on the server
+              try {
+                if (widget._session.id == null) {
+                  widget._logger.fine('Adding new session');
+                  await routinesProvider.addSession(widget._session, widget._routineId);
+                } else {
+                  widget._logger.fine('Editing existing session with id ${widget._session.id}');
+                  await routinesProvider.editSession(widget._session);
+                }
+
+                setState(() {
+                  errorMessage = const SizedBox.shrink();
+                });
+
+                if (context.mounted && widget._onSaved != null) {
+                  widget._onSaved!();
+                }
+              } on WgerHttpException catch (error) {
+                widget._logger.warning('Could not save session: $error');
+                if (context.mounted) {
+                  setState(() {
+                    errorMessage = FormHttpErrorsWidget(error);
+                  });
+                }
+              }
+            },
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/routines/forms/slot.dart b/lib/widgets/routines/forms/slot.dart
new file mode 100644
index 00000000..59ab4aa9
--- /dev/null
+++ b/lib/widgets/routines/forms/slot.dart
@@ -0,0 +1,268 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:wger/exceptions/http_exception.dart';
+import 'package:wger/helpers/errors.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/workouts/day.dart';
+import 'package:wger/models/workouts/slot.dart';
+import 'package:wger/models/workouts/slot_entry.dart';
+import 'package:wger/providers/routines.dart';
+import 'package:wger/widgets/core/progress_indicator.dart';
+import 'package:wger/widgets/exercises/autocompleter.dart';
+import 'package:wger/widgets/routines/forms/slot_entry.dart';
+import 'package:wger/widgets/routines/slot.dart';
+
+class SlotDetailWidget extends StatefulWidget {
+  final Slot slot;
+  final bool simpleMode;
+  final int routineId;
+
+  const SlotDetailWidget(this.slot, this.routineId, {this.simpleMode = true, super.key});
+
+  @override
+  State<SlotDetailWidget> createState() => _SlotDetailWidgetState();
+}
+
+class _SlotDetailWidgetState extends State<SlotDetailWidget> {
+  bool _showExerciseSearchBox = false;
+  Widget errorMessage = const SizedBox.shrink();
+
+  @override
+  Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
+    final provider = context.read<RoutinesProvider>();
+
+    return Column(
+      children: [
+        errorMessage,
+        ...widget.slot.entries.map(
+          (entry) => entry.hasProgressionRules
+              ? ProgressionRulesInfoBox(entry.exerciseObj)
+              : SlotEntryForm(entry, widget.routineId, simpleMode: widget.simpleMode),
+        ),
+        const SizedBox(height: 10),
+        if (_showExerciseSearchBox || widget.slot.entries.isEmpty)
+          ExerciseAutocompleter(
+            onExerciseSelected: (exercise) async {
+              setState(() => _showExerciseSearchBox = false);
+
+              final SlotEntry entry = SlotEntry.withData(
+                slotId: widget.slot.id!,
+                order: widget.slot.entries.length + 1,
+                exercise: exercise,
+              );
+
+              try {
+                await provider.addSlotEntry(entry, widget.routineId);
+                if (context.mounted) {
+                  setState(() => errorMessage = const SizedBox.shrink());
+                }
+              } on WgerHttpException catch (error) {
+                if (context.mounted) {
+                  setState(() {
+                    errorMessage = FormHttpErrorsWidget(error);
+                  });
+                }
+              }
+            },
+          ),
+        if (widget.slot.entries.isNotEmpty)
+          FilledButton(
+            onPressed: () {
+              setState(() => _showExerciseSearchBox = !_showExerciseSearchBox);
+            },
+            child: Text(i18n.addSuperset),
+          ),
+        const SizedBox(height: 5),
+      ],
+    );
+  }
+}
+
+class ReorderableSlotList extends StatefulWidget {
+  final List<Slot> slots;
+  final Day day;
+
+  const ReorderableSlotList(this.slots, this.day);
+
+  @override
+  _SlotFormWidgetStateNg createState() => _SlotFormWidgetStateNg();
+}
+
+class _SlotFormWidgetStateNg extends State<ReorderableSlotList> {
+  int? selectedSlotId;
+  bool simpleMode = true;
+  bool isAddingSlot = false;
+  int? isDeletingSlot;
+  Widget errorMessage = const SizedBox.shrink();
+
+  @override
+  Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
+    final provider = context.read<RoutinesProvider>();
+    final languageCode = Localizations.localeOf(context).languageCode;
+
+    return Column(
+      children: [
+        errorMessage,
+        if (!widget.day.isRest)
+          SwitchListTile(
+            value: simpleMode,
+            title: Text(i18n.simpleMode),
+            subtitle: Text(i18n.simpleModeHelp),
+            contentPadding: const EdgeInsets.all(4),
+            onChanged: (value) {
+              setState(() => simpleMode = value);
+            },
+          ),
+        ReorderableListView.builder(
+          buildDefaultDragHandles: false,
+          shrinkWrap: true,
+          physics: const NeverScrollableScrollPhysics(),
+          itemCount: widget.slots.length,
+          itemBuilder: (context, index) {
+            final slot = widget.slots[index];
+            final isCurrentSlotSelected = slot.id == selectedSlotId;
+
+            return Card(
+              color: slot.entries.isEmpty ? Theme.of(context).colorScheme.inversePrimary : null,
+              key: ValueKey(slot.id),
+              child: Column(
+                children: [
+                  ListTile(
+                    title: slot.isSuperset
+                        ? Text(i18n.supersetNr((index + 1).toString()))
+                        : Text(i18n.exerciseNr((index + 1).toString())),
+                    tileColor: isCurrentSlotSelected ? Theme.of(context).highlightColor : null,
+                    leading: selectedSlotId == null
+                        ? ReorderableDragStartListener(
+                            index: index,
+                            child: const Icon(Icons.drag_handle),
+                          )
+                        : const Icon(Icons.block),
+                    subtitle: slot.entries.isEmpty
+                        ? Text(i18n.setHasNoExercises)
+                        : Column(
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            children: [
+                              ...slot.entries.map(
+                                (e) => Text(e.exerciseObj.getTranslation(languageCode).name),
+                              ),
+                            ],
+                          ),
+                    trailing: Row(
+                      mainAxisSize: MainAxisSize.min,
+                      children: [
+                        IconButton(
+                          onPressed: () {
+                            setState(() {
+                              if (selectedSlotId == slot.id) {
+                                selectedSlotId = null;
+                              } else {
+                                selectedSlotId = slot.id;
+                              }
+                            });
+                          },
+                          icon: isCurrentSlotSelected
+                              ? const Icon(Icons.edit_off)
+                              : const Icon(Icons.edit),
+                        ),
+                        IconButton(
+                          icon: const Icon(Icons.delete),
+                          onPressed: isDeletingSlot == index
+                              ? null
+                              : () async {
+                                  selectedSlotId = null;
+                                  setState(() => isDeletingSlot = index);
+                                  await provider.deleteSlot(slot.id!, widget.day.routineId);
+                                  if (mounted) {
+                                    setState(() => isDeletingSlot = null);
+                                  }
+                                },
+                        ),
+                      ],
+                    ),
+                  ),
+                  if (isCurrentSlotSelected)
+                    SlotDetailWidget(slot, widget.day.routineId, simpleMode: simpleMode),
+                ],
+              ),
+            );
+          },
+          onReorder: (int oldIndex, int newIndex) {
+            setState(() {
+              // Update the order of slots in your data source
+              if (oldIndex < newIndex) {
+                newIndex -= 1;
+              }
+              final item = widget.slots.removeAt(oldIndex);
+              widget.slots.insert(newIndex, item);
+
+              for (int i = 0; i < widget.slots.length; i++) {
+                widget.slots[i].order = i + 1;
+              }
+
+              try {
+                provider.editSlots(widget.slots, widget.day.routineId);
+                setState(() {
+                  errorMessage = const SizedBox.shrink();
+                });
+              } on WgerHttpException catch (error) {
+                if (context.mounted) {
+                  setState(() {
+                    errorMessage = FormHttpErrorsWidget(error);
+                  });
+                }
+              }
+            });
+          },
+        ),
+        if (!widget.day.isRest)
+          Card(
+            child: ListTile(
+              leading: isAddingSlot ? const FormProgressIndicator() : const Icon(Icons.add),
+              title: Text(
+                i18n.addExercise,
+                style: Theme.of(context).textTheme.titleMedium,
+              ),
+              onTap: isAddingSlot
+                  ? null
+                  : () async {
+                      setState(() => isAddingSlot = true);
+
+                      final newSlot = await provider.addSlot(
+                        Slot.withData(
+                          day: widget.day.id,
+                          order: widget.slots.length + 1,
+                        ),
+                        widget.day.routineId,
+                      );
+                      if (mounted) {
+                        setState(() => isAddingSlot = false);
+                        setState(() => selectedSlotId = newSlot.id);
+                      }
+                    },
+            ),
+          ),
+      ],
+    );
+  }
+}
diff --git a/lib/widgets/routines/forms/slot_entry.dart b/lib/widgets/routines/forms/slot_entry.dart
new file mode 100644
index 00000000..94ccd7f5
--- /dev/null
+++ b/lib/widgets/routines/forms/slot_entry.dart
@@ -0,0 +1,652 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+import 'package:provider/provider.dart';
+import 'package:wger/exceptions/http_exception.dart';
+import 'package:wger/helpers/consts.dart';
+import 'package:wger/helpers/errors.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/workouts/day.dart';
+import 'package:wger/models/workouts/slot.dart';
+import 'package:wger/models/workouts/slot_entry.dart';
+import 'package:wger/providers/routines.dart';
+import 'package:wger/widgets/core/progress_indicator.dart';
+import 'package:wger/widgets/exercises/autocompleter.dart';
+import 'package:wger/widgets/routines/forms/reps_unit.dart';
+import 'package:wger/widgets/routines/forms/rir.dart';
+import 'package:wger/widgets/routines/forms/weight_unit.dart';
+import 'package:wger/widgets/routines/slot.dart';
+
+class SlotEntryForm extends StatefulWidget {
+  final SlotEntry entry;
+  final bool simpleMode;
+  final int routineId;
+
+  const SlotEntryForm(this.entry, this.routineId, {this.simpleMode = true, super.key});
+
+  @override
+  State<SlotEntryForm> createState() => _SlotEntryFormState();
+}
+
+class _SlotEntryFormState extends State<SlotEntryForm> {
+  bool isSaving = false;
+  bool isDeleting = false;
+
+  final iconSize = 18.0;
+
+  double setsSliderValue = 1.0;
+
+  final weightController = TextEditingController();
+  final maxWeightController = TextEditingController();
+  final repetitionsController = TextEditingController();
+  final maxRepetitionsController = TextEditingController();
+  final restController = TextEditingController();
+  final maxRestController = TextEditingController();
+  final rirController = TextEditingController();
+
+  Widget errorMessage = const SizedBox.shrink();
+
+  final _form = GlobalKey<FormState>();
+
+  var _edit = false;
+
+  @override
+  void initState() {
+    super.initState();
+    if (widget.entry.nrOfSetsConfigs.isNotEmpty) {
+      setsSliderValue = widget.entry.nrOfSetsConfigs.first.value.toDouble();
+    }
+
+    if (widget.entry.weightConfigs.isNotEmpty) {
+      weightController.text = widget.entry.weightConfigs.first.value.toString();
+    }
+    if (widget.entry.maxWeightConfigs.isNotEmpty) {
+      maxWeightController.text = widget.entry.maxWeightConfigs.first.value.toString();
+    }
+
+    if (widget.entry.repetitionsConfigs.isNotEmpty) {
+      repetitionsController.text = widget.entry.repetitionsConfigs.first.value.round().toString();
+    }
+    if (widget.entry.maxRepetitionsConfigs.isNotEmpty) {
+      maxRepetitionsController.text = widget.entry.maxRepetitionsConfigs.first.value
+          .round()
+          .toString();
+    }
+
+    if (widget.entry.restTimeConfigs.isNotEmpty) {
+      restController.text = widget.entry.restTimeConfigs.first.value.round().toString();
+    }
+    if (widget.entry.maxRestTimeConfigs.isNotEmpty) {
+      maxRestController.text = widget.entry.maxRestTimeConfigs.first.value.round().toString();
+    }
+
+    if (widget.entry.rirConfigs.isNotEmpty) {
+      rirController.text = widget.entry.rirConfigs.first.value.round().toString();
+    }
+  }
+
+  @override
+  void dispose() {
+    weightController.dispose();
+    maxWeightController.dispose();
+
+    repetitionsController.dispose();
+    maxRepetitionsController.dispose();
+
+    restController.dispose();
+    maxRestController.dispose();
+
+    rirController.dispose();
+
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
+    final languageCode = Localizations.localeOf(context).languageCode;
+    final numberFormat = NumberFormat.decimalPattern(Localizations.localeOf(context).toString());
+
+    final provider = context.read<RoutinesProvider>();
+
+    return Form(
+      key: _form,
+      child: Column(
+        children: [
+          errorMessage,
+          ListTile(
+            title: Text(
+              widget.entry.exerciseObj.getTranslation(languageCode).name,
+              style: Theme.of(context).textTheme.titleMedium,
+              // textAlign: TextAlign.center,
+            ),
+            trailing: Row(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                IconButton(
+                  onPressed: () {
+                    setState(() => _edit = !_edit);
+                  },
+                  icon: _edit
+                      ? Icon(Icons.edit_off, size: iconSize)
+                      : Icon(Icons.edit, size: iconSize),
+                ),
+                IconButton(
+                  icon: Icon(Icons.delete, size: iconSize),
+                  onPressed: isDeleting
+                      ? null
+                      : () async {
+                          setState(() => isDeleting = true);
+                          try {
+                            await provider.deleteSlotEntry(widget.entry.id!, widget.routineId);
+                          } on WgerHttpException catch (error) {
+                            if (context.mounted) {
+                              setState(() {
+                                errorMessage = FormHttpErrorsWidget(error);
+                              });
+                            }
+                          } finally {
+                            if (mounted) {
+                              setState(() => isDeleting = false);
+                            }
+                          }
+                        },
+                ),
+              ],
+            ),
+          ),
+          if (_edit)
+            ExerciseAutocompleter(
+              onExerciseSelected: (exercise) => setState(() {
+                widget.entry.exercise = exercise;
+                _edit = false;
+              }),
+            ),
+          Row(
+            children: [
+              Text('${i18n.sets}: ${setsSliderValue.round()}'),
+              Expanded(
+                child: Slider(
+                  value: setsSliderValue,
+                  min: 1,
+                  max: 20,
+                  divisions: 20,
+                  label: setsSliderValue.round().toString(),
+                  onChanged: (double value) {
+                    setState(() => setsSliderValue = value);
+                  },
+                ),
+              ),
+            ],
+          ),
+          if (!widget.simpleMode)
+            DropdownButtonFormField<SlotEntryType>(
+              key: const Key('field-slot-entry-type'),
+              initialValue: widget.entry.type,
+              decoration: const InputDecoration(labelText: 'Typ'),
+              items: SlotEntryType.values.map((type) {
+                return DropdownMenuItem(
+                  key: Key('slot-entry-type-option-${type.name}'),
+                  value: type,
+                  child: Text('${type.name.toUpperCase()} - ${type.i18Label(i18n)}'),
+                );
+              }).toList(),
+              onChanged: (value) {
+                setState(() {
+                  widget.entry.type = value!;
+                });
+              },
+            ),
+          if (!widget.simpleMode)
+            WeightUnitInputWidget(
+              widget.entry.weightUnitId,
+              onChanged: (value) {
+                widget.entry.weightUnitId = value;
+              },
+            ),
+          Row(
+            spacing: 10,
+            children: [
+              Flexible(
+                child: TextFormField(
+                  key: const ValueKey('field-weight'),
+                  controller: weightController,
+                  keyboardType: textInputTypeDecimal,
+                  decoration: InputDecoration(labelText: i18n.weight),
+                  validator: (value) {
+                    if (value != null && value != '' && numberFormat.tryParse(value) == null) {
+                      return i18n.enterValidNumber;
+                    }
+                    return null;
+                  },
+                ),
+              ),
+              if (!widget.simpleMode)
+                Flexible(
+                  child: TextFormField(
+                    key: const ValueKey('field-max-weight'),
+                    controller: maxWeightController,
+                    keyboardType: textInputTypeDecimal,
+                    decoration: InputDecoration(labelText: i18n.max),
+                    validator: (value) {
+                      if (value != null && value != '' && numberFormat.tryParse(value) == null) {
+                        return i18n.enterValidNumber;
+                      }
+                      return null;
+                    },
+                  ),
+                ),
+            ],
+          ),
+          if (!widget.simpleMode)
+            RepetitionUnitInputWidget(
+              widget.entry.repetitionUnitId,
+              onChanged: (value) {
+                widget.entry.repetitionUnitId = value;
+              },
+            ),
+          Row(
+            spacing: 10,
+            children: [
+              Flexible(
+                child: TextFormField(
+                  key: const ValueKey('field-repetitions'),
+                  controller: repetitionsController,
+                  keyboardType: textInputTypeDecimal,
+                  decoration: InputDecoration(labelText: i18n.repetitions),
+                  validator: (value) {
+                    if (value != null && value != '' && numberFormat.tryParse(value) == null) {
+                      return i18n.enterValidNumber;
+                    }
+                    return null;
+                  },
+                ),
+              ),
+              if (!widget.simpleMode)
+                Flexible(
+                  child: TextFormField(
+                    key: const ValueKey('field-max-repetitions'),
+                    controller: maxRepetitionsController,
+                    keyboardType: textInputTypeDecimal,
+                    decoration: InputDecoration(labelText: i18n.max),
+                    validator: (value) {
+                      if (value != null && value != '' && numberFormat.tryParse(value) == null) {
+                        return i18n.enterValidNumber;
+                      }
+                      return null;
+                    },
+                  ),
+                ),
+            ],
+          ),
+          if (!widget.simpleMode)
+            Row(
+              spacing: 10,
+              children: [
+                Flexible(
+                  child: TextFormField(
+                    key: const ValueKey('field-rest'),
+                    controller: restController,
+                    keyboardType: TextInputType.number,
+                    decoration: InputDecoration(labelText: i18n.restTime),
+                    validator: (value) {
+                      if (value != null && value != '' && int.tryParse(value) == null) {
+                        return i18n.enterValidNumber;
+                      }
+                      return null;
+                    },
+                  ),
+                ),
+                Flexible(
+                  child: TextFormField(
+                    key: const ValueKey('field-max-rest'),
+                    controller: maxRestController,
+                    keyboardType: TextInputType.number,
+                    decoration: InputDecoration(labelText: i18n.max),
+                    validator: (value) {
+                      if (value != null && value != '' && int.tryParse(value) == null) {
+                        return i18n.enterValidNumber;
+                      }
+                      return null;
+                    },
+                  ),
+                ),
+              ],
+            ),
+          if (!widget.simpleMode)
+            RiRInputWidget(
+              rirController.text == '' ? null : num.parse(rirController.text),
+              onChanged: (value) => rirController.text = value,
+            ),
+          const SizedBox(height: 5),
+          OutlinedButton(
+            key: const Key(SUBMIT_BUTTON_KEY_NAME),
+            onPressed: isSaving
+                ? null
+                : () async {
+                    if (!_form.currentState!.validate()) {
+                      return;
+                    }
+                    _form.currentState!.save();
+                    setState(() => isSaving = true);
+
+                    // Process new, edited or entries to be deleted
+                    try {
+                      await Future.wait([
+                        provider.handleConfig(
+                          widget.entry,
+                          setsSliderValue == 0 ? null : setsSliderValue.round(),
+                          ConfigType.sets,
+                        ),
+                        provider.handleConfig(
+                          widget.entry,
+                          numberFormat.tryParse(weightController.text),
+                          ConfigType.weight,
+                        ),
+                        provider.handleConfig(
+                          widget.entry,
+                          numberFormat.tryParse(maxWeightController.text),
+                          ConfigType.maxWeight,
+                        ),
+                        provider.handleConfig(
+                          widget.entry,
+                          numberFormat.tryParse(repetitionsController.text),
+                          ConfigType.repetitions,
+                        ),
+                        provider.handleConfig(
+                          widget.entry,
+                          numberFormat.tryParse(maxRepetitionsController.text),
+                          ConfigType.maxRepetitions,
+                        ),
+                        provider.handleConfig(
+                          widget.entry,
+                          numberFormat.tryParse(restController.text),
+                          ConfigType.rest,
+                        ),
+                        provider.handleConfig(
+                          widget.entry,
+                          numberFormat.tryParse(maxRestController.text),
+                          ConfigType.maxRest,
+                        ),
+                        provider.handleConfig(
+                          widget.entry,
+                          numberFormat.tryParse(rirController.text),
+                          ConfigType.rir,
+                        ),
+                      ]);
+
+                      await provider.editSlotEntry(widget.entry, widget.routineId);
+                      if (mounted) {
+                        setState(() => isSaving = false);
+                        errorMessage = const SizedBox.shrink();
+                      }
+                    } on WgerHttpException catch (error) {
+                      if (context.mounted) {
+                        setState(() {
+                          errorMessage = FormHttpErrorsWidget(error);
+                        });
+                      }
+                    } finally {
+                      if (mounted) {
+                        setState(() => isSaving = false);
+                      }
+                    }
+                  },
+            child: isSaving
+                ? const FormProgressIndicator()
+                : Text(AppLocalizations.of(context).save),
+          ),
+          const SizedBox(height: 10),
+        ],
+      ),
+    );
+  }
+}
+
+class SlotDetailWidget extends StatefulWidget {
+  final Slot slot;
+  final bool simpleMode;
+  final int routineId;
+
+  const SlotDetailWidget(this.slot, this.routineId, {this.simpleMode = true, super.key});
+
+  @override
+  State<SlotDetailWidget> createState() => _SlotDetailWidgetState();
+}
+
+class _SlotDetailWidgetState extends State<SlotDetailWidget> {
+  bool _showExerciseSearchBox = false;
+  Widget errorMessage = const SizedBox.shrink();
+
+  @override
+  Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
+    final provider = context.read<RoutinesProvider>();
+
+    return Column(
+      children: [
+        errorMessage,
+        ...widget.slot.entries.map(
+          (entry) => entry.hasProgressionRules
+              ? ProgressionRulesInfoBox(entry.exerciseObj)
+              : SlotEntryForm(entry, widget.routineId, simpleMode: widget.simpleMode),
+        ),
+        const SizedBox(height: 10),
+        if (_showExerciseSearchBox || widget.slot.entries.isEmpty)
+          ExerciseAutocompleter(
+            onExerciseSelected: (exercise) async {
+              setState(() => _showExerciseSearchBox = false);
+
+              final SlotEntry entry = SlotEntry.withData(
+                slotId: widget.slot.id!,
+                order: widget.slot.entries.length + 1,
+                exercise: exercise,
+              );
+
+              try {
+                await provider.addSlotEntry(entry, widget.routineId);
+                if (context.mounted) {
+                  setState(() => errorMessage = const SizedBox.shrink());
+                }
+              } on WgerHttpException catch (error) {
+                if (context.mounted) {
+                  setState(() {
+                    errorMessage = FormHttpErrorsWidget(error);
+                  });
+                }
+              }
+            },
+          ),
+        if (widget.slot.entries.isNotEmpty)
+          FilledButton(
+            onPressed: () {
+              setState(() => _showExerciseSearchBox = !_showExerciseSearchBox);
+            },
+            child: Text(i18n.addSuperset),
+          ),
+        const SizedBox(height: 5),
+      ],
+    );
+  }
+}
+
+class ReorderableSlotList extends StatefulWidget {
+  final List<Slot> slots;
+  final Day day;
+
+  const ReorderableSlotList(this.slots, this.day);
+
+  @override
+  _SlotFormWidgetStateNg createState() => _SlotFormWidgetStateNg();
+}
+
+class _SlotFormWidgetStateNg extends State<ReorderableSlotList> {
+  int? selectedSlotId;
+  bool simpleMode = true;
+  bool isAddingSlot = false;
+  int? isDeletingSlot;
+  Widget errorMessage = const SizedBox.shrink();
+
+  @override
+  Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
+    final provider = context.read<RoutinesProvider>();
+    final languageCode = Localizations.localeOf(context).languageCode;
+
+    return Column(
+      children: [
+        errorMessage,
+        if (!widget.day.isRest)
+          SwitchListTile(
+            value: simpleMode,
+            title: Text(i18n.simpleMode),
+            subtitle: Text(i18n.simpleModeHelp),
+            contentPadding: const EdgeInsets.all(4),
+            onChanged: (value) {
+              setState(() => simpleMode = value);
+            },
+          ),
+        ReorderableListView.builder(
+          buildDefaultDragHandles: false,
+          shrinkWrap: true,
+          physics: const NeverScrollableScrollPhysics(),
+          itemCount: widget.slots.length,
+          itemBuilder: (context, index) {
+            final slot = widget.slots[index];
+            final isCurrentSlotSelected = slot.id == selectedSlotId;
+
+            return Card(
+              color: slot.entries.isEmpty ? Theme.of(context).colorScheme.inversePrimary : null,
+              key: ValueKey(slot.id),
+              child: Column(
+                children: [
+                  ListTile(
+                    title: slot.isSuperset
+                        ? Text(i18n.supersetNr((index + 1).toString()))
+                        : Text(i18n.exerciseNr((index + 1).toString())),
+                    tileColor: isCurrentSlotSelected ? Theme.of(context).highlightColor : null,
+                    leading: selectedSlotId == null
+                        ? ReorderableDragStartListener(
+                            index: index,
+                            child: const Icon(Icons.drag_handle),
+                          )
+                        : const Icon(Icons.block),
+                    subtitle: slot.entries.isEmpty
+                        ? Text(i18n.setHasNoExercises)
+                        : Column(
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            children: [
+                              ...slot.entries.map(
+                                (e) => Text(e.exerciseObj.getTranslation(languageCode).name),
+                              ),
+                            ],
+                          ),
+                    trailing: Row(
+                      mainAxisSize: MainAxisSize.min,
+                      children: [
+                        IconButton(
+                          onPressed: () {
+                            setState(() {
+                              if (selectedSlotId == slot.id) {
+                                selectedSlotId = null;
+                              } else {
+                                selectedSlotId = slot.id;
+                              }
+                            });
+                          },
+                          icon: isCurrentSlotSelected
+                              ? const Icon(Icons.edit_off)
+                              : const Icon(Icons.edit),
+                        ),
+                        IconButton(
+                          icon: const Icon(Icons.delete),
+                          onPressed: isDeletingSlot == index
+                              ? null
+                              : () async {
+                                  selectedSlotId = null;
+                                  setState(() => isDeletingSlot = index);
+                                  await provider.deleteSlot(slot.id!, widget.day.routineId);
+                                  if (mounted) {
+                                    setState(() => isDeletingSlot = null);
+                                  }
+                                },
+                        ),
+                      ],
+                    ),
+                  ),
+                  if (isCurrentSlotSelected)
+                    SlotDetailWidget(slot, widget.day.routineId, simpleMode: simpleMode),
+                ],
+              ),
+            );
+          },
+          onReorder: (int oldIndex, int newIndex) {
+            setState(() {
+              // Update the order of slots in your data source
+              if (oldIndex < newIndex) {
+                newIndex -= 1;
+              }
+              final item = widget.slots.removeAt(oldIndex);
+              widget.slots.insert(newIndex, item);
+
+              for (int i = 0; i < widget.slots.length; i++) {
+                widget.slots[i].order = i + 1;
+              }
+
+              try {
+                provider.editSlots(widget.slots, widget.day.routineId);
+                setState(() {
+                  errorMessage = const SizedBox.shrink();
+                });
+              } on WgerHttpException catch (error) {
+                if (context.mounted) {
+                  setState(() {
+                    errorMessage = FormHttpErrorsWidget(error);
+                  });
+                }
+              }
+            });
+          },
+        ),
+        if (!widget.day.isRest)
+          Card(
+            child: ListTile(
+              leading: isAddingSlot ? const FormProgressIndicator() : const Icon(Icons.add),
+              title: Text(i18n.addExercise, style: Theme.of(context).textTheme.titleMedium),
+              onTap: isAddingSlot
+                  ? null
+                  : () async {
+                      setState(() => isAddingSlot = true);
+
+                      final newSlot = await provider.addSlot(
+                        Slot.withData(day: widget.day.id, order: widget.slots.length + 1),
+                        widget.day.routineId,
+                      );
+                      if (mounted) {
+                        setState(() => isAddingSlot = false);
+                        setState(() => selectedSlotId = newSlot.id);
+                      }
+                    },
+            ),
+          ),
+      ],
+    );
+  }
+}
diff --git a/lib/widgets/routines/forms/weight_unit.dart b/lib/widgets/routines/forms/weight_unit.dart
new file mode 100644
index 00000000..8afb6784
--- /dev/null
+++ b/lib/widgets/routines/forms/weight_unit.dart
@@ -0,0 +1,70 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/workouts/weight_unit.dart';
+import 'package:wger/providers/routines.dart';
+
+/// Input widget for workout weight units
+///
+/// Can be used with a Setting or a Log object
+class WeightUnitInputWidget extends StatefulWidget {
+  late int? selectedWeightUnit;
+  final ValueChanged<int?> onChanged;
+
+  WeightUnitInputWidget(int? initialValue, {required this.onChanged}) {
+    selectedWeightUnit = initialValue;
+  }
+
+  @override
+  _WeightUnitInputWidgetState createState() => _WeightUnitInputWidgetState();
+}
+
+class _WeightUnitInputWidgetState extends State<WeightUnitInputWidget> {
+  @override
+  Widget build(BuildContext context) {
+    final unitProvider = context.read<RoutinesProvider>();
+
+    WeightUnit? selectedWeightUnit = widget.selectedWeightUnit != null
+        ? unitProvider.findWeightUnitById(widget.selectedWeightUnit!)
+        : null;
+
+    return DropdownButtonFormField(
+      value: selectedWeightUnit,
+      decoration: InputDecoration(labelText: AppLocalizations.of(context).weightUnit),
+      onChanged: (WeightUnit? newValue) {
+        setState(() {
+          selectedWeightUnit = newValue!;
+          widget.selectedWeightUnit = newValue.id;
+          widget.onChanged(newValue.id);
+        });
+      },
+      items: Provider.of<RoutinesProvider>(context, listen: false).weightUnits
+          .map<DropdownMenuItem<WeightUnit>>((WeightUnit value) {
+            return DropdownMenuItem<WeightUnit>(
+              key: Key(value.id.toString()),
+              value: value,
+              child: Text(value.name),
+            );
+          })
+          .toList(),
+    );
+  }
+}
diff --git a/lib/widgets/routines/gym_mode/exercise_overview.dart b/lib/widgets/routines/gym_mode/exercise_overview.dart
new file mode 100644
index 00000000..df34e881
--- /dev/null
+++ b/lib/widgets/routines/gym_mode/exercise_overview.dart
@@ -0,0 +1,60 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+import 'package:flutter/material.dart';
+import 'package:wger/models/exercises/exercise.dart';
+import 'package:wger/widgets/exercises/exercises.dart';
+import 'package:wger/widgets/routines/gym_mode/navigation.dart';
+
+class ExerciseOverview extends StatelessWidget {
+  final PageController _controller;
+  final Exercise _exercise;
+  final double _ratioCompleted;
+  final Map<Exercise, int> _exercisePages;
+  final int _totalPages;
+
+  const ExerciseOverview(
+    this._controller,
+    this._exercise,
+    this._ratioCompleted,
+    this._exercisePages,
+    this._totalPages,
+  );
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      children: [
+        NavigationHeader(
+          _exercise.getTranslation(Localizations.localeOf(context).languageCode).name,
+          _controller,
+          totalPages: _totalPages,
+          exercisePages: _exercisePages,
+        ),
+        Expanded(
+          child: SingleChildScrollView(
+            child: Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 10),
+              child: ExerciseDetail(_exercise),
+            ),
+          ),
+        ),
+        NavigationFooter(_controller, _ratioCompleted),
+      ],
+    );
+  }
+}
diff --git a/lib/widgets/routines/gym_mode/gym_mode.dart b/lib/widgets/routines/gym_mode/gym_mode.dart
new file mode 100644
index 00000000..e769ed9b
--- /dev/null
+++ b/lib/widgets/routines/gym_mode/gym_mode.dart
@@ -0,0 +1,239 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:logging/logging.dart';
+import 'package:provider/provider.dart' as provider;
+import 'package:wger/models/exercises/exercise.dart';
+import 'package:wger/models/workouts/day_data.dart';
+import 'package:wger/providers/exercises.dart';
+import 'package:wger/providers/gym_state.dart';
+import 'package:wger/providers/routines.dart';
+import 'package:wger/widgets/routines/gym_mode/exercise_overview.dart';
+import 'package:wger/widgets/routines/gym_mode/log_page.dart';
+import 'package:wger/widgets/routines/gym_mode/session_page.dart';
+import 'package:wger/widgets/routines/gym_mode/start_page.dart';
+import 'package:wger/widgets/routines/gym_mode/timer.dart';
+
+class GymMode extends ConsumerStatefulWidget {
+  final DayData _dayDataGym;
+  final DayData _dayDataDisplay;
+  final int _iteration;
+  final _logger = Logger('GymMode');
+
+  GymMode(this._dayDataGym, this._dayDataDisplay, this._iteration);
+
+  @override
+  ConsumerState<GymMode> createState() => _GymModeState();
+}
+
+class _GymModeState extends ConsumerState<GymMode> {
+  var _totalElements = 1;
+  var _totalPages = 1;
+  late Future<int> _initData;
+  bool _initialPageJumped = false;
+
+  /// Map with the first (navigation) page for each exercise
+  final Map<Exercise, int> _exercisePages = {};
+  late final PageController _controller;
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    _initData = _loadGymState();
+    _controller = PageController(initialPage: 0);
+    _calculatePages();
+
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      ref.read(gymStateProvider.notifier).setExercisePages(_exercisePages);
+    });
+  }
+
+  Future<int> _loadGymState() async {
+    // Re-fetch the current routine data to ensure we have the latest session
+    // data since it is possible that the user created or deleted it from the
+    // web interface.
+    await context.read<RoutinesProvider>().fetchAndSetRoutineFull(
+      widget._dayDataGym.day!.routineId,
+    );
+    widget._logger.fine('Refreshed routine data');
+
+    final validUntil = ref.read(gymStateProvider).validUntil;
+    final currentPage = ref.read(gymStateProvider).currentPage;
+    final savedDayId = ref.read(gymStateProvider).dayId;
+    final newDayId = widget._dayDataGym.day!.id!;
+
+    final shouldReset = newDayId != savedDayId || validUntil.isBefore(DateTime.now());
+    if (shouldReset) {
+      widget._logger.fine('Day ID mismatch or expired validUntil date. Resetting to page 0.');
+    }
+    final initialPage = shouldReset ? 0 : currentPage;
+
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      ref.read(gymStateProvider.notifier)
+        ..setDayId(newDayId)
+        ..setCurrentPage(initialPage);
+    });
+
+    return initialPage;
+  }
+
+  void _calculatePages() {
+    for (final slot in widget._dayDataGym.slots) {
+      _totalElements += slot.setConfigs.length;
+      // add 1 for each exercise
+      _totalPages += 1;
+      for (final config in slot.setConfigs) {
+        // add nrOfSets * 2, 1 for log page and 1 for timer
+        _totalPages += (config.nrOfSets! * 2).toInt();
+      }
+    }
+    _exercisePages.clear();
+    var currentPage = 1;
+
+    for (final slot in widget._dayDataGym.slots) {
+      var firstPage = true;
+      for (final config in slot.setConfigs) {
+        final exercise = context.read<ExercisesProvider>().findExerciseById(config.exerciseId);
+
+        if (firstPage) {
+          _exercisePages[exercise] = currentPage;
+          currentPage++;
+        }
+        currentPage += 2;
+        firstPage = false;
+      }
+    }
+  }
+
+  List<Widget> getContent() {
+    final state = ref.watch(gymStateProvider);
+    final exerciseProvider = context.read<ExercisesProvider>();
+    final routinesProvider = context.read<RoutinesProvider>();
+    var currentElement = 1;
+    final List<Widget> out = [];
+
+    for (final slotData in widget._dayDataGym.slots) {
+      var firstPage = true;
+      for (final config in slotData.setConfigs) {
+        final ratioCompleted = currentElement / _totalElements;
+        final exercise = exerciseProvider.findExerciseById(config.exerciseId);
+        currentElement++;
+
+        if (firstPage && state.showExercisePages) {
+          out.add(
+            ExerciseOverview(
+              _controller,
+              exercise,
+              ratioCompleted,
+              state.exercisePages,
+              _totalPages,
+            ),
+          );
+        }
+
+        out.add(
+          LogPage(
+            _controller,
+            config,
+            slotData,
+            exercise,
+            routinesProvider.findById(widget._dayDataGym.day!.routineId),
+            ratioCompleted,
+            state.exercisePages,
+            _totalPages,
+            widget._iteration,
+          ),
+        );
+
+        // If there is a rest time, add a countdown timer
+        if (config.restTime != null) {
+          out.add(
+            TimerCountdownWidget(
+              _controller,
+              config.restTime!.toInt(),
+              ratioCompleted,
+              state.exercisePages,
+              _totalPages,
+            ),
+          );
+        } else {
+          out.add(TimerWidget(_controller, ratioCompleted, state.exercisePages, _totalPages));
+        }
+
+        firstPage = false;
+      }
+    }
+    return out;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return FutureBuilder<int>(
+      future: _initData,
+      builder: (context, snapshot) {
+        if (snapshot.connectionState == ConnectionState.waiting) {
+          return const Center(child: CircularProgressIndicator());
+        } else if (snapshot.hasError) {
+          return Center(child: Text('Error: ${snapshot.error}'));
+        }
+
+        final initialPage = snapshot.data!;
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          if (!_initialPageJumped && _controller.hasClients) {
+            _controller.jumpToPage(initialPage);
+            setState(() => _initialPageJumped = true);
+          }
+        });
+
+        final List<Widget> children = [
+          StartPage(_controller, widget._dayDataDisplay, _exercisePages),
+          ...getContent(),
+          SessionPage(
+            context.read<RoutinesProvider>().findById(widget._dayDataGym.day!.routineId),
+            _controller,
+            ref.read(gymStateProvider).startTime,
+            _exercisePages,
+            dayId: widget._dayDataGym.day!.id!,
+          ),
+        ];
+
+        return PageView(
+          controller: _controller,
+          onPageChanged: (page) {
+            ref.read(gymStateProvider.notifier).setCurrentPage(page);
+
+            // Check if the last page is reached
+            if (page == children.length - 1) {
+              ref.read(gymStateProvider.notifier).clear();
+            }
+          },
+          children: children,
+        );
+      },
+    );
+  }
+}
diff --git a/lib/widgets/routines/gym_mode/log_page.dart b/lib/widgets/routines/gym_mode/log_page.dart
new file mode 100644
index 00000000..899d82ea
--- /dev/null
+++ b/lib/widgets/routines/gym_mode/log_page.dart
@@ -0,0 +1,702 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:intl/intl.dart';
+import 'package:logging/logging.dart';
+import 'package:provider/provider.dart' as provider;
+import 'package:wger/exceptions/http_exception.dart';
+import 'package:wger/helpers/consts.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/exercises/exercise.dart';
+import 'package:wger/models/workouts/log.dart';
+import 'package:wger/models/workouts/routine.dart';
+import 'package:wger/models/workouts/set_config_data.dart';
+import 'package:wger/models/workouts/slot_data.dart';
+import 'package:wger/models/workouts/slot_entry.dart';
+import 'package:wger/providers/plate_weights.dart';
+import 'package:wger/providers/routines.dart';
+import 'package:wger/screens/configure_plates_screen.dart';
+import 'package:wger/widgets/core/core.dart';
+import 'package:wger/widgets/core/progress_indicator.dart';
+import 'package:wger/widgets/routines/forms/reps_unit.dart';
+import 'package:wger/widgets/routines/forms/rir.dart';
+import 'package:wger/widgets/routines/forms/weight_unit.dart';
+import 'package:wger/widgets/routines/gym_mode/navigation.dart';
+import 'package:wger/widgets/routines/plate_calculator.dart';
+
+class LogPage extends ConsumerStatefulWidget {
+  final PageController _controller;
+  final SetConfigData _configData;
+  final SlotData _slotData;
+  final Exercise _exercise;
+  final Routine _routine;
+  final double _ratioCompleted;
+  final Map<Exercise, int> _exercisePages;
+  final Log _log;
+  final int _totalPages;
+
+  LogPage(
+    this._controller,
+    this._configData,
+    this._slotData,
+    this._exercise,
+    this._routine,
+    this._ratioCompleted,
+    this._exercisePages,
+    this._totalPages,
+    int? iteration,
+  ) : _log = Log.fromSetConfigData(_configData)
+        ..routineId = _routine.id!
+        ..iteration = iteration;
+
+  @override
+  _LogPageState createState() => _LogPageState();
+}
+
+class _LogPageState extends ConsumerState<LogPage> {
+  final GlobalKey<_LogFormWidgetState> _logFormKey = GlobalKey<_LogFormWidgetState>();
+
+  late FocusNode focusNode;
+
+  @override
+  void initState() {
+    super.initState();
+    focusNode = FocusNode();
+  }
+
+  @override
+  void dispose() {
+    focusNode.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+
+    return Column(
+      children: [
+        NavigationHeader(
+          widget._exercise.getTranslation(Localizations.localeOf(context).languageCode).name,
+          widget._controller,
+          totalPages: widget._totalPages,
+          exercisePages: widget._exercisePages,
+        ),
+
+        Container(
+          color: theme.colorScheme.onInverseSurface,
+          padding: const EdgeInsets.symmetric(vertical: 10),
+          child: Center(
+            child: Column(
+              children: [
+                Text(
+                  widget._configData.textRepr,
+                  style: theme.textTheme.headlineMedium?.copyWith(
+                    color: Theme.of(context).colorScheme.primary,
+                  ),
+                  textAlign: TextAlign.center,
+                ),
+                if (widget._configData.type != SlotEntryType.normal)
+                  Text(
+                    widget._configData.type.name.toUpperCase(),
+                    style: theme.textTheme.headlineMedium?.copyWith(
+                      color: Theme.of(context).colorScheme.primary,
+                    ),
+                    textAlign: TextAlign.center,
+                  ),
+              ],
+            ),
+          ),
+        ),
+        if (widget._log.exercise.showPlateCalculator) const LogsPlatesWidget(),
+        if (widget._slotData.comment.isNotEmpty)
+          Text(widget._slotData.comment, textAlign: TextAlign.center),
+        const SizedBox(height: 10),
+        Expanded(
+          child: (widget._routine.filterLogsByExercise(widget._exercise.id!).isNotEmpty)
+              ? LogsPastLogsWidget(
+                  log: widget._log,
+                  pastLogs: widget._routine.filterLogsByExercise(widget._exercise.id!),
+                  onCopy: (pastLog) {
+                    _logFormKey.currentState?.copyFromPastLog(pastLog);
+                  },
+                  setStateCallback: (fn) {
+                    setState(fn);
+                  },
+                )
+              : Container(),
+        ),
+
+        Padding(
+          padding: const EdgeInsets.all(10),
+          child: Card(
+            color: Theme.of(context).colorScheme.inversePrimary,
+            // color: Theme.of(context).secondaryHeaderColor,
+            child: Padding(
+              padding: const EdgeInsets.symmetric(vertical: 5),
+              child: LogFormWidget(
+                key: _logFormKey,
+                controller: widget._controller,
+                configData: widget._configData,
+                log: widget._log,
+                focusNode: focusNode,
+              ),
+            ),
+          ),
+        ),
+        NavigationFooter(widget._controller, widget._ratioCompleted),
+      ],
+    );
+  }
+}
+
+class LogsPlatesWidget extends ConsumerWidget {
+  const LogsPlatesWidget({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final plateWeightsState = ref.watch(plateCalculatorProvider);
+
+    return Container(
+      color: Theme.of(context).colorScheme.onInverseSurface,
+      child: Column(
+        children: [
+          GestureDetector(
+            onTap: () {
+              Navigator.of(context).pushNamed(ConfigurePlatesScreen.routeName);
+            },
+            child: SizedBox(
+              child: plateWeightsState.hasPlates
+                  ? Row(
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      children: [
+                        ...plateWeightsState.calculatePlates.entries.map(
+                          (entry) => Row(
+                            children: [
+                              Text(entry.value.toString()),
+                              const Text('×'),
+                              PlateWeight(
+                                value: entry.key,
+                                size: 37,
+                                padding: 2,
+                                margin: 0,
+                                color: ref.read(plateCalculatorProvider).getColor(entry.key),
+                              ),
+                              const SizedBox(width: 10),
+                            ],
+                          ),
+                        ),
+                      ],
+                    )
+                  : Padding(
+                      padding: const EdgeInsets.symmetric(horizontal: 8),
+                      child: MutedText(
+                        AppLocalizations.of(context).plateCalculatorNotDivisible,
+                        textAlign: TextAlign.center,
+                      ),
+                    ),
+            ),
+          ),
+          const SizedBox(height: 3),
+        ],
+      ),
+    );
+  }
+}
+
+class LogsRepsWidget extends StatelessWidget {
+  final TextEditingController controller;
+  final SetConfigData configData;
+  final FocusNode focusNode;
+  final Log log;
+  final void Function(VoidCallback fn) setStateCallback;
+
+  final _logger = Logger('LogsRepsWidget');
+
+  LogsRepsWidget({
+    super.key,
+    required this.controller,
+    required this.configData,
+    required this.focusNode,
+    required this.log,
+    required this.setStateCallback,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final repsValueChange = configData.repetitionsRounding ?? 1;
+    final numberFormat = NumberFormat.decimalPattern(Localizations.localeOf(context).toString());
+
+    final i18n = AppLocalizations.of(context);
+
+    return Row(
+      children: [
+        IconButton(
+          icon: const Icon(Icons.remove, color: Colors.black),
+          onPressed: () {
+            final currentValue = numberFormat.tryParse(controller.text) ?? 0;
+            final newValue = currentValue - repsValueChange;
+            if (newValue >= 0) {
+              setStateCallback(() {
+                log.repetitions = newValue;
+                controller.text = numberFormat.format(newValue);
+              });
+            }
+          },
+        ),
+        Expanded(
+          child: TextFormField(
+            decoration: InputDecoration(labelText: i18n.repetitions),
+            enabled: true,
+            controller: controller,
+            keyboardType: textInputTypeDecimal,
+            focusNode: focusNode,
+            onChanged: (value) {
+              try {
+                final newValue = numberFormat.parse(value);
+                setStateCallback(() {
+                  log.repetitions = newValue;
+                });
+              } on FormatException catch (error) {
+                _logger.fine('Error parsing repetitions: $error');
+              }
+            },
+            onSaved: (newValue) {
+              _logger.info('Saving new reps value: $newValue');
+              setStateCallback(() {
+                log.repetitions = numberFormat.parse(newValue!);
+              });
+            },
+            validator: (value) {
+              if (numberFormat.tryParse(value ?? '') == null) {
+                return i18n.enterValidNumber;
+              }
+              return null;
+            },
+          ),
+        ),
+        IconButton(
+          icon: const Icon(Icons.add, color: Colors.black),
+          onPressed: () {
+            try {
+              final newValue = numberFormat.parse(controller.text) + repsValueChange;
+              setStateCallback(() {
+                log.repetitions = newValue;
+                controller.text = numberFormat.format(newValue);
+              });
+            } on FormatException catch (error) {
+              _logger.fine('Error parsing reps during quick-add: $error');
+            }
+          },
+        ),
+      ],
+    );
+  }
+}
+
+class LogsWeightWidget extends ConsumerWidget {
+  final TextEditingController controller;
+  final SetConfigData configData;
+  final FocusNode focusNode;
+  final Log log;
+  final void Function(VoidCallback fn) setStateCallback;
+
+  final _logger = Logger('LogsWeightWidget');
+
+  LogsWeightWidget({
+    super.key,
+    required this.controller,
+    required this.configData,
+    required this.focusNode,
+    required this.log,
+    required this.setStateCallback,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final weightValueChange = configData.weightRounding ?? 1.25;
+    final numberFormat = NumberFormat.decimalPattern(Localizations.localeOf(context).toString());
+    final i18n = AppLocalizations.of(context);
+
+    return Row(
+      children: [
+        IconButton(
+          icon: const Icon(Icons.remove, color: Colors.black),
+          onPressed: () {
+            try {
+              final newValue = numberFormat.parse(controller.text) - weightValueChange;
+              if (newValue > 0) {
+                setStateCallback(() {
+                  log.weight = newValue;
+                  controller.text = numberFormat.format(newValue);
+                  ref
+                      .read(plateCalculatorProvider.notifier)
+                      .setWeight(
+                        controller.text == '' ? 0 : newValue,
+                      );
+                });
+              }
+            } on FormatException catch (error) {
+              _logger.fine('Error parsing weight during quick-remove: $error');
+            }
+          },
+        ),
+        Expanded(
+          child: TextFormField(
+            decoration: InputDecoration(labelText: i18n.weight),
+            controller: controller,
+            keyboardType: textInputTypeDecimal,
+            onChanged: (value) {
+              try {
+                final newValue = numberFormat.parse(value);
+                setStateCallback(() {
+                  log.weight = newValue;
+                  ref
+                      .read(plateCalculatorProvider.notifier)
+                      .setWeight(
+                        controller.text == '' ? 0 : numberFormat.parse(controller.text),
+                      );
+                });
+              } on FormatException catch (error) {
+                _logger.fine('Error parsing weight: $error');
+              }
+            },
+            onSaved: (newValue) {
+              setStateCallback(() {
+                log.weight = numberFormat.parse(newValue!);
+              });
+            },
+            validator: (value) {
+              if (numberFormat.tryParse(value ?? '') == null) {
+                return i18n.enterValidNumber;
+              }
+              return null;
+            },
+          ),
+        ),
+        IconButton(
+          icon: const Icon(Icons.add, color: Colors.black),
+          onPressed: () {
+            try {
+              final newValue = numberFormat.parse(controller.text) + weightValueChange;
+              setStateCallback(() {
+                log.weight = newValue;
+                controller.text = numberFormat.format(newValue);
+                ref
+                    .read(plateCalculatorProvider.notifier)
+                    .setWeight(
+                      controller.text == '' ? 0 : newValue,
+                    );
+              });
+            } on FormatException catch (error) {
+              _logger.fine('Error parsing weight during quick-add: $error');
+            }
+          },
+        ),
+      ],
+    );
+  }
+}
+
+class LogsPastLogsWidget extends StatelessWidget {
+  final Log log;
+  final List<Log> pastLogs;
+  final void Function(Log pastLog) onCopy;
+  final void Function(VoidCallback fn) setStateCallback;
+
+  const LogsPastLogsWidget({
+    super.key,
+    required this.log,
+    required this.pastLogs,
+    required this.onCopy,
+    required this.setStateCallback,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      padding: const EdgeInsets.symmetric(vertical: 8),
+      child: ListView(
+        children: [
+          Text(
+            AppLocalizations.of(context).labelWorkoutLogs,
+            style: Theme.of(context).textTheme.titleMedium,
+            textAlign: TextAlign.center,
+          ),
+          ...pastLogs.map((pastLog) {
+            return ListTile(
+              title: Text(pastLog.singleLogRepTextNoNl),
+              subtitle: Text(
+                DateFormat.yMd(Localizations.localeOf(context).languageCode).format(pastLog.date),
+              ),
+              trailing: const Icon(Icons.copy),
+              onTap: () {
+                setStateCallback(() {
+                  log.rir = pastLog.rir;
+                  log.repetitionUnit = pastLog.repetitionsUnitObj;
+                  log.weightUnit = pastLog.weightUnitObj;
+
+                  onCopy(pastLog);
+
+                  ScaffoldMessenger.of(context).hideCurrentSnackBar();
+                  ScaffoldMessenger.of(context).showSnackBar(
+                    SnackBar(
+                      content: Text(AppLocalizations.of(context).dataCopied),
+                    ),
+                  );
+                });
+              },
+              contentPadding: const EdgeInsets.symmetric(horizontal: 40),
+            );
+          }),
+        ],
+      ),
+    );
+  }
+}
+
+class LogFormWidget extends ConsumerStatefulWidget {
+  final PageController controller;
+  final SetConfigData configData;
+  final Log log;
+  final FocusNode focusNode;
+
+  const LogFormWidget({
+    super.key,
+    required this.controller,
+    required this.configData,
+    required this.log,
+    required this.focusNode,
+  });
+
+  @override
+  _LogFormWidgetState createState() => _LogFormWidgetState();
+}
+
+class _LogFormWidgetState extends ConsumerState<LogFormWidget> {
+  final _form = GlobalKey<FormState>();
+  var _detailed = false;
+  bool _isSaving = false;
+
+  late final TextEditingController _repetitionsController;
+  late final TextEditingController _weightController;
+
+  @override
+  void initState() {
+    super.initState();
+
+    _repetitionsController = TextEditingController();
+    _weightController = TextEditingController();
+
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      final locale = Localizations.localeOf(context).toString();
+      final numberFormat = NumberFormat.decimalPattern(locale);
+
+      if (widget.configData.repetitions != null) {
+        _repetitionsController.text = numberFormat.format(widget.configData.repetitions);
+      }
+
+      if (widget.configData.weight != null) {
+        _weightController.text = numberFormat.format(widget.configData.weight);
+      }
+    });
+  }
+
+  @override
+  void dispose() {
+    _repetitionsController.dispose();
+    _weightController.dispose();
+    super.dispose();
+  }
+
+  void copyFromPastLog(Log pastLog) {
+    final locale = Localizations.localeOf(context).toString();
+    final numberFormat = NumberFormat.decimalPattern(locale);
+
+    setState(() {
+      _repetitionsController.text = pastLog.repetitions != null
+          ? numberFormat.format(pastLog.repetitions)
+          : '';
+      _weightController.text = pastLog.weight != null ? numberFormat.format(pastLog.weight) : '';
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
+
+    return Form(
+      key: _form,
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: [
+          Text(
+            i18n.newEntry,
+            style: Theme.of(context).textTheme.titleLarge,
+            textAlign: TextAlign.center,
+          ),
+          if (!_detailed)
+            Row(
+              children: [
+                Flexible(
+                  child: LogsRepsWidget(
+                    controller: _repetitionsController,
+                    configData: widget.configData,
+                    focusNode: widget.focusNode,
+                    log: widget.log,
+                    setStateCallback: (fn) {
+                      setState(fn);
+                    },
+                  ),
+                ),
+                const SizedBox(width: 8),
+                Flexible(
+                  child: LogsWeightWidget(
+                    controller: _weightController,
+                    configData: widget.configData,
+                    focusNode: widget.focusNode,
+                    log: widget.log,
+                    setStateCallback: (fn) {
+                      setState(fn);
+                    },
+                  ),
+                ),
+              ],
+            ),
+          if (_detailed)
+            Row(
+              crossAxisAlignment: CrossAxisAlignment.end,
+              children: [
+                Flexible(
+                  child: LogsRepsWidget(
+                    controller: _repetitionsController,
+                    configData: widget.configData,
+                    focusNode: widget.focusNode,
+                    log: widget.log,
+                    setStateCallback: (fn) {
+                      setState(fn);
+                    },
+                  ),
+                ),
+                const SizedBox(width: 8),
+                Flexible(
+                  child: RepetitionUnitInputWidget(
+                    widget.log.repetitionsUnitId,
+                    onChanged: (v) => {},
+                  ),
+                ),
+                const SizedBox(width: 8),
+              ],
+            ),
+          if (_detailed)
+            Row(
+              crossAxisAlignment: CrossAxisAlignment.end,
+              children: [
+                Flexible(
+                  child: LogsWeightWidget(
+                    controller: _weightController,
+                    configData: widget.configData,
+                    focusNode: widget.focusNode,
+                    log: widget.log,
+                    setStateCallback: (fn) {
+                      setState(fn);
+                    },
+                  ),
+                ),
+                const SizedBox(width: 8),
+                Flexible(
+                  child: WeightUnitInputWidget(widget.log.weightUnitId, onChanged: (v) => {}),
+                ),
+                const SizedBox(width: 8),
+              ],
+            ),
+          if (_detailed)
+            RiRInputWidget(
+              widget.log.rir,
+              onChanged: (value) {
+                if (value == '') {
+                  widget.log.rir = null;
+                } else {
+                  widget.log.rir = num.parse(value);
+                }
+              },
+            ),
+          SwitchListTile(
+            dense: true,
+            title: Text(i18n.setUnitsAndRir),
+            value: _detailed,
+            onChanged: (value) {
+              setState(() {
+                _detailed = !_detailed;
+              });
+            },
+          ),
+          FilledButton(
+            onPressed: _isSaving
+                ? null
+                : () async {
+                    final isValid = _form.currentState!.validate();
+                    if (!isValid) {
+                      return;
+                    }
+                    _isSaving = true;
+                    _form.currentState!.save();
+
+                    try {
+                      await provider.Provider.of<RoutinesProvider>(
+                        context,
+                        listen: false,
+                      ).addLog(widget.log);
+
+                      if (mounted) {
+                        ScaffoldMessenger.of(context).showSnackBar(
+                          SnackBar(
+                            duration: const Duration(seconds: 2),
+                            content: Text(
+                              i18n.successfullySaved,
+                              textAlign: TextAlign.center,
+                            ),
+                          ),
+                        );
+                      }
+                      widget.controller.nextPage(
+                        duration: DEFAULT_ANIMATION_DURATION,
+                        curve: DEFAULT_ANIMATION_CURVE,
+                      );
+                      setState(() {
+                        _isSaving = false;
+                      });
+                    } on WgerHttpException {
+                      setState(() {
+                        _isSaving = false;
+                      });
+                      rethrow;
+                    } finally {
+                      setState(() {
+                        _isSaving = false;
+                      });
+                    }
+                  },
+            child: _isSaving ? const FormProgressIndicator() : Text(i18n.save),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/routines/gym_mode/navigation.dart b/lib/widgets/routines/gym_mode/navigation.dart
new file mode 100644
index 00000000..29dc30fa
--- /dev/null
+++ b/lib/widgets/routines/gym_mode/navigation.dart
@@ -0,0 +1,177 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:wger/helpers/consts.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/exercises/exercise.dart';
+import 'package:wger/theme/theme.dart';
+
+class NavigationFooter extends StatelessWidget {
+  final PageController _controller;
+  final double _ratioCompleted;
+  final bool showPrevious;
+  final bool showNext;
+
+  const NavigationFooter(
+    this._controller,
+    this._ratioCompleted, {
+    this.showPrevious = true,
+    this.showNext = true,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      children: [
+        if (showPrevious)
+          IconButton(
+            icon: const Icon(Icons.chevron_left),
+            onPressed: () {
+              _controller.previousPage(
+                duration: DEFAULT_ANIMATION_DURATION,
+                curve: DEFAULT_ANIMATION_CURVE,
+              );
+            },
+          )
+        else
+          const SizedBox(width: 48),
+        Expanded(
+          child: LinearProgressIndicator(
+            minHeight: 3,
+            value: _ratioCompleted,
+            valueColor: const AlwaysStoppedAnimation<Color>(wgerPrimaryColor),
+          ),
+        ),
+        if (showNext)
+          IconButton(
+            icon: const Icon(Icons.chevron_right),
+            onPressed: () {
+              _controller.nextPage(
+                duration: DEFAULT_ANIMATION_DURATION,
+                curve: DEFAULT_ANIMATION_CURVE,
+              );
+            },
+          )
+        else
+          const SizedBox(width: 48),
+      ],
+    );
+  }
+}
+
+class NavigationHeader extends StatelessWidget {
+  final PageController _controller;
+  final String _title;
+  final Map<Exercise, int> exercisePages;
+  final int ?totalPages;
+
+  const NavigationHeader(
+    this._title,
+    this._controller, {
+      this.totalPages,
+      required this.exercisePages
+    });
+
+  Widget getDialog(BuildContext context) {
+    final TextButton? endWorkoutButton = totalPages != null
+        ? TextButton(
+            child: Text(AppLocalizations.of(context).endWorkout),
+            onPressed: () {
+              _controller.animateToPage(
+                totalPages!,
+                duration: DEFAULT_ANIMATION_DURATION,
+                curve: DEFAULT_ANIMATION_CURVE,
+              );
+
+              Navigator.of(context).pop();
+            },
+          )
+        : null;
+
+    return AlertDialog(
+      title: Text(
+        AppLocalizations.of(context).jumpTo,
+        textAlign: TextAlign.center,
+      ),
+      contentPadding: EdgeInsets.zero,
+      content: SingleChildScrollView(
+        child: Column(
+          children: [
+            ...exercisePages.keys.map((e) {
+              return ListTile(
+                title: Text(e.getTranslation(Localizations.localeOf(context).languageCode).name),
+                trailing: const Icon(Icons.chevron_right),
+                onTap: () {
+                  _controller.animateToPage(
+                    exercisePages[e]!,
+                    duration: DEFAULT_ANIMATION_DURATION,
+                    curve: DEFAULT_ANIMATION_CURVE,
+                  );
+                  Navigator.of(context).pop();
+                },
+              );
+            }),
+          ],
+        ),
+      ),
+      actions: [
+        ?endWorkoutButton,
+        TextButton(
+          child: Text(MaterialLocalizations.of(context).closeButtonLabel),
+          onPressed: () {
+            Navigator.of(context).pop();
+          },
+        ),
+      ],
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      children: [
+        IconButton(
+          icon: const Icon(Icons.close),
+          onPressed: () {
+            Navigator.of(context).pop();
+          },
+        ),
+        Expanded(
+          child: Padding(
+            padding: const EdgeInsets.symmetric(vertical: 10),
+            child: Text(
+              _title,
+              style: Theme.of(context).textTheme.headlineSmall,
+              textAlign: TextAlign.center,
+            ),
+          ),
+        ),
+        IconButton(
+          icon: const Icon(Icons.toc),
+          onPressed: () {
+            showDialog(
+              context: context,
+              builder: (ctx) => getDialog(context),
+            );
+          },
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/widgets/routines/gym_mode/session_page.dart b/lib/widgets/routines/gym_mode/session_page.dart
new file mode 100644
index 00000000..45509156
--- /dev/null
+++ b/lib/widgets/routines/gym_mode/session_page.dart
@@ -0,0 +1,77 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+import 'package:clock/clock.dart';
+import 'package:flutter/material.dart';
+import 'package:wger/helpers/consts.dart';
+import 'package:wger/helpers/date.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/exercises/exercise.dart';
+import 'package:wger/models/workouts/routine.dart';
+import 'package:wger/models/workouts/session.dart';
+import 'package:wger/widgets/routines/forms/session.dart';
+import 'package:wger/widgets/routines/gym_mode/navigation.dart';
+
+class SessionPage extends StatelessWidget {
+  final Routine _routine;
+  final WorkoutSession _session;
+  final PageController _controller;
+  final Map<Exercise, int> _exercisePages;
+
+  SessionPage(
+    this._routine,
+    this._controller,
+    TimeOfDay start,
+    this._exercisePages, {
+    int? dayId,
+  }) : _session = _routine.sessions
+           .map((sessionApi) => sessionApi.session)
+           .firstWhere(
+             (session) => session.date.isSameDayAs(clock.now()),
+             orElse: () => WorkoutSession(
+               dayId: dayId,
+               routineId: _routine.id!,
+               impression: DEFAULT_IMPRESSION,
+               date: clock.now(),
+               timeStart: start,
+               timeEnd: TimeOfDay.fromDateTime(clock.now()),
+             ),
+           );
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      children: [
+        NavigationHeader(
+          AppLocalizations.of(context).workoutSession,
+          _controller,
+          exercisePages: _exercisePages,
+        ),
+        Expanded(child: Container()),
+        Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 15),
+          child: SessionForm(
+            _routine.id!,
+            onSaved: () => Navigator.of(context).pop(),
+            session: _session,
+          ),
+        ),
+        NavigationFooter(_controller, 1, showNext: false),
+      ],
+    );
+  }
+}
diff --git a/lib/widgets/routines/gym_mode/start_page.dart b/lib/widgets/routines/gym_mode/start_page.dart
new file mode 100644
index 00000000..ca672133
--- /dev/null
+++ b/lib/widgets/routines/gym_mode/start_page.dart
@@ -0,0 +1,89 @@
+import 'package:flutter/material.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/exercises/exercise.dart';
+import 'package:wger/models/workouts/day.dart';
+import 'package:wger/models/workouts/day_data.dart';
+import 'package:wger/widgets/exercises/images.dart';
+import 'package:wger/widgets/routines/gym_mode/navigation.dart';
+
+class StartPage extends StatelessWidget {
+  final PageController _controller;
+  final DayData _dayData;
+  final Map<Exercise, int> _exercisePages;
+
+  const StartPage(this._controller, this._dayData, this._exercisePages);
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      children: [
+        NavigationHeader(
+          AppLocalizations.of(context).todaysWorkout,
+          _controller,
+          exercisePages: _exercisePages,
+        ),
+        Expanded(
+          child: ListView(
+            children: [
+              if (_dayData.day!.isSpecialType)
+                Center(
+                  child: Padding(
+                    padding: const EdgeInsets.all(15),
+                    child: Text(
+                      '${_dayData.day!.type.name.toUpperCase()}\n${_dayData.day!.type.i18Label(AppLocalizations.of(context))}',
+                      textAlign: TextAlign.center,
+                      style: Theme.of(context).textTheme.headlineSmall,
+                    ),
+                  ),
+                ),
+              ..._dayData.slots.map((slotData) {
+                return Column(
+                  children: [
+                    ...slotData.setConfigs
+                        .fold<Map<Exercise, List<String>>>({}, (acc, entry) {
+                          acc.putIfAbsent(entry.exercise, () => []).add(entry.textReprWithType);
+                          return acc;
+                        })
+                        .entries
+                        .map((entry) {
+                          final exercise = entry.key;
+                          return Column(
+                            children: [
+                              ListTile(
+                                leading: SizedBox(
+                                  width: 45,
+                                  child: ExerciseImageWidget(image: exercise.getMainImage),
+                                ),
+                                title: Text(
+                                  exercise
+                                      .getTranslation(Localizations.localeOf(context).languageCode)
+                                      .name,
+                                ),
+                                subtitle: Column(
+                                  crossAxisAlignment: CrossAxisAlignment.start,
+                                  children: entry.value.map((text) => Text(text)).toList(),
+                                ),
+                              ),
+                            ],
+                          );
+                        }),
+                  ],
+                );
+              }),
+            ],
+          ),
+        ),
+        FilledButton(
+          child: Text(AppLocalizations.of(context).start),
+          onPressed: () {
+            _controller.nextPage(
+              duration: const Duration(milliseconds: 200),
+              curve: Curves.bounceIn,
+            );
+          },
+        ),
+        NavigationFooter(_controller, 0, showPrevious: false),
+      ],
+    );
+  }
+}
diff --git a/lib/widgets/routines/gym_mode/timer.dart b/lib/widgets/routines/gym_mode/timer.dart
new file mode 100644
index 00000000..e9ccb548
--- /dev/null
+++ b/lib/widgets/routines/gym_mode/timer.dart
@@ -0,0 +1,155 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/exercises/exercise.dart';
+import 'package:wger/theme/theme.dart';
+import 'package:wger/widgets/routines/gym_mode/navigation.dart';
+
+class TimerWidget extends StatefulWidget {
+  final PageController _controller;
+  final double _ratioCompleted;
+  final Map<Exercise, int> _exercisePages;
+  final _totalPages;
+
+  const TimerWidget(this._controller, this._ratioCompleted, this._exercisePages, this._totalPages);
+
+  @override
+  _TimerWidgetState createState() => _TimerWidgetState();
+}
+
+class _TimerWidgetState extends State<TimerWidget> {
+  late DateTime _startTime;
+  final _maxSeconds = 600;
+  late Timer _uiTimer;
+
+  @override
+  void initState() {
+    super.initState();
+    _startTime = DateTime.now();
+
+    _uiTimer = Timer.periodic(const Duration(seconds: 1), (_) {
+      // ignore: no-empty-block, avoid-empty-setstate
+      if (mounted) setState(() {});
+    });
+  }
+
+  @override
+  void dispose() {
+    _uiTimer.cancel();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final elapsed = DateTime.now().difference(_startTime).inSeconds;
+    final displaySeconds = elapsed > _maxSeconds ? _maxSeconds : elapsed;
+    final displayTime = DateTime(2000, 1, 1, 0, 0, 0).add(Duration(seconds: displaySeconds));
+
+    return Column(
+      children: [
+        NavigationHeader(
+          AppLocalizations.of(context).pause,
+          widget._controller,
+          totalPages: widget._totalPages,
+          exercisePages: widget._exercisePages,
+        ),
+        Expanded(
+          child: Center(
+            child: Text(
+              DateFormat('m:ss').format(displayTime),
+              style: Theme.of(context).textTheme.displayLarge!.copyWith(color: wgerPrimaryColor),
+            ),
+          ),
+        ),
+        NavigationFooter(widget._controller, widget._ratioCompleted),
+      ],
+    );
+  }
+}
+
+class TimerCountdownWidget extends StatefulWidget {
+  final PageController _controller;
+  final double _ratioCompleted;
+  final int _seconds;
+  final Map<Exercise, int> _exercisePages;
+  final int _totalPages;
+
+  const TimerCountdownWidget(
+    this._controller,
+    this._seconds,
+    this._ratioCompleted,
+    this._exercisePages,
+    this._totalPages,
+  );
+
+  @override
+  _TimerCountdownWidgetState createState() => _TimerCountdownWidgetState();
+}
+
+class _TimerCountdownWidgetState extends State<TimerCountdownWidget> {
+  late DateTime _endTime;
+  late Timer _uiTimer;
+
+  @override
+  void initState() {
+    super.initState();
+    _endTime = DateTime.now().add(Duration(seconds: widget._seconds));
+
+    _uiTimer = Timer.periodic(const Duration(seconds: 1), (_) {
+      // ignore: no-empty-block, avoid-empty-setstate
+      if (mounted) setState(() {});
+    });
+  }
+
+  @override
+  void dispose() {
+    _uiTimer.cancel();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final remaining = _endTime.difference(DateTime.now());
+    final remainingSeconds = remaining.inSeconds <= 0 ? 0 : remaining.inSeconds;
+    final displayTime = DateTime(2000, 1, 1, 0, 0, 0).add(Duration(seconds: remainingSeconds));
+
+    return Column(
+      children: [
+        NavigationHeader(
+          AppLocalizations.of(context).pause,
+          widget._controller,
+          totalPages: widget._totalPages,
+          exercisePages: widget._exercisePages,
+        ),
+        Expanded(
+          child: Center(
+            child: Text(
+              DateFormat('m:ss').format(displayTime),
+              style: Theme.of(context).textTheme.displayLarge!.copyWith(color: wgerPrimaryColor),
+            ),
+          ),
+        ),
+        NavigationFooter(widget._controller, widget._ratioCompleted),
+      ],
+    );
+  }
+}
diff --git a/lib/widgets/routines/log.dart b/lib/widgets/routines/log.dart
new file mode 100644
index 00000000..9613ec1d
--- /dev/null
+++ b/lib/widgets/routines/log.dart
@@ -0,0 +1,225 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+import 'package:wger/helpers/colors.dart';
+import 'package:wger/helpers/date.dart';
+import 'package:wger/helpers/errors.dart';
+import 'package:wger/helpers/misc.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/workouts/log.dart';
+import 'package:wger/models/workouts/routine.dart';
+import 'package:wger/models/workouts/session.dart';
+import 'package:wger/widgets/measurements/charts.dart';
+import 'package:wger/widgets/routines/charts.dart';
+import 'package:wger/widgets/routines/forms/session.dart';
+
+class SessionInfo extends StatefulWidget {
+  final WorkoutSession _session;
+
+  const SessionInfo(this._session);
+
+  @override
+  State<SessionInfo> createState() => _SessionInfoState();
+}
+
+class _SessionInfoState extends State<SessionInfo> {
+  bool editMode = false;
+
+  @override
+  Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
+
+    return Padding(
+      padding: const EdgeInsets.all(16.0),
+      child: Column(
+        children: [
+          ListTile(
+            title: Text(
+              i18n.workoutSession,
+              style: Theme.of(context).textTheme.headlineSmall,
+            ),
+            subtitle: Text(
+              DateFormat.yMd(
+                Localizations.localeOf(context).languageCode,
+              ).format(widget._session.date),
+            ),
+            onTap: () => setState(() => editMode = !editMode),
+            trailing: Icon(editMode ? Icons.edit_off : Icons.edit),
+            contentPadding: EdgeInsets.zero,
+          ),
+          if (editMode)
+            SessionForm(
+              widget._session.routineId!,
+              onSaved: () => setState(() => editMode = false),
+              session: widget._session,
+            )
+          else
+            Column(
+              children: [
+                _buildInfoRow(
+                  context,
+                  i18n.timeStart,
+                  widget._session.timeStart != null
+                      ? MaterialLocalizations.of(
+                          context,
+                        ).formatTimeOfDay(widget._session.timeStart!)
+                      : '-/-',
+                ),
+                _buildInfoRow(
+                  context,
+                  i18n.timeEnd,
+                  widget._session.timeEnd != null
+                      ? MaterialLocalizations.of(context).formatTimeOfDay(widget._session.timeEnd!)
+                      : '-/-',
+                ),
+                _buildInfoRow(
+                  context,
+                  i18n.impression,
+                  widget._session.impressionAsString,
+                ),
+                _buildInfoRow(
+                  context,
+                  i18n.notes,
+                  widget._session.notes.isNotEmpty ? widget._session.notes : '-/-',
+                ),
+              ],
+            ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildInfoRow(BuildContext context, String label, String value) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 4.0),
+      child: Row(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            '$label: ',
+            style: Theme.of(context).textTheme.titleMedium?.copyWith(fontWeight: FontWeight.bold),
+          ),
+          Expanded(child: Text(value)),
+        ],
+      ),
+    );
+  }
+}
+
+class ExerciseLogChart extends StatelessWidget {
+  final Map<num, List<Log>> _logs;
+  final DateTime _selectedDate;
+
+  const ExerciseLogChart(this._logs, this._selectedDate);
+
+  @override
+  Widget build(BuildContext context) {
+    final colors = generateChartColors(_logs.keys.length).iterator;
+
+    return Column(
+      mainAxisSize: MainAxisSize.max,
+      children: [
+        LogChartWidgetFl(_logs, _selectedDate),
+        SingleChildScrollView(
+          scrollDirection: Axis.horizontal,
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              ..._logs.keys.map((reps) {
+                colors.moveNext();
+
+                return Indicator(
+                  color: colors.current,
+                  text: formatNum(reps).toString(),
+                  isSquare: false,
+                );
+              }),
+            ],
+          ),
+        ),
+        const SizedBox(height: 15),
+      ],
+    );
+  }
+}
+
+class DayLogWidget extends StatelessWidget {
+  final DateTime _date;
+  final Routine _routine;
+
+  const DayLogWidget(this._date, this._routine);
+
+  @override
+  Widget build(BuildContext context) {
+    final sessionApi = _routine.sessions.firstWhere(
+      (sessionApi) => sessionApi.session.date.isSameDayAs(_date),
+    );
+    final exercises = sessionApi.exercises;
+
+    return Card(
+      child: Column(
+        children: [
+          SessionInfo(sessionApi.session),
+          ...exercises.map((exercise) {
+            final translation = exercise.getTranslation(
+              Localizations.localeOf(context).languageCode,
+            );
+            return Column(
+              children: [
+                Text(
+                  translation.name,
+                  style: Theme.of(context).textTheme.titleMedium,
+                ),
+                ...sessionApi.logs
+                    .where((l) => l.exerciseId == exercise.id)
+                    .map(
+                      (log) => Row(
+                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                        children: [
+                          Text(log.singleLogRepTextNoNl),
+                          IconButton(
+                            icon: const Icon(Icons.delete),
+                            key: ValueKey('delete-log-${log.id}'),
+                            onPressed: () {
+                              showDeleteDialog(context, translation.name, log);
+                            },
+                          ),
+                        ],
+                      ),
+                    ),
+                Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 15),
+                  child: ExerciseLogChart(
+                    _routine.groupLogsByRepetition(
+                      logs: _routine.filterLogsByExercise(exercise.id!),
+                      filterNullReps: true,
+                      filterNullWeights: true,
+                    ),
+                    _date,
+                  ),
+                ),
+              ],
+            );
+          }),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/routines/plate_calculator.dart b/lib/widgets/routines/plate_calculator.dart
new file mode 100644
index 00000000..4e5c06b7
--- /dev/null
+++ b/lib/widgets/routines/plate_calculator.dart
@@ -0,0 +1,169 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:wger/helpers/consts.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/providers/plate_weights.dart';
+
+class PlateWeight extends StatelessWidget {
+  final num value;
+  final Color color;
+  final bool isSelected;
+  final double size;
+  final double padding;
+  final double margin;
+
+  const PlateWeight({
+    super.key,
+    required this.value,
+    required this.color,
+    this.isSelected = true,
+    this.size = 50,
+    this.padding = 8,
+    this.margin = 3,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      key: ValueKey('plateWeight-$value'),
+      height: size,
+      width: size,
+      child: Padding(
+        padding: EdgeInsets.all(padding),
+        child: Container(
+          alignment: Alignment.center,
+          margin: EdgeInsets.all(margin),
+          decoration: BoxDecoration(
+            color: isSelected ? color : Colors.black12,
+            shape: BoxShape.circle,
+            border: Border.all(color: Colors.black, width: isSelected ? 2 : 0),
+          ),
+          child: FittedBox(
+            fit: BoxFit.scaleDown,
+            child: Text(
+              value.toString(),
+              textAlign: TextAlign.center,
+              style: TextStyle(
+                color: isSelected ? Colors.black : Colors.black87,
+                fontWeight: isSelected ? FontWeight.bold : FontWeight.normal,
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class ConfigureAvailablePlates extends ConsumerStatefulWidget {
+  const ConfigureAvailablePlates({super.key});
+
+  @override
+  ConsumerState<ConfigureAvailablePlates> createState() => _AddPlateWeightsState();
+}
+
+class _AddPlateWeightsState extends ConsumerState<ConfigureAvailablePlates> {
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      ref.read(plateCalculatorProvider.notifier);
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
+
+    final plateWeightsState = ref.watch(plateCalculatorProvider);
+    final plateWeightsNotifier = ref.read(plateCalculatorProvider.notifier);
+    // final userProvider = provider.Provider.of<UserProvider>(context);
+
+    return Column(
+      mainAxisSize: MainAxisSize.max,
+      children: [
+        Padding(
+          padding: const EdgeInsets.all(10),
+          child: DropdownMenu<WeightUnitEnum>(
+            key: const ValueKey('weightUnitDropdown'),
+            width: double.infinity,
+            initialSelection: plateWeightsState.isMetric ? WeightUnitEnum.kg : WeightUnitEnum.lb,
+            requestFocusOnTap: true,
+            label: Text(i18n.unit),
+            onSelected: (WeightUnitEnum? unit) {
+              if (unit == null) {
+                return;
+              }
+              plateWeightsNotifier.unitChange(unit: unit);
+              // userProvider.changeUnit(changeTo: unit.name);
+              // userProvider.saveProfile();
+            },
+            dropdownMenuEntries: WeightUnitEnum.values.map((unit) {
+              return DropdownMenuEntry<WeightUnitEnum>(
+                value: unit,
+                label: unit == WeightUnitEnum.kg ? i18n.kg : i18n.lb,
+              );
+            }).toList(),
+          ),
+        ),
+        Padding(
+          padding: const EdgeInsets.all(10),
+          child: DropdownMenu<num>(
+            key: const ValueKey('barWeightDropdown'),
+            width: double.infinity,
+            initialSelection: plateWeightsState.barWeight,
+            requestFocusOnTap: true,
+            label: Text(i18n.barWeight),
+            onSelected: (num? value) {
+              if (value == null) {
+                return;
+              }
+              plateWeightsNotifier.setBarWeight(value);
+            },
+            dropdownMenuEntries: plateWeightsState.availableBarsWeights.map((value) {
+              return DropdownMenuEntry<num>(
+                value: value,
+                label: value.toString(),
+              );
+            }).toList(),
+          ),
+        ),
+        SwitchListTile(
+          key: const ValueKey('useColorsSwitch'),
+          title: Text(i18n.useColors),
+          value: plateWeightsState.useColors,
+          onChanged: (state) => plateWeightsNotifier.setUseColors(state),
+        ),
+        LayoutBuilder(
+          builder: (context, constraints) {
+            const double widthThreshold = 450.0;
+            final int crossAxisCount = constraints.maxWidth > widthThreshold ? 10 : 5;
+            return GridView.count(
+              crossAxisCount: crossAxisCount,
+              shrinkWrap: true,
+              physics: const NeverScrollableScrollPhysics(),
+              children: plateWeightsState.availablePlates.map((number) {
+                final bool isSelected = plateWeightsState.selectedPlates.contains(number);
+                return GestureDetector(
+                  onTap: () => plateWeightsNotifier.toggleSelection(number),
+                  child: PlateWeight(
+                    value: number,
+                    isSelected: isSelected,
+                    color: plateWeightsState.getColor(number),
+                  ),
+                );
+              }).toList(),
+            );
+          },
+        ),
+        FilledButton(
+          onPressed: () {
+            plateWeightsNotifier.saveToSharedPrefs();
+            Navigator.pop(context);
+          },
+          child: Text(i18n.save),
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/widgets/routines/routine_detail.dart b/lib/widgets/routines/routine_detail.dart
new file mode 100644
index 00000000..57a34207
--- /dev/null
+++ b/lib/widgets/routines/routine_detail.dart
@@ -0,0 +1,76 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/workouts/routine.dart';
+import 'package:wger/screens/routine_edit_screen.dart';
+import 'package:wger/widgets/routines/day.dart';
+
+class RoutineDetail extends StatelessWidget {
+  final Routine _routine;
+  final bool viewMode;
+
+  const RoutineDetail(this._routine, {this.viewMode = false, super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
+
+    return Column(
+      children: [
+        const SizedBox(height: 10),
+        if (_routine.description.isNotEmpty)
+          Padding(
+            padding: const EdgeInsets.all(15),
+            child: Text(_routine.description),
+          ),
+        if (!viewMode && _routine.days.isEmpty)
+          Center(
+            child: ElevatedButton(
+              onPressed: () {
+                Navigator.pushNamed(context, RoutineEditScreen.routeName, arguments: _routine.id);
+              },
+              child: Text(i18n.edit),
+            ),
+          ),
+        ..._routine.dayDataCurrentIteration
+            .where((dayData) => dayData.day != null)
+            .map((dayData) => RoutineDayWidget(dayData, _routine.id!, viewMode)),
+        // if (_routine.fitInWeek)
+        //   Padding(
+        //     padding: const EdgeInsets.only(left: 8, right: 8, bottom: 12),
+        //     child: Card(
+        //       margin: EdgeInsets.zero,
+        //       child: ListTile(
+        //         tileColor: Theme.of(context).focusColor,
+        //         contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+        //         title: Text(
+        //           i18n.tillEndOfWeek,
+        //           style: Theme.of(context).textTheme.headlineSmall,
+        //           overflow: TextOverflow.ellipsis,
+        //         ),
+        //         leading: const Icon(Icons.hotel),
+        //         minLeadingWidth: 8,
+        //       ),
+        //     ),
+        //   ),
+      ],
+    );
+  }
+}
diff --git a/lib/widgets/routines/routine_edit.dart b/lib/widgets/routines/routine_edit.dart
new file mode 100644
index 00000000..081f88f4
--- /dev/null
+++ b/lib/widgets/routines/routine_edit.dart
@@ -0,0 +1,81 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:collection/collection.dart';
+import 'package:flutter/material.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/workouts/day.dart';
+import 'package:wger/models/workouts/routine.dart';
+import 'package:wger/widgets/routines/forms/day.dart';
+import 'package:wger/widgets/routines/forms/routine.dart';
+import 'package:wger/widgets/routines/routine_detail.dart';
+
+class RoutineEdit extends StatefulWidget {
+  final Routine _routine;
+
+  const RoutineEdit(this._routine);
+
+  @override
+  State<RoutineEdit> createState() => _RoutineEditState();
+}
+
+class _RoutineEditState extends State<RoutineEdit> {
+  int? selectedDayId;
+
+  @override
+  Widget build(BuildContext context) {
+    final i18n = AppLocalizations.of(context);
+
+    Day? selectedDay;
+    if (selectedDayId != null) {
+      selectedDay = widget._routine.days.firstWhereOrNull((day) => day.id == selectedDayId);
+    }
+
+    return Padding(
+      padding: const EdgeInsets.all(8),
+      child: SingleChildScrollView(
+        child: Column(
+          children: [
+            RoutineForm(widget._routine, useListView: false),
+            Container(height: 10),
+            Text(i18n.routineDays, style: Theme.of(context).textTheme.titleLarge),
+            ReorderableDaysList(
+              routineId: widget._routine.id!,
+              days: widget._routine.days.where((day) => day.id != null).toList(),
+              selectedDayId: selectedDayId,
+              onDaySelected: (id) {
+                setState(() {
+                  if (selectedDayId == id) {
+                    selectedDayId = null;
+                  } else {
+                    selectedDayId = id;
+                  }
+                });
+              },
+            ),
+            if (selectedDay != null) DayFormWidget(key: ValueKey(selectedDayId), day: selectedDay),
+            const SizedBox(height: 25),
+            Text(i18n.resultingRoutine, style: Theme.of(context).textTheme.titleLarge),
+            const Divider(),
+            RoutineDetail(widget._routine, viewMode: true),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/routines/routines_list.dart b/lib/widgets/routines/routines_list.dart
new file mode 100644
index 00000000..151c6417
--- /dev/null
+++ b/lib/widgets/routines/routines_list.dart
@@ -0,0 +1,152 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+import 'package:provider/provider.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/providers/routines.dart';
+import 'package:wger/screens/routine_screen.dart';
+import 'package:wger/widgets/core/text_prompt.dart';
+
+class RoutinesList extends StatefulWidget {
+  final RoutinesProvider _routineProvider;
+
+  const RoutinesList(this._routineProvider);
+
+  @override
+  State<RoutinesList> createState() => _RoutinesListState();
+}
+
+class _RoutinesListState extends State<RoutinesList> {
+  int? _loadingRoutine;
+
+  @override
+  Widget build(BuildContext context) {
+    final dateFormat = DateFormat.yMd(Localizations.localeOf(context).languageCode);
+
+    return RefreshIndicator(
+      onRefresh: () => widget._routineProvider.fetchAndSetAllRoutinesSparse(),
+      child: widget._routineProvider.items.isEmpty
+          ? const TextPrompt()
+          : ListView.builder(
+              padding: const EdgeInsets.all(10.0),
+              itemCount: widget._routineProvider.items.length,
+              itemBuilder: (context, index) {
+                final currentRoutine = widget._routineProvider.items[index];
+
+                return Card(
+                  child: ListTile(
+                    onTap: () async {
+                      setState(() {
+                        _loadingRoutine = currentRoutine.id;
+                      });
+                      try {
+                        await widget._routineProvider.fetchAndSetRoutineFull(currentRoutine.id!);
+                      } finally {
+                        if (mounted) {
+                          setState(() => _loadingRoutine = null);
+                        }
+                      }
+
+                      if (context.mounted) {
+                        Navigator.of(context).pushNamed(
+                          RoutineScreen.routeName,
+                          arguments: currentRoutine.id,
+                        );
+                      }
+                    },
+                    title: Text(currentRoutine.name),
+                    subtitle: Text(
+                      '${dateFormat.format(currentRoutine.start)}'
+                      ' - ${dateFormat.format(currentRoutine.end)}',
+                    ),
+                    trailing: Row(
+                      mainAxisSize: MainAxisSize.min,
+                      children: [
+                        const VerticalDivider(),
+                        if (_loadingRoutine == currentRoutine.id)
+                          const IconButton(
+                            icon: CircularProgressIndicator(),
+                            onPressed: null,
+                          )
+                        else
+                          IconButton(
+                            icon: const Icon(Icons.delete),
+                            tooltip: AppLocalizations.of(context).delete,
+                            onPressed: () async {
+                              // Delete workout from DB
+                              await showDialog(
+                                context: context,
+                                builder: (BuildContext contextDialog) {
+                                  return AlertDialog(
+                                    content: Text(
+                                      AppLocalizations.of(
+                                        context,
+                                      ).confirmDelete(currentRoutine.name),
+                                    ),
+                                    actions: [
+                                      TextButton(
+                                        child: Text(
+                                          MaterialLocalizations.of(context).cancelButtonLabel,
+                                        ),
+                                        onPressed: () => Navigator.of(contextDialog).pop(),
+                                      ),
+                                      TextButton(
+                                        child: Text(
+                                          AppLocalizations.of(context).delete,
+                                          style: TextStyle(
+                                            color: Theme.of(context).colorScheme.error,
+                                          ),
+                                        ),
+                                        onPressed: () {
+                                          // Confirmed, delete the workout
+                                          Provider.of<RoutinesProvider>(
+                                            context,
+                                            listen: false,
+                                          ).deleteRoutine(currentRoutine.id!);
+
+                                          // Close the popup
+                                          Navigator.of(contextDialog).pop();
+
+                                          // and inform the user
+                                          ScaffoldMessenger.of(context).showSnackBar(
+                                            SnackBar(
+                                              content: Text(
+                                                AppLocalizations.of(context).successfullyDeleted,
+                                                textAlign: TextAlign.center,
+                                              ),
+                                            ),
+                                          );
+                                        },
+                                      ),
+                                    ],
+                                  );
+                                },
+                              );
+                            },
+                          ),
+                      ],
+                    ),
+                  ),
+                );
+              },
+            ),
+    );
+  }
+}
diff --git a/lib/widgets/routines/slot.dart b/lib/widgets/routines/slot.dart
new file mode 100644
index 00000000..dcdaf072
--- /dev/null
+++ b/lib/widgets/routines/slot.dart
@@ -0,0 +1,34 @@
+import 'package:flutter/material.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/exercises/exercise.dart';
+
+class ProgressionRulesInfoBox extends StatelessWidget {
+  final Exercise exercise;
+
+  const ProgressionRulesInfoBox(this.exercise, {super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final languageCode = Localizations.localeOf(context).languageCode;
+    final i18n = AppLocalizations.of(context);
+
+    return Column(
+      children: [
+        ListTile(
+          title: Text(
+            exercise.getTranslation(languageCode).name,
+            style: Theme.of(context).textTheme.titleMedium,
+          ),
+        ),
+        ListTile(
+          leading: const Icon(Icons.info),
+          tileColor: Theme.of(context).colorScheme.primaryContainer,
+          title: Text(
+            i18n.progressionRules,
+            style: Theme.of(context).textTheme.bodySmall,
+          ),
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/widgets/workouts/workout_logs.dart b/lib/widgets/routines/workout_logs.dart
similarity index 53%
rename from lib/widgets/workouts/workout_logs.dart
rename to lib/widgets/routines/workout_logs.dart
index 9524c963..66ab75aa 100644
--- a/lib/widgets/workouts/workout_logs.dart
+++ b/lib/widgets/routines/workout_logs.dart
@@ -16,70 +16,41 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import 'package:clock/clock.dart';
 import 'package:flutter/material.dart';
 import 'package:table_calendar/table_calendar.dart';
 import 'package:wger/helpers/consts.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
-import 'package:wger/models/exercises/exercise.dart';
-import 'package:wger/models/workouts/log.dart';
-import 'package:wger/models/workouts/session.dart';
-import 'package:wger/models/workouts/workout_plan.dart';
-import 'package:wger/screens/workout_plan_screen.dart';
+import 'package:wger/models/workouts/routine.dart';
 import 'package:wger/theme/theme.dart';
-import 'package:wger/widgets/workouts/log.dart';
+import 'package:wger/widgets/routines/log.dart';
 
-class WorkoutLogs extends StatefulWidget {
-  final WorkoutPlan _workoutPlan;
-  final Function _changeMode;
+class WorkoutLogs extends StatelessWidget {
+  final Routine _routine;
 
-  const WorkoutLogs(this._workoutPlan, this._changeMode);
-
-  @override
-  _WorkoutLogsState createState() => _WorkoutLogsState();
-}
-
-class _WorkoutLogsState extends State<WorkoutLogs> {
-  final dayController = TextEditingController();
-
-  @override
-  void dispose() {
-    dayController.dispose();
-    super.dispose();
-  }
+  const WorkoutLogs(this._routine);
 
   @override
   Widget build(BuildContext context) {
-    return Column(
+    return ListView(
+      padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 8),
       children: [
-        ToggleButtons(
-          renderBorder: false,
-          onPressed: (int index) {
-            if (index == 0) {
-              widget._changeMode(WorkoutScreenMode.workout);
-            }
-          },
-          isSelected: const [false, true],
-          children: const [Icon(Icons.table_chart), Icon(Icons.show_chart)],
+        Text(
+          AppLocalizations.of(context).labelWorkoutLogs,
+          style: Theme.of(context).textTheme.headlineSmall,
         ),
-        Padding(
-          padding: const EdgeInsets.symmetric(vertical: 10),
-          child: Text(
-            AppLocalizations.of(context).labelWorkoutLogs,
-            style: Theme.of(context).textTheme.headlineSmall,
-          ),
+        Text(
+          AppLocalizations.of(context).logHelpEntries,
+          textAlign: TextAlign.justify,
         ),
-        Padding(
-          padding: const EdgeInsets.all(8.0),
-          child: Text(AppLocalizations.of(context).logHelpEntries, textAlign: TextAlign.justify),
+        Text(
+          AppLocalizations.of(context).logHelpEntriesUnits,
+          textAlign: TextAlign.justify,
         ),
-        Padding(
-          padding: const EdgeInsets.all(8.0),
-          child: Text(
-            AppLocalizations.of(context).logHelpEntriesUnits,
-            textAlign: TextAlign.justify,
-          ),
+        SizedBox(
+          width: double.infinity,
+          child: WorkoutLogCalendar(_routine),
         ),
-        SizedBox(width: double.infinity, child: WorkoutLogCalendar(widget._workoutPlan)),
       ],
     );
   }
@@ -88,26 +59,24 @@ class _WorkoutLogsState extends State<WorkoutLogs> {
 /// An event in the workout log calendar
 class WorkoutLogEvent {
   final DateTime dateTime;
-  final WorkoutSession? session;
-  final Map<Exercise, List<Log>> exercises;
 
-  const WorkoutLogEvent(this.dateTime, this.session, this.exercises);
+  const WorkoutLogEvent(this.dateTime);
 }
 
 class WorkoutLogCalendar extends StatefulWidget {
-  final WorkoutPlan _workoutPlan;
+  final Routine _routine;
 
-  const WorkoutLogCalendar(this._workoutPlan);
+  const WorkoutLogCalendar(this._routine);
 
   @override
   _WorkoutLogCalendarState createState() => _WorkoutLogCalendarState();
 }
 
 class _WorkoutLogCalendarState extends State<WorkoutLogCalendar> {
-  DateTime _focusedDay = DateTime.now();
+  DateTime _focusedDay = clock.now();
   DateTime? _selectedDay;
-  late final ValueNotifier<List<WorkoutLogEvent>> _selectedEvents;
-  late Map<String, List<WorkoutLogEvent>> _events;
+  late final ValueNotifier<List<DateTime>> _selectedEvents;
+  late Map<String, List<DateTime>> _events;
 
   @override
   void initState() {
@@ -126,18 +95,16 @@ class _WorkoutLogCalendarState extends State<WorkoutLogCalendar> {
   }
 
   void loadEvents() {
-    for (final date in widget._workoutPlan.logData.keys) {
-      final entry = widget._workoutPlan.logData[date]!;
-      _events[DateFormatLists.format(date)] = [
-        WorkoutLogEvent(date, entry['session'], entry['exercises']),
+    for (final sessionApi in widget._routine.sessions) {
+      _events[DateFormatLists.format(sessionApi.session.date)] = [
+        sessionApi.session.date,
       ];
     }
 
-    // Add initial selected day to events list
     _selectedEvents.value = _getEventsForDay(_selectedDay!);
   }
 
-  List<WorkoutLogEvent> _getEventsForDay(DateTime day) {
+  List<DateTime> _getEventsForDay(DateTime day) {
     return _events[DateFormatLists.format(day)] ?? [];
   }
 
@@ -158,8 +125,8 @@ class _WorkoutLogCalendarState extends State<WorkoutLogCalendar> {
       children: [
         TableCalendar(
           locale: Localizations.localeOf(context).languageCode,
-          firstDay: DateTime.now().subtract(const Duration(days: 1000)),
-          lastDay: DateTime.now(),
+          firstDay: clock.now().subtract(const Duration(days: 1000)),
+          lastDay: clock.now(),
           focusedDay: _focusedDay,
           selectedDayPredicate: (day) => isSameDay(_selectedDay, day),
           calendarFormat: CalendarFormat.month,
@@ -170,22 +137,17 @@ class _WorkoutLogCalendarState extends State<WorkoutLogCalendar> {
           availableCalendarFormats: const {CalendarFormat.month: ''},
           onDaySelected: _onDaySelected,
           onPageChanged: (focusedDay) {
-            // No need to call `setState()` here
             _focusedDay = focusedDay;
           },
         ),
         const SizedBox(height: 8.0),
         SizedBox(
-          child: ValueListenableBuilder<List<WorkoutLogEvent>>(
+          child: ValueListenableBuilder<List<DateTime>>(
             valueListenable: _selectedEvents,
             builder: (context, logEvents, _) {
               // At the moment there is only one "event" per day
               return logEvents.isNotEmpty
-                  ? DayLogWidget(
-                      logEvents.first.dateTime,
-                      logEvents.first.exercises,
-                      logEvents.first.session,
-                    )
+                  ? DayLogWidget(logEvents.first, widget._routine)
                   : Container();
             },
           ),
diff --git a/lib/widgets/weight/forms.dart b/lib/widgets/weight/forms.dart
index 502b3de6..c7dbe00a 100644
--- a/lib/widgets/weight/forms.dart
+++ b/lib/widgets/weight/forms.dart
@@ -18,38 +18,48 @@
 
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
-import 'package:wger/exceptions/http_exception.dart';
-import 'package:wger/helpers/json.dart';
-import 'package:wger/helpers/ui.dart';
+import 'package:wger/helpers/consts.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/models/body_weight/weight_entry.dart';
 import 'package:wger/providers/body_weight.dart';
 
 class WeightForm extends StatelessWidget {
   final _form = GlobalKey<FormState>();
-  final dateController = TextEditingController();
-  final weightController = TextEditingController();
+  final dateController = TextEditingController(text: '');
+  final timeController = TextEditingController(text: '');
+  final weightController = TextEditingController(text: '');
 
-  late final WeightEntry _weightEntry;
+  final WeightEntry _weightEntry;
 
-  WeightForm([WeightEntry? weightEntry]) {
-    _weightEntry = weightEntry ?? WeightEntry(date: DateTime.now());
-    weightController.text = _weightEntry.weight == 0 ? '' : _weightEntry.weight.toString();
-    dateController.text = toDate(_weightEntry.date)!;
-  }
+  WeightForm([WeightEntry? weightEntry])
+    : _weightEntry = weightEntry ?? WeightEntry(date: DateTime.now());
 
   @override
   Widget build(BuildContext context) {
+    final numberFormat = NumberFormat.decimalPattern(Localizations.localeOf(context).toString());
+    final dateFormat = DateFormat.yMd(Localizations.localeOf(context).languageCode);
+    final timeFormat = DateFormat.Hm(Localizations.localeOf(context).languageCode);
+
+    if (weightController.text.isEmpty && _weightEntry.weight != 0) {
+      weightController.text = numberFormat.format(_weightEntry.weight);
+    }
+    if (dateController.text.isEmpty) {
+      dateController.text = dateFormat.format(_weightEntry.date);
+    }
+    if (timeController.text.isEmpty) {
+      timeController.text = TimeOfDay.fromDateTime(_weightEntry.date).format(context);
+    }
+
     return Form(
       key: _form,
       child: Column(
         children: [
-          // Weight date
           TextFormField(
             key: const Key('dateInput'),
-            readOnly: true,
             // Stop keyboard from appearing
+            readOnly: true,
             decoration: InputDecoration(
               labelText: AppLocalizations.of(context).date,
               suffixIcon: const Icon(Icons.calendar_today, key: Key('calendarIcon')),
@@ -57,30 +67,56 @@ class WeightForm extends StatelessWidget {
             enableInteractiveSelection: false,
             controller: dateController,
             onTap: () async {
-              // Show Date Picker Here
               final pickedDate = await showDatePicker(
                 context: context,
                 initialDate: _weightEntry.date,
                 firstDate: DateTime(DateTime.now().year - 10),
                 lastDate: DateTime.now(),
-                selectableDayPredicate: (day) {
-                  // Always allow the current initial date
-                  if (day == _weightEntry.date) {
-                    return true;
-                  }
-
-                  // if the date is known, don't allow it
-                  return Provider.of<BodyWeightProvider>(context, listen: false).findByDate(day) ==
-                      null;
-                },
               );
 
               if (pickedDate != null) {
-                dateController.text = toDate(pickedDate)!;
+                dateController.text = dateFormat.format(pickedDate);
               }
             },
             onSaved: (newValue) {
-              _weightEntry.date = DateTime.parse(newValue!);
+              final date = dateFormat.parse(newValue!);
+              _weightEntry.date = _weightEntry.date.copyWith(
+                year: date.year,
+                month: date.month,
+                day: date.day,
+              );
+            },
+          ),
+          TextFormField(
+            key: const Key('timeInput'),
+            // Stop keyboard from appearing
+            readOnly: true,
+            decoration: InputDecoration(
+              labelText: AppLocalizations.of(context).time,
+              suffixIcon: const Icon(
+                Icons.access_time_outlined,
+                key: Key('clockIcon'),
+              ),
+            ),
+            enableInteractiveSelection: false,
+            controller: timeController,
+            onTap: () async {
+              final pickedTime = await showTimePicker(
+                context: context,
+                initialTime: TimeOfDay.fromDateTime(_weightEntry.date),
+              );
+
+              if (pickedTime != null) {
+                timeController.text = pickedTime.format(context);
+              }
+            },
+            onSaved: (newValue) {
+              final time = timeFormat.parse(newValue!);
+              _weightEntry.date = _weightEntry.date.copyWith(
+                hour: time.hour,
+                minute: time.minute,
+                second: time.second,
+              );
             },
           ),
 
@@ -97,8 +133,8 @@ class WeightForm extends StatelessWidget {
                     icon: const FaIcon(FontAwesomeIcons.circleMinus),
                     onPressed: () {
                       try {
-                        final num newValue = num.parse(weightController.text) - 1;
-                        weightController.text = newValue.toString();
+                        final newValue = numberFormat.parse(weightController.text) - 1;
+                        weightController.text = numberFormat.format(newValue);
                       } on FormatException {}
                     },
                   ),
@@ -107,8 +143,8 @@ class WeightForm extends StatelessWidget {
                     icon: const FaIcon(FontAwesomeIcons.minus),
                     onPressed: () {
                       try {
-                        final num newValue = num.parse(weightController.text) - 0.1;
-                        weightController.text = newValue.toStringAsFixed(1);
+                        final newValue = numberFormat.parse(weightController.text) - 0.1;
+                        weightController.text = numberFormat.format(newValue);
                       } on FormatException {}
                     },
                   ),
@@ -122,8 +158,8 @@ class WeightForm extends StatelessWidget {
                     icon: const FaIcon(FontAwesomeIcons.plus),
                     onPressed: () {
                       try {
-                        final num newValue = num.parse(weightController.text) + 0.1;
-                        weightController.text = newValue.toStringAsFixed(1);
+                        final newValue = numberFormat.parse(weightController.text) + 0.1;
+                        weightController.text = numberFormat.format(newValue);
                       } on FormatException {}
                     },
                   ),
@@ -132,8 +168,8 @@ class WeightForm extends StatelessWidget {
                     icon: const FaIcon(FontAwesomeIcons.circlePlus),
                     onPressed: () {
                       try {
-                        final num newValue = num.parse(weightController.text) + 1;
-                        weightController.text = newValue.toString();
+                        final newValue = numberFormat.parse(weightController.text) + 1;
+                        weightController.text = numberFormat.format(newValue);
                       } on FormatException {}
                     },
                   ),
@@ -141,16 +177,17 @@ class WeightForm extends StatelessWidget {
               ),
             ),
             controller: weightController,
-            keyboardType: TextInputType.number,
+            keyboardType: textInputTypeDecimal,
             onSaved: (newValue) {
-              _weightEntry.weight = double.parse(newValue!);
+              _weightEntry.weight = numberFormat.parse(newValue!);
             },
             validator: (value) {
               if (value!.isEmpty) {
                 return AppLocalizations.of(context).enterValue;
               }
+
               try {
-                double.parse(value);
+                numberFormat.parse(value);
               } catch (error) {
                 return AppLocalizations.of(context).enterValidNumber;
               }
@@ -158,6 +195,7 @@ class WeightForm extends StatelessWidget {
             },
           ),
           ElevatedButton(
+            key: const Key(SUBMIT_BUTTON_KEY_NAME),
             child: Text(AppLocalizations.of(context).save),
             onPressed: () async {
               // Validate and save the current values to the weightEntry
@@ -168,20 +206,11 @@ class WeightForm extends StatelessWidget {
               _form.currentState!.save();
 
               // Save the entry on the server
-              try {
-                final provider = Provider.of<BodyWeightProvider>(context, listen: false);
-                _weightEntry.id == null
-                    ? await provider.addEntry(_weightEntry)
-                    : await provider.editEntry(_weightEntry);
-              } on WgerHttpException catch (error) {
-                if (context.mounted) {
-                  showHttpExceptionErrorDialog(error, context);
-                }
-              } catch (error) {
-                if (context.mounted) {
-                  showErrorDialog(error, context);
-                }
-              }
+              final provider = Provider.of<BodyWeightProvider>(context, listen: false);
+              _weightEntry.id == null
+                  ? await provider.addEntry(_weightEntry)
+                  : await provider.editEntry(_weightEntry);
+
               if (context.mounted) {
                 Navigator.of(context).pop();
               }
diff --git a/lib/widgets/weight/weight_overview.dart b/lib/widgets/weight/weight_overview.dart
index facc0af2..caecfd21 100644
--- a/lib/widgets/weight/weight_overview.dart
+++ b/lib/widgets/weight/weight_overview.dart
@@ -30,17 +30,17 @@ import 'package:wger/widgets/measurements/helpers.dart';
 import 'package:wger/widgets/weight/forms.dart';
 
 class WeightOverview extends StatelessWidget {
-  const WeightOverview();
+  final BodyWeightProvider _provider;
+
+  const WeightOverview(this._provider);
 
   @override
   Widget build(BuildContext context) {
     final profile = context.read<UserProvider>().profile;
-    final weightProvider = Provider.of<BodyWeightProvider>(context, listen: false);
-    final plan = Provider.of<NutritionPlansProvider>(context, listen: false).currentPlan;
+    final numberFormat = NumberFormat.decimalPattern(Localizations.localeOf(context).toString());
+    final plans = Provider.of<NutritionPlansProvider>(context, listen: false).items;
 
-    final entriesAll = weightProvider.items
-        .map((e) => MeasurementChartEntry(e.weight, e.date))
-        .toList();
+    final entriesAll = _provider.items.map((e) => MeasurementChartEntry(e.weight, e.date)).toList();
     final entries7dAvg = moving7dAverage(entriesAll);
 
     final unit = weightUnit(profile!.isMetric, context);
@@ -51,7 +51,7 @@ class WeightOverview extends StatelessWidget {
           AppLocalizations.of(context).weight,
           entriesAll,
           entries7dAvg,
-          plan,
+          plans,
           unit,
           context,
         ),
@@ -68,19 +68,21 @@ class WeightOverview extends StatelessWidget {
         SizedBox(
           height: 300,
           child: RefreshIndicator(
-            onRefresh: () => weightProvider.fetchAndSetEntries(),
+            onRefresh: () => _provider.fetchAndSetEntries(),
             child: ListView.builder(
               padding: const EdgeInsets.all(10.0),
-              itemCount: weightProvider.items.length,
+              itemCount: _provider.items.length,
               itemBuilder: (context, index) {
-                final currentEntry = weightProvider.items[index];
+                final currentEntry = _provider.items[index];
                 return Card(
                   child: ListTile(
-                    title: Text('${currentEntry.weight} ${weightUnit(profile.isMetric, context)}'),
+                    title: Text(
+                      '${numberFormat.format(currentEntry.weight)} ${weightUnit(profile.isMetric, context)}',
+                    ),
                     subtitle: Text(
                       DateFormat.yMd(
                         Localizations.localeOf(context).languageCode,
-                      ).format(currentEntry.date),
+                      ).add_Hm().format(currentEntry.date),
                     ),
                     trailing: PopupMenuButton(
                       itemBuilder: (BuildContext context) {
@@ -100,7 +102,7 @@ class WeightOverview extends StatelessWidget {
                             child: Text(AppLocalizations.of(context).delete),
                             onTap: () async {
                               // Delete entry from DB
-                              await weightProvider.deleteEntry(currentEntry.id!);
+                              await _provider.deleteEntry(currentEntry.id!);
 
                               // and inform the user
                               if (context.mounted) {
diff --git a/lib/widgets/workouts/app_bar.dart b/lib/widgets/workouts/app_bar.dart
deleted file mode 100644
index 312a2bd2..00000000
--- a/lib/widgets/workouts/app_bar.dart
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * This file is part of wger Workout Manager <https://github.com/wger-project>.
- * Copyright (C) 2020, 2021 wger Team
- *
- * wger Workout Manager is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import 'package:flutter/material.dart';
-import 'package:wger/l10n/generated/app_localizations.dart';
-import 'package:wger/screens/add_exercise_screen.dart';
-import 'package:wger/screens/exercises_screen.dart';
-
-enum _WorkoutAppBarOptions { list, contribute }
-
-class WorkoutOverviewAppBar extends StatelessWidget implements PreferredSizeWidget {
-  const WorkoutOverviewAppBar();
-  @override
-  Widget build(BuildContext context) {
-    return AppBar(
-      title: Text(AppLocalizations.of(context).labelWorkoutPlans),
-      actions: [
-        PopupMenuButton(
-          itemBuilder: (context) {
-            return [
-              PopupMenuItem<_WorkoutAppBarOptions>(
-                value: _WorkoutAppBarOptions.list,
-                child: Text(AppLocalizations.of(context).exerciseList),
-              ),
-              PopupMenuItem<_WorkoutAppBarOptions>(
-                value: _WorkoutAppBarOptions.contribute,
-                child: Text(AppLocalizations.of(context).contributeExercise),
-              ),
-            ];
-          },
-          onSelected: (value) {
-            switch (value) {
-              case _WorkoutAppBarOptions.contribute:
-                Navigator.of(context).pushNamed(AddExerciseScreen.routeName);
-                break;
-              case _WorkoutAppBarOptions.list:
-                Navigator.of(context).pushNamed(ExercisesScreen.routeName);
-                break;
-            }
-          },
-        ),
-      ],
-    );
-  }
-
-  @override
-  Size get preferredSize => const Size.fromHeight(kToolbarHeight);
-}
diff --git a/lib/widgets/workouts/day.dart b/lib/widgets/workouts/day.dart
deleted file mode 100644
index 2c5ccb56..00000000
--- a/lib/widgets/workouts/day.dart
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * This file is part of wger Workout Manager <https://github.com/wger-project>.
- * Copyright (C) 2020, 2021 wger Team
- *
- * wger Workout Manager is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * wger Workout Manager is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import 'package:wger/helpers/consts.dart';
-import 'package:wger/l10n/generated/app_localizations.dart';
-import 'package:wger/models/workouts/day.dart';
-import 'package:wger/models/workouts/set.dart';
-import 'package:wger/models/workouts/setting.dart';
-import 'package:wger/providers/workout_plans.dart';
-import 'package:wger/screens/form_screen.dart';
-import 'package:wger/screens/gym_mode.dart';
-import 'package:wger/widgets/core/core.dart';
-import 'package:wger/widgets/exercises/exercises.dart';
-import 'package:wger/widgets/exercises/images.dart';
-import 'package:wger/widgets/workouts/forms.dart';
-
-class SettingWidget extends StatelessWidget {
-  final Set set;
-  final Setting setting;
-  final bool expanded;
-  final Function toggle;
-
-  const SettingWidget({
-    required this.set,
-    required this.setting,
-    required this.expanded,
-    required this.toggle,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return ListTile(
-      leading: InkWell(
-        child: SizedBox(
-          width: 45,
-          child: ExerciseImageWidget(image: setting.exerciseObj.getMainImage),
-        ),
-        onTap: () {
-          showDialog(
-            context: context,
-            builder: (BuildContext context) {
-              return AlertDialog(
-                title: Text(
-                  setting.exerciseObj
-                      .getExercise(Localizations.localeOf(context).languageCode)
-                      .name,
-                ),
-                content: ExerciseDetail(setting.exerciseObj),
-                actions: [
-                  TextButton(
-                    child: Text(MaterialLocalizations.of(context).closeButtonLabel),
-                    onPressed: () {
-                      Navigator.of(context).pop();
-                    },
-                  ),
-                ],
-              );
-            },
-          );
-        },
-      ),
-      title: Text(
-        setting.exerciseObj.getExercise(Localizations.localeOf(context).languageCode).name,
-      ),
-      subtitle: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [...set.getSmartRepr(setting.exerciseObj).map((e) => Text(e))],
-      ),
-    );
-  }
-}
-
-class WorkoutDayWidget extends StatefulWidget {
-  final Day _day;
-
-  const WorkoutDayWidget(this._day);
-
-  @override
-  _WorkoutDayWidgetState createState() => _WorkoutDayWidgetState();
-}
-
-class _WorkoutDayWidgetState extends State<WorkoutDayWidget> {
-  bool _editing = false;
-  late List<Set> _sets;
-
-  @override
-  void initState() {
-    super.initState();
-    _sets = widget._day.sets;
-    _sets.sort((a, b) => a.order.compareTo(b.order));
-  }
-
-  void _toggleExpanded() {
-    setState(() {
-      _editing = !_editing;
-    });
-  }
-
-  Widget getSetRow(Set set, int index) {
-    return Row(
-      key: ValueKey(set.id),
-      crossAxisAlignment: CrossAxisAlignment.center,
-      children: [
-        if (_editing)
-          IconButton(
-            visualDensity: VisualDensity.compact,
-            icon: const Icon(Icons.delete),
-            iconSize: ICON_SIZE_SMALL,
-            tooltip: AppLocalizations.of(context).delete,
-            onPressed: () {
-              Provider.of<WorkoutPlansProvider>(context, listen: false).deleteSet(set);
-            },
-          ),
-        Expanded(
-          child: Column(
-            children: [
-              if (set.comment != '') MutedText(set.comment),
-              ...set.settingsFiltered.map(
-                (setting) => SettingWidget(
-                  set: set,
-                  setting: setting,
-                  expanded: _editing,
-                  toggle: _toggleExpanded,
-                ),
-              ),
-              const Divider(),
-            ],
-          ),
-        ),
-        if (_editing)
-          ReorderableDragStartListener(
-            index: index,
-            child: const IconButton(icon: Icon(Icons.drag_handle), onPressed: null),
-          ),
-      ],
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.only(left: 8, right: 8, bottom: 12),
-      child: Card(
-        margin: EdgeInsets.zero,
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            DayHeader(day: widget._day, expanded: _editing, toggle: _toggleExpanded),
-            if (_editing)
-              Padding(
-                padding: const EdgeInsets.symmetric(vertical: 8),
-                child: Wrap(
-                  spacing: 8,
-                  children: [
-                    TextButton.icon(
-                      label: Text(AppLocalizations.of(context).addSet),
-                      icon: const Icon(Icons.add),
-                      onPressed: () {
-                        Navigator.pushNamed(
-                          context,
-                          FormScreen.routeName,
-                          arguments: FormScreenArguments(
-                            AppLocalizations.of(context).newSet,
-                            SetFormWidget(widget._day),
-                            hasListView: true,
-                            padding: EdgeInsets.zero,
-                          ),
-                        );
-                      },
-                    ),
-                    TextButton.icon(
-                      icon: const Icon(Icons.calendar_month),
-                      label: Text(AppLocalizations.of(context).edit),
-                      onPressed: () {
-                        Navigator.pushNamed(
-                          context,
-                          FormScreen.routeName,
-                          arguments: FormScreenArguments(
-                            AppLocalizations.of(context).edit,
-                            DayFormWidget(
-                              Provider.of<WorkoutPlansProvider>(
-                                context,
-                                listen: false,
-                              ).findById(widget._day.workoutId),
-                              widget._day,
-                            ),
-                            hasListView: true,
-                          ),
-                        );
-                      },
-                    ),
-                    TextButton.icon(
-                      icon: const Icon(Icons.delete),
-                      label: Text(AppLocalizations.of(context).delete),
-                      onPressed: () {
-                        Provider.of<WorkoutPlansProvider>(
-                          context,
-                          listen: false,
-                        ).deleteDay(widget._day);
-                      },
-                    ),
-                  ],
-                ),
-              ),
-            const Divider(),
-            ReorderableListView(
-              physics: const NeverScrollableScrollPhysics(),
-              shrinkWrap: true,
-              buildDefaultDragHandles: false,
-              onReorder: (oldIndex, newIndex) async {
-                int startIndex = 0;
-                if (oldIndex < newIndex) {
-                  newIndex -= 1;
-                  startIndex = oldIndex;
-                } else {
-                  startIndex = newIndex;
-                }
-                setState(() {
-                  _sets.insert(newIndex, _sets.removeAt(oldIndex));
-                });
-                _sets = await Provider.of<WorkoutPlansProvider>(
-                  context,
-                  listen: false,
-                ).reorderSets(_sets, startIndex);
-              },
-              children: [
-                for (var i = 0; i < widget._day.sets.length; i++) getSetRow(widget._day.sets[i], i),
-              ],
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
-
-class DayHeader extends StatelessWidget {
-  final Day _day;
-  final bool _editing;
-  final Function _toggle;
-
-  const DayHeader({required Day day, required bool expanded, required Function toggle})
-    : _day = day,
-      _editing = expanded,
-      _toggle = toggle;
-
-  @override
-  Widget build(BuildContext context) {
-    return ListTile(
-      contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
-      title: Text(
-        _day.description,
-        style: Theme.of(context).textTheme.headlineSmall,
-        overflow: TextOverflow.ellipsis,
-      ),
-      subtitle: Text(_day.getDaysTextTranslated(Localizations.localeOf(context).languageCode)),
-      leading: const Icon(Icons.play_arrow),
-      minLeadingWidth: 8,
-      trailing: Row(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          const SizedBox(height: 40, width: 1, child: VerticalDivider()),
-          const SizedBox(width: 10),
-          IconButton(
-            icon: _editing ? const Icon(Icons.done) : const Icon(Icons.edit),
-            tooltip: _editing
-                ? AppLocalizations.of(context).done
-                : AppLocalizations.of(context).edit,
-            onPressed: () {
-              _toggle();
-            },
-          ),
-        ],
-      ),
-      onTap: () {
-        Navigator.of(context).pushNamed(GymModeScreen.routeName, arguments: _day);
-      },
-    );
-  }
-}
diff --git a/lib/widgets/workouts/forms.dart b/lib/widgets/workouts/forms.dart
deleted file mode 100644
index e23bb3c6..00000000
--- a/lib/widgets/workouts/forms.dart
+++ /dev/null
@@ -1,941 +0,0 @@
-/*
- * This file is part of wger Workout Manager <https://github.com/wger-project>.
- * Copyright (C) 2020, 2021 wger Team
- *
- * wger Workout Manager is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * wger Workout Manager is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import 'package:flutter/material.dart';
-import 'package:flutter_typeahead/flutter_typeahead.dart';
-import 'package:provider/provider.dart';
-import 'package:wger/helpers/consts.dart';
-import 'package:wger/l10n/generated/app_localizations.dart';
-import 'package:wger/models/exercises/exercise.dart';
-import 'package:wger/models/workouts/day.dart';
-import 'package:wger/models/workouts/repetition_unit.dart';
-import 'package:wger/models/workouts/set.dart';
-import 'package:wger/models/workouts/setting.dart';
-import 'package:wger/models/workouts/weight_unit.dart';
-import 'package:wger/models/workouts/workout_plan.dart';
-import 'package:wger/providers/exercises.dart';
-import 'package:wger/providers/workout_plans.dart';
-import 'package:wger/screens/add_exercise_screen.dart';
-import 'package:wger/screens/workout_plan_screen.dart';
-import 'package:wger/widgets/exercises/images.dart';
-
-class WorkoutForm extends StatelessWidget {
-  final WorkoutPlan _plan;
-  final _form = GlobalKey<FormState>();
-
-  WorkoutForm(this._plan);
-
-  final TextEditingController workoutNameController = TextEditingController();
-  final TextEditingController workoutDescriptionController = TextEditingController();
-
-  @override
-  Widget build(BuildContext context) {
-    if (_plan.id != null) {
-      workoutNameController.text = _plan.name;
-      workoutDescriptionController.text = _plan.description;
-    }
-
-    return Form(
-      key: _form,
-      child: Column(
-        children: [
-          TextFormField(
-            key: const Key('field-name'),
-            decoration: InputDecoration(labelText: AppLocalizations.of(context).name),
-            controller: workoutNameController,
-            validator: (value) {
-              const minLength = 1;
-              const maxLength = 100;
-              if (value!.isEmpty || value.length < minLength || value.length > maxLength) {
-                return AppLocalizations.of(context).enterCharacters(minLength, maxLength);
-              }
-              return null;
-            },
-            onSaved: (newValue) {
-              _plan.name = newValue!;
-            },
-          ),
-          TextFormField(
-            key: const Key('field-description'),
-            decoration: InputDecoration(labelText: AppLocalizations.of(context).description),
-            minLines: 3,
-            maxLines: 10,
-            controller: workoutDescriptionController,
-            validator: (value) {
-              const minLength = 0;
-              const maxLength = 1000;
-              if (value!.length > maxLength) {
-                return AppLocalizations.of(context).enterCharacters(minLength, maxLength);
-              }
-              return null;
-            },
-            onSaved: (newValue) {
-              _plan.description = newValue!;
-            },
-          ),
-          ElevatedButton(
-            key: const Key(SUBMIT_BUTTON_KEY_NAME),
-            child: Text(AppLocalizations.of(context).save),
-            onPressed: () async {
-              // Validate and save
-              final isValid = _form.currentState!.validate();
-              if (!isValid) {
-                return;
-              }
-              _form.currentState!.save();
-
-              // Save to DB
-              if (_plan.id != null) {
-                await Provider.of<WorkoutPlansProvider>(context, listen: false).editWorkout(_plan);
-                if (context.mounted) {
-                  Navigator.of(context).pop();
-                }
-              } else {
-                final WorkoutPlan newPlan = await Provider.of<WorkoutPlansProvider>(
-                  context,
-                  listen: false,
-                ).addWorkout(_plan);
-                if (context.mounted) {
-                  Navigator.of(
-                    context,
-                  ).pushReplacementNamed(WorkoutPlanScreen.routeName, arguments: newPlan);
-                }
-              }
-            },
-          ),
-        ],
-      ),
-    );
-  }
-}
-
-class DayCheckbox extends StatefulWidget {
-  final Day _day;
-  final int _dayNr;
-
-  const DayCheckbox(this._dayNr, this._day);
-
-  @override
-  _DayCheckboxState createState() => _DayCheckboxState();
-}
-
-class _DayCheckboxState extends State<DayCheckbox> {
-  @override
-  Widget build(BuildContext context) {
-    return CheckboxListTile(
-      key: Key('field-checkbox-${widget._dayNr}'),
-      title: Text(
-        widget._day.getDayTranslated(widget._dayNr, Localizations.localeOf(context).languageCode),
-      ),
-      value: widget._day.daysOfWeek.contains(widget._dayNr),
-      onChanged: (bool? newValue) {
-        setState(() {
-          if (!newValue!) {
-            widget._day.daysOfWeek.remove(widget._dayNr);
-          } else {
-            widget._day.daysOfWeek.add(widget._dayNr);
-          }
-        });
-      },
-    );
-  }
-}
-
-class DayFormWidget extends StatefulWidget {
-  final WorkoutPlan workout;
-  final dayController = TextEditingController();
-  late final Day _day;
-
-  DayFormWidget(this.workout, [Day? day]) {
-    _day = day ?? Day();
-    _day.workoutId = workout.id!;
-    if (_day.id != null) {
-      dayController.text = day!.description;
-    }
-  }
-
-  @override
-  _DayFormWidgetState createState() => _DayFormWidgetState();
-}
-
-class _DayFormWidgetState extends State<DayFormWidget> {
-  final _form = GlobalKey<FormState>();
-
-  @override
-  Widget build(BuildContext context) {
-    return Form(
-      key: _form,
-      child: ListView(
-        children: [
-          TextFormField(
-            key: const Key('field-description'),
-            decoration: InputDecoration(
-              labelText: AppLocalizations.of(context).description,
-              helperText: AppLocalizations.of(context).dayDescriptionHelp,
-              helperMaxLines: 3,
-            ),
-            controller: widget.dayController,
-            onSaved: (value) {
-              widget._day.description = value!;
-            },
-            validator: (value) {
-              const minLength = 1;
-              const maxLength = 100;
-              if (value!.isEmpty || value.length < minLength || value.length > maxLength) {
-                return AppLocalizations.of(context).enterCharacters(minLength, maxLength);
-              }
-
-              if (widget._day.daysOfWeek.isEmpty) {
-                return 'You need to select at least one day';
-              }
-              return null;
-            },
-          ),
-          const SizedBox(height: 10),
-          ...Day.weekdays.keys.map((dayNr) => DayCheckbox(dayNr, widget._day)),
-          ElevatedButton(
-            key: const Key(SUBMIT_BUTTON_KEY_NAME),
-            child: Text(AppLocalizations.of(context).save),
-            onPressed: () async {
-              if (!_form.currentState!.validate()) {
-                return;
-              }
-              _form.currentState!.save();
-
-              try {
-                if (widget._day.id == null) {
-                  Provider.of<WorkoutPlansProvider>(
-                    context,
-                    listen: false,
-                  ).addDay(widget._day, widget.workout);
-                } else {
-                  Provider.of<WorkoutPlansProvider>(context, listen: false).editDay(widget._day);
-                }
-
-                widget.dayController.clear();
-                Navigator.of(context).pop();
-              } catch (error) {
-                await showDialog(
-                  context: context,
-                  builder: (ctx) => AlertDialog(
-                    title: const Text('An error occurred!'),
-                    content: const Text('Something went wrong.'),
-                    actions: [
-                      TextButton(
-                        child: const Text('Okay'),
-                        onPressed: () {
-                          Navigator.of(ctx).pop();
-                        },
-                      ),
-                    ],
-                  ),
-                );
-              }
-            },
-          ),
-        ],
-      ),
-    );
-  }
-}
-
-class SetFormWidget extends StatefulWidget {
-  final Day _day;
-  late final Set _set;
-
-  SetFormWidget(this._day, [Set? set]) {
-    _set = set ?? Set.withData(day: _day.id, order: _day.sets.length, sets: 4);
-  }
-
-  @override
-  _SetFormWidgetState createState() => _SetFormWidgetState();
-}
-
-class _SetFormWidgetState extends State<SetFormWidget> {
-  double _currentSetSliderValue = Set.DEFAULT_NR_SETS.toDouble();
-  bool _detailed = false;
-  bool _searchEnglish = true;
-
-  // Form stuff
-  final GlobalKey<FormState> _formKey = GlobalKey();
-  final _exercisesController = TextEditingController();
-
-  /// Removes an exercise from the current set
-  void removeExerciseBase(Exercise base) {
-    setState(() {
-      widget._set.removeExercise(base);
-    });
-  }
-
-  @override
-  void dispose() {
-    _exercisesController.dispose();
-    super.dispose();
-  }
-
-  /// Adds an exercise to the current set
-  void addExercise(Exercise base) {
-    setState(() {
-      widget._set.addExerciseBase(base);
-      addSettings();
-    });
-  }
-
-  /// Adds settings to the set
-  void addSettings() {
-    final workoutProvider = context.read<WorkoutPlansProvider>();
-
-    widget._set.settings = [];
-    int order = 0;
-    for (final exercise in widget._set.exerciseBasesObj) {
-      order++;
-      for (int loop = 0; loop < widget._set.sets; loop++) {
-        final Setting setting = Setting.empty();
-        setting.order = order;
-        setting.exercise = exercise;
-        setting.weightUnit = workoutProvider.defaultWeightUnit;
-        setting.repetitionUnit = workoutProvider.defaultRepetitionUnit;
-
-        widget._set.settings.add(setting);
-      }
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Form(
-      key: _formKey,
-      child: ListView(
-        children: [
-          Container(
-            padding: const EdgeInsets.only(top: 10),
-            color: Theme.of(context).colorScheme.primaryContainer,
-            child: Column(
-              //crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Text(AppLocalizations.of(context).nrOfSets(_currentSetSliderValue.round())),
-                Slider(
-                  value: _currentSetSliderValue,
-                  min: 1,
-                  max: 10,
-                  divisions: 10,
-                  label: _currentSetSliderValue.round().toString(),
-                  onChanged: (double value) {
-                    setState(() {
-                      widget._set.sets = value.round();
-                      _currentSetSliderValue = value;
-                      addSettings();
-                    });
-                  },
-                  inactiveColor: Theme.of(context).colorScheme.surface,
-                ),
-                if (widget._set.settings.isNotEmpty)
-                  SwitchListTile(
-                    title: Text(AppLocalizations.of(context).setUnitsAndRir),
-                    value: _detailed,
-                    onChanged: (value) {
-                      setState(() {
-                        _detailed = !_detailed;
-                      });
-                    },
-                  ),
-              ],
-            ),
-          ),
-          Padding(
-            padding: const EdgeInsets.all(8.0),
-            child: Column(
-              children: [
-                Card(
-                  child: Column(
-                    children: [
-                      TypeAheadField<Exercise>(
-                        key: const Key('field-typeahead'),
-                        decorationBuilder: (context, child) {
-                          return Material(
-                            type: MaterialType.card,
-                            elevation: 4,
-                            borderRadius: BorderRadius.circular(8),
-                            child: child,
-                          );
-                        },
-                        controller: _exercisesController,
-                        builder: (context, controller, focusNode) {
-                          return TextFormField(
-                            controller: controller,
-                            focusNode: focusNode,
-                            // autofocus: true,
-                            decoration: InputDecoration(
-                              labelText: AppLocalizations.of(context).searchExercise,
-                              prefixIcon: const Icon(Icons.search),
-                              suffixIcon: IconButton(
-                                icon: const Icon(Icons.help),
-                                onPressed: () {
-                                  showDialog(
-                                    context: context,
-                                    builder: (context) => AlertDialog(
-                                      content: Column(
-                                        mainAxisSize: MainAxisSize.min,
-                                        children: [
-                                          Text(AppLocalizations.of(context).selectExercises),
-                                          const SizedBox(height: 10),
-                                          Text(AppLocalizations.of(context).sameRepetitions),
-                                        ],
-                                      ),
-                                      actions: [
-                                        TextButton(
-                                          child: Text(
-                                            MaterialLocalizations.of(context).closeButtonLabel,
-                                          ),
-                                          onPressed: () {
-                                            Navigator.of(context).pop();
-                                          },
-                                        ),
-                                      ],
-                                    ),
-                                  );
-                                },
-                              ),
-                              errorMaxLines: 2,
-                              border: InputBorder.none,
-                            ),
-                            validator: (value) {
-                              // At least one exercise must be selected
-                              if (widget._set.exerciseBasesIds.isEmpty) {
-                                return AppLocalizations.of(context).selectExercise;
-                              }
-
-                              // At least one setting has to be filled in
-                              if (widget._set.settings
-                                      .where((s) => s.weight == null && s.reps == null)
-                                      .length ==
-                                  widget._set.settings.length) {
-                                return AppLocalizations.of(context).enterRepetitionsOrWeight;
-                              }
-                              return null;
-                            },
-                          );
-                        },
-                        suggestionsCallback: (pattern) {
-                          if (pattern == '') {
-                            return null;
-                          }
-                          return context.read<ExercisesProvider>().searchExercise(
-                            pattern,
-                            languageCode: Localizations.localeOf(context).languageCode,
-                            searchEnglish: _searchEnglish,
-                          );
-                        },
-                        itemBuilder: (BuildContext context, Exercise exerciseSuggestion) => ListTile(
-                          key: Key('exercise-${exerciseSuggestion.id}'),
-                          leading: SizedBox(
-                            width: 45,
-                            child: ExerciseImageWidget(image: exerciseSuggestion.getMainImage),
-                          ),
-                          title: Text(
-                            exerciseSuggestion
-                                .getExercise(Localizations.localeOf(context).languageCode)
-                                .name,
-                          ),
-                          subtitle: Text(
-                            '${exerciseSuggestion.category!.name} / ${exerciseSuggestion.equipment.map((e) => e.name).join(', ')}',
-                          ),
-                        ),
-                        emptyBuilder: (context) {
-                          return Column(
-                            mainAxisSize: MainAxisSize.min,
-                            children: [
-                              ListTile(
-                                title: Text(AppLocalizations.of(context).noMatchingExerciseFound),
-                              ),
-                              ListTile(
-                                title: OutlinedButton(
-                                  onPressed: () {
-                                    Navigator.of(context).pushNamed(AddExerciseScreen.routeName);
-                                  },
-                                  child: Text(AppLocalizations.of(context).contributeExercise),
-                                ),
-                              ),
-                            ],
-                          );
-                        },
-                        transitionBuilder: (context, animation, child) => FadeTransition(
-                          opacity: CurvedAnimation(parent: animation, curve: Curves.fastOutSlowIn),
-                          child: child,
-                        ),
-                        onSelected: (Exercise exerciseSuggestion) {
-                          // SuggestionsController.of(context).select(exerciseSuggestion);
-
-                          addExercise(exerciseSuggestion);
-                          _exercisesController.text = '';
-                        },
-                      ),
-                      if (Localizations.localeOf(context).languageCode != LANGUAGE_SHORT_ENGLISH)
-                        SwitchListTile(
-                          title: Text(AppLocalizations.of(context).searchNamesInEnglish),
-                          value: _searchEnglish,
-                          onChanged: (_) {
-                            setState(() {
-                              _searchEnglish = !_searchEnglish;
-                            });
-                          },
-                          dense: true,
-                        ),
-                    ],
-                  ),
-                ),
-                const SizedBox(height: 10),
-                TextFormField(
-                  decoration: InputDecoration(
-                    labelText: AppLocalizations.of(context).comment,
-                    errorMaxLines: 2,
-                  ),
-                  keyboardType: TextInputType.text,
-                  validator: (value) {
-                    const minLength = 0;
-                    const maxLength = 200;
-                    if (value!.length > maxLength) {
-                      return AppLocalizations.of(context).enterCharacters(minLength, maxLength);
-                    }
-                    return null;
-                  },
-                  onSaved: (newValue) {
-                    widget._set.comment = newValue!;
-                  },
-                ),
-                const SizedBox(height: 10),
-                ...widget._set.exerciseBasesObj.asMap().entries.map((entry) {
-                  final index = entry.key;
-                  final exercise = entry.value;
-                  final showSupersetInfo = (index + 1) < widget._set.exerciseBasesObj.length;
-                  final settings = widget._set.settings
-                      .where((e) => e.exerciseObj.id == exercise.id)
-                      .toList();
-
-                  return Column(
-                    children: [
-                      ExerciseSetting(
-                        exercise,
-                        settings,
-                        _detailed,
-                        _currentSetSliderValue,
-                        removeExerciseBase,
-                      ),
-                      if (showSupersetInfo)
-                        const Padding(padding: EdgeInsets.all(3.0), child: Text('+')),
-                      if (showSupersetInfo) Text(AppLocalizations.of(context).supersetWith),
-                      if (showSupersetInfo)
-                        const Padding(padding: EdgeInsets.all(3.0), child: Text('+')),
-                    ],
-                  );
-                }),
-                ElevatedButton(
-                  key: const Key(SUBMIT_BUTTON_KEY_NAME),
-                  child: Text(AppLocalizations.of(context).save),
-                  onPressed: () async {
-                    final isValid = _formKey.currentState!.validate();
-                    if (!isValid) {
-                      return;
-                    }
-                    _formKey.currentState!.save();
-
-                    final workoutProvider = Provider.of<WorkoutPlansProvider>(
-                      context,
-                      listen: false,
-                    );
-
-                    // Save set
-                    final Set setDb = await workoutProvider.addSet(widget._set);
-                    widget._set.id = setDb.id;
-
-                    // Remove unused settings
-                    widget._set.settings.removeWhere((s) => s.weight == null && s.reps == null);
-
-                    // Save remaining settings
-                    for (final setting in widget._set.settings) {
-                      setting.setId = setDb.id!;
-                      setting.comment = '';
-
-                      final Setting settingDb = await workoutProvider.addSetting(setting);
-                      setting.id = settingDb.id;
-                    }
-
-                    // Add to workout day
-                    workoutProvider.fetchComputedSettings(widget._set);
-                    widget._day.sets.add(widget._set);
-
-                    // Close the bottom sheet
-                    if (context.mounted) {
-                      Navigator.of(context).pop();
-                    }
-                  },
-                ),
-              ],
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}
-
-class ExerciseSetting extends StatelessWidget {
-  final Exercise _exerciseBase;
-  late final int _numberOfSets;
-  final bool _detailed;
-  final Function removeExercise;
-  final List<Setting> _settings;
-
-  ExerciseSetting(
-    this._exerciseBase,
-    this._settings,
-    this._detailed,
-    double sliderValue,
-    this.removeExercise,
-  ) {
-    _numberOfSets = sliderValue.round();
-  }
-
-  Widget getRows(BuildContext context) {
-    final List<Widget> out = [];
-    for (var i = 0; i < _numberOfSets; i++) {
-      final setting = _settings[i];
-
-      if (_detailed) {
-        out.add(
-          Column(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              Text(
-                AppLocalizations.of(context).setNr(i + 1),
-                style: Theme.of(context).textTheme.titleLarge,
-              ),
-              Row(
-                crossAxisAlignment: CrossAxisAlignment.end,
-                children: [
-                  Flexible(flex: 2, child: RepsInputWidget(setting, _detailed)),
-                  const SizedBox(width: 4),
-                  Flexible(flex: 3, child: RepetitionUnitInputWidget(setting)),
-                ],
-              ),
-              Row(
-                crossAxisAlignment: CrossAxisAlignment.end,
-                children: [
-                  Flexible(flex: 2, child: WeightInputWidget(setting, _detailed)),
-                  const SizedBox(width: 4),
-                  Flexible(flex: 3, child: WeightUnitInputWidget(setting, key: Key(i.toString()))),
-                ],
-              ),
-              Flexible(flex: 2, child: RiRInputWidget(setting)),
-              const SizedBox(height: 15),
-            ],
-          ),
-        );
-      } else {
-        out.add(
-          Row(
-            mainAxisAlignment: MainAxisAlignment.spaceAround,
-            crossAxisAlignment: CrossAxisAlignment.baseline,
-            textBaseline: TextBaseline.alphabetic,
-            children: [
-              Text(
-                AppLocalizations.of(context).setNr(i + 1),
-                style: const TextStyle(fontWeight: FontWeight.bold),
-              ),
-              const SizedBox(width: 10),
-              Flexible(child: RepsInputWidget(setting, _detailed)),
-              const SizedBox(width: 4),
-              Flexible(child: WeightInputWidget(setting, _detailed)),
-            ],
-          ),
-        );
-      }
-    }
-    return Column(children: out);
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Card(
-      child: Padding(
-        padding: const EdgeInsets.all(15),
-        child: Column(
-          children: [
-            ListTile(
-              title: Text(
-                _exerciseBase.getExercise(Localizations.localeOf(context).languageCode).name,
-                style: Theme.of(context).textTheme.titleLarge,
-              ),
-              subtitle: Text(_exerciseBase.category!.name),
-              contentPadding: EdgeInsets.zero,
-              leading: ExerciseImageWidget(image: _exerciseBase.getMainImage),
-              trailing: IconButton(
-                icon: const Icon(Icons.delete),
-                onPressed: () {
-                  removeExercise(_exerciseBase);
-                },
-              ),
-            ),
-            const Divider(),
-
-            //ExerciseImage(imageUrl: _exercise.images.first.url),
-            if (!_detailed)
-              Row(
-                mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                children: [
-                  Text(AppLocalizations.of(context).repetitions),
-                  Text(AppLocalizations.of(context).weight),
-                ],
-              ),
-            getRows(context),
-          ],
-        ),
-      ),
-    );
-  }
-}
-
-class RepsInputWidget extends StatelessWidget {
-  final _repsController = TextEditingController();
-  final Setting _setting;
-  final bool _detailed;
-
-  RepsInputWidget(this._setting, this._detailed);
-
-  @override
-  Widget build(BuildContext context) {
-    return TextFormField(
-      decoration: InputDecoration(
-        labelText: _detailed ? AppLocalizations.of(context).repetitions : '',
-        errorMaxLines: 2,
-      ),
-      controller: _repsController,
-      keyboardType: TextInputType.number,
-      validator: (value) {
-        try {
-          if (value != '') {
-            double.parse(value!);
-          }
-        } catch (error) {
-          return AppLocalizations.of(context).enterValidNumber;
-        }
-        return null;
-      },
-      onChanged: (newValue) {
-        if (newValue != '') {
-          try {
-            _setting.reps = int.parse(newValue);
-          } catch (e) {}
-        }
-      },
-    );
-  }
-}
-
-class WeightInputWidget extends StatelessWidget {
-  final _weightController = TextEditingController();
-  final Setting _setting;
-  final bool _detailed;
-
-  WeightInputWidget(this._setting, this._detailed);
-
-  @override
-  Widget build(BuildContext context) {
-    return TextFormField(
-      decoration: InputDecoration(
-        labelText: _detailed ? AppLocalizations.of(context).weight : '',
-        errorMaxLines: 2,
-      ),
-      controller: _weightController,
-      keyboardType: TextInputType.number,
-      validator: (value) {
-        try {
-          if (value != '') {
-            double.parse(value!);
-          }
-        } catch (error) {
-          return AppLocalizations.of(context).enterValidNumber;
-        }
-        return null;
-      },
-      onChanged: (newValue) {
-        if (newValue != '') {
-          try {
-            _setting.weight = double.parse(newValue);
-          } catch (e) {}
-        }
-      },
-    );
-  }
-}
-
-/// Input widget for Rests In Reserve
-///
-/// Can be used with a Setting or a Log object
-class RiRInputWidget extends StatefulWidget {
-  final dynamic _setting;
-  late String dropdownValue;
-  late double _currentSetSliderValue;
-
-  static const SLIDER_START = -0.5;
-
-  RiRInputWidget(this._setting) {
-    dropdownValue = _setting.rir ?? Setting.DEFAULT_RIR;
-
-    // Read string RiR into a double
-    if (_setting.rir != null) {
-      if (_setting.rir == '') {
-        _currentSetSliderValue = SLIDER_START;
-      } else {
-        _currentSetSliderValue = double.parse(_setting.rir);
-      }
-    } else {
-      _currentSetSliderValue = SLIDER_START;
-    }
-  }
-
-  @override
-  _RiRInputWidgetState createState() => _RiRInputWidgetState();
-}
-
-class _RiRInputWidgetState extends State<RiRInputWidget> {
-  /// Returns the string used in the slider
-  String getSliderLabel(double value) {
-    if (value < 0) {
-      return AppLocalizations.of(context).rirNotUsed;
-    }
-    return '$value ${AppLocalizations.of(context).rir}';
-  }
-
-  String mapDoubleToAllowedRir(double value) {
-    if (value < 0) {
-      return '';
-    } else {
-      // The representation is different (3.0 -> 3) we are on an int, round
-      if (value.toInt() < value) {
-        return value.toString();
-      } else {
-        return value.toInt().toString();
-      }
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Row(
-      mainAxisSize: MainAxisSize.max,
-      children: [
-        Text(AppLocalizations.of(context).rir),
-        Expanded(
-          child: Slider(
-            value: widget._currentSetSliderValue,
-            min: RiRInputWidget.SLIDER_START,
-            max: (Setting.POSSIBLE_RIR_VALUES.length - 2) / 2,
-            divisions: Setting.POSSIBLE_RIR_VALUES.length - 1,
-            label: getSliderLabel(widget._currentSetSliderValue),
-            onChanged: (double value) {
-              widget._setting.setRir(mapDoubleToAllowedRir(value));
-              setState(() {
-                widget._currentSetSliderValue = value;
-              });
-            },
-          ),
-        ),
-      ],
-    );
-  }
-}
-
-/// Input widget for workout weight units
-///
-/// Can be used with a Setting or a Log object
-class WeightUnitInputWidget extends StatefulWidget {
-  final dynamic _setting;
-
-  const WeightUnitInputWidget(this._setting, {super.key});
-
-  @override
-  _WeightUnitInputWidgetState createState() => _WeightUnitInputWidgetState();
-}
-
-class _WeightUnitInputWidgetState extends State<WeightUnitInputWidget> {
-  @override
-  Widget build(BuildContext context) {
-    WeightUnit selectedWeightUnit = widget._setting.weightUnitObj;
-
-    return DropdownButtonFormField(
-      value: selectedWeightUnit,
-      decoration: InputDecoration(labelText: AppLocalizations.of(context).weightUnit),
-      onChanged: (WeightUnit? newValue) {
-        setState(() {
-          selectedWeightUnit = newValue!;
-          widget._setting.weightUnit = newValue;
-        });
-      },
-      items: Provider.of<WorkoutPlansProvider>(context, listen: false).weightUnits
-          .map<DropdownMenuItem<WeightUnit>>((WeightUnit value) {
-            return DropdownMenuItem<WeightUnit>(
-              key: Key(value.id.toString()),
-              value: value,
-              child: Text(value.name),
-            );
-          })
-          .toList(),
-    );
-  }
-}
-
-/// Input widget for repetition units
-///
-/// Can be used with a Setting or a Log object
-class RepetitionUnitInputWidget extends StatefulWidget {
-  final dynamic _setting;
-
-  const RepetitionUnitInputWidget(this._setting);
-
-  @override
-  _RepetitionUnitInputWidgetState createState() => _RepetitionUnitInputWidgetState();
-}
-
-class _RepetitionUnitInputWidgetState extends State<RepetitionUnitInputWidget> {
-  @override
-  Widget build(BuildContext context) {
-    RepetitionUnit selectedWeightUnit = widget._setting.repetitionUnitObj;
-
-    return DropdownButtonFormField(
-      value: selectedWeightUnit,
-      decoration: InputDecoration(labelText: AppLocalizations.of(context).repetitionUnit),
-      isDense: true,
-      onChanged: (RepetitionUnit? newValue) {
-        setState(() {
-          selectedWeightUnit = newValue!;
-          widget._setting.repetitionUnit = newValue;
-        });
-      },
-      items: Provider.of<WorkoutPlansProvider>(context, listen: false).repetitionUnits
-          .map<DropdownMenuItem<RepetitionUnit>>((RepetitionUnit value) {
-            return DropdownMenuItem<RepetitionUnit>(
-              key: Key(value.id.toString()),
-              value: value,
-              child: Text(value.name),
-            );
-          })
-          .toList(),
-    );
-  }
-}
diff --git a/lib/widgets/workouts/gym_mode.dart b/lib/widgets/workouts/gym_mode.dart
deleted file mode 100644
index 8283cb74..00000000
--- a/lib/widgets/workouts/gym_mode.dart
+++ /dev/null
@@ -1,1106 +0,0 @@
-/*
- * This file is part of wger Workout Manager <https://github.com/wger-project>.
- * Copyright (C) 2020, 2021 wger Team
- *
- * wger Workout Manager is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * wger Workout Manager is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-import 'dart:async';
-
-import 'package:flutter/material.dart';
-import 'package:flutter_html/flutter_html.dart';
-import 'package:intl/intl.dart';
-import 'package:provider/provider.dart';
-import 'package:wger/exceptions/http_exception.dart';
-import 'package:wger/helpers/consts.dart';
-import 'package:wger/helpers/gym_mode.dart';
-import 'package:wger/helpers/i18n.dart';
-import 'package:wger/helpers/json.dart';
-import 'package:wger/helpers/ui.dart';
-import 'package:wger/l10n/generated/app_localizations.dart';
-import 'package:wger/models/exercises/exercise.dart';
-import 'package:wger/models/workouts/day.dart';
-import 'package:wger/models/workouts/log.dart';
-import 'package:wger/models/workouts/session.dart';
-import 'package:wger/models/workouts/set.dart';
-import 'package:wger/models/workouts/setting.dart';
-import 'package:wger/models/workouts/workout_plan.dart';
-import 'package:wger/providers/exercises.dart';
-import 'package:wger/providers/workout_plans.dart';
-import 'package:wger/theme/theme.dart';
-import 'package:wger/widgets/core/core.dart';
-import 'package:wger/widgets/exercises/images.dart';
-import 'package:wger/widgets/workouts/forms.dart';
-
-class GymMode extends StatefulWidget {
-  final Day _workoutDay;
-  late final TimeOfDay _start;
-
-  GymMode(this._workoutDay) {
-    _start = TimeOfDay.now();
-  }
-
-  @override
-  _GymModeState createState() => _GymModeState();
-}
-
-class _GymModeState extends State<GymMode> {
-  var _totalElements = 1;
-
-  /// Map with the first (navigation) page for each exercise
-  final Map<Exercise, int> _exercisePages = {};
-  final PageController _controller = PageController(initialPage: 0);
-
-  @override
-  void dispose() {
-    _controller.dispose();
-    super.dispose();
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    // Calculate amount of elements for progress indicator
-    for (final set in widget._workoutDay.sets) {
-      _totalElements = _totalElements + set.settingsComputed.length;
-    }
-    // Calculate the pages for the navigation
-    //
-    // This duplicates the code below in the getContent method, but it seems to
-    // be the easiest way
-    var currentPage = 1;
-    for (final set in widget._workoutDay.sets) {
-      var firstPage = true;
-      for (final setting in set.settingsComputed) {
-        final exerciseBase = Provider.of<ExercisesProvider>(
-          context,
-          listen: false,
-        ).findExerciseById(setting.exerciseId);
-
-        if (firstPage) {
-          _exercisePages[exerciseBase] = currentPage;
-          currentPage++;
-        }
-
-        // Log Page
-        currentPage++;
-
-        // Timer
-        currentPage++;
-        firstPage = false;
-      }
-    }
-  }
-
-  // Returns the list of exercise overview, sets and pause pages
-  List<Widget> getContent() {
-    final exerciseProvider = Provider.of<ExercisesProvider>(context, listen: false);
-    final workoutProvider = Provider.of<WorkoutPlansProvider>(context, listen: false);
-    var currentElement = 1;
-    final List<Widget> out = [];
-
-    for (final set in widget._workoutDay.sets) {
-      var firstPage = true;
-      for (final setting in set.settingsComputed) {
-        final ratioCompleted = currentElement / _totalElements;
-        final exerciseBase = exerciseProvider.findExerciseById(setting.exerciseId);
-        currentElement++;
-
-        if (firstPage) {
-          out.add(ExerciseOverview(_controller, exerciseBase, ratioCompleted, _exercisePages));
-        }
-
-        out.add(
-          LogPage(
-            _controller,
-            setting,
-            set,
-            exerciseBase,
-            workoutProvider.findById(widget._workoutDay.workoutId),
-            ratioCompleted,
-            _exercisePages,
-          ),
-        );
-        out.add(TimerWidget(_controller, ratioCompleted, _exercisePages));
-        firstPage = false;
-      }
-    }
-
-    return out;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return PageView(
-      controller: _controller,
-      children: [
-        StartPage(_controller, widget._workoutDay, _exercisePages),
-        ...getContent(),
-        SessionPage(
-          Provider.of<WorkoutPlansProvider>(
-            context,
-            listen: false,
-          ).findById(widget._workoutDay.workoutId),
-          _controller,
-          widget._start,
-          _exercisePages,
-        ),
-      ],
-    );
-  }
-}
-
-class StartPage extends StatelessWidget {
-  final PageController _controller;
-  final Day _day;
-  final Map<Exercise, int> _exercisePages;
-
-  const StartPage(this._controller, this._day, this._exercisePages);
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      children: [
-        NavigationHeader(
-          AppLocalizations.of(context).todaysWorkout,
-          _controller,
-          exercisePages: _exercisePages,
-        ),
-        const Divider(),
-        Expanded(
-          child: ListView(
-            children: [
-              ..._day.sets.map((set) {
-                return Column(
-                  children: [
-                    ...set.settingsFiltered.map((s) {
-                      return Column(
-                        children: [
-                          Text(
-                            s.exerciseObj
-                                .getExercise(Localizations.localeOf(context).languageCode)
-                                .name,
-                            style: Theme.of(context).textTheme.titleLarge,
-                          ),
-                          ...set.getSmartRepr(s.exerciseObj).map((e) => Text(e)),
-                          const SizedBox(height: 15),
-                        ],
-                      );
-                    }),
-                  ],
-                );
-              }),
-            ],
-          ),
-        ),
-        FilledButton(
-          child: Text(AppLocalizations.of(context).start),
-          onPressed: () {
-            _controller.nextPage(
-              duration: const Duration(milliseconds: 200),
-              curve: Curves.bounceIn,
-            );
-          },
-        ),
-        NavigationFooter(_controller, 0, showPrevious: false),
-      ],
-    );
-  }
-}
-
-class LogPage extends StatefulWidget {
-  final PageController _controller;
-  final Setting _setting;
-  final Set _set;
-  final Exercise _exerciseBase;
-  final WorkoutPlan _workoutPlan;
-  final double _ratioCompleted;
-  final Map<Exercise, int> _exercisePages;
-  final Log _log = Log.empty();
-
-  LogPage(
-    this._controller,
-    this._setting,
-    this._set,
-    this._exerciseBase,
-    this._workoutPlan,
-    this._ratioCompleted,
-    this._exercisePages,
-  ) {
-    _log.date = DateTime.now();
-    _log.workoutPlan = _workoutPlan.id!;
-    _log.exerciseBase = _exerciseBase;
-    _log.weightUnit = _setting.weightUnitObj;
-    _log.repetitionUnit = _setting.repetitionUnitObj;
-    _log.rir = _setting.rir;
-  }
-
-  @override
-  _LogPageState createState() => _LogPageState();
-}
-
-class _LogPageState extends State<LogPage> {
-  final _form = GlobalKey<FormState>();
-  String rirValue = Setting.DEFAULT_RIR;
-  final _repsController = TextEditingController();
-  final _weightController = TextEditingController();
-  var _detailed = false;
-  bool _isSaving = false;
-
-  late FocusNode focusNode;
-
-  @override
-  void initState() {
-    super.initState();
-
-    focusNode = FocusNode();
-
-    if (widget._setting.reps != null) {
-      _repsController.text = widget._setting.reps.toString();
-    }
-
-    if (widget._setting.weight != null) {
-      _weightController.text = widget._setting.weight.toString();
-    }
-  }
-
-  @override
-  void dispose() {
-    focusNode.dispose();
-    _repsController.dispose();
-    _weightController.dispose();
-    super.dispose();
-  }
-
-  Widget getRepsWidget() {
-    return Row(
-      children: [
-        IconButton(
-          icon: const Icon(Icons.remove, color: Colors.black),
-          onPressed: () {
-            try {
-              final int newValue = int.parse(_repsController.text) - 1;
-              if (newValue > 0) {
-                _repsController.text = newValue.toString();
-              }
-            } on FormatException {}
-          },
-        ),
-        Expanded(
-          child: TextFormField(
-            decoration: InputDecoration(labelText: AppLocalizations.of(context).repetitions),
-            enabled: true,
-            controller: _repsController,
-            keyboardType: TextInputType.number,
-            focusNode: focusNode,
-            onFieldSubmitted: (_) {},
-            onSaved: (newValue) {
-              widget._log.reps = int.parse(newValue!);
-              focusNode.unfocus();
-            },
-            validator: (value) {
-              try {
-                int.parse(value!);
-              } catch (error) {
-                return AppLocalizations.of(context).enterValidNumber;
-              }
-              return null;
-            },
-          ),
-        ),
-        IconButton(
-          icon: const Icon(Icons.add, color: Colors.black),
-          onPressed: () {
-            try {
-              final int newValue = int.parse(_repsController.text) + 1;
-              _repsController.text = newValue.toString();
-            } on FormatException {}
-          },
-        ),
-      ],
-    );
-  }
-
-  Widget getWeightWidget() {
-    const minPlateWeight = 1.25;
-    return Row(
-      children: [
-        IconButton(
-          icon: const Icon(Icons.remove, color: Colors.black),
-          onPressed: () {
-            try {
-              final double newValue = double.parse(_weightController.text) - (2 * minPlateWeight);
-              if (newValue > 0) {
-                setState(() {
-                  widget._log.weight = newValue;
-                  _weightController.text = newValue.toString();
-                });
-              }
-            } on FormatException {}
-          },
-        ),
-        Expanded(
-          child: TextFormField(
-            decoration: InputDecoration(labelText: AppLocalizations.of(context).weight),
-            controller: _weightController,
-            keyboardType: TextInputType.number,
-            onFieldSubmitted: (_) {},
-            onChanged: (value) {
-              try {
-                double.parse(value);
-                setState(() {
-                  widget._log.weight = double.parse(value);
-                });
-              } on FormatException {}
-            },
-            onSaved: (newValue) {
-              setState(() {
-                widget._log.weight = double.parse(newValue!);
-              });
-            },
-            validator: (value) {
-              try {
-                double.parse(value!);
-              } catch (error) {
-                return AppLocalizations.of(context).enterValidNumber;
-              }
-              return null;
-            },
-          ),
-        ),
-        IconButton(
-          icon: const Icon(Icons.add, color: Colors.black),
-          onPressed: () {
-            try {
-              final double newValue = double.parse(_weightController.text) + (2 * minPlateWeight);
-              setState(() {
-                widget._log.weight = newValue;
-                _weightController.text = newValue.toString();
-              });
-            } on FormatException {}
-          },
-        ),
-      ],
-    );
-  }
-
-  Widget getForm() {
-    return Form(
-      key: _form,
-      child: Column(
-        mainAxisAlignment: MainAxisAlignment.center,
-        children: [
-          Text(
-            AppLocalizations.of(context).newEntry,
-            style: Theme.of(context).textTheme.titleLarge,
-            textAlign: TextAlign.center,
-          ),
-          if (!_detailed)
-            Row(
-              children: [
-                Flexible(child: getRepsWidget()),
-                const SizedBox(width: 8),
-                Flexible(child: getWeightWidget()),
-              ],
-            ),
-          if (_detailed)
-            Row(
-              crossAxisAlignment: CrossAxisAlignment.end,
-              children: [
-                Flexible(child: getRepsWidget()),
-                const SizedBox(width: 8),
-                Flexible(child: RepetitionUnitInputWidget(widget._log)),
-              ],
-            ),
-          if (_detailed)
-            Row(
-              crossAxisAlignment: CrossAxisAlignment.end,
-              children: [
-                Flexible(child: getWeightWidget()),
-                const SizedBox(width: 8),
-                Flexible(child: WeightUnitInputWidget(widget._log)),
-              ],
-            ),
-          if (_detailed) RiRInputWidget(widget._log),
-          SwitchListTile(
-            title: Text(AppLocalizations.of(context).setUnitsAndRir),
-            value: _detailed,
-            onChanged: (value) {
-              setState(() {
-                _detailed = !_detailed;
-              });
-            },
-          ),
-          ElevatedButton(
-            onPressed: _isSaving
-                ? null
-                : () async {
-                    // Validate and save the current values to the weightEntry
-                    final isValid = _form.currentState!.validate();
-                    if (!isValid) {
-                      return;
-                    }
-                    _isSaving = true;
-                    _form.currentState!.save();
-
-                    // Save the entry on the server
-                    try {
-                      await Provider.of<WorkoutPlansProvider>(
-                        context,
-                        listen: false,
-                      ).addLog(widget._log);
-                      ScaffoldMessenger.of(context).showSnackBar(
-                        SnackBar(
-                          duration: const Duration(seconds: 2), // default is 4
-                          content: Text(
-                            AppLocalizations.of(context).successfullySaved,
-                            textAlign: TextAlign.center,
-                          ),
-                        ),
-                      );
-                      widget._controller.nextPage(
-                        duration: DEFAULT_ANIMATION_DURATION,
-                        curve: DEFAULT_ANIMATION_CURVE,
-                      );
-                      _isSaving = false;
-                    } on WgerHttpException catch (error) {
-                      if (mounted) {
-                        showHttpExceptionErrorDialog(error, context);
-                      }
-                      _isSaving = false;
-                    } catch (error) {
-                      if (mounted) {
-                        showErrorDialog(error, context);
-                      }
-                      _isSaving = false;
-                    }
-                  },
-            child: (!_isSaving)
-                ? Text(AppLocalizations.of(context).save)
-                : const SizedBox(
-                    height: 20,
-                    width: 20,
-                    child: CircularProgressIndicator(
-                      valueColor: AlwaysStoppedAnimation<Color>(Colors.white),
-                    ),
-                  ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget getPastLogs() {
-    return ListView(
-      children: [
-        Text(
-          AppLocalizations.of(context).labelWorkoutLogs,
-          style: Theme.of(context).textTheme.titleLarge,
-          textAlign: TextAlign.center,
-        ),
-        ...widget._workoutPlan.filterLogsByExerciseBase(widget._exerciseBase, unique: true).map((
-          log,
-        ) {
-          return ListTile(
-            title: Text(log.singleLogRepTextNoNl),
-            subtitle: Text(
-              DateFormat.yMd(Localizations.localeOf(context).languageCode).format(log.date),
-            ),
-            trailing: const Icon(Icons.copy),
-            onTap: () {
-              setState(() {
-                // Text field
-                _repsController.text = log.reps.toString();
-                _weightController.text = log.weight.toString();
-
-                // Drop downs
-                widget._log.rir = log.rir;
-                widget._log.repetitionUnit = log.repetitionUnitObj;
-                widget._log.weightUnit = log.weightUnitObj;
-
-                ScaffoldMessenger.of(context).hideCurrentSnackBar();
-                ScaffoldMessenger.of(
-                  context,
-                ).showSnackBar(SnackBar(content: Text(AppLocalizations.of(context).dataCopied)));
-              });
-            },
-            contentPadding: const EdgeInsets.symmetric(horizontal: 40),
-          );
-        }),
-      ],
-    );
-  }
-
-  Widget getPlates() {
-    final plates = plateCalculator(
-      double.parse(_weightController.text),
-      BAR_WEIGHT,
-      AVAILABLE_PLATES,
-    );
-    final groupedPlates = groupPlates(plates);
-
-    return Column(
-      children: [
-        Text(
-          AppLocalizations.of(context).plateCalculator,
-          style: Theme.of(context).textTheme.titleLarge,
-        ),
-        SizedBox(
-          height: 35,
-          child: plates.isNotEmpty
-              ? Row(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: [
-                    ...groupedPlates.keys.map(
-                      (key) => Row(
-                        children: [
-                          Text(groupedPlates[key].toString()),
-                          const Text('×'),
-                          Container(
-                            decoration: BoxDecoration(
-                              color: Theme.of(context).colorScheme.primaryContainer,
-                              shape: BoxShape.circle,
-                            ),
-                            child: Padding(
-                              padding: const EdgeInsets.symmetric(horizontal: 3),
-                              child: SizedBox(
-                                height: 35,
-                                width: 35,
-                                child: Align(
-                                  alignment: Alignment.center,
-                                  child: Text(
-                                    key.toString(),
-                                    style: const TextStyle(fontWeight: FontWeight.bold),
-                                  ),
-                                ),
-                              ),
-                            ),
-                          ),
-                          const SizedBox(width: 10),
-                        ],
-                      ),
-                    ),
-                  ],
-                )
-              : MutedText(AppLocalizations.of(context).plateCalculatorNotDivisible),
-        ),
-        const SizedBox(height: 3),
-      ],
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      children: [
-        NavigationHeader(
-          widget._exerciseBase.getExercise(Localizations.localeOf(context).languageCode).name,
-          widget._controller,
-          exercisePages: widget._exercisePages,
-        ),
-        Center(
-          child: Text(
-            widget._setting.singleSettingRepText,
-            style: Theme.of(context).textTheme.headlineMedium,
-            textAlign: TextAlign.center,
-          ),
-        ),
-        if (widget._set.comment != '') Text(widget._set.comment, textAlign: TextAlign.center),
-        const SizedBox(height: 10),
-        Expanded(
-          child: (widget._workoutPlan.filterLogsByExerciseBase(widget._exerciseBase).isNotEmpty)
-              ? getPastLogs()
-              : Container(),
-        ),
-        // Only show calculator for barbell
-        if (widget._log.exerciseBaseObj.equipment.map((e) => e.id).contains(ID_EQUIPMENT_BARBELL))
-          getPlates(),
-        Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 15),
-          child: Card(child: getForm()),
-        ),
-        NavigationFooter(widget._controller, widget._ratioCompleted),
-      ],
-    );
-  }
-}
-
-class ExerciseOverview extends StatelessWidget {
-  final PageController _controller;
-  final Exercise _exerciseBase;
-  final double _ratioCompleted;
-  final Map<Exercise, int> _exercisePages;
-
-  const ExerciseOverview(
-    this._controller,
-    this._exerciseBase,
-    this._ratioCompleted,
-    this._exercisePages,
-  );
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      children: [
-        NavigationHeader(
-          _exerciseBase.getExercise(Localizations.localeOf(context).languageCode).name,
-          _controller,
-          exercisePages: _exercisePages,
-        ),
-        const Divider(),
-        Expanded(
-          child: ListView(
-            padding: const EdgeInsets.symmetric(horizontal: 15),
-            children: [
-              Text(
-                getTranslation(_exerciseBase.category!.name, context),
-                semanticsLabel: getTranslation(_exerciseBase.category!.name, context),
-                style: Theme.of(context).textTheme.titleLarge,
-                textAlign: TextAlign.center,
-              ),
-              ..._exerciseBase.equipment.map(
-                (e) => Text(
-                  getTranslation(e.name, context),
-                  style: Theme.of(context).textTheme.titleLarge,
-                  textAlign: TextAlign.center,
-                ),
-              ),
-              if (_exerciseBase.images.isNotEmpty)
-                SizedBox(
-                  width: double.infinity,
-                  height: 200,
-                  child: ListView(
-                    scrollDirection: Axis.horizontal,
-                    children: [..._exerciseBase.images.map((e) => ExerciseImageWidget(image: e))],
-                  ),
-                ),
-              Html(
-                data: _exerciseBase
-                    .getExercise(Localizations.localeOf(context).languageCode)
-                    .description,
-              ),
-            ],
-          ),
-        ),
-        NavigationFooter(_controller, _ratioCompleted),
-      ],
-    );
-  }
-}
-
-class SessionPage extends StatefulWidget {
-  final WorkoutPlan _workoutPlan;
-  final PageController _controller;
-  final TimeOfDay _start;
-  final Map<Exercise, int> _exercisePages;
-
-  const SessionPage(this._workoutPlan, this._controller, this._start, this._exercisePages);
-
-  @override
-  _SessionPageState createState() => _SessionPageState();
-}
-
-class _SessionPageState extends State<SessionPage> {
-  final _form = GlobalKey<FormState>();
-  final impressionController = TextEditingController();
-  final notesController = TextEditingController();
-  final timeStartController = TextEditingController();
-  final timeEndController = TextEditingController();
-
-  final _session = WorkoutSession.now();
-
-  /// Selected impression: bad, neutral, good
-  var selectedImpression = [false, true, false];
-
-  @override
-  void initState() {
-    super.initState();
-
-    timeStartController.text = timeToString(widget._start)!;
-    timeEndController.text = timeToString(TimeOfDay.now())!;
-    _session.workoutId = widget._workoutPlan.id!;
-    _session.impression = DEFAULT_IMPRESSION;
-    _session.date = DateTime.now();
-  }
-
-  @override
-  void dispose() {
-    impressionController.dispose();
-    notesController.dispose();
-    timeStartController.dispose();
-    timeEndController.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      children: [
-        NavigationHeader(
-          AppLocalizations.of(context).workoutSession,
-          widget._controller,
-          exercisePages: widget._exercisePages,
-        ),
-        const Divider(),
-        Expanded(child: Container()),
-        Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 15),
-          child: Form(
-            key: _form,
-            child: Column(
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: [
-                ToggleButtons(
-                  renderBorder: false,
-                  onPressed: (int index) {
-                    setState(() {
-                      for (
-                        int buttonIndex = 0;
-                        buttonIndex < selectedImpression.length;
-                        buttonIndex++
-                      ) {
-                        _session.impression = index + 1;
-
-                        if (buttonIndex == index) {
-                          selectedImpression[buttonIndex] = true;
-                        } else {
-                          selectedImpression[buttonIndex] = false;
-                        }
-                      }
-                    });
-                  },
-                  isSelected: selectedImpression,
-                  children: const [
-                    Icon(Icons.sentiment_very_dissatisfied),
-                    Icon(Icons.sentiment_neutral),
-                    Icon(Icons.sentiment_very_satisfied),
-                  ],
-                ),
-                TextFormField(
-                  decoration: InputDecoration(labelText: AppLocalizations.of(context).notes),
-                  maxLines: 3,
-                  controller: notesController,
-                  keyboardType: TextInputType.multiline,
-                  onFieldSubmitted: (_) {},
-                  onSaved: (newValue) {
-                    _session.notes = newValue!;
-                  },
-                ),
-                Row(
-                  children: [
-                    Flexible(
-                      child: TextFormField(
-                        decoration: InputDecoration(
-                          labelText: AppLocalizations.of(context).timeStart,
-                          errorMaxLines: 2,
-                        ),
-                        controller: timeStartController,
-                        onFieldSubmitted: (_) {},
-                        onTap: () async {
-                          // Stop keyboard from appearing
-                          FocusScope.of(context).requestFocus(FocusNode());
-
-                          // Open time picker
-                          final pickedTime = await showTimePicker(
-                            context: context,
-                            initialTime: _session.timeStart,
-                          );
-
-                          if (pickedTime != null) {
-                            timeStartController.text = timeToString(pickedTime)!;
-                            _session.timeStart = pickedTime;
-                          }
-                        },
-                        onSaved: (newValue) {
-                          _session.timeStart = stringToTime(newValue);
-                        },
-                        validator: (_) {
-                          final TimeOfDay startTime = stringToTime(timeStartController.text);
-                          final TimeOfDay endTime = stringToTime(timeEndController.text);
-                          if (startTime.isAfter(endTime)) {
-                            return AppLocalizations.of(context).timeStartAhead;
-                          }
-                          return null;
-                        },
-                      ),
-                    ),
-                    const SizedBox(width: 10),
-                    Flexible(
-                      child: TextFormField(
-                        decoration: InputDecoration(
-                          labelText: AppLocalizations.of(context).timeEnd,
-                        ),
-                        controller: timeEndController,
-                        onFieldSubmitted: (_) {},
-                        onTap: () async {
-                          // Stop keyboard from appearing
-                          FocusScope.of(context).requestFocus(FocusNode());
-
-                          // Open time picker
-                          final pickedTime = await showTimePicker(
-                            context: context,
-                            initialTime: _session.timeEnd,
-                          );
-
-                          if (pickedTime != null) {
-                            timeEndController.text = timeToString(pickedTime)!;
-                            _session.timeEnd = pickedTime;
-                          }
-                        },
-                        onSaved: (newValue) {
-                          _session.timeEnd = stringToTime(newValue);
-                        },
-                      ),
-                    ),
-                  ],
-                ),
-                ElevatedButton(
-                  child: Text(AppLocalizations.of(context).save),
-                  onPressed: () async {
-                    // Validate and save the current values to the weightEntry
-                    final isValid = _form.currentState!.validate();
-                    if (!isValid) {
-                      return;
-                    }
-                    _form.currentState!.save();
-
-                    // Save the entry on the server
-                    try {
-                      await Provider.of<WorkoutPlansProvider>(
-                        context,
-                        listen: false,
-                      ).addSession(_session);
-                      if (mounted) {
-                        Navigator.of(context).pop();
-                      }
-                    } on WgerHttpException catch (error) {
-                      if (mounted) {
-                        showHttpExceptionErrorDialog(error, context);
-                      }
-                    } catch (error) {
-                      if (mounted) {
-                        showErrorDialog(error, context);
-                      }
-                    }
-                  },
-                ),
-              ],
-            ),
-          ),
-        ),
-        NavigationFooter(widget._controller, 1, showNext: false),
-      ],
-    );
-  }
-}
-
-class TimerWidget extends StatefulWidget {
-  final PageController _controller;
-  final double _ratioCompleted;
-  final Map<Exercise, int> _exercisePages;
-
-  const TimerWidget(this._controller, this._ratioCompleted, this._exercisePages);
-
-  @override
-  _TimerWidgetState createState() => _TimerWidgetState();
-}
-
-class _TimerWidgetState extends State<TimerWidget> {
-  // See https://stackoverflow.com/questions/54610121/flutter-countdown-timer
-
-  Timer? _timer;
-  int _seconds = 1;
-  final _maxSeconds = 600;
-  DateTime today = DateTime(2000, 1, 1, 0, 0, 0);
-
-  void startTimer() {
-    setState(() {
-      _seconds = 0;
-    });
-
-    _timer?.cancel();
-
-    const oneSecond = Duration(seconds: 1);
-    _timer = Timer.periodic(oneSecond, (Timer timer) {
-      if (_seconds == _maxSeconds) {
-        setState(() {
-          timer.cancel();
-        });
-      } else {
-        setState(() {
-          _seconds++;
-        });
-      }
-    });
-  }
-
-  @override
-  void dispose() {
-    _timer?.cancel();
-    super.dispose();
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    startTimer();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      children: [
-        NavigationHeader(
-          AppLocalizations.of(context).pause,
-          widget._controller,
-          exercisePages: widget._exercisePages,
-        ),
-        Expanded(
-          child: Center(
-            child: Text(
-              DateFormat('m:ss').format(today.add(Duration(seconds: _seconds))),
-              style: Theme.of(context).textTheme.displayLarge!.copyWith(color: wgerPrimaryColor),
-            ),
-          ),
-        ),
-        NavigationFooter(widget._controller, widget._ratioCompleted),
-      ],
-    );
-  }
-}
-
-class NavigationFooter extends StatelessWidget {
-  final PageController _controller;
-  final double _ratioCompleted;
-  final bool showPrevious;
-  final bool showNext;
-
-  const NavigationFooter(
-    this._controller,
-    this._ratioCompleted, {
-    this.showPrevious = true,
-    this.showNext = true,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Row(
-      children: [
-        if (showPrevious)
-          IconButton(
-            icon: const Icon(Icons.chevron_left),
-            onPressed: () {
-              _controller.previousPage(
-                duration: DEFAULT_ANIMATION_DURATION,
-                curve: DEFAULT_ANIMATION_CURVE,
-              );
-            },
-          )
-        else
-          const SizedBox(width: 48),
-        Expanded(
-          child: LinearProgressIndicator(
-            minHeight: 1.5,
-            value: _ratioCompleted,
-            valueColor: const AlwaysStoppedAnimation<Color>(wgerPrimaryColor),
-          ),
-        ),
-        if (showNext)
-          IconButton(
-            icon: const Icon(Icons.chevron_right),
-            onPressed: () {
-              _controller.nextPage(
-                duration: DEFAULT_ANIMATION_DURATION,
-                curve: DEFAULT_ANIMATION_CURVE,
-              );
-            },
-          )
-        else
-          const SizedBox(width: 48),
-      ],
-    );
-  }
-}
-
-class NavigationHeader extends StatelessWidget {
-  final PageController _controller;
-  final String _title;
-  final Map<Exercise, int> exercisePages;
-
-  const NavigationHeader(this._title, this._controller, {required this.exercisePages});
-
-  Widget getDialog(BuildContext context) {
-    return AlertDialog(
-      title: Text(AppLocalizations.of(context).jumpTo, textAlign: TextAlign.center),
-      contentPadding: EdgeInsets.zero,
-      content: SingleChildScrollView(
-        child: Column(
-          children: [
-            ...exercisePages.keys.map((e) {
-              return ListTile(
-                title: Text(e.getExercise(Localizations.localeOf(context).languageCode).name),
-                trailing: const Icon(Icons.chevron_right),
-                onTap: () {
-                  _controller.animateToPage(
-                    exercisePages[e]!,
-                    duration: DEFAULT_ANIMATION_DURATION,
-                    curve: DEFAULT_ANIMATION_CURVE,
-                  );
-                  Navigator.of(context).pop();
-                },
-              );
-            }),
-          ],
-        ),
-      ),
-      actions: [
-        TextButton(
-          child: Text(MaterialLocalizations.of(context).closeButtonLabel),
-          onPressed: () {
-            Navigator.of(context).pop();
-          },
-        ),
-      ],
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Row(
-      children: [
-        IconButton(
-          icon: const Icon(Icons.close),
-          onPressed: () {
-            Navigator.of(context).pop();
-          },
-        ),
-        Expanded(
-          child: Padding(
-            padding: const EdgeInsets.symmetric(vertical: 10),
-            child: Text(
-              _title,
-              style: Theme.of(context).textTheme.headlineSmall,
-              textAlign: TextAlign.center,
-            ),
-          ),
-        ),
-        IconButton(
-          icon: const Icon(Icons.toc),
-          onPressed: () {
-            showDialog(context: context, builder: (ctx) => getDialog(context));
-          },
-        ),
-      ],
-    );
-  }
-}
diff --git a/lib/widgets/workouts/log.dart b/lib/widgets/workouts/log.dart
deleted file mode 100644
index e59def77..00000000
--- a/lib/widgets/workouts/log.dart
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * This file is part of wger Workout Manager <https://github.com/wger-project>.
- * Copyright (C) 2020, 2021 wger Team
- *
- * wger Workout Manager is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * wger Workout Manager is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import 'package:flutter/material.dart';
-import 'package:intl/intl.dart';
-import 'package:provider/provider.dart';
-import 'package:wger/helpers/colors.dart';
-import 'package:wger/helpers/ui.dart';
-import 'package:wger/models/exercises/exercise.dart';
-import 'package:wger/models/workouts/log.dart';
-import 'package:wger/models/workouts/session.dart';
-import 'package:wger/providers/workout_plans.dart';
-import 'package:wger/widgets/measurements/charts.dart';
-import 'package:wger/widgets/workouts/charts.dart';
-
-class ExerciseLogChart extends StatelessWidget {
-  final Exercise _base;
-  final DateTime _currentDate;
-
-  const ExerciseLogChart(this._base, this._currentDate);
-
-  @override
-  Widget build(BuildContext context) {
-    final workoutPlansData = Provider.of<WorkoutPlansProvider>(context, listen: false);
-    final workout = workoutPlansData.currentPlan;
-    var colors = generateChartColors(1).iterator;
-
-    Future<Map<String, dynamic>> getChartEntries(BuildContext context) async {
-      return workoutPlansData.fetchLogData(workout!, _base);
-    }
-
-    return FutureBuilder(
-      future: getChartEntries(context),
-      builder: (context, AsyncSnapshot<Map<String, dynamic>> snapshot) {
-        if (snapshot.connectionState == ConnectionState.done) {
-          colors = generateChartColors(snapshot.data!['chart_data'].length).iterator;
-        }
-
-        return SizedBox(
-          height: 260,
-          child: snapshot.connectionState == ConnectionState.waiting
-              ? const Center(child: CircularProgressIndicator())
-              : Column(
-                  mainAxisSize: MainAxisSize.max,
-                  children: [
-                    LogChartWidgetFl(snapshot.data!, _currentDate),
-                    Row(
-                      mainAxisAlignment: MainAxisAlignment.center,
-                      children: [
-                        ...snapshot.data!['chart_data'].map((e) {
-                          // e is the list of logs with the same reps, so we can just take the
-                          // first entry and read the reps from it. Yes, this is an amazingly ugly hack
-                          final reps = e.first['reps'];
-
-                          colors.moveNext();
-                          return Indicator(
-                            color: colors.current,
-                            text: reps.toString(),
-                            isSquare: false,
-                          );
-                        }).toList(),
-                      ],
-                    ),
-                    const SizedBox(height: 15),
-                  ],
-                ),
-        );
-      },
-    );
-  }
-}
-
-class DayLogWidget extends StatefulWidget {
-  final DateTime _date;
-  final WorkoutSession? _session;
-  final Map<Exercise, List<Log>> _exerciseData;
-
-  const DayLogWidget(this._date, this._exerciseData, this._session);
-
-  @override
-  _DayLogWidgetState createState() => _DayLogWidgetState();
-}
-
-class _DayLogWidgetState extends State<DayLogWidget> {
-  @override
-  void initState() {
-    super.initState();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Card(
-      child: Column(
-        children: [
-          Text(
-            DateFormat.yMd(Localizations.localeOf(context).languageCode).format(widget._date),
-            style: Theme.of(context).textTheme.headlineSmall,
-          ),
-          if (widget._session != null) const Text('Session data here'),
-          ...widget._exerciseData.keys.map((base) {
-            final exercise = base.getExercise(Localizations.localeOf(context).languageCode);
-            return Column(
-              children: [
-                if (widget._exerciseData[base]!.isNotEmpty)
-                  Text(
-                    exercise.name,
-                    style: Theme.of(context).textTheme.headlineSmall,
-                  )
-                else
-                  Container(),
-                ...widget._exerciseData[base]!.map(
-                  (log) => Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    children: [
-                      Text(log.singleLogRepTextNoNl),
-                      IconButton(
-                        icon: const Icon(Icons.delete),
-                        onPressed: () async {
-                          showDeleteDialog(
-                            context,
-                            exercise.name,
-                            log,
-                            exercise,
-                            widget._exerciseData,
-                          );
-                        },
-                      ),
-                    ],
-                  ),
-                ),
-                Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 15),
-                  child: ExerciseLogChart(base, widget._date),
-                ),
-              ],
-            );
-          }),
-        ],
-      ),
-    );
-  }
-}
diff --git a/lib/widgets/workouts/workout_plan_detail.dart b/lib/widgets/workouts/workout_plan_detail.dart
deleted file mode 100644
index c167cb81..00000000
--- a/lib/widgets/workouts/workout_plan_detail.dart
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * This file is part of wger Workout Manager <https://github.com/wger-project>.
- * Copyright (C) 2020, 2021 wger Team
- *
- * wger Workout Manager is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * wger Workout Manager is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import 'package:flutter/material.dart';
-import 'package:wger/l10n/generated/app_localizations.dart';
-import 'package:wger/models/workouts/workout_plan.dart';
-import 'package:wger/screens/form_screen.dart';
-import 'package:wger/screens/workout_plan_screen.dart';
-import 'package:wger/widgets/workouts/day.dart';
-import 'package:wger/widgets/workouts/forms.dart';
-
-class WorkoutPlanDetail extends StatefulWidget {
-  final WorkoutPlan _workoutPlan;
-  final Function _changeMode;
-
-  const WorkoutPlanDetail(this._workoutPlan, this._changeMode);
-
-  @override
-  _WorkoutPlanDetailState createState() => _WorkoutPlanDetailState();
-}
-
-class _WorkoutPlanDetailState extends State<WorkoutPlanDetail> {
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      children: [
-        if (widget._workoutPlan.days.isNotEmpty)
-          Padding(
-            padding: const EdgeInsets.all(10),
-            child: ToggleButtons(
-              renderBorder: false,
-              onPressed: (int index) {
-                if (index == 1) {
-                  widget._changeMode(WorkoutScreenMode.log);
-                }
-              },
-              isSelected: const [true, false],
-              children: const [Icon(Icons.table_chart), Icon(Icons.show_chart)],
-            ),
-          ),
-        if (widget._workoutPlan.description != '')
-          Padding(padding: const EdgeInsets.all(15), child: Text(widget._workoutPlan.description)),
-        ...widget._workoutPlan.days.map((workoutDay) => WorkoutDayWidget(workoutDay)),
-        Column(
-          children: [
-            ElevatedButton(
-              child: Text(AppLocalizations.of(context).newDay),
-              onPressed: () {
-                Navigator.pushNamed(
-                  context,
-                  FormScreen.routeName,
-                  arguments: FormScreenArguments(
-                    AppLocalizations.of(context).newDay,
-                    DayFormWidget(widget._workoutPlan),
-                    hasListView: true,
-                  ),
-                );
-              },
-            ),
-          ],
-        ),
-      ],
-    );
-  }
-}
diff --git a/lib/widgets/workouts/workout_plans_list.dart b/lib/widgets/workouts/workout_plans_list.dart
deleted file mode 100644
index 534fcc80..00000000
--- a/lib/widgets/workouts/workout_plans_list.dart
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * This file is part of wger Workout Manager <https://github.com/wger-project>.
- * Copyright (C) 2020, 2021 wger Team
- *
- * wger Workout Manager is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * wger Workout Manager is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import 'package:flutter/material.dart';
-import 'package:intl/intl.dart';
-import 'package:provider/provider.dart';
-import 'package:wger/l10n/generated/app_localizations.dart';
-import 'package:wger/providers/workout_plans.dart';
-import 'package:wger/screens/workout_plan_screen.dart';
-import 'package:wger/widgets/core/text_prompt.dart';
-
-class WorkoutPlansList extends StatelessWidget {
-  final WorkoutPlansProvider _workoutProvider;
-
-  const WorkoutPlansList(this._workoutProvider);
-
-  @override
-  Widget build(BuildContext context) {
-    return RefreshIndicator(
-      onRefresh: () => _workoutProvider.fetchAndSetAllPlansSparse(),
-      child: _workoutProvider.items.isEmpty
-          ? const TextPrompt()
-          : ListView.builder(
-              padding: const EdgeInsets.all(10.0),
-              itemCount: _workoutProvider.items.length,
-              itemBuilder: (context, index) {
-                final currentWorkout = _workoutProvider.items[index];
-
-                return Card(
-                  child: ListTile(
-                    onTap: () {
-                      _workoutProvider.setCurrentPlan(currentWorkout.id!);
-
-                      Navigator.of(
-                        context,
-                      ).pushNamed(WorkoutPlanScreen.routeName, arguments: currentWorkout);
-                    },
-                    title: Text(currentWorkout.name),
-                    subtitle: Text(
-                      DateFormat.yMd(
-                        Localizations.localeOf(context).languageCode,
-                      ).format(currentWorkout.creationDate),
-                    ),
-                    trailing: Row(
-                      mainAxisSize: MainAxisSize.min,
-                      children: [
-                        const VerticalDivider(),
-                        IconButton(
-                          icon: const Icon(Icons.delete),
-                          tooltip: AppLocalizations.of(context).delete,
-                          onPressed: () async {
-                            // Delete workout from DB
-                            await showDialog(
-                              context: context,
-                              builder: (BuildContext contextDialog) {
-                                return AlertDialog(
-                                  content: Text(
-                                    AppLocalizations.of(context).confirmDelete(currentWorkout.name),
-                                  ),
-                                  actions: [
-                                    TextButton(
-                                      child: Text(
-                                        MaterialLocalizations.of(context).cancelButtonLabel,
-                                      ),
-                                      onPressed: () => Navigator.of(contextDialog).pop(),
-                                    ),
-                                    TextButton(
-                                      child: Text(
-                                        AppLocalizations.of(context).delete,
-                                        style: TextStyle(
-                                          color: Theme.of(context).colorScheme.error,
-                                        ),
-                                      ),
-                                      onPressed: () {
-                                        // Confirmed, delete the workout
-                                        Provider.of<WorkoutPlansProvider>(
-                                          context,
-                                          listen: false,
-                                        ).deleteWorkout(currentWorkout.id!);
-
-                                        // Close the popup
-                                        Navigator.of(contextDialog).pop();
-
-                                        // and inform the user
-                                        ScaffoldMessenger.of(context).showSnackBar(
-                                          SnackBar(
-                                            content: Text(
-                                              AppLocalizations.of(context).successfullyDeleted,
-                                              textAlign: TextAlign.center,
-                                            ),
-                                          ),
-                                        );
-                                      },
-                                    ),
-                                  ],
-                                );
-                              },
-                            );
-                          },
-                        ),
-                      ],
-                    ),
-                  ),
-                );
-              },
-            ),
-    );
-  }
-}
diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt
index e94ac890..f75ee17e 100644
--- a/linux/CMakeLists.txt
+++ b/linux/CMakeLists.txt
@@ -5,6 +5,7 @@ project(runner LANGUAGES CXX)
 # The name of the executable created for the application. Change this to change
 # the on-disk name of your application.
 set(BINARY_NAME "wger")
+
 # The unique GTK application identifier for this application. See:
 # https://wiki.gnome.org/HowDoI/ChooseApplicationID
 set(APPLICATION_ID "de.wger.flutter")
@@ -17,22 +18,22 @@ cmake_policy(SET CMP0063 NEW)
 set(CMAKE_INSTALL_RPATH "$ORIGIN/lib")
 
 # Root filesystem for cross-building.
-if(FLUTTER_TARGET_PLATFORM_SYSROOT)
-  set(CMAKE_SYSROOT ${FLUTTER_TARGET_PLATFORM_SYSROOT})
-  set(CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT})
-  set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-  set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
-  set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-  set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-endif()
+if (FLUTTER_TARGET_PLATFORM_SYSROOT)
+    set(CMAKE_SYSROOT ${FLUTTER_TARGET_PLATFORM_SYSROOT})
+    set(CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT})
+    set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+    set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
+    set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+    set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+endif ()
 
 # Define build configuration options.
-if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-  set(CMAKE_BUILD_TYPE "Debug" CACHE
-    STRING "Flutter build mode" FORCE)
-  set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
-    "Debug" "Profile" "Release")
-endif()
+if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+    set(CMAKE_BUILD_TYPE "Debug" CACHE
+            STRING "Flutter build mode" FORCE)
+    set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
+            "Debug" "Profile" "Release")
+endif ()
 
 # Compilation settings that should be applied to most targets.
 #
@@ -40,10 +41,15 @@ endif()
 # default. In most cases, you should add new options to specific targets instead
 # of modifying this function.
 function(APPLY_STANDARD_SETTINGS TARGET)
-  target_compile_features(${TARGET} PUBLIC cxx_std_14)
-  target_compile_options(${TARGET} PRIVATE -Wall -Werror)
-  target_compile_options(${TARGET} PRIVATE "$<$<NOT:$<CONFIG:Debug>>:-O3>")
-  target_compile_definitions(${TARGET} PRIVATE "$<$<NOT:$<CONFIG:Debug>>:NDEBUG>")
+    target_compile_features(${TARGET} PUBLIC cxx_std_14)
+
+    # Workarounds for:
+    # * https://github.com/wger-project/flutter/issues/577 / https://github.com/rive-app/rive-flutter/issues/390
+    # * https://github.com/rive-app/rive-flutter/issues/482
+    #target_compile_options(${TARGET} PRIVATE -Wall -Werror) -- original options
+    target_compile_options(${TARGET} PRIVATE -Wall -Werror -Wno-error=nontrivial-memaccess -Wno-unused-variable -Wno-unused-function)
+    target_compile_options(${TARGET} PRIVATE "$<$<NOT:$<CONFIG:Debug>>:-O3>")
+    target_compile_definitions(${TARGET} PRIVATE "$<$<NOT:$<CONFIG:Debug>>:NDEBUG>")
 endfunction()
 
 # Flutter library and tool build rules.
@@ -61,9 +67,9 @@ add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}")
 #
 # Any new source files that you add to the application should be added here.
 add_executable(${BINARY_NAME}
-  "main.cc"
-  "my_application.cc"
-  "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc"
+        "main.cc"
+        "my_application.cc"
+        "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc"
 )
 
 # Apply the standard set of build settings. This can be removed for applications
@@ -82,8 +88,8 @@ add_dependencies(${BINARY_NAME} flutter_assemble)
 # people trying to run the unbundled copy, put it in a subdirectory instead of
 # the default top-level location.
 set_target_properties(${BINARY_NAME}
-  PROPERTIES
-  RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intermediates_do_not_run"
+        PROPERTIES
+        RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intermediates_do_not_run"
 )
 
 # Generated plugin build rules, which manage building the plugins and adding
@@ -95,9 +101,9 @@ include(flutter/generated_plugins.cmake)
 # By default, "installing" just makes a relocatable bundle in the build
 # directory.
 set(BUILD_BUNDLE_DIR "${PROJECT_BINARY_DIR}/bundle")
-if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-  set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE)
-endif()
+if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+    set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE)
+endif ()
 
 # Start with a clean build bundle directory every time.
 install(CODE "
@@ -108,19 +114,19 @@ set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data")
 set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib")
 
 install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}"
-  COMPONENT Runtime)
+        COMPONENT Runtime)
 
 install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}"
-  COMPONENT Runtime)
+        COMPONENT Runtime)
 
 install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
-  COMPONENT Runtime)
+        COMPONENT Runtime)
 
-foreach(bundled_library ${PLUGIN_BUNDLED_LIBRARIES})
-  install(FILES "${bundled_library}"
-    DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
-    COMPONENT Runtime)
-endforeach(bundled_library)
+foreach (bundled_library ${PLUGIN_BUNDLED_LIBRARIES})
+    install(FILES "${bundled_library}"
+            DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
+            COMPONENT Runtime)
+endforeach (bundled_library)
 
 # Fully re-copy the assets directory on each build to avoid having stale files
 # from a previous install.
@@ -129,10 +135,10 @@ install(CODE "
   file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\")
   " COMPONENT Runtime)
 install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}"
-  DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime)
+        DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime)
 
 # Install the AOT library on non-Debug builds only.
-if(NOT CMAKE_BUILD_TYPE MATCHES "Debug")
-  install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
-    COMPONENT Runtime)
-endif()
+if (NOT CMAKE_BUILD_TYPE MATCHES "Debug")
+    install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
+            COMPONENT Runtime)
+endif ()
diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc
index e1098f6b..bd459b41 100644
--- a/linux/flutter/generated_plugin_registrant.cc
+++ b/linux/flutter/generated_plugin_registrant.cc
@@ -8,6 +8,7 @@
 
 #include <file_selector_linux/file_selector_plugin.h>
 #include <powersync_flutter_libs/powersync_flutter_libs_plugin.h>
+#include <rive_common/rive_plugin.h>
 #include <sqlite3_flutter_libs/sqlite3_flutter_libs_plugin.h>
 #include <url_launcher_linux/url_launcher_plugin.h>
 
@@ -15,6 +16,9 @@ void fl_register_plugins(FlPluginRegistry* registry) {
   g_autoptr(FlPluginRegistrar) file_selector_linux_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "FileSelectorPlugin");
   file_selector_plugin_register_with_registrar(file_selector_linux_registrar);
+  g_autoptr(FlPluginRegistrar) rive_common_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "RivePlugin");
+  rive_plugin_register_with_registrar(rive_common_registrar);
   g_autoptr(FlPluginRegistrar) powersync_flutter_libs_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "PowersyncFlutterLibsPlugin");
   powersync_flutter_libs_plugin_register_with_registrar(powersync_flutter_libs_registrar);
diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake
index 296e5b2f..122005a4 100644
--- a/linux/flutter/generated_plugins.cmake
+++ b/linux/flutter/generated_plugins.cmake
@@ -5,6 +5,7 @@
 list(APPEND FLUTTER_PLUGIN_LIST
   file_selector_linux
   powersync_flutter_libs
+  rive_common
   sqlite3_flutter_libs
   url_launcher_linux
 )
diff --git a/macos/Podfile.lock b/macos/Podfile.lock
index a623cf30..38ef6c65 100644
--- a/macos/Podfile.lock
+++ b/macos/Podfile.lock
@@ -14,21 +14,31 @@ PODS:
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - "sqlite3 (3.45.3+1)":
-    - "sqlite3/common (= 3.45.3+1)"
-  - "sqlite3/common (3.45.3+1)"
-  - "sqlite3/fts5 (3.45.3+1)":
+  - sqlite3 (3.50.4):
+    - sqlite3/common (= 3.50.4)
+  - sqlite3/common (3.50.4)
+  - sqlite3/dbstatvtab (3.50.4):
     - sqlite3/common
-  - "sqlite3/perf-threadsafe (3.45.3+1)":
+  - sqlite3/fts5 (3.50.4):
     - sqlite3/common
-  - "sqlite3/rtree (3.45.3+1)":
+  - sqlite3/math (3.50.4):
+    - sqlite3/common
+  - sqlite3/perf-threadsafe (3.50.4):
+    - sqlite3/common
+  - sqlite3/rtree (3.50.4):
+    - sqlite3/common
+  - sqlite3/session (3.50.4):
     - sqlite3/common
   - sqlite3_flutter_libs (0.0.1):
+    - Flutter
     - FlutterMacOS
-    - "sqlite3 (~> 3.45.3+1)"
+    - sqlite3 (~> 3.50.4)
+    - sqlite3/dbstatvtab
     - sqlite3/fts5
+    - sqlite3/math
     - sqlite3/perf-threadsafe
     - sqlite3/rtree
+    - sqlite3/session
   - url_launcher_macos (0.0.1):
     - FlutterMacOS
   - video_player_avfoundation (0.0.1):
@@ -43,7 +53,7 @@ DEPENDENCIES:
   - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`)
   - rive_common (from `Flutter/ephemeral/.symlinks/plugins/rive_common/macos`)
   - shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin`)
-  - sqlite3_flutter_libs (from `Flutter/ephemeral/.symlinks/plugins/sqlite3_flutter_libs/macos`)
+  - sqlite3_flutter_libs (from `Flutter/ephemeral/.symlinks/plugins/sqlite3_flutter_libs/darwin`)
   - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`)
   - video_player_avfoundation (from `Flutter/ephemeral/.symlinks/plugins/video_player_avfoundation/darwin`)
 
@@ -67,25 +77,25 @@ EXTERNAL SOURCES:
   shared_preferences_foundation:
     :path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin
   sqlite3_flutter_libs:
-    :path: Flutter/ephemeral/.symlinks/plugins/sqlite3_flutter_libs/macos
+    :path: Flutter/ephemeral/.symlinks/plugins/sqlite3_flutter_libs/darwin
   url_launcher_macos:
     :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos
   video_player_avfoundation:
     :path: Flutter/ephemeral/.symlinks/plugins/video_player_avfoundation/darwin
 
 SPEC CHECKSUMS:
-  file_selector_macos: 54fdab7caa3ac3fc43c9fac4d7d8d231277f8cf2
-  flutter_zxing: ea030278aa2a051cd81a5b0053be9d0569d11c9a
-  FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
-  package_info_plus: fa739dd842b393193c5ca93c26798dff6e3d0e0c
-  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
-  rive_common: cf5ab646aa576b2d742d0e2d528126fbf032c856
-  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
-  sqlite3: 02d1f07eaaa01f80a1c16b4b31dfcbb3345ee01a
-  sqlite3_flutter_libs: 8d204ef443cf0d5c1c8b058044eab53f3943a9c5
-  url_launcher_macos: 5f437abeda8c85500ceb03f5c1938a8c5a705399
-  video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3
+  file_selector_macos: 6280b52b459ae6c590af5d78fc35c7267a3c4b31
+  flutter_zxing: 91e9d17c79c60860450e8879cced0ec54f6a2601
+  FlutterMacOS: d0db08ddef1a9af05a5ec4b724367152bb0500b1
+  package_info_plus: f0052d280d17aa382b932f399edf32507174e870
+  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
+  rive_common: ea79040f86acf053a2d5a75a2506175ee39796a5
+  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
+  sqlite3: 73513155ec6979715d3904ef53a8d68892d4032b
+  sqlite3_flutter_libs: 83f8e9f5b6554077f1d93119fe20ebaa5f3a9ef1
+  url_launcher_macos: 0fba8ddabfc33ce0a9afe7c5fef5aab3d8d2d673
+  video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b
 
 PODFILE CHECKSUM: 0d3963a09fc94f580682bd88480486da345dc3f0
 
-COCOAPODS: 1.14.3
+COCOAPODS: 1.16.2
diff --git a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index ffa638a0..84c7fa0b 100644
--- a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -48,6 +48,7 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
+      enableGPUValidationMode = "1"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
diff --git a/macos/Runner/AppDelegate.swift b/macos/Runner/AppDelegate.swift
index d53ef643..b3c17614 100644
--- a/macos/Runner/AppDelegate.swift
+++ b/macos/Runner/AppDelegate.swift
@@ -1,9 +1,13 @@
 import Cocoa
 import FlutterMacOS
 
-@NSApplicationMain
+@main
 class AppDelegate: FlutterAppDelegate {
   override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
     return true
   }
+
+  override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool {
+    return true
+  }
 }
diff --git a/pubspec.lock b/pubspec.lock
index f7c40298..e6d7ec3a 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -5,114 +5,82 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7"
+      sha256: f0bb5d1648339c8308cc0b9838d8456b3cfe5c91f9dc1a735b4d003269e5da9a
       url: "https://pub.dev"
     source: hosted
-    version: "67.0.0"
+    version: "88.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d"
+      sha256: "0b7b9c329d2879f8f05d6c05b32ee9ec025f39b077864bdb5ac9a7b63418a98f"
       url: "https://pub.dev"
     source: hosted
-    version: "6.4.1"
-  analyzer_plugin:
-    dependency: transitive
-    description:
-      name: analyzer_plugin
-      sha256: "9661b30b13a685efaee9f02e5d01ed9f2b423bd889d28a304d02d704aee69161"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.11.3"
-  android_metadata:
-    dependency: "direct main"
-    description:
-      name: android_metadata
-      sha256: "29d15dfd03ff67f84bf706d43f1ac087e82d529698e173133bb7cbc84a67d11d"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.1"
+    version: "8.1.1"
   archive:
     dependency: transitive
     description:
       name: archive
-      sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d
+      sha256: "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd"
       url: "https://pub.dev"
     source: hosted
-    version: "3.6.1"
+    version: "4.0.7"
   args:
     dependency: transitive
     description:
       name: args
-      sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a"
+      sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.0"
+    version: "2.7.0"
   async:
     dependency: transitive
     description:
       name: async
-      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
+      sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
       url: "https://pub.dev"
     source: hosted
-    version: "2.11.0"
+    version: "2.13.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
+      sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   build:
     dependency: transitive
     description:
       name: build
-      sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0"
+      sha256: "5b887c55a0f734b433b3b2d89f9cd1f99eb636b17e268a5b4259258bc916504b"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.1"
+    version: "4.0.0"
   build_config:
     dependency: transitive
     description:
       name: build_config
-      sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1
+      sha256: "4f64382b97504dc2fcdf487d5aae33418e08b4703fc21249e4db6d804a4d0187"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.2.0"
   build_daemon:
     dependency: transitive
     description:
       name: build_daemon
-      sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9"
+      sha256: "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.2"
-  build_resolvers:
-    dependency: transitive
-    description:
-      name: build_resolvers
-      sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.2"
+    version: "4.0.4"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d"
+      sha256: "4e54dbeefdc70691ba80b3bce3976af63b5425c8c07dface348dfee664a0edc1"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.13"
-  build_runner_core:
-    dependency: transitive
-    description:
-      name: build_runner_core
-      sha256: e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe
-      url: "https://pub.dev"
-    source: hosted
-    version: "7.3.1"
+    version: "2.9.0"
   built_collection:
     dependency: transitive
     description:
@@ -125,82 +93,82 @@ packages:
     dependency: transitive
     description:
       name: built_value
-      sha256: c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb
+      sha256: "082001b5c3dc495d4a42f1d5789990505df20d8547d42507c29050af6933ee27"
       url: "https://pub.dev"
     source: hosted
-    version: "8.9.2"
+    version: "8.10.1"
   camera:
     dependency: transitive
     description:
       name: camera
-      sha256: "2170a943dcb67be2af2c6bcda8775e74b41d4c02d6a4eb10bdc832ee185c4eea"
+      sha256: "413d2b34fe28496c35c69ede5b232fb9dd5ca2c3a4cb606b14efc1c7546cc8cb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.11.0+1"
+    version: "0.11.1"
   camera_android_camerax:
     dependency: transitive
     description:
       name: camera_android_camerax
-      sha256: "7c03940cb8c92eb5b184952674a07cc4a73c6ba2b3568aad70255ad4cb913660"
+      sha256: "9fb44e73e0fea3647a904dc26d38db24055e5b74fc68fd2b6d3abfa1bd20f536"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.7+1"
+    version: "0.6.17"
   camera_avfoundation:
     dependency: transitive
     description:
       name: camera_avfoundation
-      sha256: "95c2f40b4d06cdb0fd2ad893c762d1f2c931a5e370793ec34c939eb4fcbf96bb"
+      sha256: ca36181194f429eef3b09de3c96280f2400693f9735025f90d1f4a27465fdd72
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.17"
+    version: "0.9.19"
   camera_platform_interface:
     dependency: transitive
     description:
       name: camera_platform_interface
-      sha256: b3ede1f171532e0d83111fe0980b46d17f1aa9788a07a2fbed07366bbdbb9061
+      sha256: "2f757024a48696ff4814a789b0bd90f5660c0fb25f393ab4564fb483327930e2"
       url: "https://pub.dev"
     source: hosted
-    version: "2.8.0"
+    version: "2.10.0"
   camera_web:
     dependency: transitive
     description:
       name: camera_web
-      sha256: b9235ec0a2ce949daec546f1f3d86f05c3921ed31c7d9ab6b7c03214d152fc2d
+      sha256: "595f28c89d1fb62d77c73c633193755b781c6d2e0ebcd8dc25b763b514e6ba8f"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.4"
+    version: "0.3.5"
   carousel_slider:
     dependency: "direct main"
     description:
       name: carousel_slider
-      sha256: "7b006ec356205054af5beaef62e2221160ea36b90fb70a35e4deacd49d0349ae"
+      sha256: bcc61735345c9ab5cb81073896579e735f81e35fd588907a393143ea986be8ff
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.0"
+    version: "5.1.1"
   change:
     dependency: transitive
     description:
       name: change
-      sha256: c92878d5d4f4960bda62201b5cae63f5d0aaaefc0377e856251920418070b96f
+      sha256: "3bda1ce98526b21927cdea05688563c7065fd7e66d1abbe176c354fef3b2057b"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.3"
+    version: "0.7.5"
   characters:
     dependency: transitive
     description:
       name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+      sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.4.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
-      sha256: fb98c0f6d12c920a02ee2d998da788bca066ca5f148492b7085ee23372b12306
+      sha256: fb0f1107cac15a5ea6ef0a6ef71a807b9e4267c713bb93e00e92d737cc8dbd8a
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.1"
+    version: "1.4.0"
   checked_yaml:
     dependency: transitive
     description:
@@ -221,42 +189,42 @@ packages:
     dependency: transitive
     description:
       name: cli_util
-      sha256: c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19
+      sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c
       url: "https://pub.dev"
     source: hosted
-    version: "0.4.1"
+    version: "0.4.2"
   clock:
     dependency: "direct main"
     description:
       name: clock
-      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.2"
   code_builder:
     dependency: transitive
     description:
       name: code_builder
-      sha256: f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37
+      sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e"
       url: "https://pub.dev"
     source: hosted
-    version: "4.10.0"
+    version: "4.10.1"
   collection:
     dependency: "direct main"
     description:
       name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.19.1"
   convert:
     dependency: transitive
     description:
       name: convert
-      sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
+      sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.1"
+    version: "3.1.2"
   cross_file:
     dependency: transitive
     description:
@@ -269,18 +237,18 @@ packages:
     dependency: transitive
     description:
       name: crypto
-      sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
+      sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.0.6"
   csslib:
     dependency: transitive
     description:
       name: csslib
-      sha256: "831883fb353c8bdc1d71979e5b342c7d88acfbc643113c14ae51e2442ea0f20f"
+      sha256: "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e"
       url: "https://pub.dev"
     source: hosted
-    version: "0.17.3"
+    version: "1.0.2"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -293,90 +261,74 @@ packages:
     dependency: transitive
     description:
       name: dart_style
-      sha256: "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9"
+      sha256: c87dfe3d56f183ffe9106a18aebc6db431fc7c98c31a54b952a77f3d54a85697
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.6"
+    version: "3.1.2"
   drift:
     dependency: "direct main"
     description:
       name: drift
-      sha256: d6ff1ec6a0f3fa097dda6b776cf601f1f3d88b53b287288e09c1306f394fb1b3
+      sha256: "540cf382a3bfa99b76e51514db5b0ebcd81ce3679b7c1c9cb9478ff3735e47a1"
       url: "https://pub.dev"
     source: hosted
-    version: "2.20.3"
+    version: "2.28.2"
   drift_dev:
     dependency: "direct dev"
     description:
       name: drift_dev
-      sha256: "3ee987578ca2281b5ff91eadd757cd6dd36001458d6e33784f990d67ff38f756"
+      sha256: "4db0eeedc7e8bed117a9f22d867ab7a3a294300fed5c269aac90d0b3545967ca"
       url: "https://pub.dev"
     source: hosted
-    version: "2.20.3"
+    version: "2.28.3"
   equatable:
     dependency: "direct main"
     description:
       name: equatable
-      sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2
+      sha256: "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.5"
+    version: "2.0.7"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
-      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+      sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.1"
-  fetch_api:
-    dependency: transitive
-    description:
-      name: fetch_api
-      sha256: "97f46c25b480aad74f7cc2ad7ccba2c5c6f08d008e68f95c1077286ce243d0e6"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.0"
-  fetch_client:
-    dependency: transitive
-    description:
-      name: fetch_client
-      sha256: "9666ee14536778474072245ed5cba07db81ae8eb5de3b7bf4a2d1e2c49696092"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.2"
+    version: "1.3.3"
   ffi:
     dependency: transitive
     description:
       name: ffi
-      sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21"
+      sha256: "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.4"
   file:
     dependency: transitive
     description:
       name: file
-      sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
+      sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.0"
+    version: "7.0.1"
   file_selector_linux:
     dependency: transitive
     description:
       name: file_selector_linux
-      sha256: "045d372bf19b02aeb69cacf8b4009555fb5f6f0b7ad8016e5f46dd1387ddd492"
+      sha256: "54cbbd957e1156d29548c7d9b9ec0c0ebb6de0a90452198683a7d23aed617a33"
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.2+1"
+    version: "0.9.3+2"
   file_selector_macos:
     dependency: transitive
     description:
       name: file_selector_macos
-      sha256: f42eacb83b318e183b1ae24eead1373ab1334084404c8c16e0354f9a3e55d385
+      sha256: "271ab9986df0c135d45c3cdb6bd0faa5db6f4976d3e4b437cf7d0f258d941bfc"
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.4"
+    version: "0.9.4+2"
   file_selector_platform_interface:
     dependency: transitive
     description:
@@ -389,63 +341,47 @@ packages:
     dependency: transitive
     description:
       name: file_selector_windows
-      sha256: d3547240c20cabf205c7c7f01a50ecdbc413755814d6677f3cb366f04abcead0
+      sha256: "320fcfb6f33caa90f0b58380489fc5ac05d99ee94b61aa96ec2bff0ba81d3c2b"
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.3+1"
+    version: "0.9.3+4"
   fixnum:
     dependency: transitive
     description:
       name: fixnum
-      sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1"
+      sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   fl_chart:
     dependency: "direct main"
     description:
       name: fl_chart
-      sha256: "94307bef3a324a0d329d3ab77b2f0c6e5ed739185ffc029ed28c0f9b019ea7ef"
+      sha256: "7ca9a40f4eb85949190e54087be8b4d6ac09dc4c54238d782a34cf1f7c011de9"
       url: "https://pub.dev"
     source: hosted
-    version: "0.69.0"
+    version: "1.1.1"
   flex_color_scheme:
     dependency: "direct main"
     description:
       name: flex_color_scheme
-      sha256: "32914024a4f404d90ff449f58d279191675b28e7c08824046baf06826e99d984"
+      sha256: "034d5720747e6af39b2ad090d82dd92d33fde68e7964f1814b714c9d49ddbd64"
       url: "https://pub.dev"
     source: hosted
-    version: "7.3.1"
+    version: "8.3.0"
   flex_seed_scheme:
     dependency: "direct main"
     description:
       name: flex_seed_scheme
-      sha256: "4cee2f1d07259f77e8b36f4ec5f35499d19e74e17c7dce5b819554914082bc01"
+      sha256: b06d8b367b84cbf7ca5c5603c858fa5edae88486c4e4da79ac1044d73b6c62ec
       url: "https://pub.dev"
     source: hosted
-    version: "1.5.0"
+    version: "3.5.1"
   flutter:
     dependency: "direct main"
     description: flutter
     source: sdk
     version: "0.0.0"
-  flutter_barcode_scanner:
-    dependency: "direct main"
-    description:
-      name: flutter_barcode_scanner
-      sha256: a4ba37daf9933f451a5e812c753ddd045d6354e4a3280342d895b07fecaab3fa
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.0"
-  flutter_calendar_carousel:
-    dependency: "direct main"
-    description:
-      name: flutter_calendar_carousel
-      sha256: "675a2331da6ecd7ba180ba7cd6551a18d41861187bb7537c11859a2df72d1646"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.4"
   flutter_driver:
     dependency: transitive
     description: flutter
@@ -455,10 +391,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_html
-      sha256: "02ad69e813ecfc0728a455e4bf892b9379983e050722b1dce00192ee2e41d1ee"
+      sha256: "38a2fd702ffdf3243fb7441ab58aa1bc7e6922d95a50db76534de8260638558d"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0-beta.2"
+    version: "3.0.0"
   flutter_keyboard_visibility:
     dependency: transitive
     description:
@@ -511,10 +447,10 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
+      sha256: "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "6.0.0"
   flutter_localizations:
     dependency: "direct main"
     description: flutter
@@ -524,10 +460,18 @@ packages:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      sha256: c6b0b4c05c458e1c01ad9bcc14041dd7b1f6783d487be4386f793f47a8a4d03e
+      sha256: f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.20"
+    version: "2.0.28"
+  flutter_riverpod:
+    dependency: "direct main"
+    description:
+      name: flutter_riverpod
+      sha256: "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.6.1"
   flutter_staggered_grid_view:
     dependency: "direct main"
     description:
@@ -540,10 +484,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_svg
-      sha256: "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2"
+      sha256: b9c2ad5872518a27507ab432d1fb97e8813b05f0fc693f9d40fad06d073e0678
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.10+1"
+    version: "2.2.1"
   flutter_svg_icons:
     dependency: "direct main"
     description:
@@ -574,42 +518,34 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_zxing
-      sha256: "7ced1ebb196a5361964f03af37a8f51120271982698ff7befe34f7e35f0babbc"
+      sha256: dbcd89da2c9aa84f48d7d7e1ba436825f8656a69b142abb7bcdb7c2d9c22d48c
       url: "https://pub.dev"
     source: hosted
-    version: "1.7.0"
+    version: "2.2.1"
   font_awesome_flutter:
     dependency: "direct main"
     description:
       name: font_awesome_flutter
-      sha256: "275ff26905134bcb59417cf60ad979136f1f8257f2f449914b2c3e05bbb4cd6f"
+      sha256: "27af5982e6c510dec1ba038eff634fa284676ee84e3fd807225c80c4ad869177"
       url: "https://pub.dev"
     source: hosted
-    version: "10.7.0"
+    version: "10.10.0"
   freezed:
     dependency: "direct dev"
     description:
       name: freezed
-      sha256: a434911f643466d78462625df76fd9eb13e57348ff43fe1f77bbe909522c67a1
+      sha256: "13065f10e135263a4f5a4391b79a8efc5fb8106f8dd555a9e49b750b45393d77"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.2"
+    version: "3.2.3"
   freezed_annotation:
     dependency: "direct main"
     description:
       name: freezed_annotation
-      sha256: c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2
+      sha256: "7294967ff0a6d98638e7acb774aac3af2550777accd8149c90af5b014e6d44d8"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.4"
-  frontend_server_client:
-    dependency: transitive
-    description:
-      name: frontend_server_client
-      sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.0"
+    version: "3.1.0"
   fuchsia_remote_debug_protocol:
     dependency: transitive
     description: flutter
@@ -619,138 +555,130 @@ packages:
     dependency: "direct main"
     description:
       name: get_it
-      sha256: d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1
+      sha256: a4292e7cf67193f8e7c1258203104eb2a51ec8b3a04baa14695f4064c144297b
       url: "https://pub.dev"
     source: hosted
-    version: "7.7.0"
+    version: "8.2.0"
   glob:
     dependency: transitive
     description:
       name: glob
-      sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63"
+      sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
-  golden_toolkit:
-    dependency: "direct dev"
-    description:
-      name: golden_toolkit
-      sha256: "8f74adab33154fe7b731395782797021f97d2edc52f7bfb85ff4f1b5c4a215f0"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.15.0"
+    version: "2.1.3"
   graphs:
     dependency: transitive
     description:
       name: graphs
-      sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19
+      sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.3.2"
   html:
     dependency: transitive
     description:
       name: html
-      sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a"
+      sha256: "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602"
       url: "https://pub.dev"
     source: hosted
-    version: "0.15.4"
+    version: "0.15.6"
   http:
     dependency: "direct main"
     description:
       name: http
-      sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
+      sha256: bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.2"
+    version: "1.5.0"
   http_multi_server:
     dependency: transitive
     description:
       name: http_multi_server
-      sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b"
+      sha256: aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.1"
+    version: "3.2.2"
   http_parser:
     dependency: transitive
     description:
       name: http_parser
-      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
+      sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.2"
+    version: "4.1.2"
   image:
     dependency: transitive
     description:
       name: image
-      sha256: "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8"
+      sha256: "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928"
       url: "https://pub.dev"
     source: hosted
-    version: "4.2.0"
+    version: "4.5.4"
   image_picker:
     dependency: "direct main"
     description:
       name: image_picker
-      sha256: "021834d9c0c3de46bf0fe40341fa07168407f694d9b2bb18d532dc1261867f7a"
+      sha256: "736eb56a911cf24d1859315ad09ddec0b66104bc41a7f8c5b96b4e2620cf5041"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.2"
+    version: "1.2.0"
   image_picker_android:
     dependency: transitive
     description:
       name: image_picker_android
-      sha256: ff39a10ab4f48f4ac70776d0494a97bf073cd2570892cd46bc8a5cac162c25db
+      sha256: e83b2b05141469c5e19d77e1dfa11096b6b1567d09065b2265d7c6904560050c
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.12+4"
+    version: "0.8.13"
   image_picker_for_web:
     dependency: transitive
     description:
       name: image_picker_for_web
-      sha256: "65d94623e15372c5c51bebbcb820848d7bcb323836e12dfdba60b5d3a8b39e50"
+      sha256: "40c2a6a0da15556dc0f8e38a3246064a971a9f512386c3339b89f76db87269b6"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.5"
+    version: "3.1.0"
   image_picker_ios:
     dependency: transitive
     description:
       name: image_picker_ios
-      sha256: "6703696ad49f5c3c8356d576d7ace84d1faf459afb07accbb0fae780753ff447"
+      sha256: eb06fe30bab4c4497bad449b66448f50edcc695f1c59408e78aa3a8059eb8f0e
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.12"
+    version: "0.8.13"
   image_picker_linux:
     dependency: transitive
     description:
       name: image_picker_linux
-      sha256: "4ed1d9bb36f7cd60aa6e6cd479779cc56a4cb4e4de8f49d487b1aaad831300fa"
+      sha256: "1f81c5f2046b9ab724f85523e4af65be1d47b038160a8c8deed909762c308ed4"
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.1+1"
+    version: "0.2.2"
   image_picker_macos:
     dependency: transitive
     description:
       name: image_picker_macos
-      sha256: "3f5ad1e8112a9a6111c46d0b57a7be2286a9a07fc6e1976fdf5be2bd31d4ff62"
+      sha256: d58cd9d67793d52beefd6585b12050af0a7663c0c2a6ece0fb110a35d6955e04
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.1+1"
+    version: "0.2.2"
   image_picker_platform_interface:
     dependency: transitive
     description:
       name: image_picker_platform_interface
-      sha256: "9ec26d410ff46f483c5519c29c02ef0e02e13a543f882b152d4bfd2f06802f80"
+      sha256: "9f143b0dba3e459553209e20cc425c9801af48e6dfa4f01a0fcf927be3f41665"
       url: "https://pub.dev"
     source: hosted
-    version: "2.10.0"
+    version: "2.11.0"
   image_picker_windows:
     dependency: transitive
     description:
       name: image_picker_windows
-      sha256: "6ad07afc4eb1bc25f3a01084d28520496c4a3bb0cb13685435838167c9dcedeb"
+      sha256: d248c86554a72b5495a31c56f060cf73a41c7ff541689327b1a7dbccc33adfae
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.1+1"
+    version: "0.2.2"
   integration_test:
     dependency: "direct dev"
     description: flutter
@@ -760,26 +688,18 @@ packages:
     dependency: "direct main"
     description:
       name: intl
-      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
+      sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5"
       url: "https://pub.dev"
     source: hosted
-    version: "0.19.0"
+    version: "0.20.2"
   io:
     dependency: transitive
     description:
       name: io
-      sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e"
+      sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
-  js:
-    dependency: transitive
-    description:
-      name: js
-      sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.7.1"
+    version: "1.0.5"
   json_annotation:
     dependency: "direct main"
     description:
@@ -792,42 +712,42 @@ packages:
     dependency: "direct dev"
     description:
       name: json_serializable
-      sha256: ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b
+      sha256: "33a040668b31b320aafa4822b7b1e177e163fc3c1e835c6750319d4ab23aa6fe"
       url: "https://pub.dev"
     source: hosted
-    version: "6.8.0"
+    version: "6.11.1"
   leak_tracker:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
+      sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.5"
+    version: "11.0.2"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
+      sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.5"
+    version: "3.0.10"
   leak_tracker_testing:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
+      sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
   lints:
     dependency: transitive
     description:
       name: lints
-      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
+      sha256: a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "6.0.0"
   list_counter:
     dependency: transitive
     description:
@@ -840,18 +760,18 @@ packages:
     dependency: "direct main"
     description:
       name: logging
-      sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340"
+      sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   markdown:
     dependency: transitive
     description:
       name: markdown
-      sha256: ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051
+      sha256: "935e23e1ff3bc02d390bad4d4be001208ee92cc217cb5b5a6c19bc14aaa318c1"
       url: "https://pub.dev"
     source: hosted
-    version: "7.2.2"
+    version: "7.3.0"
   marker:
     dependency: transitive
     description:
@@ -864,10 +784,10 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
+      sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.16+1"
+    version: "0.12.17"
   material_color_utilities:
     dependency: transitive
     description:
@@ -880,26 +800,26 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
+      sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
       url: "https://pub.dev"
     source: hosted
-    version: "1.15.0"
+    version: "1.16.0"
   mime:
     dependency: transitive
     description:
       name: mime
-      sha256: "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2"
+      sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.5"
+    version: "2.0.0"
   mockito:
     dependency: "direct dev"
     description:
       name: mockito
-      sha256: "6841eed20a7befac0ce07df8116c8b8233ed1f4486a7647c7fc5a02ae6163917"
+      sha256: "4feb43bc4eb6c03e832f5fcd637d1abb44b98f9cfa245c58e27382f58859f8f6"
       url: "https://pub.dev"
     source: hosted
-    version: "5.4.4"
+    version: "5.5.1"
   multi_select_flutter:
     dependency: "direct main"
     description:
@@ -908,14 +828,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.1.3"
-  mutex:
-    dependency: transitive
-    description:
-      name: mutex
-      sha256: "8827da25de792088eb33e572115a5eb0d61d61a3c01acbc8bcbe76ed78f1a1f2"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.0"
   nested:
     dependency: transitive
     description:
@@ -936,66 +848,66 @@ packages:
     dependency: transitive
     description:
       name: package_config
-      sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd"
+      sha256: f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.2.0"
   package_info_plus:
     dependency: "direct main"
     description:
       name: package_info_plus
-      sha256: "894f37107424311bdae3e476552229476777b8752c5a2a2369c0cb9a2d5442ef"
+      sha256: f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d
       url: "https://pub.dev"
     source: hosted
-    version: "8.0.3"
+    version: "9.0.0"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
       name: package_info_plus_platform_interface
-      sha256: ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66
+      sha256: "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.2.1"
   path:
     dependency: "direct main"
     description:
       name: path
-      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
+      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.0"
+    version: "1.9.1"
   path_parsing:
     dependency: transitive
     description:
       name: path_parsing
-      sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf
+      sha256: "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
+    version: "1.1.0"
   path_provider:
     dependency: "direct main"
     description:
       name: path_provider
-      sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378
+      sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.5"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: "30c5aa827a6ae95ce2853cdc5fe3971daaac00f6f081c419c013f7f57bff2f5e"
+      sha256: d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.7"
+    version: "2.2.17"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16
+      sha256: "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.0"
+    version: "2.4.1"
   path_provider_linux:
     dependency: transitive
     description:
@@ -1024,18 +936,18 @@ packages:
     dependency: transitive
     description:
       name: petitparser
-      sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27
+      sha256: "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646"
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.2"
+    version: "6.1.0"
   platform:
     dependency: transitive
     description:
       name: platform
-      sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
+      sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.5"
+    version: "3.1.6"
   plugin_platform_interface:
     dependency: transitive
     description:
@@ -1048,10 +960,10 @@ packages:
     dependency: transitive
     description:
       name: pointer_interceptor
-      sha256: d0a8e660d1204eaec5bd34b34cc92174690e076d2e4f893d9d68c486a13b07c4
+      sha256: "57210410680379aea8b1b7ed6ae0c3ad349bfd56fe845b8ea934a53344b9d523"
       url: "https://pub.dev"
     source: hosted
-    version: "0.10.1+1"
+    version: "0.10.1+2"
   pointer_interceptor_ios:
     dependency: transitive
     description:
@@ -1084,54 +996,46 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.5.1"
-  powersync:
-    dependency: "direct main"
-    description:
-      name: powersync
-      sha256: "7f1d2f38a936d3afd82447c4aee3b103929c6987beeae8353ccb135fe7490534"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.8.6"
-  powersync_flutter_libs:
+  posix:
     dependency: transitive
     description:
-      name: powersync_flutter_libs
-      sha256: "9cddbbc91a5887eb54297fc8f189aff76ca5f70988eaf702cf46d1ab2bdb3b72"
+      name: posix
+      sha256: f0d7856b6ca1887cfa6d1d394056a296ae33489db914e365e2044fdada449e62
       url: "https://pub.dev"
     source: hosted
-    version: "0.4.0"
+    version: "6.0.2"
   process:
     dependency: transitive
     description:
       name: process
-      sha256: "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32"
+      sha256: "107d8be718f120bbba9dcd1e95e3bd325b1b4a4f07db64154635ba03f2567a0d"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.2"
+    version: "5.0.3"
   provider:
     dependency: "direct main"
     description:
       name: provider
-      sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c
+      sha256: "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.2"
+    version: "6.1.5"
   pub_semver:
     dependency: transitive
     description:
       name: pub_semver
-      sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c"
+      sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.2.0"
   pubspec_parse:
     dependency: transitive
     description:
       name: pubspec_parse
-      sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8
+      sha256: "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.5.0"
   recase:
     dependency: transitive
     description:
@@ -1152,42 +1056,50 @@ packages:
     dependency: "direct main"
     description:
       name: rive
-      sha256: ae75a6e9cfbf146630bfb1feba97ee582d935508be6b362e4bd197b9c55a6dd3
+      sha256: "2551a44fa766a7ed3f52aa2b94feda6d18d00edc25dee5f66e72e9b365bb6d6c"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.4"
+    version: "0.13.20"
   rive_common:
     dependency: transitive
     description:
       name: rive_common
-      sha256: f4e20d0a99c5040c85624a3eb2b0b6b19e614d93a693c3bb25cf6e7bb2d3d6d3
+      sha256: "2ba42f80d37a4efd0696fb715787c4785f8a13361e8aea9227c50f1e78cf763a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.8"
+    version: "0.4.15"
+  riverpod:
+    dependency: transitive
+    description:
+      name: riverpod
+      sha256: "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.6.1"
   shared_preferences:
     dependency: "direct main"
     description:
       name: shared_preferences
-      sha256: "746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051"
+      sha256: "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.5.3"
   shared_preferences_android:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: "480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e"
+      sha256: "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.4.10"
   shared_preferences_foundation:
     dependency: transitive
     description:
       name: shared_preferences_foundation
-      sha256: c4b35f6cb8f63c147312c054ce7c2254c8066745125264f0c88739c417fc9d9f
+      sha256: "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.2"
+    version: "2.5.4"
   shared_preferences_linux:
     dependency: transitive
     description:
@@ -1197,7 +1109,7 @@ packages:
     source: hosted
     version: "2.4.1"
   shared_preferences_platform_interface:
-    dependency: transitive
+    dependency: "direct dev"
     description:
       name: shared_preferences_platform_interface
       sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80"
@@ -1208,10 +1120,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_web
-      sha256: d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e
+      sha256: c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.2"
+    version: "2.4.3"
   shared_preferences_windows:
     dependency: transitive
     description:
@@ -1224,18 +1136,18 @@ packages:
     dependency: transitive
     description:
       name: shelf
-      sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4
+      sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.1"
+    version: "1.4.2"
   shelf_web_socket:
     dependency: transitive
     description:
       name: shelf_web_socket
-      sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611"
+      sha256: "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "3.0.0"
   simple_gesture_detector:
     dependency: transitive
     description:
@@ -1248,111 +1160,95 @@ packages:
     dependency: transitive
     description: flutter
     source: sdk
-    version: "0.0.99"
+    version: "0.0.0"
   source_gen:
     dependency: transitive
     description:
       name: source_gen
-      sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832"
+      sha256: ccf30b0c9fbcd79d8b6f5bfac23199fb354938436f62475e14aea0f29ee0f800
       url: "https://pub.dev"
     source: hosted
-    version: "1.5.0"
+    version: "4.0.1"
   source_helper:
     dependency: transitive
     description:
       name: source_helper
-      sha256: "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd"
+      sha256: "6a3c6cc82073a8797f8c4dc4572146114a39652851c157db37e964d9c7038723"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.4"
+    version: "1.3.8"
   source_span:
     dependency: transitive
     description:
       name: source_span
-      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
+      sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
-  sprintf:
-    dependency: transitive
-    description:
-      name: sprintf
-      sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23"
-      url: "https://pub.dev"
-    source: hosted
-    version: "7.0.0"
+    version: "1.10.1"
   sqlite3:
     dependency: transitive
     description:
       name: sqlite3
-      sha256: "45f168ae2213201b54e09429ed0c593dc2c88c924a1488d6f9c523a255d567cb"
+      sha256: "310af39c40dd0bb2058538333c9d9840a2725ae0b9f77e4fd09ad6696aa8f66e"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.6"
+    version: "2.7.5"
   sqlite3_flutter_libs:
     dependency: "direct main"
     description:
       name: sqlite3_flutter_libs
-      sha256: "62bbb4073edbcdf53f40c80775f33eea01d301b7b81417e5b3fb7395416258c1"
+      sha256: "69c80d812ef2500202ebd22002cbfc1b6565e9ff56b2f971e757fac5d42294df"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.24"
-  sqlite3_web:
-    dependency: transitive
-    description:
-      name: sqlite3_web
-      sha256: b4043336e74cac54d3ca44c90434a3c310550b9a80851b09ad1af282af0df6d4
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.3"
-  sqlite_async:
-    dependency: "direct main"
-    description:
-      name: sqlite_async
-      sha256: c5c57b025133d0869cce6a647f99b378ab42cc26488ff22ff942ae9588201af0
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.9.0"
+    version: "0.5.40"
   sqlparser:
     dependency: transitive
     description:
       name: sqlparser
-      sha256: "852cf80f9e974ac8e1b613758a8aa640215f7701352b66a7f468e95711eb570b"
+      sha256: "57090342af1ce32bb499aa641f4ecdd2d6231b9403cea537ac059e803cc20d67"
       url: "https://pub.dev"
     source: hosted
-    version: "0.38.1"
+    version: "0.41.2"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.1"
+    version: "1.12.1"
+  state_notifier:
+    dependency: transitive
+    description:
+      name: state_notifier
+      sha256: b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
+      sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.4"
   stream_transform:
     dependency: transitive
     description:
       name: stream_transform
-      sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f"
+      sha256: ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.4.1"
   sync_http:
     dependency: transitive
     description:
@@ -1365,90 +1261,74 @@ packages:
     dependency: "direct main"
     description:
       name: table_calendar
-      sha256: "4ca32b2fc919452c9974abd4c6ea611a63e33b9e4f0b8c38dba3ac1f4a6549d1"
+      sha256: "0c0c6219878b363a2d5f40c7afb159d845f253d061dc3c822aa0d5fe0f721982"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.2"
+    version: "3.2.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
+      sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.2.2"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
+      sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.2"
-  timing:
-    dependency: transitive
-    description:
-      name: timing
-      sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.1"
+    version: "0.7.6"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
-      sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
+      sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.2"
-  universal_io:
-    dependency: transitive
-    description:
-      name: universal_io
-      sha256: "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.2"
+    version: "1.4.0"
   url_launcher:
     dependency: "direct main"
     description:
       name: url_launcher
-      sha256: "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603"
+      sha256: f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.1"
+    version: "6.3.2"
   url_launcher_android:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: ceb2625f0c24ade6ef6778d1de0b2e44f2db71fded235eb52295247feba8c5cf
+      sha256: "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79"
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.3"
+    version: "6.3.16"
   url_launcher_ios:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: "7068716403343f6ba4969b4173cbf3b84fc768042124bc2c011e5d782b24fe89"
+      sha256: "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb"
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.0"
+    version: "6.3.3"
   url_launcher_linux:
     dependency: transitive
     description:
       name: url_launcher_linux
-      sha256: ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811
+      sha256: "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.1"
+    version: "3.2.1"
   url_launcher_macos:
     dependency: transitive
     description:
       name: url_launcher_macos
-      sha256: "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de"
+      sha256: "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2"
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.0"
+    version: "3.2.2"
   url_launcher_platform_interface:
     dependency: transitive
     description:
@@ -1461,58 +1341,50 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_web
-      sha256: "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e"
+      sha256: "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.3"
+    version: "2.4.1"
   url_launcher_windows:
     dependency: transitive
     description:
       name: url_launcher_windows
-      sha256: ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7
+      sha256: "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.1"
-  uuid:
-    dependency: transitive
-    description:
-      name: uuid
-      sha256: "83d37c7ad7aaf9aa8e275490669535c8080377cfa7a7004c24dfac53afffaa90"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.4.2"
+    version: "3.1.4"
   vector_graphics:
     dependency: transitive
     description:
       name: vector_graphics
-      sha256: "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3"
+      sha256: "44cc7104ff32563122a929e4620cf3efd584194eec6d1d913eb5ba593dbcf6de"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.11+1"
+    version: "1.1.18"
   vector_graphics_codec:
     dependency: transitive
     description:
       name: vector_graphics_codec
-      sha256: c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da
+      sha256: "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.11+1"
+    version: "1.1.13"
   vector_graphics_compiler:
     dependency: transitive
     description:
       name: vector_graphics_compiler
-      sha256: "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81"
+      sha256: "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.11+1"
+    version: "1.1.16"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.2.0"
   version:
     dependency: "direct main"
     description:
@@ -1533,106 +1405,106 @@ packages:
     dependency: "direct main"
     description:
       name: video_player
-      sha256: "4a8c3492d734f7c39c2588a3206707a05ee80cef52e8c7f3b2078d430c84bc17"
+      sha256: "0d55b1f1a31e5ad4c4967bfaa8ade0240b07d20ee4af1dfef5f531056512961a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.9.2"
+    version: "2.10.0"
   video_player_android:
     dependency: transitive
     description:
       name: video_player_android
-      sha256: fdc0331ce9f808cc2714014cb8126bd6369943affefd54f8fdab0ea0bb617b7f
+      sha256: "28dcc4122079f40f93a0965b3679aff1a5f4251cf79611bd8011f937eb6b69de"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.2"
+    version: "2.8.4"
   video_player_avfoundation:
     dependency: transitive
     description:
       name: video_player_avfoundation
-      sha256: d1e9a824f2b324000dc8fb2dcb2a3285b6c1c7c487521c63306cc5b394f68a7c
+      sha256: "9ee764e5cd2fc1e10911ae8ad588e1a19db3b6aa9a6eb53c127c42d3a3c3f22f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.6.1"
+    version: "2.7.1"
   video_player_platform_interface:
     dependency: transitive
     description:
       name: video_player_platform_interface
-      sha256: "236454725fafcacf98f0f39af0d7c7ab2ce84762e3b63f2cbb3ef9a7e0550bc6"
+      sha256: df534476c341ab2c6a835078066fc681b8265048addd853a1e3c78740316a844
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.2"
+    version: "6.3.0"
   video_player_web:
     dependency: transitive
     description:
       name: video_player_web
-      sha256: "6dcdd298136523eaf7dfc31abaf0dfba9aa8a8dbc96670e87e9d42b6f2caf774"
+      sha256: e8bba2e5d1e159d5048c9a491bb2a7b29c535c612bb7d10c1e21107f5bd365ba
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.3.5"
   vm_service:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
+      sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.5"
+    version: "15.0.0"
   watcher:
     dependency: transitive
     description:
       name: watcher
-      sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8"
+      sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   web:
     dependency: transitive
     description:
       name: web
-      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
+      sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   web_socket:
     dependency: transitive
     description:
       name: web_socket
-      sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83"
+      sha256: "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c"
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.6"
+    version: "1.0.1"
   web_socket_channel:
     dependency: transitive
     description:
       name: web_socket_channel
-      sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f"
+      sha256: d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.3"
   webdriver:
     dependency: transitive
     description:
       name: webdriver
-      sha256: "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e"
+      sha256: "2f3a14ca026957870cfd9c635b83507e0e51d8091568e90129fbf805aba7cade"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.1.0"
   win32:
     dependency: transitive
     description:
       name: win32
-      sha256: "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a"
+      sha256: "329edf97fdd893e0f1e3b9e88d6a0e627128cc17cc316a8d67fda8f1451178ba"
       url: "https://pub.dev"
     source: hosted
-    version: "5.5.4"
+    version: "5.13.0"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
-      sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d
+      sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "1.1.0"
   xml:
     dependency: transitive
     description:
@@ -1645,10 +1517,10 @@ packages:
     dependency: transitive
     description:
       name: yaml
-      sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5"
+      sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.2"
+    version: "3.1.3"
 sdks:
-  dart: ">=3.5.0 <4.0.0"
-  flutter: ">=3.22.0"
+  dart: ">=3.9.0 <4.0.0"
+  flutter: ">=3.35.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index aaee00e4..195b4c96 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -21,10 +21,10 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 #   - the version number is taken from the git tag vX.Y.Z
 #   - the build number is computed by reading the last one from the play store
 #     and increasing by one
-version: 1.7.7+48
+version: 1.9.0+100
 
 environment:
-  sdk: '>=3.0.0 <4.0.0'
+  sdk: '>=3.8.0 <4.0.0'
 
 dependencies:
   flutter:
@@ -32,47 +32,49 @@ dependencies:
   flutter_localizations:
     sdk: flutter
 
-  android_metadata: ^0.2.1
   powersync: ^1.5.5
-  collection: ^1.17.0
+  carousel_slider: ^5.1.1
+  clock: ^1.1.2
+  collection: ^1.18.0
   cupertino_icons: ^1.0.8
-  equatable: ^2.0.5
-  flutter_calendar_carousel: ^2.4.4
-  flutter_html: ^3.0.0-beta.2
-  flutter_typeahead: ^5.2.0
-  font_awesome_flutter: ^10.7.0
-  http: ^1.2.2
-  image_picker: ^1.1.0
-  intl: ^0.19.0
-  json_annotation: ^4.8.1
-  version: ^3.0.2
-  package_info_plus: ^8.0.3
-  provider: ^6.1.2
-  # Note, do not update rive! https://github.com/wger-project/flutter/issues/577
-  rive: ^0.12.4
-  shared_preferences: ^2.3.2
-  table_calendar: ^3.0.8
-  url_launcher: ^6.3.1
-  flutter_barcode_scanner: ^2.0.0
-  video_player: ^2.9.2
+  drift: ^2.28.2
+  equatable: ^2.0.7
+  fl_chart: ^1.1.1
+  flex_color_scheme: ^8.3.0
+  flex_seed_scheme: ^3.5.1
+  flutter_html: ^3.0.0
   flutter_staggered_grid_view: ^0.7.0
-  carousel_slider: ^5.0.0
+  flutter_svg: ^2.2.1
+  flutter_svg_icons: ^0.0.1
+  flutter_typeahead: ^5.2.0
+  flutter_zxing: ^2.2.1
+  font_awesome_flutter: ^10.10.0
+  freezed_annotation: ^3.0.0
+  get_it: ^8.2.0
+  http: ^1.5.0
+  image_picker: ^1.2.0
+  intl: ^0.20.0
+  json_annotation: ^4.8.1
   multi_select_flutter: ^4.1.3
   flutter_svg: ^2.0.10+1
   fl_chart: ^0.69.0
   flutter_zxing: ^1.5.2
   drift: ^2.16.0
-  path: ^1.8.3
-  path_provider: ^2.1.4
-  sqlite3_flutter_libs: ^0.5.20
-  get_it: ^7.6.8
-  flex_seed_scheme: ^1.5.0
-  flex_color_scheme: ^7.3.1
-  freezed_annotation: ^2.4.4
-  clock: ^1.1.1
+  package_info_plus: ^9.0.0
+  path: ^1.9.0
+  path_provider: ^2.1.5
+  provider: ^6.1.5
+  rive: ^0.13.20
+  shared_preferences: ^2.5.3
+  sqlite3_flutter_libs: ^0.5.40
+  table_calendar: ^3.0.8
+  url_launcher: ^6.3.2
+  version: ^3.0.2
+  video_player: ^2.10.0
+  logging: ^1.3.0
+  flutter_riverpod: ^2.6.1
   flutter_svg_icons: ^0.0.1
   sqlite_async: ^0.9.0
-  logging: ^1.2.0
 
 dependency_overrides:
   intl: ^0.19.0
@@ -82,15 +84,18 @@ dev_dependencies:
     sdk: flutter
   integration_test:
     sdk: flutter
-  build_runner: ^2.4.13
-  json_serializable: ^6.8.0
-  mockito: ^5.4.4
-  network_image_mock: ^2.1.1
-  flutter_lints: ^4.0.0
+  build_runner: ^2.9.0
   cider: ^0.2.7
-  drift_dev: ^2.20.3
-  freezed: ^2.5.2
-  golden_toolkit: ^0.15.0
+  drift_dev: ^2.28.3
+  flutter_lints: ^6.0.0
+  freezed: ^3.2.0
+  json_serializable: ^6.11.1
+  mockito: ^5.5.1
+  network_image_mock: ^2.1.1
+  shared_preferences_platform_interface: ^2.0.0
+
+  # Script to read out unused translations
+  #translations_cleaner: ^0.0.5
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
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 a6050a3e..2267b74a 100644
--- a/test/auth/auth_screen_test.dart
+++ b/test/auth/auth_screen_test.dart
@@ -27,6 +27,8 @@ import 'package:mockito/mockito.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:provider/provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
+import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
+import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/providers/auth.dart';
 import 'package:wger/screens/auth_screen.dart';
@@ -35,18 +37,33 @@ import 'auth_screen_test.mocks.dart';
 
 @GenerateMocks([http.Client])
 void main() {
+  /// Replacement for SharedPreferences.setMockInitialValues()
+  SharedPreferencesAsyncPlatform.instance = InMemorySharedPreferencesAsync.empty();
+
   late AuthProvider authProvider;
   late MockClient mockClient;
 
-  final Uri tRegistration = Uri(scheme: 'https', host: 'wger.de', path: 'api/v2/register/');
+  final Uri tRegistration = Uri(
+    scheme: 'https',
+    host: 'wger.de',
+    path: 'api/v2/register/',
+  );
 
-  final Uri tLogin = Uri(scheme: 'https', host: 'wger.de', path: 'api/v2/login/');
-
-  final responseLoginOk = {'token': 'b01c44d3e3e016a615d2f82b16d31f8b924fb936'};
+  final Uri tLogin = Uri(
+    scheme: 'https',
+    host: 'wger.de',
+    path: 'api/v2/login/',
+  );
+  final Uri tProfileCheck = Uri(
+    scheme: 'https',
+    host: 'wger.de',
+    path: 'api/v2/userprofile/',
+  );
+  final responseLoginOk = {'token': '1234567890abcdef1234567890abcdef12345678'};
 
   final responseRegistrationOk = {
     'message': 'api user successfully registered',
-    'token': 'b01c44d3e3e016a615d2f82b16d31f8b924fb936',
+    'token': '1234567890abcdef1234567890abcdef12345678',
   };
 
   MultiProvider getWidget() {
@@ -65,7 +82,7 @@ void main() {
 
   setUp(() {
     mockClient = MockClient();
-    authProvider = AuthProvider(mockClient, false);
+    authProvider = AuthProvider(mockClient);
     authProvider.serverUrl = 'https://wger.de';
 
     SharedPreferences.setMockInitialValues({});
@@ -78,13 +95,24 @@ void main() {
     );
 
     when(
-      mockClient.post(tLogin, headers: anyNamed('headers'), body: anyNamed('body')),
+      mockClient.post(
+        tLogin,
+        headers: anyNamed('headers'),
+        body: anyNamed('body'),
+      ),
     ).thenAnswer((_) => Future(() => Response(json.encode(responseLoginOk), 200)));
 
     when(mockClient.get(any)).thenAnswer((_) => Future(() => Response('"1.2.3.4"', 200)));
+    when(
+      mockClient.get(any, headers: anyNamed('headers')),
+    ).thenAnswer((_) => Future(() => Response('"1.2.3.4"', 200)));
 
     when(
-      mockClient.post(tRegistration, headers: anyNamed('headers'), body: anyNamed('body')),
+      mockClient.post(
+        tRegistration,
+        headers: anyNamed('headers'),
+        body: anyNamed('body'),
+      ),
     ).thenAnswer((_) => Future(() => Response(json.encode(responseRegistrationOk), 201)));
   });
 
@@ -107,9 +135,10 @@ void main() {
       expect(find.byKey(const Key('actionButton')), findsOneWidget);
       expect(find.byKey(const Key('toggleActionButton')), findsOneWidget);
       expect(find.byKey(const Key('toggleCustomServerButton')), findsOneWidget);
+      expect(find.byKey(const ValueKey('toggleApiTokenButton')), findsNothing);
     });
 
-    testWidgets('Login - happy path', (WidgetTester tester) async {
+    testWidgets('Login - with username & password - happy path', (WidgetTester tester) async {
       // Arrange
       await tester.pumpWidget(getWidget());
 
@@ -120,6 +149,7 @@ void main() {
       await tester.pumpAndSettle();
 
       // Assert
+      expect(find.byKey(const ValueKey('inputApiToken')), findsNothing);
       expect(find.textContaining('An Error Occurred'), findsNothing);
       verify(mockClient.get(any));
       verify(
@@ -131,17 +161,21 @@ void main() {
       );
     });
 
-    testWidgets('Login - wront username & password', (WidgetTester tester) async {
+    testWidgets('Login - wrong username & password', (WidgetTester tester) async {
       // Arrange
       await tester.binding.setSurfaceSize(const Size(1080, 1920));
       tester.view.devicePixelRatio = 1.0;
       final response = {
         'non_field_errors': ['Username or password unknown'],
       };
-
       when(
-        mockClient.post(tLogin, headers: anyNamed('headers'), body: anyNamed('body')),
+        mockClient.post(
+          tLogin,
+          headers: anyNamed('headers'),
+          body: anyNamed('body'),
+        ),
       ).thenAnswer((_) => Future(() => Response(json.encode(response), 400)));
+
       await tester.pumpWidget(getWidget());
 
       // Act
@@ -151,7 +185,6 @@ void main() {
       await tester.pumpAndSettle();
 
       // Assert
-      expect(find.textContaining('An Error Occurred'), findsOne);
       expect(find.textContaining('Non field errors'), findsOne);
       expect(find.textContaining('Username or password unknown'), findsOne);
       verify(
@@ -162,6 +195,97 @@ void main() {
         ),
       );
     });
+
+    testWidgets('Login - with API token - happy path', (WidgetTester tester) async {
+      // Arrange
+      await tester.pumpWidget(getWidget());
+
+      // Act
+      await tester.tap(find.byKey(const ValueKey('toggleCustomServerButton')));
+      await tester.pumpAndSettle();
+      await tester.tap(find.byKey(const ValueKey('toggleApiTokenButton')));
+      await tester.pumpAndSettle();
+      await tester.enterText(
+        find.byKey(const ValueKey('inputApiToken')),
+        '1234567890abcdef1234567890abcdef12345678',
+      );
+      await tester.tap(find.byKey(const Key('actionButton')));
+      await tester.pumpAndSettle();
+
+      // Assert
+      expect(find.byKey(const ValueKey('inputApiToken')), findsOne);
+      expect(find.byKey(const Key('inputUsername')), findsNothing);
+      expect(find.byKey(const Key('inputPassword')), findsNothing);
+      expect(find.textContaining('An Error Occurred'), findsNothing);
+
+      verify(
+        mockClient.get(
+          tProfileCheck,
+          headers: argThat(
+            predicate(
+              (headers) =>
+                  headers is Map<String, String> &&
+                  headers['authorization'] == 'Token 1234567890abcdef1234567890abcdef12345678',
+            ),
+            named: 'headers',
+          ),
+        ),
+      );
+      verifyNever(
+        mockClient.post(
+          any,
+          headers: anyNamed('headers'),
+          body: anyNamed('body'),
+        ),
+      );
+    });
+
+    testWidgets('Login - with API token - wrong key', (WidgetTester tester) async {
+      // Arrange
+      final response = {
+        'detail': ['Invalid token'],
+      };
+      when(
+        mockClient.get(tProfileCheck, headers: anyNamed('headers')),
+      ).thenAnswer((_) => Future(() => Response(json.encode(response), 400)));
+      await tester.pumpWidget(getWidget());
+
+      // Act
+      await tester.tap(find.byKey(const ValueKey('toggleCustomServerButton')));
+      await tester.pumpAndSettle();
+      await tester.tap(find.byKey(const ValueKey('toggleApiTokenButton')));
+      await tester.pumpAndSettle();
+      await tester.enterText(
+        find.byKey(const ValueKey('inputApiToken')),
+        '31e2ea0322c07b9df583a9b6d1e794f7139e78d4',
+      );
+      await tester.tap(find.byKey(const Key('actionButton')));
+      await tester.pumpAndSettle();
+
+      // Assert
+      expect(find.textContaining('Detail'), findsOne);
+      expect(find.textContaining('Invalid token'), findsOne);
+      verify(
+        mockClient.get(
+          tProfileCheck,
+          headers: argThat(
+            predicate(
+              (headers) =>
+                  headers is Map<String, String> &&
+                  headers['authorization'] == 'Token 31e2ea0322c07b9df583a9b6d1e794f7139e78d4',
+            ),
+            named: 'headers',
+          ),
+        ),
+      );
+      verifyNever(
+        mockClient.post(
+          any,
+          headers: anyNamed('headers'),
+          body: anyNamed('body'),
+        ),
+      );
+    });
   });
 
   group('Registration mode', () {
@@ -224,11 +348,18 @@ void main() {
       tester.view.devicePixelRatio = 1.0;
       final response = {
         'username': ['This field must be unique.'],
-        'password': ['This password is too common.', 'This password is entirely numeric.'],
+        'password': [
+          'This password is too common.',
+          'This password is entirely numeric.',
+        ],
       };
 
       when(
-        mockClient.post(tRegistration, headers: anyNamed('headers'), body: anyNamed('body')),
+        mockClient.post(
+          tRegistration,
+          headers: anyNamed('headers'),
+          body: anyNamed('body'),
+        ),
       ).thenAnswer((_) => Future(() => Response(json.encode(response), 400)));
       await tester.pumpWidget(getWidget());
 
@@ -241,7 +372,6 @@ void main() {
       await tester.pumpAndSettle();
 
       // Assert
-      expect(find.textContaining('An Error Occurred'), findsOne);
       expect(find.textContaining('This password is too common'), findsOne);
       expect(find.textContaining('This password is entirely numeric'), findsOne);
       expect(find.textContaining('This field must be unique'), findsOne);
diff --git a/test/auth/auth_screen_test.mocks.dart b/test/auth/auth_screen_test.mocks.dart
index f2c7f3b9..f303de9d 100644
--- a/test/auth/auth_screen_test.mocks.dart
+++ b/test/auth/auth_screen_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.4.4 from annotations
+// Mocks generated by Mockito 5.4.6 from annotations
 // in wger/test/auth/auth_screen_test.dart.
 // Do not manually edit this file.
 
@@ -19,30 +19,20 @@ import 'package:mockito/src/dummies.dart' as _i5;
 // ignore_for_file: deprecated_member_use_from_same_package
 // ignore_for_file: implementation_imports
 // ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
 // ignore_for_file: camel_case_types
 // ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
 
 class _FakeResponse_0 extends _i1.SmartFake implements _i2.Response {
-  _FakeResponse_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeResponse_0(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
-class _FakeStreamedResponse_1 extends _i1.SmartFake
-    implements _i2.StreamedResponse {
-  _FakeStreamedResponse_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+class _FakeStreamedResponse_1 extends _i1.SmartFake implements _i2.StreamedResponse {
+  _FakeStreamedResponse_1(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 /// A class which mocks [Client].
@@ -54,46 +44,24 @@ class MockClient extends _i1.Mock implements _i2.Client {
   }
 
   @override
-  _i3.Future<_i2.Response> head(
-    Uri? url, {
-    Map<String, String>? headers,
-  }) =>
+  _i3.Future<_i2.Response> head(Uri? url, {Map<String, String>? headers}) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #head,
-          [url],
-          {#headers: headers},
-        ),
-        returnValue: _i3.Future<_i2.Response>.value(_FakeResponse_0(
-          this,
-          Invocation.method(
-            #head,
-            [url],
-            {#headers: headers},
-          ),
-        )),
-      ) as _i3.Future<_i2.Response>);
+            Invocation.method(#head, [url], {#headers: headers}),
+            returnValue: _i3.Future<_i2.Response>.value(
+              _FakeResponse_0(this, Invocation.method(#head, [url], {#headers: headers})),
+            ),
+          )
+          as _i3.Future<_i2.Response>);
 
   @override
-  _i3.Future<_i2.Response> get(
-    Uri? url, {
-    Map<String, String>? headers,
-  }) =>
+  _i3.Future<_i2.Response> get(Uri? url, {Map<String, String>? headers}) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #get,
-          [url],
-          {#headers: headers},
-        ),
-        returnValue: _i3.Future<_i2.Response>.value(_FakeResponse_0(
-          this,
-          Invocation.method(
-            #get,
-            [url],
-            {#headers: headers},
-          ),
-        )),
-      ) as _i3.Future<_i2.Response>);
+            Invocation.method(#get, [url], {#headers: headers}),
+            returnValue: _i3.Future<_i2.Response>.value(
+              _FakeResponse_0(this, Invocation.method(#get, [url], {#headers: headers})),
+            ),
+          )
+          as _i3.Future<_i2.Response>);
 
   @override
   _i3.Future<_i2.Response> post(
@@ -103,28 +71,19 @@ class MockClient extends _i1.Mock implements _i2.Client {
     _i4.Encoding? encoding,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #post,
-          [url],
-          {
-            #headers: headers,
-            #body: body,
-            #encoding: encoding,
-          },
-        ),
-        returnValue: _i3.Future<_i2.Response>.value(_FakeResponse_0(
-          this,
-          Invocation.method(
-            #post,
-            [url],
-            {
-              #headers: headers,
-              #body: body,
-              #encoding: encoding,
-            },
-          ),
-        )),
-      ) as _i3.Future<_i2.Response>);
+            Invocation.method(#post, [url], {#headers: headers, #body: body, #encoding: encoding}),
+            returnValue: _i3.Future<_i2.Response>.value(
+              _FakeResponse_0(
+                this,
+                Invocation.method(
+                  #post,
+                  [url],
+                  {#headers: headers, #body: body, #encoding: encoding},
+                ),
+              ),
+            ),
+          )
+          as _i3.Future<_i2.Response>);
 
   @override
   _i3.Future<_i2.Response> put(
@@ -134,28 +93,19 @@ class MockClient extends _i1.Mock implements _i2.Client {
     _i4.Encoding? encoding,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #put,
-          [url],
-          {
-            #headers: headers,
-            #body: body,
-            #encoding: encoding,
-          },
-        ),
-        returnValue: _i3.Future<_i2.Response>.value(_FakeResponse_0(
-          this,
-          Invocation.method(
-            #put,
-            [url],
-            {
-              #headers: headers,
-              #body: body,
-              #encoding: encoding,
-            },
-          ),
-        )),
-      ) as _i3.Future<_i2.Response>);
+            Invocation.method(#put, [url], {#headers: headers, #body: body, #encoding: encoding}),
+            returnValue: _i3.Future<_i2.Response>.value(
+              _FakeResponse_0(
+                this,
+                Invocation.method(
+                  #put,
+                  [url],
+                  {#headers: headers, #body: body, #encoding: encoding},
+                ),
+              ),
+            ),
+          )
+          as _i3.Future<_i2.Response>);
 
   @override
   _i3.Future<_i2.Response> patch(
@@ -165,28 +115,19 @@ class MockClient extends _i1.Mock implements _i2.Client {
     _i4.Encoding? encoding,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #patch,
-          [url],
-          {
-            #headers: headers,
-            #body: body,
-            #encoding: encoding,
-          },
-        ),
-        returnValue: _i3.Future<_i2.Response>.value(_FakeResponse_0(
-          this,
-          Invocation.method(
-            #patch,
-            [url],
-            {
-              #headers: headers,
-              #body: body,
-              #encoding: encoding,
-            },
-          ),
-        )),
-      ) as _i3.Future<_i2.Response>);
+            Invocation.method(#patch, [url], {#headers: headers, #body: body, #encoding: encoding}),
+            returnValue: _i3.Future<_i2.Response>.value(
+              _FakeResponse_0(
+                this,
+                Invocation.method(
+                  #patch,
+                  [url],
+                  {#headers: headers, #body: body, #encoding: encoding},
+                ),
+              ),
+            ),
+          )
+          as _i3.Future<_i2.Response>);
 
   @override
   _i3.Future<_i2.Response> delete(
@@ -196,87 +137,53 @@ class MockClient extends _i1.Mock implements _i2.Client {
     _i4.Encoding? encoding,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #delete,
-          [url],
-          {
-            #headers: headers,
-            #body: body,
-            #encoding: encoding,
-          },
-        ),
-        returnValue: _i3.Future<_i2.Response>.value(_FakeResponse_0(
-          this,
-          Invocation.method(
-            #delete,
-            [url],
-            {
-              #headers: headers,
-              #body: body,
-              #encoding: encoding,
-            },
-          ),
-        )),
-      ) as _i3.Future<_i2.Response>);
+            Invocation.method(
+              #delete,
+              [url],
+              {#headers: headers, #body: body, #encoding: encoding},
+            ),
+            returnValue: _i3.Future<_i2.Response>.value(
+              _FakeResponse_0(
+                this,
+                Invocation.method(
+                  #delete,
+                  [url],
+                  {#headers: headers, #body: body, #encoding: encoding},
+                ),
+              ),
+            ),
+          )
+          as _i3.Future<_i2.Response>);
 
   @override
-  _i3.Future<String> read(
-    Uri? url, {
-    Map<String, String>? headers,
-  }) =>
+  _i3.Future<String> read(Uri? url, {Map<String, String>? headers}) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #read,
-          [url],
-          {#headers: headers},
-        ),
-        returnValue: _i3.Future<String>.value(_i5.dummyValue<String>(
-          this,
-          Invocation.method(
-            #read,
-            [url],
-            {#headers: headers},
-          ),
-        )),
-      ) as _i3.Future<String>);
+            Invocation.method(#read, [url], {#headers: headers}),
+            returnValue: _i3.Future<String>.value(
+              _i5.dummyValue<String>(this, Invocation.method(#read, [url], {#headers: headers})),
+            ),
+          )
+          as _i3.Future<String>);
 
   @override
-  _i3.Future<_i6.Uint8List> readBytes(
-    Uri? url, {
-    Map<String, String>? headers,
-  }) =>
+  _i3.Future<_i6.Uint8List> readBytes(Uri? url, {Map<String, String>? headers}) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #readBytes,
-          [url],
-          {#headers: headers},
-        ),
-        returnValue: _i3.Future<_i6.Uint8List>.value(_i6.Uint8List(0)),
-      ) as _i3.Future<_i6.Uint8List>);
+            Invocation.method(#readBytes, [url], {#headers: headers}),
+            returnValue: _i3.Future<_i6.Uint8List>.value(_i6.Uint8List(0)),
+          )
+          as _i3.Future<_i6.Uint8List>);
 
   @override
   _i3.Future<_i2.StreamedResponse> send(_i2.BaseRequest? request) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #send,
-          [request],
-        ),
-        returnValue:
-            _i3.Future<_i2.StreamedResponse>.value(_FakeStreamedResponse_1(
-          this,
-          Invocation.method(
-            #send,
-            [request],
-          ),
-        )),
-      ) as _i3.Future<_i2.StreamedResponse>);
+            Invocation.method(#send, [request]),
+            returnValue: _i3.Future<_i2.StreamedResponse>.value(
+              _FakeStreamedResponse_1(this, Invocation.method(#send, [request])),
+            ),
+          )
+          as _i3.Future<_i2.StreamedResponse>);
 
   @override
-  void close() => super.noSuchMethod(
-        Invocation.method(
-          #close,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void close() =>
+      super.noSuchMethod(Invocation.method(#close, []), returnValueForMissingStub: null);
 }
diff --git a/test/core/settings_test.dart b/test/core/settings_test.dart
index 8eb931e7..474603c9 100644
--- a/test/core/settings_test.dart
+++ b/test/core/settings_test.dart
@@ -21,23 +21,44 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
 import 'package:provider/provider.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:wger/helpers/consts.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/providers/base_provider.dart';
 import 'package:wger/providers/exercises.dart';
 import 'package:wger/providers/nutrition.dart';
+import 'package:wger/providers/user.dart';
 import 'package:wger/widgets/core/settings.dart';
 
+import '../../test_data/exercises.dart';
+import '../../test_data/nutritional_plans.dart';
 import 'settings_test.mocks.dart';
 
-@GenerateMocks([ExercisesProvider, NutritionPlansProvider])
+@GenerateMocks([
+  ExercisesProvider,
+  NutritionPlansProvider,
+  UserProvider,
+  WgerBaseProvider,
+  SharedPreferencesAsync,
+])
 void main() {
   final mockExerciseProvider = MockExercisesProvider();
   final mockNutritionProvider = MockNutritionPlansProvider();
+  final mockSharedPreferences = MockSharedPreferencesAsync();
+  final mockUserProvider = MockUserProvider();
+
+  setUp(() {
+    when(mockUserProvider.themeMode).thenReturn(ThemeMode.system);
+    when(mockExerciseProvider.exercises).thenReturn(getTestExercises());
+    when(mockNutritionProvider.ingredients).thenReturn([ingredient1, ingredient2]);
+  });
 
   Widget createSettingsScreen({locale = 'en'}) {
     return MultiProvider(
       providers: [
         ChangeNotifierProvider<NutritionPlansProvider>(create: (context) => mockNutritionProvider),
         ChangeNotifierProvider<ExercisesProvider>(create: (context) => mockExerciseProvider),
+        ChangeNotifierProvider<UserProvider>(create: (context) => mockUserProvider),
       ],
       child: MaterialApp(
         locale: Locale(locale),
@@ -51,12 +72,22 @@ void main() {
   group('Cache', () {
     testWidgets('Test resetting the exercise cache', (WidgetTester tester) async {
       await tester.pumpWidget(createSettingsScreen());
-      await tester.tap(find.byKey(const ValueKey('cacheIconExercises')));
+      await tester.tap(find.byKey(const ValueKey('cacheIconExercisesDelete')));
       await tester.pumpAndSettle();
 
       verify(mockExerciseProvider.clearAllCachesAndPrefs());
     });
 
+    testWidgets('Test refreshing the exercise cache', (WidgetTester tester) async {
+      await tester.pumpWidget(createSettingsScreen());
+      await tester.tap(find.byKey(const ValueKey('cacheIconExercisesRefresh')));
+      await tester.pumpAndSettle();
+
+      verify(mockExerciseProvider.clearAllCachesAndPrefs());
+      verify(mockExerciseProvider.fetchAndSetInitialData());
+      verify(mockExerciseProvider.fetchAndSetAllExercises());
+    });
+
     testWidgets('Test resetting the ingredient cache', (WidgetTester tester) async {
       await tester.pumpWidget(createSettingsScreen());
       await tester.tap(find.byKey(const ValueKey('cacheIconIngredients')));
@@ -65,4 +96,35 @@ void main() {
       verify(mockNutritionProvider.clearIngredientCache());
     });
   });
+
+  group('Theme settings', () {
+    test('Default theme is system', () async {
+      when(mockSharedPreferences.getBool(PREFS_USER_DARK_THEME)).thenAnswer((_) async => null);
+      final userProvider = await UserProvider(MockWgerBaseProvider(), prefs: mockSharedPreferences);
+      expect(userProvider.themeMode, ThemeMode.system);
+    });
+
+    test('Loads light theme', () async {
+      when(mockSharedPreferences.getBool(PREFS_USER_DARK_THEME)).thenAnswer((_) async => false);
+      final userProvider = await UserProvider(MockWgerBaseProvider(), prefs: mockSharedPreferences);
+      expect(userProvider.themeMode, ThemeMode.light);
+    });
+
+    test('Saves theme to prefs', () {
+      when(mockSharedPreferences.getBool(any)).thenAnswer((_) async => null);
+      final userProvider = UserProvider(MockWgerBaseProvider(), prefs: mockSharedPreferences);
+      userProvider.setThemeMode(ThemeMode.dark);
+      verify(mockSharedPreferences.setBool(PREFS_USER_DARK_THEME, true)).called(1);
+      expect(userProvider.themeMode, ThemeMode.dark);
+    });
+
+    testWidgets('Test changing the theme mode in preferences', (WidgetTester tester) async {
+      await tester.pumpWidget(createSettingsScreen());
+      await tester.tap(find.byKey(const ValueKey('themeModeDropdown')));
+      await tester.pumpAndSettle();
+      await tester.tap(find.text('Always light mode'));
+
+      verify(mockUserProvider.setThemeMode(ThemeMode.light)).called(1);
+    });
+  });
 }
diff --git a/test/core/settings_test.mocks.dart b/test/core/settings_test.mocks.dart
index 5812e036..f6a3f1b5 100644
--- a/test/core/settings_test.mocks.dart
+++ b/test/core/settings_test.mocks.dart
@@ -1,27 +1,32 @@
-// Mocks generated by Mockito 5.4.4 from annotations
+// Mocks generated by Mockito 5.4.6 from annotations
 // in wger/test/core/settings_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i15;
-import 'dart:ui' as _i16;
+import 'dart:async' as _i18;
+import 'dart:ui' as _i19;
 
+import 'package:flutter/material.dart' as _i22;
+import 'package:http/http.dart' as _i16;
 import 'package:mockito/mockito.dart' as _i1;
+import 'package:shared_preferences/shared_preferences.dart' as _i14;
 import 'package:wger/database/exercises/exercise_database.dart' as _i3;
 import 'package:wger/database/ingredients/ingredients_database.dart' as _i9;
 import 'package:wger/models/exercises/category.dart' as _i5;
 import 'package:wger/models/exercises/equipment.dart' as _i6;
 import 'package:wger/models/exercises/exercise.dart' as _i4;
-import 'package:wger/models/exercises/ingredient_api.dart' as _i18;
 import 'package:wger/models/exercises/language.dart' as _i8;
 import 'package:wger/models/exercises/muscle.dart' as _i7;
 import 'package:wger/models/nutrition/ingredient.dart' as _i13;
 import 'package:wger/models/nutrition/meal.dart' as _i11;
 import 'package:wger/models/nutrition/meal_item.dart' as _i12;
 import 'package:wger/models/nutrition/nutritional_plan.dart' as _i10;
+import 'package:wger/models/user/profile.dart' as _i23;
+import 'package:wger/providers/auth.dart' as _i15;
 import 'package:wger/providers/base_provider.dart' as _i2;
-import 'package:wger/providers/exercises.dart' as _i14;
-import 'package:wger/providers/nutrition.dart' as _i17;
+import 'package:wger/providers/exercises.dart' as _i17;
+import 'package:wger/providers/nutrition.dart' as _i20;
+import 'package:wger/providers/user.dart' as _i21;
 
 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -31,998 +36,1072 @@ import 'package:wger/providers/nutrition.dart' as _i17;
 // ignore_for_file: deprecated_member_use_from_same_package
 // ignore_for_file: implementation_imports
 // ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
 // ignore_for_file: camel_case_types
 // ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
 
-class _FakeWgerBaseProvider_0 extends _i1.SmartFake
-    implements _i2.WgerBaseProvider {
-  _FakeWgerBaseProvider_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider {
+  _FakeWgerBaseProvider_0(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
-class _FakeExerciseDatabase_1 extends _i1.SmartFake
-    implements _i3.ExerciseDatabase {
-  _FakeExerciseDatabase_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+class _FakeExerciseDatabase_1 extends _i1.SmartFake implements _i3.ExerciseDatabase {
+  _FakeExerciseDatabase_1(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeExercise_2 extends _i1.SmartFake implements _i4.Exercise {
-  _FakeExercise_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeExercise_2(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
-class _FakeExerciseCategory_3 extends _i1.SmartFake
-    implements _i5.ExerciseCategory {
-  _FakeExerciseCategory_3(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+class _FakeExerciseCategory_3 extends _i1.SmartFake implements _i5.ExerciseCategory {
+  _FakeExerciseCategory_3(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeEquipment_4 extends _i1.SmartFake implements _i6.Equipment {
-  _FakeEquipment_4(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeEquipment_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeMuscle_5 extends _i1.SmartFake implements _i7.Muscle {
-  _FakeMuscle_5(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeMuscle_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeLanguage_6 extends _i1.SmartFake implements _i8.Language {
-  _FakeLanguage_6(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeLanguage_6(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
-class _FakeIngredientDatabase_7 extends _i1.SmartFake
-    implements _i9.IngredientDatabase {
-  _FakeIngredientDatabase_7(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+class _FakeIngredientDatabase_7 extends _i1.SmartFake implements _i9.IngredientDatabase {
+  _FakeIngredientDatabase_7(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
-class _FakeNutritionalPlan_8 extends _i1.SmartFake
-    implements _i10.NutritionalPlan {
-  _FakeNutritionalPlan_8(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+class _FakeNutritionalPlan_8 extends _i1.SmartFake implements _i10.NutritionalPlan {
+  _FakeNutritionalPlan_8(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeMeal_9 extends _i1.SmartFake implements _i11.Meal {
-  _FakeMeal_9(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeMeal_9(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeMealItem_10 extends _i1.SmartFake implements _i12.MealItem {
-  _FakeMealItem_10(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeMealItem_10(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeIngredient_11 extends _i1.SmartFake implements _i13.Ingredient {
-  _FakeIngredient_11(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeIngredient_11(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeSharedPreferencesAsync_12 extends _i1.SmartFake implements _i14.SharedPreferencesAsync {
+  _FakeSharedPreferencesAsync_12(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeAuthProvider_13 extends _i1.SmartFake implements _i15.AuthProvider {
+  _FakeAuthProvider_13(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeClient_14 extends _i1.SmartFake implements _i16.Client {
+  _FakeClient_14(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeUri_15 extends _i1.SmartFake implements Uri {
+  _FakeUri_15(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeResponse_16 extends _i1.SmartFake implements _i16.Response {
+  _FakeResponse_16(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 /// A class which mocks [ExercisesProvider].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockExercisesProvider extends _i1.Mock implements _i14.ExercisesProvider {
+class MockExercisesProvider extends _i1.Mock implements _i17.ExercisesProvider {
   MockExercisesProvider() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_0(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i2.WgerBaseProvider);
-
-  @override
-  _i3.ExerciseDatabase get database => (super.noSuchMethod(
-        Invocation.getter(#database),
-        returnValue: _FakeExerciseDatabase_1(
-          this,
-          Invocation.getter(#database),
-        ),
-      ) as _i3.ExerciseDatabase);
-
-  @override
-  set database(_i3.ExerciseDatabase? _database) => super.noSuchMethod(
-        Invocation.setter(
-          #database,
-          _database,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  List<_i4.Exercise> get exercises => (super.noSuchMethod(
-        Invocation.getter(#exercises),
-        returnValue: <_i4.Exercise>[],
-      ) as List<_i4.Exercise>);
-
-  @override
-  set exercises(List<_i4.Exercise>? _exercises) => super.noSuchMethod(
-        Invocation.setter(
-          #exercises,
-          _exercises,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  List<_i4.Exercise> get filteredExercises => (super.noSuchMethod(
-        Invocation.getter(#filteredExercises),
-        returnValue: <_i4.Exercise>[],
-      ) as List<_i4.Exercise>);
-
-  @override
-  set filteredExercises(List<_i4.Exercise>? newFilteredExercises) =>
-      super.noSuchMethod(
-        Invocation.setter(
-          #filteredExercises,
-          newFilteredExercises,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  Map<int, List<_i4.Exercise>> get exerciseBasesByVariation =>
+  _i2.WgerBaseProvider get baseProvider =>
       (super.noSuchMethod(
-        Invocation.getter(#exerciseBasesByVariation),
-        returnValue: <int, List<_i4.Exercise>>{},
-      ) as Map<int, List<_i4.Exercise>>);
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(this, Invocation.getter(#baseProvider)),
+          )
+          as _i2.WgerBaseProvider);
 
   @override
-  List<_i5.ExerciseCategory> get categories => (super.noSuchMethod(
-        Invocation.getter(#categories),
-        returnValue: <_i5.ExerciseCategory>[],
-      ) as List<_i5.ExerciseCategory>);
-
-  @override
-  List<_i7.Muscle> get muscles => (super.noSuchMethod(
-        Invocation.getter(#muscles),
-        returnValue: <_i7.Muscle>[],
-      ) as List<_i7.Muscle>);
-
-  @override
-  List<_i6.Equipment> get equipment => (super.noSuchMethod(
-        Invocation.getter(#equipment),
-        returnValue: <_i6.Equipment>[],
-      ) as List<_i6.Equipment>);
-
-  @override
-  List<_i8.Language> get languages => (super.noSuchMethod(
-        Invocation.getter(#languages),
-        returnValue: <_i8.Language>[],
-      ) as List<_i8.Language>);
-
-  @override
-  set languages(List<_i8.Language>? languages) => super.noSuchMethod(
-        Invocation.setter(
-          #languages,
-          languages,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  bool get hasListeners => (super.noSuchMethod(
-        Invocation.getter(#hasListeners),
-        returnValue: false,
-      ) as bool);
-
-  @override
-  _i15.Future<void> setFilters(_i14.Filters? newFilters) => (super.noSuchMethod(
-        Invocation.method(
-          #setFilters,
-          [newFilters],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
-
-  @override
-  void initFilters() => super.noSuchMethod(
-        Invocation.method(
-          #initFilters,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  _i15.Future<void> findByFilters() => (super.noSuchMethod(
-        Invocation.method(
-          #findByFilters,
-          [],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
-
-  @override
-  void clear() => super.noSuchMethod(
-        Invocation.method(
-          #clear,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  _i4.Exercise findExerciseById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findExerciseById,
-          [id],
-        ),
-        returnValue: _FakeExercise_2(
-          this,
-          Invocation.method(
-            #findExerciseById,
-            [id],
-          ),
-        ),
-      ) as _i4.Exercise);
-
-  @override
-  List<_i4.Exercise> findExercisesByVariationId(
-    int? id, {
-    int? exerciseBaseIdToExclude,
-  }) =>
+  _i3.ExerciseDatabase get database =>
       (super.noSuchMethod(
-        Invocation.method(
-          #findExercisesByVariationId,
-          [id],
-          {#exerciseBaseIdToExclude: exerciseBaseIdToExclude},
-        ),
-        returnValue: <_i4.Exercise>[],
-      ) as List<_i4.Exercise>);
+            Invocation.getter(#database),
+            returnValue: _FakeExerciseDatabase_1(this, Invocation.getter(#database)),
+          )
+          as _i3.ExerciseDatabase);
 
   @override
-  _i5.ExerciseCategory findCategoryById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findCategoryById,
-          [id],
-        ),
-        returnValue: _FakeExerciseCategory_3(
-          this,
-          Invocation.method(
-            #findCategoryById,
-            [id],
-          ),
-        ),
-      ) as _i5.ExerciseCategory);
+  List<_i4.Exercise> get exercises =>
+      (super.noSuchMethod(Invocation.getter(#exercises), returnValue: <_i4.Exercise>[])
+          as List<_i4.Exercise>);
 
   @override
-  _i6.Equipment findEquipmentById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findEquipmentById,
-          [id],
-        ),
-        returnValue: _FakeEquipment_4(
-          this,
-          Invocation.method(
-            #findEquipmentById,
-            [id],
-          ),
-        ),
-      ) as _i6.Equipment);
+  List<_i4.Exercise> get filteredExercises =>
+      (super.noSuchMethod(Invocation.getter(#filteredExercises), returnValue: <_i4.Exercise>[])
+          as List<_i4.Exercise>);
 
   @override
-  _i7.Muscle findMuscleById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findMuscleById,
-          [id],
-        ),
-        returnValue: _FakeMuscle_5(
-          this,
-          Invocation.method(
-            #findMuscleById,
-            [id],
-          ),
-        ),
-      ) as _i7.Muscle);
-
-  @override
-  _i8.Language findLanguageById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findLanguageById,
-          [id],
-        ),
-        returnValue: _FakeLanguage_6(
-          this,
-          Invocation.method(
-            #findLanguageById,
-            [id],
-          ),
-        ),
-      ) as _i8.Language);
-
-  @override
-  _i15.Future<void> fetchAndSetCategoriesFromApi() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetCategoriesFromApi,
-          [],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
-
-  @override
-  _i15.Future<void> fetchAndSetMusclesFromApi() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetMusclesFromApi,
-          [],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
-
-  @override
-  _i15.Future<void> fetchAndSetEquipmentsFromApi() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetEquipmentsFromApi,
-          [],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
-
-  @override
-  _i15.Future<void> fetchAndSetLanguagesFromApi() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetLanguagesFromApi,
-          [],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
-
-  @override
-  _i15.Future<_i4.Exercise> fetchAndSetExercise(int? exerciseId) =>
+  Map<int, List<_i4.Exercise>> get exerciseByVariation =>
       (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetExercise,
-          [exerciseId],
-        ),
-        returnValue: _i15.Future<_i4.Exercise>.value(_FakeExercise_2(
-          this,
-          Invocation.method(
-            #fetchAndSetExercise,
-            [exerciseId],
-          ),
-        )),
-      ) as _i15.Future<_i4.Exercise>);
+            Invocation.getter(#exerciseByVariation),
+            returnValue: <int, List<_i4.Exercise>>{},
+          )
+          as Map<int, List<_i4.Exercise>>);
 
   @override
-  _i15.Future<_i4.Exercise> handleUpdateExerciseFromApi(
+  List<_i5.ExerciseCategory> get categories =>
+      (super.noSuchMethod(Invocation.getter(#categories), returnValue: <_i5.ExerciseCategory>[])
+          as List<_i5.ExerciseCategory>);
+
+  @override
+  List<_i7.Muscle> get muscles =>
+      (super.noSuchMethod(Invocation.getter(#muscles), returnValue: <_i7.Muscle>[])
+          as List<_i7.Muscle>);
+
+  @override
+  List<_i6.Equipment> get equipment =>
+      (super.noSuchMethod(Invocation.getter(#equipment), returnValue: <_i6.Equipment>[])
+          as List<_i6.Equipment>);
+
+  @override
+  List<_i8.Language> get languages =>
+      (super.noSuchMethod(Invocation.getter(#languages), returnValue: <_i8.Language>[])
+          as List<_i8.Language>);
+
+  @override
+  set database(_i3.ExerciseDatabase? value) =>
+      super.noSuchMethod(Invocation.setter(#database, value), returnValueForMissingStub: null);
+
+  @override
+  set exercises(List<_i4.Exercise>? value) =>
+      super.noSuchMethod(Invocation.setter(#exercises, value), returnValueForMissingStub: null);
+
+  @override
+  set filteredExercises(List<_i4.Exercise>? newFilteredExercises) => super.noSuchMethod(
+    Invocation.setter(#filteredExercises, newFilteredExercises),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set languages(List<_i8.Language>? languages) =>
+      super.noSuchMethod(Invocation.setter(#languages, languages), returnValueForMissingStub: null);
+
+  @override
+  bool get hasListeners =>
+      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
+
+  @override
+  _i18.Future<void> setFilters(_i17.Filters? newFilters) =>
+      (super.noSuchMethod(
+            Invocation.method(#setFilters, [newFilters]),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
+
+  @override
+  void initFilters() =>
+      super.noSuchMethod(Invocation.method(#initFilters, []), returnValueForMissingStub: null);
+
+  @override
+  _i18.Future<void> findByFilters() =>
+      (super.noSuchMethod(
+            Invocation.method(#findByFilters, []),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
+
+  @override
+  void clear() =>
+      super.noSuchMethod(Invocation.method(#clear, []), returnValueForMissingStub: null);
+
+  @override
+  _i4.Exercise findExerciseById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findExerciseById, [id]),
+            returnValue: _FakeExercise_2(this, Invocation.method(#findExerciseById, [id])),
+          )
+          as _i4.Exercise);
+
+  @override
+  List<_i4.Exercise> findExercisesByVariationId(int? variationId, {int? exerciseIdToExclude}) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #findExercisesByVariationId,
+              [variationId],
+              {#exerciseIdToExclude: exerciseIdToExclude},
+            ),
+            returnValue: <_i4.Exercise>[],
+          )
+          as List<_i4.Exercise>);
+
+  @override
+  _i5.ExerciseCategory findCategoryById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findCategoryById, [id]),
+            returnValue: _FakeExerciseCategory_3(this, Invocation.method(#findCategoryById, [id])),
+          )
+          as _i5.ExerciseCategory);
+
+  @override
+  _i6.Equipment findEquipmentById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findEquipmentById, [id]),
+            returnValue: _FakeEquipment_4(this, Invocation.method(#findEquipmentById, [id])),
+          )
+          as _i6.Equipment);
+
+  @override
+  _i7.Muscle findMuscleById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findMuscleById, [id]),
+            returnValue: _FakeMuscle_5(this, Invocation.method(#findMuscleById, [id])),
+          )
+          as _i7.Muscle);
+
+  @override
+  _i8.Language findLanguageById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findLanguageById, [id]),
+            returnValue: _FakeLanguage_6(this, Invocation.method(#findLanguageById, [id])),
+          )
+          as _i8.Language);
+
+  @override
+  _i18.Future<void> fetchAndSetCategoriesFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetCategoriesFromApi, []),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
+
+  @override
+  _i18.Future<void> fetchAndSetMusclesFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetMusclesFromApi, []),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
+
+  @override
+  _i18.Future<void> fetchAndSetEquipmentsFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetEquipmentsFromApi, []),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
+
+  @override
+  _i18.Future<void> fetchAndSetLanguagesFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetLanguagesFromApi, []),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
+
+  @override
+  _i18.Future<void> fetchAndSetAllExercises() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllExercises, []),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
+
+  @override
+  _i18.Future<_i4.Exercise?> fetchAndSetExercise(int? exerciseId) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetExercise, [exerciseId]),
+            returnValue: _i18.Future<_i4.Exercise?>.value(),
+          )
+          as _i18.Future<_i4.Exercise?>);
+
+  @override
+  _i18.Future<_i4.Exercise> handleUpdateExerciseFromApi(
     _i3.ExerciseDatabase? database,
     int? exerciseId,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #handleUpdateExerciseFromApi,
-          [
-            database,
-            exerciseId,
-          ],
-        ),
-        returnValue: _i15.Future<_i4.Exercise>.value(_FakeExercise_2(
-          this,
-          Invocation.method(
-            #handleUpdateExerciseFromApi,
-            [
-              database,
-              exerciseId,
-            ],
-          ),
-        )),
-      ) as _i15.Future<_i4.Exercise>);
+            Invocation.method(#handleUpdateExerciseFromApi, [database, exerciseId]),
+            returnValue: _i18.Future<_i4.Exercise>.value(
+              _FakeExercise_2(
+                this,
+                Invocation.method(#handleUpdateExerciseFromApi, [database, exerciseId]),
+              ),
+            ),
+          )
+          as _i18.Future<_i4.Exercise>);
 
   @override
-  _i15.Future<void> initCacheTimesLocalPrefs({dynamic forceInit = false}) =>
+  _i18.Future<void> initCacheTimesLocalPrefs({dynamic forceInit = false}) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #initCacheTimesLocalPrefs,
-          [],
-          {#forceInit: forceInit},
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
+            Invocation.method(#initCacheTimesLocalPrefs, [], {#forceInit: forceInit}),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
-  _i15.Future<void> clearAllCachesAndPrefs() => (super.noSuchMethod(
-        Invocation.method(
-          #clearAllCachesAndPrefs,
-          [],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
+  _i18.Future<void> clearAllCachesAndPrefs() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearAllCachesAndPrefs, []),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
-  _i15.Future<void> fetchAndSetInitialData() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetInitialData,
-          [],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
+  _i18.Future<void> fetchAndSetInitialData() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetInitialData, []),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
-  _i15.Future<void> setExercisesFromDatabase(
+  _i18.Future<void> setExercisesFromDatabase(
     _i3.ExerciseDatabase? database, {
     bool? forceDeleteCache = false,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #setExercisesFromDatabase,
-          [database],
-          {#forceDeleteCache: forceDeleteCache},
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
+            Invocation.method(
+              #setExercisesFromDatabase,
+              [database],
+              {#forceDeleteCache: forceDeleteCache},
+            ),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
-  _i15.Future<void> updateExerciseCache(_i3.ExerciseDatabase? database) =>
+  _i18.Future<void> updateExerciseCache(_i3.ExerciseDatabase? database) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #updateExerciseCache,
-          [database],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
+            Invocation.method(#updateExerciseCache, [database]),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
-  _i15.Future<void> fetchAndSetMuscles(_i3.ExerciseDatabase? database) =>
+  _i18.Future<void> fetchAndSetMuscles(_i3.ExerciseDatabase? database) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetMuscles,
-          [database],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
+            Invocation.method(#fetchAndSetMuscles, [database]),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
-  _i15.Future<void> fetchAndSetCategories(_i3.ExerciseDatabase? database) =>
+  _i18.Future<void> fetchAndSetCategories(_i3.ExerciseDatabase? database) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetCategories,
-          [database],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
+            Invocation.method(#fetchAndSetCategories, [database]),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
-  _i15.Future<void> fetchAndSetLanguages(_i3.ExerciseDatabase? database) =>
+  _i18.Future<void> fetchAndSetLanguages(_i3.ExerciseDatabase? database) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetLanguages,
-          [database],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
+            Invocation.method(#fetchAndSetLanguages, [database]),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
-  _i15.Future<void> fetchAndSetEquipments(_i3.ExerciseDatabase? database) =>
+  _i18.Future<void> fetchAndSetEquipments(_i3.ExerciseDatabase? database) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetEquipments,
-          [database],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
+            Invocation.method(#fetchAndSetEquipments, [database]),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
-  _i15.Future<List<_i4.Exercise>> searchExercise(
+  _i18.Future<List<_i4.Exercise>> searchExercise(
     String? name, {
-    String? languageCode = r'en',
+    String? languageCode = 'en',
     bool? searchEnglish = false,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #searchExercise,
-          [name],
-          {
-            #languageCode: languageCode,
-            #searchEnglish: searchEnglish,
-          },
-        ),
-        returnValue: _i15.Future<List<_i4.Exercise>>.value(<_i4.Exercise>[]),
-      ) as _i15.Future<List<_i4.Exercise>>);
+            Invocation.method(
+              #searchExercise,
+              [name],
+              {#languageCode: languageCode, #searchEnglish: searchEnglish},
+            ),
+            returnValue: _i18.Future<List<_i4.Exercise>>.value(<_i4.Exercise>[]),
+          )
+          as _i18.Future<List<_i4.Exercise>>);
 
   @override
-  void addListener(_i16.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void addListener(_i19.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  void removeListener(_i16.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void removeListener(_i19.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#removeListener, [listener]),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void dispose() =>
+      super.noSuchMethod(Invocation.method(#dispose, []), returnValueForMissingStub: null);
 
   @override
-  void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void notifyListeners() =>
+      super.noSuchMethod(Invocation.method(#notifyListeners, []), returnValueForMissingStub: null);
 }
 
 /// A class which mocks [NutritionPlansProvider].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockNutritionPlansProvider extends _i1.Mock
-    implements _i17.NutritionPlansProvider {
+class MockNutritionPlansProvider extends _i1.Mock implements _i20.NutritionPlansProvider {
   MockNutritionPlansProvider() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_0(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i2.WgerBaseProvider);
-
-  @override
-  _i9.IngredientDatabase get database => (super.noSuchMethod(
-        Invocation.getter(#database),
-        returnValue: _FakeIngredientDatabase_7(
-          this,
-          Invocation.getter(#database),
-        ),
-      ) as _i9.IngredientDatabase);
-
-  @override
-  set database(_i9.IngredientDatabase? _database) => super.noSuchMethod(
-        Invocation.setter(
-          #database,
-          _database,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  List<_i13.Ingredient> get ingredients => (super.noSuchMethod(
-        Invocation.getter(#ingredients),
-        returnValue: <_i13.Ingredient>[],
-      ) as List<_i13.Ingredient>);
-
-  @override
-  set ingredients(List<_i13.Ingredient>? _ingredients) => super.noSuchMethod(
-        Invocation.setter(
-          #ingredients,
-          _ingredients,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  List<_i10.NutritionalPlan> get items => (super.noSuchMethod(
-        Invocation.getter(#items),
-        returnValue: <_i10.NutritionalPlan>[],
-      ) as List<_i10.NutritionalPlan>);
-
-  @override
-  bool get hasListeners => (super.noSuchMethod(
-        Invocation.getter(#hasListeners),
-        returnValue: false,
-      ) as bool);
-
-  @override
-  void clear() => super.noSuchMethod(
-        Invocation.method(
-          #clear,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  _i15.Stream<_i10.NutritionalPlan?> watchNutritionPlan(String? id) =>
+  _i2.WgerBaseProvider get baseProvider =>
       (super.noSuchMethod(
-        Invocation.method(
-          #watchNutritionPlan,
-          [id],
-        ),
-        returnValue: _i15.Stream<_i10.NutritionalPlan?>.empty(),
-      ) as _i15.Stream<_i10.NutritionalPlan?>);
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(this, Invocation.getter(#baseProvider)),
+          )
+          as _i2.WgerBaseProvider);
 
   @override
-  _i15.Stream<_i10.NutritionalPlan> watchNutritionPlanLast() =>
+  _i9.IngredientDatabase get database =>
       (super.noSuchMethod(
-        Invocation.method(
-          #watchNutritionPlanLast,
-          [],
-        ),
-        returnValue: _i15.Stream<_i10.NutritionalPlan>.empty(),
-      ) as _i15.Stream<_i10.NutritionalPlan>);
+            Invocation.getter(#database),
+            returnValue: _FakeIngredientDatabase_7(this, Invocation.getter(#database)),
+          )
+          as _i9.IngredientDatabase);
 
   @override
-  _i15.Stream<List<_i10.NutritionalPlan>> watchNutritionPlans() =>
+  List<_i13.Ingredient> get ingredients =>
+      (super.noSuchMethod(Invocation.getter(#ingredients), returnValue: <_i13.Ingredient>[])
+          as List<_i13.Ingredient>);
+
+  @override
+  List<_i10.NutritionalPlan> get items =>
+      (super.noSuchMethod(Invocation.getter(#items), returnValue: <_i10.NutritionalPlan>[])
+          as List<_i10.NutritionalPlan>);
+
+  @override
+  set database(_i9.IngredientDatabase? value) =>
+      super.noSuchMethod(Invocation.setter(#database, value), returnValueForMissingStub: null);
+
+  @override
+  set ingredients(List<_i13.Ingredient>? value) =>
+      super.noSuchMethod(Invocation.setter(#ingredients, value), returnValueForMissingStub: null);
+
+  @override
+  bool get hasListeners =>
+      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
+
+  @override
+  void clear() =>
+      super.noSuchMethod(Invocation.method(#clear, []), returnValueForMissingStub: null);
+
+  @override
+  _i10.NutritionalPlan findById(int? id) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #watchNutritionPlans,
-          [],
-        ),
-        returnValue: _i15.Stream<List<_i10.NutritionalPlan>>.empty(),
-      ) as _i15.Stream<List<_i10.NutritionalPlan>>);
+            Invocation.method(#findById, [id]),
+            returnValue: _FakeNutritionalPlan_8(this, Invocation.method(#findById, [id])),
+          )
+          as _i10.NutritionalPlan);
 
   @override
-  _i15.Future<_i10.NutritionalPlan> addPlan(_i10.NutritionalPlan? planData) =>
+  _i11.Meal? findMealById(int? id) =>
+      (super.noSuchMethod(Invocation.method(#findMealById, [id])) as _i11.Meal?);
+
+  @override
+  _i18.Future<void> fetchAndSetAllPlansSparse() =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addPlan,
-          [planData],
-        ),
-        returnValue:
-            _i15.Future<_i10.NutritionalPlan>.value(_FakeNutritionalPlan_8(
-          this,
-          Invocation.method(
-            #addPlan,
-            [planData],
-          ),
-        )),
-      ) as _i15.Future<_i10.NutritionalPlan>);
+            Invocation.method(#fetchAndSetAllPlansSparse, []),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
-  _i15.Future<void> editPlan(_i10.NutritionalPlan? plan) => (super.noSuchMethod(
-        Invocation.method(
-          #editPlan,
-          [plan],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
-
-  @override
-  _i15.Future<void> deletePlan(String? id) => (super.noSuchMethod(
-        Invocation.method(
-          #deletePlan,
-          [id],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
-
-  @override
-  _i15.Future<_i11.Meal> addMeal(
-    _i11.Meal? meal,
-    String? planId,
-  ) =>
+  _i18.Future<void> fetchAndSetAllPlansFull() =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addMeal,
-          [
-            meal,
-            planId,
-          ],
-        ),
-        returnValue: _i15.Future<_i11.Meal>.value(_FakeMeal_9(
-          this,
-          Invocation.method(
-            #addMeal,
-            [
-              meal,
-              planId,
-            ],
-          ),
-        )),
-      ) as _i15.Future<_i11.Meal>);
+            Invocation.method(#fetchAndSetAllPlansFull, []),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
-  _i15.Future<_i11.Meal> editMeal(_i11.Meal? meal) => (super.noSuchMethod(
-        Invocation.method(
-          #editMeal,
-          [meal],
-        ),
-        returnValue: _i15.Future<_i11.Meal>.value(_FakeMeal_9(
-          this,
-          Invocation.method(
-            #editMeal,
-            [meal],
-          ),
-        )),
-      ) as _i15.Future<_i11.Meal>);
-
-  @override
-  _i15.Future<void> deleteMeal(_i11.Meal? meal) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteMeal,
-          [meal],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
-
-  @override
-  _i15.Future<_i12.MealItem> addMealItem(
-    _i12.MealItem? mealItem,
-    _i11.Meal? meal,
-  ) =>
+  _i18.Future<_i10.NutritionalPlan> fetchAndSetPlanSparse(int? planId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addMealItem,
-          [
-            mealItem,
-            meal,
-          ],
-        ),
-        returnValue: _i15.Future<_i12.MealItem>.value(_FakeMealItem_10(
-          this,
-          Invocation.method(
-            #addMealItem,
-            [
-              mealItem,
-              meal,
-            ],
-          ),
-        )),
-      ) as _i15.Future<_i12.MealItem>);
+            Invocation.method(#fetchAndSetPlanSparse, [planId]),
+            returnValue: _i18.Future<_i10.NutritionalPlan>.value(
+              _FakeNutritionalPlan_8(this, Invocation.method(#fetchAndSetPlanSparse, [planId])),
+            ),
+          )
+          as _i18.Future<_i10.NutritionalPlan>);
 
   @override
-  _i15.Future<void> deleteMealItem(_i12.MealItem? mealItem) =>
+  _i18.Future<_i10.NutritionalPlan> fetchAndSetPlanFull(int? planId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteMealItem,
-          [mealItem],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
+            Invocation.method(#fetchAndSetPlanFull, [planId]),
+            returnValue: _i18.Future<_i10.NutritionalPlan>.value(
+              _FakeNutritionalPlan_8(this, Invocation.method(#fetchAndSetPlanFull, [planId])),
+            ),
+          )
+          as _i18.Future<_i10.NutritionalPlan>);
 
   @override
-  _i15.Future<void> clearIngredientCache() => (super.noSuchMethod(
-        Invocation.method(
-          #clearIngredientCache,
-          [],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
+  _i18.Future<_i10.NutritionalPlan> addPlan(_i10.NutritionalPlan? planData) =>
+      (super.noSuchMethod(
+            Invocation.method(#addPlan, [planData]),
+            returnValue: _i18.Future<_i10.NutritionalPlan>.value(
+              _FakeNutritionalPlan_8(this, Invocation.method(#addPlan, [planData])),
+            ),
+          )
+          as _i18.Future<_i10.NutritionalPlan>);
 
   @override
-  _i15.Future<_i13.Ingredient> fetchIngredient(
+  _i18.Future<void> editPlan(_i10.NutritionalPlan? plan) =>
+      (super.noSuchMethod(
+            Invocation.method(#editPlan, [plan]),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
+
+  @override
+  _i18.Future<void> deletePlan(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deletePlan, [id]),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
+
+  @override
+  _i18.Future<_i11.Meal> addMeal(_i11.Meal? meal, int? planId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addMeal, [meal, planId]),
+            returnValue: _i18.Future<_i11.Meal>.value(
+              _FakeMeal_9(this, Invocation.method(#addMeal, [meal, planId])),
+            ),
+          )
+          as _i18.Future<_i11.Meal>);
+
+  @override
+  _i18.Future<_i11.Meal> editMeal(_i11.Meal? meal) =>
+      (super.noSuchMethod(
+            Invocation.method(#editMeal, [meal]),
+            returnValue: _i18.Future<_i11.Meal>.value(
+              _FakeMeal_9(this, Invocation.method(#editMeal, [meal])),
+            ),
+          )
+          as _i18.Future<_i11.Meal>);
+
+  @override
+  _i18.Future<void> deleteMeal(_i11.Meal? meal) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteMeal, [meal]),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
+
+  @override
+  _i18.Future<_i12.MealItem> addMealItem(_i12.MealItem? mealItem, _i11.Meal? meal) =>
+      (super.noSuchMethod(
+            Invocation.method(#addMealItem, [mealItem, meal]),
+            returnValue: _i18.Future<_i12.MealItem>.value(
+              _FakeMealItem_10(this, Invocation.method(#addMealItem, [mealItem, meal])),
+            ),
+          )
+          as _i18.Future<_i12.MealItem>);
+
+  @override
+  _i18.Future<void> deleteMealItem(_i12.MealItem? mealItem) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteMealItem, [mealItem]),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
+
+  @override
+  _i18.Future<void> clearIngredientCache() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearIngredientCache, []),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
+
+  @override
+  _i18.Future<_i13.Ingredient> fetchIngredient(
     int? ingredientId, {
     _i9.IngredientDatabase? database,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #fetchIngredient,
-          [ingredientId],
-          {#database: database},
-        ),
-        returnValue: _i15.Future<_i13.Ingredient>.value(_FakeIngredient_11(
-          this,
-          Invocation.method(
-            #fetchIngredient,
-            [ingredientId],
-            {#database: database},
-          ),
-        )),
-      ) as _i15.Future<_i13.Ingredient>);
+            Invocation.method(#fetchIngredient, [ingredientId], {#database: database}),
+            returnValue: _i18.Future<_i13.Ingredient>.value(
+              _FakeIngredient_11(
+                this,
+                Invocation.method(#fetchIngredient, [ingredientId], {#database: database}),
+              ),
+            ),
+          )
+          as _i18.Future<_i13.Ingredient>);
 
   @override
-  _i15.Future<void> fetchIngredientsFromCache() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchIngredientsFromCache,
-          [],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
+  _i18.Future<void> fetchIngredientsFromCache() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchIngredientsFromCache, []),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
-  _i15.Future<List<_i18.IngredientApiSearchEntry>> searchIngredient(
+  _i18.Future<List<_i13.Ingredient>> searchIngredient(
     String? name, {
-    String? languageCode = r'en',
+    String? languageCode = 'en',
     bool? searchEnglish = false,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #searchIngredient,
-          [name],
-          {
-            #languageCode: languageCode,
-            #searchEnglish: searchEnglish,
-          },
-        ),
-        returnValue: _i15.Future<List<_i18.IngredientApiSearchEntry>>.value(
-            <_i18.IngredientApiSearchEntry>[]),
-      ) as _i15.Future<List<_i18.IngredientApiSearchEntry>>);
+            Invocation.method(
+              #searchIngredient,
+              [name],
+              {#languageCode: languageCode, #searchEnglish: searchEnglish},
+            ),
+            returnValue: _i18.Future<List<_i13.Ingredient>>.value(<_i13.Ingredient>[]),
+          )
+          as _i18.Future<List<_i13.Ingredient>>);
 
   @override
-  _i15.Future<_i13.Ingredient?> searchIngredientWithCode(String? code) =>
+  _i18.Future<_i13.Ingredient?> searchIngredientWithBarcode(String? barcode) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #searchIngredientWithCode,
-          [code],
-        ),
-        returnValue: _i15.Future<_i13.Ingredient?>.value(),
-      ) as _i15.Future<_i13.Ingredient?>);
+            Invocation.method(#searchIngredientWithBarcode, [barcode]),
+            returnValue: _i18.Future<_i13.Ingredient?>.value(),
+          )
+          as _i18.Future<_i13.Ingredient?>);
 
   @override
-  _i15.Future<void> logMealToDiary(_i11.Meal? meal) => (super.noSuchMethod(
-        Invocation.method(
-          #logMealToDiary,
-          [meal],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
+  _i18.Future<void> logMealToDiary(_i11.Meal? meal, DateTime? mealDateTime) =>
+      (super.noSuchMethod(
+            Invocation.method(#logMealToDiary, [meal, mealDateTime]),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
-  _i15.Future<void> logIngredientToDiary(
+  _i18.Future<void> logIngredientToDiary(
     _i12.MealItem? mealItem,
-    String? planId, [
+    int? planId, [
     DateTime? dateTime,
   ]) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #logIngredientToDiary,
-          [
-            mealItem,
-            planId,
-            dateTime,
-          ],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
+            Invocation.method(#logIngredientToDiary, [mealItem, planId, dateTime]),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
-  _i15.Future<void> deleteLog(
-    String? logId,
-    String? planId,
-  ) =>
+  _i18.Future<void> deleteLog(int? logId, int? planId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteLog,
-          [
-            logId,
-            planId,
-          ],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
+            Invocation.method(#deleteLog, [logId, planId]),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
-  _i15.Future<void> fetchAndSetLogs(_i10.NutritionalPlan? plan) =>
+  _i18.Future<void> fetchAndSetLogs(_i10.NutritionalPlan? plan) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetLogs,
-          [plan],
-        ),
-        returnValue: _i15.Future<void>.value(),
-        returnValueForMissingStub: _i15.Future<void>.value(),
-      ) as _i15.Future<void>);
+            Invocation.method(#fetchAndSetLogs, [plan]),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 
   @override
-  void addListener(_i16.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void addListener(_i19.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  void removeListener(_i16.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void removeListener(_i19.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#removeListener, [listener]),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void dispose() =>
+      super.noSuchMethod(Invocation.method(#dispose, []), returnValueForMissingStub: null);
 
   @override
-  void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void notifyListeners() =>
+      super.noSuchMethod(Invocation.method(#notifyListeners, []), returnValueForMissingStub: null);
+}
+
+/// A class which mocks [UserProvider].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockUserProvider extends _i1.Mock implements _i21.UserProvider {
+  MockUserProvider() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i22.ThemeMode get themeMode =>
+      (super.noSuchMethod(Invocation.getter(#themeMode), returnValue: _i22.ThemeMode.system)
+          as _i22.ThemeMode);
+
+  @override
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(this, Invocation.getter(#baseProvider)),
+          )
+          as _i2.WgerBaseProvider);
+
+  @override
+  _i14.SharedPreferencesAsync get prefs =>
+      (super.noSuchMethod(
+            Invocation.getter(#prefs),
+            returnValue: _FakeSharedPreferencesAsync_12(this, Invocation.getter(#prefs)),
+          )
+          as _i14.SharedPreferencesAsync);
+
+  @override
+  set themeMode(_i22.ThemeMode? value) =>
+      super.noSuchMethod(Invocation.setter(#themeMode, value), returnValueForMissingStub: null);
+
+  @override
+  set prefs(_i14.SharedPreferencesAsync? value) =>
+      super.noSuchMethod(Invocation.setter(#prefs, value), returnValueForMissingStub: null);
+
+  @override
+  set profile(_i23.Profile? value) =>
+      super.noSuchMethod(Invocation.setter(#profile, value), returnValueForMissingStub: null);
+
+  @override
+  bool get hasListeners =>
+      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
+
+  @override
+  void clear() =>
+      super.noSuchMethod(Invocation.method(#clear, []), returnValueForMissingStub: null);
+
+  @override
+  void setThemeMode(_i22.ThemeMode? mode) =>
+      super.noSuchMethod(Invocation.method(#setThemeMode, [mode]), returnValueForMissingStub: null);
+
+  @override
+  _i18.Future<void> fetchAndSetProfile() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetProfile, []),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
+
+  @override
+  _i18.Future<void> saveProfile() =>
+      (super.noSuchMethod(
+            Invocation.method(#saveProfile, []),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
+
+  @override
+  _i18.Future<void> verifyEmail() =>
+      (super.noSuchMethod(
+            Invocation.method(#verifyEmail, []),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
+
+  @override
+  void addListener(_i19.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void removeListener(_i19.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#removeListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void dispose() =>
+      super.noSuchMethod(Invocation.method(#dispose, []), returnValueForMissingStub: null);
+
+  @override
+  void notifyListeners() =>
+      super.noSuchMethod(Invocation.method(#notifyListeners, []), returnValueForMissingStub: null);
+}
+
+/// A class which mocks [WgerBaseProvider].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockWgerBaseProvider extends _i1.Mock implements _i2.WgerBaseProvider {
+  MockWgerBaseProvider() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i15.AuthProvider get auth =>
+      (super.noSuchMethod(
+            Invocation.getter(#auth),
+            returnValue: _FakeAuthProvider_13(this, Invocation.getter(#auth)),
+          )
+          as _i15.AuthProvider);
+
+  @override
+  _i16.Client get client =>
+      (super.noSuchMethod(
+            Invocation.getter(#client),
+            returnValue: _FakeClient_14(this, Invocation.getter(#client)),
+          )
+          as _i16.Client);
+
+  @override
+  set auth(_i15.AuthProvider? value) =>
+      super.noSuchMethod(Invocation.setter(#auth, value), returnValueForMissingStub: null);
+
+  @override
+  set client(_i16.Client? value) =>
+      super.noSuchMethod(Invocation.setter(#client, value), returnValueForMissingStub: null);
+
+  @override
+  Map<String, String> getDefaultHeaders({bool? includeAuth = false}) =>
+      (super.noSuchMethod(
+            Invocation.method(#getDefaultHeaders, [], {#includeAuth: includeAuth}),
+            returnValue: <String, String>{},
+          )
+          as Map<String, String>);
+
+  @override
+  Uri makeUrl(String? path, {int? id, String? objectMethod, Map<String, dynamic>? query}) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #makeUrl,
+              [path],
+              {#id: id, #objectMethod: objectMethod, #query: query},
+            ),
+            returnValue: _FakeUri_15(
+              this,
+              Invocation.method(
+                #makeUrl,
+                [path],
+                {#id: id, #objectMethod: objectMethod, #query: query},
+              ),
+            ),
+          )
+          as Uri);
+
+  @override
+  _i18.Future<dynamic> fetch(Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetch, [uri]),
+            returnValue: _i18.Future<dynamic>.value(),
+          )
+          as _i18.Future<dynamic>);
+
+  @override
+  _i18.Future<List<dynamic>> fetchPaginated(Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchPaginated, [uri]),
+            returnValue: _i18.Future<List<dynamic>>.value(<dynamic>[]),
+          )
+          as _i18.Future<List<dynamic>>);
+
+  @override
+  _i18.Future<Map<String, dynamic>> post(Map<String, dynamic>? data, Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#post, [data, uri]),
+            returnValue: _i18.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+          )
+          as _i18.Future<Map<String, dynamic>>);
+
+  @override
+  _i18.Future<Map<String, dynamic>> patch(Map<String, dynamic>? data, Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#patch, [data, uri]),
+            returnValue: _i18.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+          )
+          as _i18.Future<Map<String, dynamic>>);
+
+  @override
+  _i18.Future<_i16.Response> deleteRequest(String? url, int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteRequest, [url, id]),
+            returnValue: _i18.Future<_i16.Response>.value(
+              _FakeResponse_16(this, Invocation.method(#deleteRequest, [url, id])),
+            ),
+          )
+          as _i18.Future<_i16.Response>);
+}
+
+/// A class which mocks [SharedPreferencesAsync].
+///
+/// See the documentation for Mockito's code generation for more information.
+// ignore: must_be_immutable
+class MockSharedPreferencesAsync extends _i1.Mock implements _i14.SharedPreferencesAsync {
+  MockSharedPreferencesAsync() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i18.Future<Set<String>> getKeys({Set<String>? allowList}) =>
+      (super.noSuchMethod(
+            Invocation.method(#getKeys, [], {#allowList: allowList}),
+            returnValue: _i18.Future<Set<String>>.value(<String>{}),
+          )
+          as _i18.Future<Set<String>>);
+
+  @override
+  _i18.Future<Map<String, Object?>> getAll({Set<String>? allowList}) =>
+      (super.noSuchMethod(
+            Invocation.method(#getAll, [], {#allowList: allowList}),
+            returnValue: _i18.Future<Map<String, Object?>>.value(<String, Object?>{}),
+          )
+          as _i18.Future<Map<String, Object?>>);
+
+  @override
+  _i18.Future<bool?> getBool(String? key) =>
+      (super.noSuchMethod(
+            Invocation.method(#getBool, [key]),
+            returnValue: _i18.Future<bool?>.value(),
+          )
+          as _i18.Future<bool?>);
+
+  @override
+  _i18.Future<int?> getInt(String? key) =>
+      (super.noSuchMethod(Invocation.method(#getInt, [key]), returnValue: _i18.Future<int?>.value())
+          as _i18.Future<int?>);
+
+  @override
+  _i18.Future<double?> getDouble(String? key) =>
+      (super.noSuchMethod(
+            Invocation.method(#getDouble, [key]),
+            returnValue: _i18.Future<double?>.value(),
+          )
+          as _i18.Future<double?>);
+
+  @override
+  _i18.Future<String?> getString(String? key) =>
+      (super.noSuchMethod(
+            Invocation.method(#getString, [key]),
+            returnValue: _i18.Future<String?>.value(),
+          )
+          as _i18.Future<String?>);
+
+  @override
+  _i18.Future<List<String>?> getStringList(String? key) =>
+      (super.noSuchMethod(
+            Invocation.method(#getStringList, [key]),
+            returnValue: _i18.Future<List<String>?>.value(),
+          )
+          as _i18.Future<List<String>?>);
+
+  @override
+  _i18.Future<bool> containsKey(String? key) =>
+      (super.noSuchMethod(
+            Invocation.method(#containsKey, [key]),
+            returnValue: _i18.Future<bool>.value(false),
+          )
+          as _i18.Future<bool>);
+
+  @override
+  _i18.Future<void> setBool(String? key, bool? value) =>
+      (super.noSuchMethod(
+            Invocation.method(#setBool, [key, value]),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
+
+  @override
+  _i18.Future<void> setInt(String? key, int? value) =>
+      (super.noSuchMethod(
+            Invocation.method(#setInt, [key, value]),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
+
+  @override
+  _i18.Future<void> setDouble(String? key, double? value) =>
+      (super.noSuchMethod(
+            Invocation.method(#setDouble, [key, value]),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
+
+  @override
+  _i18.Future<void> setString(String? key, String? value) =>
+      (super.noSuchMethod(
+            Invocation.method(#setString, [key, value]),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
+
+  @override
+  _i18.Future<void> setStringList(String? key, List<String>? value) =>
+      (super.noSuchMethod(
+            Invocation.method(#setStringList, [key, value]),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
+
+  @override
+  _i18.Future<void> remove(String? key) =>
+      (super.noSuchMethod(
+            Invocation.method(#remove, [key]),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
+
+  @override
+  _i18.Future<void> clear({Set<String>? allowList}) =>
+      (super.noSuchMethod(
+            Invocation.method(#clear, [], {#allowList: allowList}),
+            returnValue: _i18.Future<void>.value(),
+            returnValueForMissingStub: _i18.Future<void>.value(),
+          )
+          as _i18.Future<void>);
 }
diff --git a/test/core/validators_test.dart b/test/core/validators_test.dart
new file mode 100644
index 00000000..ffa4cdf1
--- /dev/null
+++ b/test/core/validators_test.dart
@@ -0,0 +1,49 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+import 'package:wger/core/validators.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+
+import 'validators_test.mocks.dart';
+
+@GenerateMocks([AppLocalizations])
+void main() {
+  MockAppLocalizations mockI18n = MockAppLocalizations();
+
+  setUp(() {
+    mockI18n = MockAppLocalizations();
+
+    when(mockI18n.enterValue).thenReturn('Please enter a value');
+    when(mockI18n.invalidUrl).thenReturn('Invalid URL');
+  });
+
+  test('Required field empty returns error', () {
+    final result = validateUrl('', mockI18n, required: true);
+    expect(result, isNotNull);
+  });
+
+  test('Optional field empty returns no error', () {
+    final result = validateUrl('', mockI18n, required: false);
+    expect(result, isNull);
+  });
+
+  test('Invalid URL without http/https returns error', () {
+    final result = validateUrl('www.example.com', mockI18n);
+    expect(result, isNotNull);
+  });
+
+  test('Invalid URL with wrong protocol returns error', () {
+    final result = validateUrl('gopher://', mockI18n);
+    expect(result, isNotNull);
+  });
+
+  test('Valid http URL returns no error', () {
+    final result = validateUrl('http://example.com', mockI18n);
+    expect(result, isNull);
+  });
+
+  test('Valid https URL returns no error', () {
+    final result = validateUrl('https://example.com', mockI18n);
+    expect(result, isNull);
+  });
+}
diff --git a/test/core/validators_test.mocks.dart b/test/core/validators_test.mocks.dart
new file mode 100644
index 00000000..5c46a756
--- /dev/null
+++ b/test/core/validators_test.mocks.dart
@@ -0,0 +1,2799 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in wger/test/core/validators_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:mockito/src/dummies.dart' as _i3;
+import 'package:wger/l10n/generated/app_localizations.dart' as _i2;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
+
+/// A class which mocks [AppLocalizations].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockAppLocalizations extends _i1.Mock implements _i2.AppLocalizations {
+  MockAppLocalizations() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  String get localeName =>
+      (super.noSuchMethod(
+            Invocation.getter(#localeName),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#localeName)),
+          )
+          as String);
+
+  @override
+  String get userProfile =>
+      (super.noSuchMethod(
+            Invocation.getter(#userProfile),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#userProfile)),
+          )
+          as String);
+
+  @override
+  String get login =>
+      (super.noSuchMethod(
+            Invocation.getter(#login),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#login)),
+          )
+          as String);
+
+  @override
+  String get logout =>
+      (super.noSuchMethod(
+            Invocation.getter(#logout),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#logout)),
+          )
+          as String);
+
+  @override
+  String get register =>
+      (super.noSuchMethod(
+            Invocation.getter(#register),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#register)),
+          )
+          as String);
+
+  @override
+  String get useDefaultServer =>
+      (super.noSuchMethod(
+            Invocation.getter(#useDefaultServer),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#useDefaultServer)),
+          )
+          as String);
+
+  @override
+  String get useCustomServer =>
+      (super.noSuchMethod(
+            Invocation.getter(#useCustomServer),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#useCustomServer)),
+          )
+          as String);
+
+  @override
+  String get invalidUrl =>
+      (super.noSuchMethod(
+            Invocation.getter(#invalidUrl),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#invalidUrl)),
+          )
+          as String);
+
+  @override
+  String get usernameValidChars =>
+      (super.noSuchMethod(
+            Invocation.getter(#usernameValidChars),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#usernameValidChars)),
+          )
+          as String);
+
+  @override
+  String get passwordsDontMatch =>
+      (super.noSuchMethod(
+            Invocation.getter(#passwordsDontMatch),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#passwordsDontMatch)),
+          )
+          as String);
+
+  @override
+  String get passwordTooShort =>
+      (super.noSuchMethod(
+            Invocation.getter(#passwordTooShort),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#passwordTooShort)),
+          )
+          as String);
+
+  @override
+  String get selectAvailablePlates =>
+      (super.noSuchMethod(
+            Invocation.getter(#selectAvailablePlates),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#selectAvailablePlates)),
+          )
+          as String);
+
+  @override
+  String get barWeight =>
+      (super.noSuchMethod(
+            Invocation.getter(#barWeight),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#barWeight)),
+          )
+          as String);
+
+  @override
+  String get useColors =>
+      (super.noSuchMethod(
+            Invocation.getter(#useColors),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#useColors)),
+          )
+          as String);
+
+  @override
+  String get password =>
+      (super.noSuchMethod(
+            Invocation.getter(#password),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#password)),
+          )
+          as String);
+
+  @override
+  String get confirmPassword =>
+      (super.noSuchMethod(
+            Invocation.getter(#confirmPassword),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#confirmPassword)),
+          )
+          as String);
+
+  @override
+  String get invalidEmail =>
+      (super.noSuchMethod(
+            Invocation.getter(#invalidEmail),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#invalidEmail)),
+          )
+          as String);
+
+  @override
+  String get email =>
+      (super.noSuchMethod(
+            Invocation.getter(#email),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#email)),
+          )
+          as String);
+
+  @override
+  String get username =>
+      (super.noSuchMethod(
+            Invocation.getter(#username),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#username)),
+          )
+          as String);
+
+  @override
+  String get invalidUsername =>
+      (super.noSuchMethod(
+            Invocation.getter(#invalidUsername),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#invalidUsername)),
+          )
+          as String);
+
+  @override
+  String get useApiToken =>
+      (super.noSuchMethod(
+            Invocation.getter(#useApiToken),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#useApiToken)),
+          )
+          as String);
+
+  @override
+  String get useUsernameAndPassword =>
+      (super.noSuchMethod(
+            Invocation.getter(#useUsernameAndPassword),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#useUsernameAndPassword)),
+          )
+          as String);
+
+  @override
+  String get apiToken =>
+      (super.noSuchMethod(
+            Invocation.getter(#apiToken),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#apiToken)),
+          )
+          as String);
+
+  @override
+  String get invalidApiToken =>
+      (super.noSuchMethod(
+            Invocation.getter(#invalidApiToken),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#invalidApiToken)),
+          )
+          as String);
+
+  @override
+  String get apiTokenValidChars =>
+      (super.noSuchMethod(
+            Invocation.getter(#apiTokenValidChars),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#apiTokenValidChars)),
+          )
+          as String);
+
+  @override
+  String get customServerUrl =>
+      (super.noSuchMethod(
+            Invocation.getter(#customServerUrl),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#customServerUrl)),
+          )
+          as String);
+
+  @override
+  String get customServerHint =>
+      (super.noSuchMethod(
+            Invocation.getter(#customServerHint),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#customServerHint)),
+          )
+          as String);
+
+  @override
+  String get reset =>
+      (super.noSuchMethod(
+            Invocation.getter(#reset),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#reset)),
+          )
+          as String);
+
+  @override
+  String get registerInstead =>
+      (super.noSuchMethod(
+            Invocation.getter(#registerInstead),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#registerInstead)),
+          )
+          as String);
+
+  @override
+  String get loginInstead =>
+      (super.noSuchMethod(
+            Invocation.getter(#loginInstead),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#loginInstead)),
+          )
+          as String);
+
+  @override
+  String get labelBottomNavWorkout =>
+      (super.noSuchMethod(
+            Invocation.getter(#labelBottomNavWorkout),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#labelBottomNavWorkout)),
+          )
+          as String);
+
+  @override
+  String get labelBottomNavNutrition =>
+      (super.noSuchMethod(
+            Invocation.getter(#labelBottomNavNutrition),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#labelBottomNavNutrition)),
+          )
+          as String);
+
+  @override
+  String get labelWorkoutLogs =>
+      (super.noSuchMethod(
+            Invocation.getter(#labelWorkoutLogs),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#labelWorkoutLogs)),
+          )
+          as String);
+
+  @override
+  String get labelWorkoutPlan =>
+      (super.noSuchMethod(
+            Invocation.getter(#labelWorkoutPlan),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#labelWorkoutPlan)),
+          )
+          as String);
+
+  @override
+  String get labelDashboard =>
+      (super.noSuchMethod(
+            Invocation.getter(#labelDashboard),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#labelDashboard)),
+          )
+          as String);
+
+  @override
+  String get success =>
+      (super.noSuchMethod(
+            Invocation.getter(#success),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#success)),
+          )
+          as String);
+
+  @override
+  String get successfullyDeleted =>
+      (super.noSuchMethod(
+            Invocation.getter(#successfullyDeleted),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#successfullyDeleted)),
+          )
+          as String);
+
+  @override
+  String get successfullySaved =>
+      (super.noSuchMethod(
+            Invocation.getter(#successfullySaved),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#successfullySaved)),
+          )
+          as String);
+
+  @override
+  String get exerciseList =>
+      (super.noSuchMethod(
+            Invocation.getter(#exerciseList),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#exerciseList)),
+          )
+          as String);
+
+  @override
+  String get exercise =>
+      (super.noSuchMethod(
+            Invocation.getter(#exercise),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#exercise)),
+          )
+          as String);
+
+  @override
+  String get exercises =>
+      (super.noSuchMethod(
+            Invocation.getter(#exercises),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#exercises)),
+          )
+          as String);
+
+  @override
+  String get exerciseName =>
+      (super.noSuchMethod(
+            Invocation.getter(#exerciseName),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#exerciseName)),
+          )
+          as String);
+
+  @override
+  String get searchExercise =>
+      (super.noSuchMethod(
+            Invocation.getter(#searchExercise),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#searchExercise)),
+          )
+          as String);
+
+  @override
+  String get noIngredientsDefined =>
+      (super.noSuchMethod(
+            Invocation.getter(#noIngredientsDefined),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#noIngredientsDefined)),
+          )
+          as String);
+
+  @override
+  String get noMatchingExerciseFound =>
+      (super.noSuchMethod(
+            Invocation.getter(#noMatchingExerciseFound),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#noMatchingExerciseFound)),
+          )
+          as String);
+
+  @override
+  String get searchNamesInEnglish =>
+      (super.noSuchMethod(
+            Invocation.getter(#searchNamesInEnglish),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#searchNamesInEnglish)),
+          )
+          as String);
+
+  @override
+  String get equipment =>
+      (super.noSuchMethod(
+            Invocation.getter(#equipment),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#equipment)),
+          )
+          as String);
+
+  @override
+  String get muscles =>
+      (super.noSuchMethod(
+            Invocation.getter(#muscles),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#muscles)),
+          )
+          as String);
+
+  @override
+  String get musclesSecondary =>
+      (super.noSuchMethod(
+            Invocation.getter(#musclesSecondary),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#musclesSecondary)),
+          )
+          as String);
+
+  @override
+  String get category =>
+      (super.noSuchMethod(
+            Invocation.getter(#category),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#category)),
+          )
+          as String);
+
+  @override
+  String get startDate =>
+      (super.noSuchMethod(
+            Invocation.getter(#startDate),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#startDate)),
+          )
+          as String);
+
+  @override
+  String get routines =>
+      (super.noSuchMethod(
+            Invocation.getter(#routines),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#routines)),
+          )
+          as String);
+
+  @override
+  String get newRoutine =>
+      (super.noSuchMethod(
+            Invocation.getter(#newRoutine),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#newRoutine)),
+          )
+          as String);
+
+  @override
+  String get noRoutines =>
+      (super.noSuchMethod(
+            Invocation.getter(#noRoutines),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#noRoutines)),
+          )
+          as String);
+
+  @override
+  String get reps =>
+      (super.noSuchMethod(
+            Invocation.getter(#reps),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#reps)),
+          )
+          as String);
+
+  @override
+  String get restTime =>
+      (super.noSuchMethod(
+            Invocation.getter(#restTime),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#restTime)),
+          )
+          as String);
+
+  @override
+  String get sets =>
+      (super.noSuchMethod(
+            Invocation.getter(#sets),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#sets)),
+          )
+          as String);
+
+  @override
+  String get rir =>
+      (super.noSuchMethod(
+            Invocation.getter(#rir),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#rir)),
+          )
+          as String);
+
+  @override
+  String get rirNotUsed =>
+      (super.noSuchMethod(
+            Invocation.getter(#rirNotUsed),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#rirNotUsed)),
+          )
+          as String);
+
+  @override
+  String get useMetric =>
+      (super.noSuchMethod(
+            Invocation.getter(#useMetric),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#useMetric)),
+          )
+          as String);
+
+  @override
+  String get weightUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#weightUnit),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#weightUnit)),
+          )
+          as String);
+
+  @override
+  String get repetitionUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#repetitionUnit),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#repetitionUnit)),
+          )
+          as String);
+
+  @override
+  String get set =>
+      (super.noSuchMethod(
+            Invocation.getter(#set),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#set)),
+          )
+          as String);
+
+  @override
+  String get dayDescriptionHelp =>
+      (super.noSuchMethod(
+            Invocation.getter(#dayDescriptionHelp),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#dayDescriptionHelp)),
+          )
+          as String);
+
+  @override
+  String get sameRepetitions =>
+      (super.noSuchMethod(
+            Invocation.getter(#sameRepetitions),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#sameRepetitions)),
+          )
+          as String);
+
+  @override
+  String get comment =>
+      (super.noSuchMethod(
+            Invocation.getter(#comment),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#comment)),
+          )
+          as String);
+
+  @override
+  String get impression =>
+      (super.noSuchMethod(
+            Invocation.getter(#impression),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#impression)),
+          )
+          as String);
+
+  @override
+  String get notes =>
+      (super.noSuchMethod(
+            Invocation.getter(#notes),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#notes)),
+          )
+          as String);
+
+  @override
+  String get workoutSession =>
+      (super.noSuchMethod(
+            Invocation.getter(#workoutSession),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#workoutSession)),
+          )
+          as String);
+
+  @override
+  String get restDay =>
+      (super.noSuchMethod(
+            Invocation.getter(#restDay),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#restDay)),
+          )
+          as String);
+
+  @override
+  String get isRestDay =>
+      (super.noSuchMethod(
+            Invocation.getter(#isRestDay),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#isRestDay)),
+          )
+          as String);
+
+  @override
+  String get isRestDayHelp =>
+      (super.noSuchMethod(
+            Invocation.getter(#isRestDayHelp),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#isRestDayHelp)),
+          )
+          as String);
+
+  @override
+  String get needsLogsToAdvance =>
+      (super.noSuchMethod(
+            Invocation.getter(#needsLogsToAdvance),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#needsLogsToAdvance)),
+          )
+          as String);
+
+  @override
+  String get needsLogsToAdvanceHelp =>
+      (super.noSuchMethod(
+            Invocation.getter(#needsLogsToAdvanceHelp),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#needsLogsToAdvanceHelp)),
+          )
+          as String);
+
+  @override
+  String get routineDays =>
+      (super.noSuchMethod(
+            Invocation.getter(#routineDays),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#routineDays)),
+          )
+          as String);
+
+  @override
+  String get resultingRoutine =>
+      (super.noSuchMethod(
+            Invocation.getter(#resultingRoutine),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#resultingRoutine)),
+          )
+          as String);
+
+  @override
+  String get newDay =>
+      (super.noSuchMethod(
+            Invocation.getter(#newDay),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#newDay)),
+          )
+          as String);
+
+  @override
+  String get newSet =>
+      (super.noSuchMethod(
+            Invocation.getter(#newSet),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#newSet)),
+          )
+          as String);
+
+  @override
+  String get selectExercises =>
+      (super.noSuchMethod(
+            Invocation.getter(#selectExercises),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#selectExercises)),
+          )
+          as String);
+
+  @override
+  String get gymMode =>
+      (super.noSuchMethod(
+            Invocation.getter(#gymMode),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#gymMode)),
+          )
+          as String);
+
+  @override
+  String get plateCalculator =>
+      (super.noSuchMethod(
+            Invocation.getter(#plateCalculator),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#plateCalculator)),
+          )
+          as String);
+
+  @override
+  String get plateCalculatorNotDivisible =>
+      (super.noSuchMethod(
+            Invocation.getter(#plateCalculatorNotDivisible),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#plateCalculatorNotDivisible),
+            ),
+          )
+          as String);
+
+  @override
+  String get pause =>
+      (super.noSuchMethod(
+            Invocation.getter(#pause),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#pause)),
+          )
+          as String);
+
+  @override
+  String get jumpTo =>
+      (super.noSuchMethod(
+            Invocation.getter(#jumpTo),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#jumpTo)),
+          )
+          as String);
+
+  @override
+  String get todaysWorkout =>
+      (super.noSuchMethod(
+            Invocation.getter(#todaysWorkout),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#todaysWorkout)),
+          )
+          as String);
+
+  @override
+  String get logHelpEntries =>
+      (super.noSuchMethod(
+            Invocation.getter(#logHelpEntries),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#logHelpEntries)),
+          )
+          as String);
+
+  @override
+  String get logHelpEntriesUnits =>
+      (super.noSuchMethod(
+            Invocation.getter(#logHelpEntriesUnits),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#logHelpEntriesUnits)),
+          )
+          as String);
+
+  @override
+  String get description =>
+      (super.noSuchMethod(
+            Invocation.getter(#description),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#description)),
+          )
+          as String);
+
+  @override
+  String get name =>
+      (super.noSuchMethod(
+            Invocation.getter(#name),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#name)),
+          )
+          as String);
+
+  @override
+  String get save =>
+      (super.noSuchMethod(
+            Invocation.getter(#save),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#save)),
+          )
+          as String);
+
+  @override
+  String get verify =>
+      (super.noSuchMethod(
+            Invocation.getter(#verify),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#verify)),
+          )
+          as String);
+
+  @override
+  String get addSet =>
+      (super.noSuchMethod(
+            Invocation.getter(#addSet),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#addSet)),
+          )
+          as String);
+
+  @override
+  String get addMeal =>
+      (super.noSuchMethod(
+            Invocation.getter(#addMeal),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#addMeal)),
+          )
+          as String);
+
+  @override
+  String get mealLogged =>
+      (super.noSuchMethod(
+            Invocation.getter(#mealLogged),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#mealLogged)),
+          )
+          as String);
+
+  @override
+  String get ingredientLogged =>
+      (super.noSuchMethod(
+            Invocation.getter(#ingredientLogged),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#ingredientLogged)),
+          )
+          as String);
+
+  @override
+  String get logMeal =>
+      (super.noSuchMethod(
+            Invocation.getter(#logMeal),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#logMeal)),
+          )
+          as String);
+
+  @override
+  String get addIngredient =>
+      (super.noSuchMethod(
+            Invocation.getter(#addIngredient),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#addIngredient)),
+          )
+          as String);
+
+  @override
+  String get logIngredient =>
+      (super.noSuchMethod(
+            Invocation.getter(#logIngredient),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#logIngredient)),
+          )
+          as String);
+
+  @override
+  String get searchIngredient =>
+      (super.noSuchMethod(
+            Invocation.getter(#searchIngredient),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#searchIngredient)),
+          )
+          as String);
+
+  @override
+  String get nutritionalPlan =>
+      (super.noSuchMethod(
+            Invocation.getter(#nutritionalPlan),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#nutritionalPlan)),
+          )
+          as String);
+
+  @override
+  String get nutritionalDiary =>
+      (super.noSuchMethod(
+            Invocation.getter(#nutritionalDiary),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#nutritionalDiary)),
+          )
+          as String);
+
+  @override
+  String get nutritionalPlans =>
+      (super.noSuchMethod(
+            Invocation.getter(#nutritionalPlans),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#nutritionalPlans)),
+          )
+          as String);
+
+  @override
+  String get noNutritionalPlans =>
+      (super.noSuchMethod(
+            Invocation.getter(#noNutritionalPlans),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#noNutritionalPlans)),
+          )
+          as String);
+
+  @override
+  String get onlyLogging =>
+      (super.noSuchMethod(
+            Invocation.getter(#onlyLogging),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#onlyLogging)),
+          )
+          as String);
+
+  @override
+  String get onlyLoggingHelpText =>
+      (super.noSuchMethod(
+            Invocation.getter(#onlyLoggingHelpText),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#onlyLoggingHelpText)),
+          )
+          as String);
+
+  @override
+  String get goalMacro =>
+      (super.noSuchMethod(
+            Invocation.getter(#goalMacro),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#goalMacro)),
+          )
+          as String);
+
+  @override
+  String get selectMealToLog =>
+      (super.noSuchMethod(
+            Invocation.getter(#selectMealToLog),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#selectMealToLog)),
+          )
+          as String);
+
+  @override
+  String get yourCurrentNutritionPlanHasNoMealsDefinedYet =>
+      (super.noSuchMethod(
+            Invocation.getter(#yourCurrentNutritionPlanHasNoMealsDefinedYet),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#yourCurrentNutritionPlanHasNoMealsDefinedYet),
+            ),
+          )
+          as String);
+
+  @override
+  String get toAddMealsToThePlanGoToNutritionalPlanDetails =>
+      (super.noSuchMethod(
+            Invocation.getter(#toAddMealsToThePlanGoToNutritionalPlanDetails),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#toAddMealsToThePlanGoToNutritionalPlanDetails),
+            ),
+          )
+          as String);
+
+  @override
+  String get goalEnergy =>
+      (super.noSuchMethod(
+            Invocation.getter(#goalEnergy),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#goalEnergy)),
+          )
+          as String);
+
+  @override
+  String get goalProtein =>
+      (super.noSuchMethod(
+            Invocation.getter(#goalProtein),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#goalProtein)),
+          )
+          as String);
+
+  @override
+  String get goalCarbohydrates =>
+      (super.noSuchMethod(
+            Invocation.getter(#goalCarbohydrates),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#goalCarbohydrates)),
+          )
+          as String);
+
+  @override
+  String get goalFat =>
+      (super.noSuchMethod(
+            Invocation.getter(#goalFat),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#goalFat)),
+          )
+          as String);
+
+  @override
+  String get goalFiber =>
+      (super.noSuchMethod(
+            Invocation.getter(#goalFiber),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#goalFiber)),
+          )
+          as String);
+
+  @override
+  String get anErrorOccurred =>
+      (super.noSuchMethod(
+            Invocation.getter(#anErrorOccurred),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#anErrorOccurred)),
+          )
+          as String);
+
+  @override
+  String get errorInfoDescription =>
+      (super.noSuchMethod(
+            Invocation.getter(#errorInfoDescription),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#errorInfoDescription)),
+          )
+          as String);
+
+  @override
+  String get errorInfoDescription2 =>
+      (super.noSuchMethod(
+            Invocation.getter(#errorInfoDescription2),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#errorInfoDescription2)),
+          )
+          as String);
+
+  @override
+  String get errorViewDetails =>
+      (super.noSuchMethod(
+            Invocation.getter(#errorViewDetails),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#errorViewDetails)),
+          )
+          as String);
+
+  @override
+  String get applicationLogs =>
+      (super.noSuchMethod(
+            Invocation.getter(#applicationLogs),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#applicationLogs)),
+          )
+          as String);
+
+  @override
+  String get errorCouldNotConnectToServer =>
+      (super.noSuchMethod(
+            Invocation.getter(#errorCouldNotConnectToServer),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#errorCouldNotConnectToServer),
+            ),
+          )
+          as String);
+
+  @override
+  String get errorCouldNotConnectToServerDetails =>
+      (super.noSuchMethod(
+            Invocation.getter(#errorCouldNotConnectToServerDetails),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#errorCouldNotConnectToServerDetails),
+            ),
+          )
+          as String);
+
+  @override
+  String get copyToClipboard =>
+      (super.noSuchMethod(
+            Invocation.getter(#copyToClipboard),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#copyToClipboard)),
+          )
+          as String);
+
+  @override
+  String get weight =>
+      (super.noSuchMethod(
+            Invocation.getter(#weight),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#weight)),
+          )
+          as String);
+
+  @override
+  String get min =>
+      (super.noSuchMethod(
+            Invocation.getter(#min),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#min)),
+          )
+          as String);
+
+  @override
+  String get max =>
+      (super.noSuchMethod(
+            Invocation.getter(#max),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#max)),
+          )
+          as String);
+
+  @override
+  String get measurement =>
+      (super.noSuchMethod(
+            Invocation.getter(#measurement),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#measurement)),
+          )
+          as String);
+
+  @override
+  String get measurements =>
+      (super.noSuchMethod(
+            Invocation.getter(#measurements),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#measurements)),
+          )
+          as String);
+
+  @override
+  String get measurementCategoriesHelpText =>
+      (super.noSuchMethod(
+            Invocation.getter(#measurementCategoriesHelpText),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#measurementCategoriesHelpText),
+            ),
+          )
+          as String);
+
+  @override
+  String get measurementEntriesHelpText =>
+      (super.noSuchMethod(
+            Invocation.getter(#measurementEntriesHelpText),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#measurementEntriesHelpText),
+            ),
+          )
+          as String);
+
+  @override
+  String get date =>
+      (super.noSuchMethod(
+            Invocation.getter(#date),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#date)),
+          )
+          as String);
+
+  @override
+  String get creationDate =>
+      (super.noSuchMethod(
+            Invocation.getter(#creationDate),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#creationDate)),
+          )
+          as String);
+
+  @override
+  String get endDate =>
+      (super.noSuchMethod(
+            Invocation.getter(#endDate),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#endDate)),
+          )
+          as String);
+
+  @override
+  String get openEnded =>
+      (super.noSuchMethod(
+            Invocation.getter(#openEnded),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#openEnded)),
+          )
+          as String);
+
+  @override
+  String get value =>
+      (super.noSuchMethod(
+            Invocation.getter(#value),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#value)),
+          )
+          as String);
+
+  @override
+  String get start =>
+      (super.noSuchMethod(
+            Invocation.getter(#start),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#start)),
+          )
+          as String);
+
+  @override
+  String get time =>
+      (super.noSuchMethod(
+            Invocation.getter(#time),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#time)),
+          )
+          as String);
+
+  @override
+  String get timeStart =>
+      (super.noSuchMethod(
+            Invocation.getter(#timeStart),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#timeStart)),
+          )
+          as String);
+
+  @override
+  String get timeEnd =>
+      (super.noSuchMethod(
+            Invocation.getter(#timeEnd),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#timeEnd)),
+          )
+          as String);
+
+  @override
+  String get timeStartAhead =>
+      (super.noSuchMethod(
+            Invocation.getter(#timeStartAhead),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#timeStartAhead)),
+          )
+          as String);
+
+  @override
+  String get ingredient =>
+      (super.noSuchMethod(
+            Invocation.getter(#ingredient),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#ingredient)),
+          )
+          as String);
+
+  @override
+  String get energy =>
+      (super.noSuchMethod(
+            Invocation.getter(#energy),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#energy)),
+          )
+          as String);
+
+  @override
+  String get energyShort =>
+      (super.noSuchMethod(
+            Invocation.getter(#energyShort),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#energyShort)),
+          )
+          as String);
+
+  @override
+  String get macronutrients =>
+      (super.noSuchMethod(
+            Invocation.getter(#macronutrients),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#macronutrients)),
+          )
+          as String);
+
+  @override
+  String get planned =>
+      (super.noSuchMethod(
+            Invocation.getter(#planned),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#planned)),
+          )
+          as String);
+
+  @override
+  String get logged =>
+      (super.noSuchMethod(
+            Invocation.getter(#logged),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#logged)),
+          )
+          as String);
+
+  @override
+  String get today =>
+      (super.noSuchMethod(
+            Invocation.getter(#today),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#today)),
+          )
+          as String);
+
+  @override
+  String get loggedToday =>
+      (super.noSuchMethod(
+            Invocation.getter(#loggedToday),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#loggedToday)),
+          )
+          as String);
+
+  @override
+  String get weekAverage =>
+      (super.noSuchMethod(
+            Invocation.getter(#weekAverage),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#weekAverage)),
+          )
+          as String);
+
+  @override
+  String get surplus =>
+      (super.noSuchMethod(
+            Invocation.getter(#surplus),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#surplus)),
+          )
+          as String);
+
+  @override
+  String get deficit =>
+      (super.noSuchMethod(
+            Invocation.getter(#deficit),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#deficit)),
+          )
+          as String);
+
+  @override
+  String get difference =>
+      (super.noSuchMethod(
+            Invocation.getter(#difference),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#difference)),
+          )
+          as String);
+
+  @override
+  String get percentEnergy =>
+      (super.noSuchMethod(
+            Invocation.getter(#percentEnergy),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#percentEnergy)),
+          )
+          as String);
+
+  @override
+  String get gPerBodyKg =>
+      (super.noSuchMethod(
+            Invocation.getter(#gPerBodyKg),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#gPerBodyKg)),
+          )
+          as String);
+
+  @override
+  String get total =>
+      (super.noSuchMethod(
+            Invocation.getter(#total),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#total)),
+          )
+          as String);
+
+  @override
+  String get kcal =>
+      (super.noSuchMethod(
+            Invocation.getter(#kcal),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#kcal)),
+          )
+          as String);
+
+  @override
+  String get kJ =>
+      (super.noSuchMethod(
+            Invocation.getter(#kJ),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#kJ)),
+          )
+          as String);
+
+  @override
+  String get g =>
+      (super.noSuchMethod(
+            Invocation.getter(#g),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#g)),
+          )
+          as String);
+
+  @override
+  String get protein =>
+      (super.noSuchMethod(
+            Invocation.getter(#protein),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#protein)),
+          )
+          as String);
+
+  @override
+  String get proteinShort =>
+      (super.noSuchMethod(
+            Invocation.getter(#proteinShort),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#proteinShort)),
+          )
+          as String);
+
+  @override
+  String get carbohydrates =>
+      (super.noSuchMethod(
+            Invocation.getter(#carbohydrates),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#carbohydrates)),
+          )
+          as String);
+
+  @override
+  String get carbohydratesShort =>
+      (super.noSuchMethod(
+            Invocation.getter(#carbohydratesShort),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#carbohydratesShort)),
+          )
+          as String);
+
+  @override
+  String get sugars =>
+      (super.noSuchMethod(
+            Invocation.getter(#sugars),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#sugars)),
+          )
+          as String);
+
+  @override
+  String get fat =>
+      (super.noSuchMethod(
+            Invocation.getter(#fat),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#fat)),
+          )
+          as String);
+
+  @override
+  String get fatShort =>
+      (super.noSuchMethod(
+            Invocation.getter(#fatShort),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#fatShort)),
+          )
+          as String);
+
+  @override
+  String get saturatedFat =>
+      (super.noSuchMethod(
+            Invocation.getter(#saturatedFat),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#saturatedFat)),
+          )
+          as String);
+
+  @override
+  String get fiber =>
+      (super.noSuchMethod(
+            Invocation.getter(#fiber),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#fiber)),
+          )
+          as String);
+
+  @override
+  String get sodium =>
+      (super.noSuchMethod(
+            Invocation.getter(#sodium),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#sodium)),
+          )
+          as String);
+
+  @override
+  String get amount =>
+      (super.noSuchMethod(
+            Invocation.getter(#amount),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#amount)),
+          )
+          as String);
+
+  @override
+  String get unit =>
+      (super.noSuchMethod(
+            Invocation.getter(#unit),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#unit)),
+          )
+          as String);
+
+  @override
+  String get newEntry =>
+      (super.noSuchMethod(
+            Invocation.getter(#newEntry),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#newEntry)),
+          )
+          as String);
+
+  @override
+  String get noWeightEntries =>
+      (super.noSuchMethod(
+            Invocation.getter(#noWeightEntries),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#noWeightEntries)),
+          )
+          as String);
+
+  @override
+  String get noMeasurementEntries =>
+      (super.noSuchMethod(
+            Invocation.getter(#noMeasurementEntries),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#noMeasurementEntries)),
+          )
+          as String);
+
+  @override
+  String get moreMeasurementEntries =>
+      (super.noSuchMethod(
+            Invocation.getter(#moreMeasurementEntries),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#moreMeasurementEntries)),
+          )
+          as String);
+
+  @override
+  String get edit =>
+      (super.noSuchMethod(
+            Invocation.getter(#edit),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#edit)),
+          )
+          as String);
+
+  @override
+  String get loadingText =>
+      (super.noSuchMethod(
+            Invocation.getter(#loadingText),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#loadingText)),
+          )
+          as String);
+
+  @override
+  String get delete =>
+      (super.noSuchMethod(
+            Invocation.getter(#delete),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#delete)),
+          )
+          as String);
+
+  @override
+  String get newNutritionalPlan =>
+      (super.noSuchMethod(
+            Invocation.getter(#newNutritionalPlan),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#newNutritionalPlan)),
+          )
+          as String);
+
+  @override
+  String get overview =>
+      (super.noSuchMethod(
+            Invocation.getter(#overview),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#overview)),
+          )
+          as String);
+
+  @override
+  String get toggleDetails =>
+      (super.noSuchMethod(
+            Invocation.getter(#toggleDetails),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#toggleDetails)),
+          )
+          as String);
+
+  @override
+  String get goToDetailPage =>
+      (super.noSuchMethod(
+            Invocation.getter(#goToDetailPage),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#goToDetailPage)),
+          )
+          as String);
+
+  @override
+  String get aboutWhySupportTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#aboutWhySupportTitle),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#aboutWhySupportTitle)),
+          )
+          as String);
+
+  @override
+  String get aboutDescription =>
+      (super.noSuchMethod(
+            Invocation.getter(#aboutDescription),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#aboutDescription)),
+          )
+          as String);
+
+  @override
+  String get aboutDonateTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#aboutDonateTitle),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#aboutDonateTitle)),
+          )
+          as String);
+
+  @override
+  String get aboutDonateText =>
+      (super.noSuchMethod(
+            Invocation.getter(#aboutDonateText),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#aboutDonateText)),
+          )
+          as String);
+
+  @override
+  String get aboutContributeTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#aboutContributeTitle),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#aboutContributeTitle)),
+          )
+          as String);
+
+  @override
+  String get aboutContributeText =>
+      (super.noSuchMethod(
+            Invocation.getter(#aboutContributeText),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#aboutContributeText)),
+          )
+          as String);
+
+  @override
+  String get aboutBugsListTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#aboutBugsListTitle),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#aboutBugsListTitle)),
+          )
+          as String);
+
+  @override
+  String get aboutTranslationListTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#aboutTranslationListTitle),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#aboutTranslationListTitle),
+            ),
+          )
+          as String);
+
+  @override
+  String get aboutSourceListTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#aboutSourceListTitle),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#aboutSourceListTitle)),
+          )
+          as String);
+
+  @override
+  String get aboutJoinCommunityTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#aboutJoinCommunityTitle),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#aboutJoinCommunityTitle)),
+          )
+          as String);
+
+  @override
+  String get aboutMastodonTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#aboutMastodonTitle),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#aboutMastodonTitle)),
+          )
+          as String);
+
+  @override
+  String get aboutDiscordTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#aboutDiscordTitle),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#aboutDiscordTitle)),
+          )
+          as String);
+
+  @override
+  String get others =>
+      (super.noSuchMethod(
+            Invocation.getter(#others),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#others)),
+          )
+          as String);
+
+  @override
+  String get calendar =>
+      (super.noSuchMethod(
+            Invocation.getter(#calendar),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#calendar)),
+          )
+          as String);
+
+  @override
+  String get goToToday =>
+      (super.noSuchMethod(
+            Invocation.getter(#goToToday),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#goToToday)),
+          )
+          as String);
+
+  @override
+  String get enterValue =>
+      (super.noSuchMethod(
+            Invocation.getter(#enterValue),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#enterValue)),
+          )
+          as String);
+
+  @override
+  String get selectEntry =>
+      (super.noSuchMethod(
+            Invocation.getter(#selectEntry),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#selectEntry)),
+          )
+          as String);
+
+  @override
+  String get selectExercise =>
+      (super.noSuchMethod(
+            Invocation.getter(#selectExercise),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#selectExercise)),
+          )
+          as String);
+
+  @override
+  String get baseNameEnglish =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseNameEnglish),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#baseNameEnglish)),
+          )
+          as String);
+
+  @override
+  String get setUnitsAndRir =>
+      (super.noSuchMethod(
+            Invocation.getter(#setUnitsAndRir),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#setUnitsAndRir)),
+          )
+          as String);
+
+  @override
+  String get enterValidNumber =>
+      (super.noSuchMethod(
+            Invocation.getter(#enterValidNumber),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#enterValidNumber)),
+          )
+          as String);
+
+  @override
+  String get selectIngredient =>
+      (super.noSuchMethod(
+            Invocation.getter(#selectIngredient),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#selectIngredient)),
+          )
+          as String);
+
+  @override
+  String get recentlyUsedIngredients =>
+      (super.noSuchMethod(
+            Invocation.getter(#recentlyUsedIngredients),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#recentlyUsedIngredients)),
+          )
+          as String);
+
+  @override
+  String get selectImage =>
+      (super.noSuchMethod(
+            Invocation.getter(#selectImage),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#selectImage)),
+          )
+          as String);
+
+  @override
+  String get optionsLabel =>
+      (super.noSuchMethod(
+            Invocation.getter(#optionsLabel),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#optionsLabel)),
+          )
+          as String);
+
+  @override
+  String get takePicture =>
+      (super.noSuchMethod(
+            Invocation.getter(#takePicture),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#takePicture)),
+          )
+          as String);
+
+  @override
+  String get chooseFromLibrary =>
+      (super.noSuchMethod(
+            Invocation.getter(#chooseFromLibrary),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#chooseFromLibrary)),
+          )
+          as String);
+
+  @override
+  String get gallery =>
+      (super.noSuchMethod(
+            Invocation.getter(#gallery),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#gallery)),
+          )
+          as String);
+
+  @override
+  String get addImage =>
+      (super.noSuchMethod(
+            Invocation.getter(#addImage),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#addImage)),
+          )
+          as String);
+
+  @override
+  String get dataCopied =>
+      (super.noSuchMethod(
+            Invocation.getter(#dataCopied),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#dataCopied)),
+          )
+          as String);
+
+  @override
+  String get appUpdateTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#appUpdateTitle),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#appUpdateTitle)),
+          )
+          as String);
+
+  @override
+  String get appUpdateContent =>
+      (super.noSuchMethod(
+            Invocation.getter(#appUpdateContent),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#appUpdateContent)),
+          )
+          as String);
+
+  @override
+  String get productFound =>
+      (super.noSuchMethod(
+            Invocation.getter(#productFound),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#productFound)),
+          )
+          as String);
+
+  @override
+  String get productNotFound =>
+      (super.noSuchMethod(
+            Invocation.getter(#productNotFound),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#productNotFound)),
+          )
+          as String);
+
+  @override
+  String get scanBarcode =>
+      (super.noSuchMethod(
+            Invocation.getter(#scanBarcode),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#scanBarcode)),
+          )
+          as String);
+
+  @override
+  String get close =>
+      (super.noSuchMethod(
+            Invocation.getter(#close),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#close)),
+          )
+          as String);
+
+  @override
+  String get identicalExercisePleaseDiscard =>
+      (super.noSuchMethod(
+            Invocation.getter(#identicalExercisePleaseDiscard),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#identicalExercisePleaseDiscard),
+            ),
+          )
+          as String);
+
+  @override
+  String get checkInformationBeforeSubmitting =>
+      (super.noSuchMethod(
+            Invocation.getter(#checkInformationBeforeSubmitting),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#checkInformationBeforeSubmitting),
+            ),
+          )
+          as String);
+
+  @override
+  String get add_exercise_image_license =>
+      (super.noSuchMethod(
+            Invocation.getter(#add_exercise_image_license),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#add_exercise_image_license),
+            ),
+          )
+          as String);
+
+  @override
+  String get imageDetailsTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#imageDetailsTitle),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#imageDetailsTitle)),
+          )
+          as String);
+
+  @override
+  String get imageDetailsLicenseTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#imageDetailsLicenseTitle),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#imageDetailsLicenseTitle)),
+          )
+          as String);
+
+  @override
+  String get imageDetailsLicenseTitleHint =>
+      (super.noSuchMethod(
+            Invocation.getter(#imageDetailsLicenseTitleHint),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#imageDetailsLicenseTitleHint),
+            ),
+          )
+          as String);
+
+  @override
+  String get imageDetailsSourceLink =>
+      (super.noSuchMethod(
+            Invocation.getter(#imageDetailsSourceLink),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#imageDetailsSourceLink)),
+          )
+          as String);
+
+  @override
+  String get author =>
+      (super.noSuchMethod(
+            Invocation.getter(#author),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#author)),
+          )
+          as String);
+
+  @override
+  String get authorHint =>
+      (super.noSuchMethod(
+            Invocation.getter(#authorHint),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#authorHint)),
+          )
+          as String);
+
+  @override
+  String get imageDetailsAuthorLink =>
+      (super.noSuchMethod(
+            Invocation.getter(#imageDetailsAuthorLink),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#imageDetailsAuthorLink)),
+          )
+          as String);
+
+  @override
+  String get imageDetailsDerivativeSource =>
+      (super.noSuchMethod(
+            Invocation.getter(#imageDetailsDerivativeSource),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#imageDetailsDerivativeSource),
+            ),
+          )
+          as String);
+
+  @override
+  String get imageDetailsDerivativeHelp =>
+      (super.noSuchMethod(
+            Invocation.getter(#imageDetailsDerivativeHelp),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#imageDetailsDerivativeHelp),
+            ),
+          )
+          as String);
+
+  @override
+  String get imageDetailsImageType =>
+      (super.noSuchMethod(
+            Invocation.getter(#imageDetailsImageType),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#imageDetailsImageType)),
+          )
+          as String);
+
+  @override
+  String get imageDetailsLicenseNotice =>
+      (super.noSuchMethod(
+            Invocation.getter(#imageDetailsLicenseNotice),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#imageDetailsLicenseNotice),
+            ),
+          )
+          as String);
+
+  @override
+  String get imageDetailsLicenseNoticeLinkToLicense =>
+      (super.noSuchMethod(
+            Invocation.getter(#imageDetailsLicenseNoticeLinkToLicense),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#imageDetailsLicenseNoticeLinkToLicense),
+            ),
+          )
+          as String);
+
+  @override
+  String get add =>
+      (super.noSuchMethod(
+            Invocation.getter(#add),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#add)),
+          )
+          as String);
+
+  @override
+  String get variations =>
+      (super.noSuchMethod(
+            Invocation.getter(#variations),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#variations)),
+          )
+          as String);
+
+  @override
+  String get verifiedEmail =>
+      (super.noSuchMethod(
+            Invocation.getter(#verifiedEmail),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#verifiedEmail)),
+          )
+          as String);
+
+  @override
+  String get unVerifiedEmail =>
+      (super.noSuchMethod(
+            Invocation.getter(#unVerifiedEmail),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#unVerifiedEmail)),
+          )
+          as String);
+
+  @override
+  String get verifiedEmailReason =>
+      (super.noSuchMethod(
+            Invocation.getter(#verifiedEmailReason),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#verifiedEmailReason)),
+          )
+          as String);
+
+  @override
+  String get alternativeNames =>
+      (super.noSuchMethod(
+            Invocation.getter(#alternativeNames),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#alternativeNames)),
+          )
+          as String);
+
+  @override
+  String get oneNamePerLine =>
+      (super.noSuchMethod(
+            Invocation.getter(#oneNamePerLine),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#oneNamePerLine)),
+          )
+          as String);
+
+  @override
+  String get whatVariationsExist =>
+      (super.noSuchMethod(
+            Invocation.getter(#whatVariationsExist),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#whatVariationsExist)),
+          )
+          as String);
+
+  @override
+  String get previous =>
+      (super.noSuchMethod(
+            Invocation.getter(#previous),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#previous)),
+          )
+          as String);
+
+  @override
+  String get next =>
+      (super.noSuchMethod(
+            Invocation.getter(#next),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#next)),
+          )
+          as String);
+
+  @override
+  String get images =>
+      (super.noSuchMethod(
+            Invocation.getter(#images),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#images)),
+          )
+          as String);
+
+  @override
+  String get language =>
+      (super.noSuchMethod(
+            Invocation.getter(#language),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#language)),
+          )
+          as String);
+
+  @override
+  String get addExercise =>
+      (super.noSuchMethod(
+            Invocation.getter(#addExercise),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#addExercise)),
+          )
+          as String);
+
+  @override
+  String get fitInWeek =>
+      (super.noSuchMethod(
+            Invocation.getter(#fitInWeek),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#fitInWeek)),
+          )
+          as String);
+
+  @override
+  String get fitInWeekHelp =>
+      (super.noSuchMethod(
+            Invocation.getter(#fitInWeekHelp),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#fitInWeekHelp)),
+          )
+          as String);
+
+  @override
+  String get addSuperset =>
+      (super.noSuchMethod(
+            Invocation.getter(#addSuperset),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#addSuperset)),
+          )
+          as String);
+
+  @override
+  String get setHasProgression =>
+      (super.noSuchMethod(
+            Invocation.getter(#setHasProgression),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#setHasProgression)),
+          )
+          as String);
+
+  @override
+  String get setHasProgressionWarning =>
+      (super.noSuchMethod(
+            Invocation.getter(#setHasProgressionWarning),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#setHasProgressionWarning)),
+          )
+          as String);
+
+  @override
+  String get setHasNoExercises =>
+      (super.noSuchMethod(
+            Invocation.getter(#setHasNoExercises),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#setHasNoExercises)),
+          )
+          as String);
+
+  @override
+  String get contributeExercise =>
+      (super.noSuchMethod(
+            Invocation.getter(#contributeExercise),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#contributeExercise)),
+          )
+          as String);
+
+  @override
+  String get translation =>
+      (super.noSuchMethod(
+            Invocation.getter(#translation),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#translation)),
+          )
+          as String);
+
+  @override
+  String get translateExercise =>
+      (super.noSuchMethod(
+            Invocation.getter(#translateExercise),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#translateExercise)),
+          )
+          as String);
+
+  @override
+  String get baseData =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseData),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#baseData)),
+          )
+          as String);
+
+  @override
+  String get enterTextInLanguage =>
+      (super.noSuchMethod(
+            Invocation.getter(#enterTextInLanguage),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#enterTextInLanguage)),
+          )
+          as String);
+
+  @override
+  String get settingsTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#settingsTitle),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#settingsTitle)),
+          )
+          as String);
+
+  @override
+  String get settingsCacheTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#settingsCacheTitle),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#settingsCacheTitle)),
+          )
+          as String);
+
+  @override
+  String get settingsExerciseCacheDescription =>
+      (super.noSuchMethod(
+            Invocation.getter(#settingsExerciseCacheDescription),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#settingsExerciseCacheDescription),
+            ),
+          )
+          as String);
+
+  @override
+  String get settingsIngredientCacheDescription =>
+      (super.noSuchMethod(
+            Invocation.getter(#settingsIngredientCacheDescription),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#settingsIngredientCacheDescription),
+            ),
+          )
+          as String);
+
+  @override
+  String get settingsCacheDeletedSnackbar =>
+      (super.noSuchMethod(
+            Invocation.getter(#settingsCacheDeletedSnackbar),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#settingsCacheDeletedSnackbar),
+            ),
+          )
+          as String);
+
+  @override
+  String get aboutPageTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#aboutPageTitle),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#aboutPageTitle)),
+          )
+          as String);
+
+  @override
+  String get simpleMode =>
+      (super.noSuchMethod(
+            Invocation.getter(#simpleMode),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#simpleMode)),
+          )
+          as String);
+
+  @override
+  String get simpleModeHelp =>
+      (super.noSuchMethod(
+            Invocation.getter(#simpleModeHelp),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#simpleModeHelp)),
+          )
+          as String);
+
+  @override
+  String get progressionRules =>
+      (super.noSuchMethod(
+            Invocation.getter(#progressionRules),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#progressionRules)),
+          )
+          as String);
+
+  @override
+  String get cacheWarning =>
+      (super.noSuchMethod(
+            Invocation.getter(#cacheWarning),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#cacheWarning)),
+          )
+          as String);
+
+  @override
+  String get textPromptTitle =>
+      (super.noSuchMethod(
+            Invocation.getter(#textPromptTitle),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#textPromptTitle)),
+          )
+          as String);
+
+  @override
+  String get textPromptSubheading =>
+      (super.noSuchMethod(
+            Invocation.getter(#textPromptSubheading),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#textPromptSubheading)),
+          )
+          as String);
+
+  @override
+  String get abs =>
+      (super.noSuchMethod(
+            Invocation.getter(#abs),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#abs)),
+          )
+          as String);
+
+  @override
+  String get arms =>
+      (super.noSuchMethod(
+            Invocation.getter(#arms),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#arms)),
+          )
+          as String);
+
+  @override
+  String get back =>
+      (super.noSuchMethod(
+            Invocation.getter(#back),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#back)),
+          )
+          as String);
+
+  @override
+  String get barbell =>
+      (super.noSuchMethod(
+            Invocation.getter(#barbell),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#barbell)),
+          )
+          as String);
+
+  @override
+  String get bench =>
+      (super.noSuchMethod(
+            Invocation.getter(#bench),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#bench)),
+          )
+          as String);
+
+  @override
+  String get biceps =>
+      (super.noSuchMethod(
+            Invocation.getter(#biceps),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#biceps)),
+          )
+          as String);
+
+  @override
+  String get body_weight =>
+      (super.noSuchMethod(
+            Invocation.getter(#body_weight),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#body_weight)),
+          )
+          as String);
+
+  @override
+  String get calves =>
+      (super.noSuchMethod(
+            Invocation.getter(#calves),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#calves)),
+          )
+          as String);
+
+  @override
+  String get cardio =>
+      (super.noSuchMethod(
+            Invocation.getter(#cardio),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#cardio)),
+          )
+          as String);
+
+  @override
+  String get chest =>
+      (super.noSuchMethod(
+            Invocation.getter(#chest),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#chest)),
+          )
+          as String);
+
+  @override
+  String get dumbbell =>
+      (super.noSuchMethod(
+            Invocation.getter(#dumbbell),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#dumbbell)),
+          )
+          as String);
+
+  @override
+  String get glutes =>
+      (super.noSuchMethod(
+            Invocation.getter(#glutes),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#glutes)),
+          )
+          as String);
+
+  @override
+  String get gym_mat =>
+      (super.noSuchMethod(
+            Invocation.getter(#gym_mat),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#gym_mat)),
+          )
+          as String);
+
+  @override
+  String get hamstrings =>
+      (super.noSuchMethod(
+            Invocation.getter(#hamstrings),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#hamstrings)),
+          )
+          as String);
+
+  @override
+  String get incline_bench =>
+      (super.noSuchMethod(
+            Invocation.getter(#incline_bench),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#incline_bench)),
+          )
+          as String);
+
+  @override
+  String get kettlebell =>
+      (super.noSuchMethod(
+            Invocation.getter(#kettlebell),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#kettlebell)),
+          )
+          as String);
+
+  @override
+  String get kilometers =>
+      (super.noSuchMethod(
+            Invocation.getter(#kilometers),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#kilometers)),
+          )
+          as String);
+
+  @override
+  String get kilometers_per_hour =>
+      (super.noSuchMethod(
+            Invocation.getter(#kilometers_per_hour),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#kilometers_per_hour)),
+          )
+          as String);
+
+  @override
+  String get lats =>
+      (super.noSuchMethod(
+            Invocation.getter(#lats),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#lats)),
+          )
+          as String);
+
+  @override
+  String get legs =>
+      (super.noSuchMethod(
+            Invocation.getter(#legs),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#legs)),
+          )
+          as String);
+
+  @override
+  String get lower_back =>
+      (super.noSuchMethod(
+            Invocation.getter(#lower_back),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#lower_back)),
+          )
+          as String);
+
+  @override
+  String get max_reps =>
+      (super.noSuchMethod(
+            Invocation.getter(#max_reps),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#max_reps)),
+          )
+          as String);
+
+  @override
+  String get miles =>
+      (super.noSuchMethod(
+            Invocation.getter(#miles),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#miles)),
+          )
+          as String);
+
+  @override
+  String get miles_per_hour =>
+      (super.noSuchMethod(
+            Invocation.getter(#miles_per_hour),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#miles_per_hour)),
+          )
+          as String);
+
+  @override
+  String get minutes =>
+      (super.noSuchMethod(
+            Invocation.getter(#minutes),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#minutes)),
+          )
+          as String);
+
+  @override
+  String get plates =>
+      (super.noSuchMethod(
+            Invocation.getter(#plates),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#plates)),
+          )
+          as String);
+
+  @override
+  String get pull_up_bar =>
+      (super.noSuchMethod(
+            Invocation.getter(#pull_up_bar),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#pull_up_bar)),
+          )
+          as String);
+
+  @override
+  String get quads =>
+      (super.noSuchMethod(
+            Invocation.getter(#quads),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#quads)),
+          )
+          as String);
+
+  @override
+  String get repetitions =>
+      (super.noSuchMethod(
+            Invocation.getter(#repetitions),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#repetitions)),
+          )
+          as String);
+
+  @override
+  String get resistance_band =>
+      (super.noSuchMethod(
+            Invocation.getter(#resistance_band),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#resistance_band)),
+          )
+          as String);
+
+  @override
+  String get sz_bar =>
+      (super.noSuchMethod(
+            Invocation.getter(#sz_bar),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#sz_bar)),
+          )
+          as String);
+
+  @override
+  String get seconds =>
+      (super.noSuchMethod(
+            Invocation.getter(#seconds),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#seconds)),
+          )
+          as String);
+
+  @override
+  String get shoulders =>
+      (super.noSuchMethod(
+            Invocation.getter(#shoulders),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#shoulders)),
+          )
+          as String);
+
+  @override
+  String get swiss_ball =>
+      (super.noSuchMethod(
+            Invocation.getter(#swiss_ball),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#swiss_ball)),
+          )
+          as String);
+
+  @override
+  String get triceps =>
+      (super.noSuchMethod(
+            Invocation.getter(#triceps),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#triceps)),
+          )
+          as String);
+
+  @override
+  String get until_failure =>
+      (super.noSuchMethod(
+            Invocation.getter(#until_failure),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#until_failure)),
+          )
+          as String);
+
+  @override
+  String get kg =>
+      (super.noSuchMethod(
+            Invocation.getter(#kg),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#kg)),
+          )
+          as String);
+
+  @override
+  String get lb =>
+      (super.noSuchMethod(
+            Invocation.getter(#lb),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#lb)),
+          )
+          as String);
+
+  @override
+  String get none__bodyweight_exercise_ =>
+      (super.noSuchMethod(
+            Invocation.getter(#none__bodyweight_exercise_),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.getter(#none__bodyweight_exercise_),
+            ),
+          )
+          as String);
+
+  @override
+  String get log =>
+      (super.noSuchMethod(
+            Invocation.getter(#log),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#log)),
+          )
+          as String);
+
+  @override
+  String get done =>
+      (super.noSuchMethod(
+            Invocation.getter(#done),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#done)),
+          )
+          as String);
+
+  @override
+  String get overallChangeWeight =>
+      (super.noSuchMethod(
+            Invocation.getter(#overallChangeWeight),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#overallChangeWeight)),
+          )
+          as String);
+
+  @override
+  String get goalTypeMeals =>
+      (super.noSuchMethod(
+            Invocation.getter(#goalTypeMeals),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#goalTypeMeals)),
+          )
+          as String);
+
+  @override
+  String get goalTypeBasic =>
+      (super.noSuchMethod(
+            Invocation.getter(#goalTypeBasic),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#goalTypeBasic)),
+          )
+          as String);
+
+  @override
+  String get goalTypeAdvanced =>
+      (super.noSuchMethod(
+            Invocation.getter(#goalTypeAdvanced),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#goalTypeAdvanced)),
+          )
+          as String);
+
+  @override
+  String get indicatorRaw =>
+      (super.noSuchMethod(
+            Invocation.getter(#indicatorRaw),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#indicatorRaw)),
+          )
+          as String);
+
+  @override
+  String get indicatorAvg =>
+      (super.noSuchMethod(
+            Invocation.getter(#indicatorAvg),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#indicatorAvg)),
+          )
+          as String);
+
+  @override
+  String get themeMode =>
+      (super.noSuchMethod(
+            Invocation.getter(#themeMode),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#themeMode)),
+          )
+          as String);
+
+  @override
+  String get darkMode =>
+      (super.noSuchMethod(
+            Invocation.getter(#darkMode),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#darkMode)),
+          )
+          as String);
+
+  @override
+  String get lightMode =>
+      (super.noSuchMethod(
+            Invocation.getter(#lightMode),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#lightMode)),
+          )
+          as String);
+
+  @override
+  String get systemMode =>
+      (super.noSuchMethod(
+            Invocation.getter(#systemMode),
+            returnValue: _i3.dummyValue<String>(this, Invocation.getter(#systemMode)),
+          )
+          as String);
+
+  @override
+  String exerciseNr(String? nr) =>
+      (super.noSuchMethod(
+            Invocation.method(#exerciseNr, [nr]),
+            returnValue: _i3.dummyValue<String>(this, Invocation.method(#exerciseNr, [nr])),
+          )
+          as String);
+
+  @override
+  String supersetNr(String? nr) =>
+      (super.noSuchMethod(
+            Invocation.method(#supersetNr, [nr]),
+            returnValue: _i3.dummyValue<String>(this, Invocation.method(#supersetNr, [nr])),
+          )
+          as String);
+
+  @override
+  String chartAllTimeTitle(String? name) =>
+      (super.noSuchMethod(
+            Invocation.method(#chartAllTimeTitle, [name]),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.method(#chartAllTimeTitle, [name]),
+            ),
+          )
+          as String);
+
+  @override
+  String chart30DaysTitle(String? name) =>
+      (super.noSuchMethod(
+            Invocation.method(#chart30DaysTitle, [name]),
+            returnValue: _i3.dummyValue<String>(this, Invocation.method(#chart30DaysTitle, [name])),
+          )
+          as String);
+
+  @override
+  String chartDuringPlanTitle(String? chartName, String? planName) =>
+      (super.noSuchMethod(
+            Invocation.method(#chartDuringPlanTitle, [chartName, planName]),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.method(#chartDuringPlanTitle, [chartName, planName]),
+            ),
+          )
+          as String);
+
+  @override
+  String kcalValue(String? value) =>
+      (super.noSuchMethod(
+            Invocation.method(#kcalValue, [value]),
+            returnValue: _i3.dummyValue<String>(this, Invocation.method(#kcalValue, [value])),
+          )
+          as String);
+
+  @override
+  String gValue(String? value) =>
+      (super.noSuchMethod(
+            Invocation.method(#gValue, [value]),
+            returnValue: _i3.dummyValue<String>(this, Invocation.method(#gValue, [value])),
+          )
+          as String);
+
+  @override
+  String percentValue(String? value) =>
+      (super.noSuchMethod(
+            Invocation.method(#percentValue, [value]),
+            returnValue: _i3.dummyValue<String>(this, Invocation.method(#percentValue, [value])),
+          )
+          as String);
+
+  @override
+  String confirmDelete(String? toDelete) =>
+      (super.noSuchMethod(
+            Invocation.method(#confirmDelete, [toDelete]),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.method(#confirmDelete, [toDelete]),
+            ),
+          )
+          as String);
+
+  @override
+  String enterCharacters(String? min, String? max) =>
+      (super.noSuchMethod(
+            Invocation.method(#enterCharacters, [min, max]),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.method(#enterCharacters, [min, max]),
+            ),
+          )
+          as String);
+
+  @override
+  String enterMinCharacters(String? min) =>
+      (super.noSuchMethod(
+            Invocation.method(#enterMinCharacters, [min]),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.method(#enterMinCharacters, [min]),
+            ),
+          )
+          as String);
+
+  @override
+  String nrOfSets(String? nrOfSets) =>
+      (super.noSuchMethod(
+            Invocation.method(#nrOfSets, [nrOfSets]),
+            returnValue: _i3.dummyValue<String>(this, Invocation.method(#nrOfSets, [nrOfSets])),
+          )
+          as String);
+
+  @override
+  String productFoundDescription(String? productName) =>
+      (super.noSuchMethod(
+            Invocation.method(#productFoundDescription, [productName]),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.method(#productFoundDescription, [productName]),
+            ),
+          )
+          as String);
+
+  @override
+  String productNotFoundDescription(String? barcode) =>
+      (super.noSuchMethod(
+            Invocation.method(#productNotFoundDescription, [barcode]),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.method(#productNotFoundDescription, [barcode]),
+            ),
+          )
+          as String);
+
+  @override
+  String alsoKnownAs(String? aliases) =>
+      (super.noSuchMethod(
+            Invocation.method(#alsoKnownAs, [aliases]),
+            returnValue: _i3.dummyValue<String>(this, Invocation.method(#alsoKnownAs, [aliases])),
+          )
+          as String);
+
+  @override
+  String verifiedEmailInfo(String? email) =>
+      (super.noSuchMethod(
+            Invocation.method(#verifiedEmailInfo, [email]),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.method(#verifiedEmailInfo, [email]),
+            ),
+          )
+          as String);
+
+  @override
+  String contributeExerciseWarning(String? days) =>
+      (super.noSuchMethod(
+            Invocation.method(#contributeExerciseWarning, [days]),
+            returnValue: _i3.dummyValue<String>(
+              this,
+              Invocation.method(#contributeExerciseWarning, [days]),
+            ),
+          )
+          as String);
+}
diff --git a/test/exercises/contribute_exercise_image_test.dart b/test/exercises/contribute_exercise_image_test.dart
new file mode 100644
index 00000000..f8fe127a
--- /dev/null
+++ b/test/exercises/contribute_exercise_image_test.dart
@@ -0,0 +1,199 @@
+import 'dart:io';
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:wger/models/exercises/exercise_submission_images.dart';
+import 'package:wger/providers/add_exercise.dart';
+import 'package:wger/providers/base_provider.dart';
+
+import 'contribute_exercise_image_test.mocks.dart';
+
+/// Unit tests for AddExerciseProvider image metadata handling
+///
+/// Tests the functionality added for issue #931 - storing and managing
+/// CC BY-SA 4.0 license metadata alongside exercise images.
+///
+/// Key areas tested:
+/// - Adding images with complete/partial/no metadata
+/// - Edge cases (empty lists, duplicates, special characters)
+/// - State management (clear, remove)
+/// - Image ordering and batch operations
+
+@GenerateMocks([AddExerciseProvider, WgerBaseProvider])
+void main() {
+  late MockWgerBaseProvider mockBaseProvider;
+  late AddExerciseProvider provider;
+
+  setUp(() {
+    mockBaseProvider = MockWgerBaseProvider();
+    provider = AddExerciseProvider(mockBaseProvider);
+  });
+
+  group('Image metadata handling', () {
+    /// Verify that all CC BY-SA license fields are stored correctly
+    /// Tests: title, author, authorUrl, sourceUrl, derivativeSourceUrl, style
+    test('should store image with all license fields', () {
+      final mockFile = File('test.jpg');
+
+      provider.addExerciseImages([
+        ExerciseSubmissionImage(
+          imageFile: mockFile,
+          title: 'Test Title',
+          author: 'Test Author',
+          authorUrl: 'https://test.com/author',
+          sourceUrl: 'https://source.com',
+          derivativeSourceUrl: 'https://derivative.com',
+          type: ImageType.lowPoly,
+        ),
+      ]);
+
+      expect(provider.exerciseImages.length, 1);
+      expect(provider.exerciseImages.first.imageFile.path, mockFile.path);
+    });
+
+    /// License fields are optional - provider should handle null/empty values
+    /// Only non-empty fields should be included in the metadata map
+    test('should handle empty fields gracefully', () {
+      final mockFile = File('test2.jpg');
+
+      provider.addExerciseImages([
+        ExerciseSubmissionImage(imageFile: mockFile, title: 'Only Title', type: ImageType.threeD),
+      ]);
+
+      expect(provider.exerciseImages.length, 1);
+    });
+
+    /// Each image can have different metadata - test storing multiple
+    /// images with unique license information
+    test('should handle multiple images with different metadata', () {
+      final file1 = File('image1.jpg');
+      final file2 = File('image2.jpg');
+
+      provider.addExerciseImages([ExerciseSubmissionImage(imageFile: file1, author: 'Author 1')]);
+      provider.addExerciseImages([ExerciseSubmissionImage(imageFile: file2, author: 'Author 1')]);
+
+      expect(provider.exerciseImages.length, 2);
+      expect(provider.exerciseImages[0].imageFile.path, file1.path);
+      expect(provider.exerciseImages[1].imageFile.path, file2.path);
+    });
+
+    /// Edge case: calling addExerciseImages with empty list should not crash
+    test('should handle empty image list', () {
+      provider.addExerciseImages([]);
+
+      expect(provider.exerciseImages.length, 0);
+    });
+
+    /// Removing an image should also remove its associated metadata
+    /// to prevent memory leaks
+    test('should remove image and its metadata', () {
+      final mockFile = File('to_remove.jpg');
+      provider.addExerciseImages([ExerciseSubmissionImage(imageFile: mockFile)]);
+
+      expect(provider.exerciseImages.length, 1);
+
+      provider.removeImage(mockFile.path);
+
+      expect(provider.exerciseImages.length, 0);
+    });
+
+    /// Attempting to remove a non-existent image should throw StateError
+    /// (from firstWhere with no orElse)
+    test('should handle removing non-existent image gracefully', () {
+      expect(() => provider.removeImage('nonexistent.jpg'), throwsStateError);
+    });
+
+    /// clear() should reset all state including images and metadata
+    test('should clear all images and metadata', () {
+      provider.addExerciseImages([
+        ExerciseSubmissionImage(imageFile: File('image1.jpg'), title: 'Image 1'),
+        ExerciseSubmissionImage(imageFile: File('image2.jpg'), title: 'Image 2'),
+      ]);
+
+      expect(provider.exerciseImages.length, 2);
+
+      provider.clear();
+
+      expect(provider.exerciseImages.length, 0);
+    });
+
+    /// Clearing an already empty list should not cause errors
+    test('should handle clearing empty list', () {
+      expect(provider.exerciseImages.length, 0);
+
+      provider.clear();
+
+      expect(provider.exerciseImages.length, 0);
+    });
+
+    /// Removing one image from a set should not affect others
+    test('should allow removing specific image from multiple images', () {
+      final file1 = File('keep1.jpg');
+      final file2 = File('remove.jpg');
+      final file3 = File('keep2.jpg');
+
+      provider.addExerciseImages([ExerciseSubmissionImage(imageFile: file1)]);
+      provider.addExerciseImages([ExerciseSubmissionImage(imageFile: file2)]);
+      provider.addExerciseImages([ExerciseSubmissionImage(imageFile: file3)]);
+
+      expect(provider.exerciseImages.length, 3);
+
+      provider.removeImage(file2.path);
+
+      expect(provider.exerciseImages.length, 2);
+      expect(provider.exerciseImages[0].imageFile.path, file1.path);
+      expect(provider.exerciseImages[1].imageFile.path, file3.path);
+    });
+
+    /// Test with extremely long strings (1000 chars) to ensure no
+    /// buffer overflow or validation issues
+    test('should handle very long metadata strings', () {
+      final mockFile = File('long.jpg');
+      final longString = 'a' * 1000;
+
+      provider.addExerciseImages([
+        ExerciseSubmissionImage(
+          imageFile: mockFile,
+          title: longString,
+          author: longString,
+          authorUrl: 'https://example.com/$longString',
+        ),
+      ]);
+
+      expect(provider.exerciseImages.length, 1);
+    });
+
+    /// Unicode characters, emojis, and URL-encoded strings should all work
+    /// Tests international character support
+    test('should handle special characters in metadata', () {
+      final mockFile = File('special.jpg');
+
+      provider.addExerciseImages([
+        ExerciseSubmissionImage(
+          imageFile: mockFile,
+          title: 'Title with émojis 🎉 and spëcial çhars',
+          author: 'Autör with ümlauts',
+          authorUrl: 'https://example.com/path?query=value&another=value',
+        ),
+      ]);
+
+      expect(provider.exerciseImages.length, 1);
+    });
+  });
+
+  group('State management', () {
+    /// clear() should reset ALL provider state, not just images
+    /// Ensures no data leaks between exercises
+    test('should reset all state after clear', () {
+      provider.exerciseNameEn = 'Test Exercise';
+      provider.descriptionEn = 'Description';
+      provider.addExerciseImages([ExerciseSubmissionImage(imageFile: File('test.jpg'))]);
+
+      provider.clear();
+
+      expect(provider.exerciseImages.length, 0);
+      expect(provider.exerciseNameEn, isNull);
+      expect(provider.descriptionEn, isNull);
+    });
+  });
+}
diff --git a/test/exercises/contribute_exercise_image_test.mocks.dart b/test/exercises/contribute_exercise_image_test.mocks.dart
new file mode 100644
index 00000000..22ab5237
--- /dev/null
+++ b/test/exercises/contribute_exercise_image_test.mocks.dart
@@ -0,0 +1,395 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in wger/test/exercises/contribute_exercise_image_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i14;
+import 'dart:ui' as _i15;
+
+import 'package:http/http.dart' as _i5;
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:mockito/src/dummies.dart' as _i8;
+import 'package:wger/models/exercises/category.dart' as _i13;
+import 'package:wger/models/exercises/equipment.dart' as _i9;
+import 'package:wger/models/exercises/exercise_submission.dart' as _i11;
+import 'package:wger/models/exercises/exercise_submission_images.dart' as _i7;
+import 'package:wger/models/exercises/language.dart' as _i12;
+import 'package:wger/models/exercises/muscle.dart' as _i10;
+import 'package:wger/models/exercises/variation.dart' as _i3;
+import 'package:wger/providers/add_exercise.dart' as _i6;
+import 'package:wger/providers/auth.dart' as _i4;
+import 'package:wger/providers/base_provider.dart' as _i2;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
+
+class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider {
+  _FakeWgerBaseProvider_0(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeVariation_1 extends _i1.SmartFake implements _i3.Variation {
+  _FakeVariation_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeAuthProvider_2 extends _i1.SmartFake implements _i4.AuthProvider {
+  _FakeAuthProvider_2(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeClient_3 extends _i1.SmartFake implements _i5.Client {
+  _FakeClient_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeUri_4 extends _i1.SmartFake implements Uri {
+  _FakeUri_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeResponse_5 extends _i1.SmartFake implements _i5.Response {
+  _FakeResponse_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+/// A class which mocks [AddExerciseProvider].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockAddExerciseProvider extends _i1.Mock implements _i6.AddExerciseProvider {
+  MockAddExerciseProvider() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(this, Invocation.getter(#baseProvider)),
+          )
+          as _i2.WgerBaseProvider);
+
+  @override
+  List<_i7.ExerciseSubmissionImage> get exerciseImages =>
+      (super.noSuchMethod(
+            Invocation.getter(#exerciseImages),
+            returnValue: <_i7.ExerciseSubmissionImage>[],
+          )
+          as List<_i7.ExerciseSubmissionImage>);
+
+  @override
+  String get author =>
+      (super.noSuchMethod(
+            Invocation.getter(#author),
+            returnValue: _i8.dummyValue<String>(this, Invocation.getter(#author)),
+          )
+          as String);
+
+  @override
+  List<String> get alternateNamesEn =>
+      (super.noSuchMethod(Invocation.getter(#alternateNamesEn), returnValue: <String>[])
+          as List<String>);
+
+  @override
+  List<String> get alternateNamesTrans =>
+      (super.noSuchMethod(Invocation.getter(#alternateNamesTrans), returnValue: <String>[])
+          as List<String>);
+
+  @override
+  List<_i9.Equipment> get equipment =>
+      (super.noSuchMethod(Invocation.getter(#equipment), returnValue: <_i9.Equipment>[])
+          as List<_i9.Equipment>);
+
+  @override
+  bool get newVariation =>
+      (super.noSuchMethod(Invocation.getter(#newVariation), returnValue: false) as bool);
+
+  @override
+  _i3.Variation get variation =>
+      (super.noSuchMethod(
+            Invocation.getter(#variation),
+            returnValue: _FakeVariation_1(this, Invocation.getter(#variation)),
+          )
+          as _i3.Variation);
+
+  @override
+  List<_i10.Muscle> get primaryMuscles =>
+      (super.noSuchMethod(Invocation.getter(#primaryMuscles), returnValue: <_i10.Muscle>[])
+          as List<_i10.Muscle>);
+
+  @override
+  List<_i10.Muscle> get secondaryMuscles =>
+      (super.noSuchMethod(Invocation.getter(#secondaryMuscles), returnValue: <_i10.Muscle>[])
+          as List<_i10.Muscle>);
+
+  @override
+  _i11.ExerciseSubmissionApi get exerciseApiObject =>
+      (super.noSuchMethod(
+            Invocation.getter(#exerciseApiObject),
+            returnValue: _i8.dummyValue<_i11.ExerciseSubmissionApi>(
+              this,
+              Invocation.getter(#exerciseApiObject),
+            ),
+          )
+          as _i11.ExerciseSubmissionApi);
+
+  @override
+  set author(String? value) =>
+      super.noSuchMethod(Invocation.setter(#author, value), returnValueForMissingStub: null);
+
+  @override
+  set exerciseNameEn(String? value) => super.noSuchMethod(
+    Invocation.setter(#exerciseNameEn, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set exerciseNameTrans(String? value) => super.noSuchMethod(
+    Invocation.setter(#exerciseNameTrans, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set descriptionEn(String? value) =>
+      super.noSuchMethod(Invocation.setter(#descriptionEn, value), returnValueForMissingStub: null);
+
+  @override
+  set descriptionTrans(String? value) => super.noSuchMethod(
+    Invocation.setter(#descriptionTrans, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set languageEn(_i12.Language? value) =>
+      super.noSuchMethod(Invocation.setter(#languageEn, value), returnValueForMissingStub: null);
+
+  @override
+  set languageTranslation(_i12.Language? value) => super.noSuchMethod(
+    Invocation.setter(#languageTranslation, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set alternateNamesEn(List<String>? value) => super.noSuchMethod(
+    Invocation.setter(#alternateNamesEn, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set alternateNamesTrans(List<String>? value) => super.noSuchMethod(
+    Invocation.setter(#alternateNamesTrans, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set category(_i13.ExerciseCategory? value) =>
+      super.noSuchMethod(Invocation.setter(#category, value), returnValueForMissingStub: null);
+
+  @override
+  set equipment(List<_i9.Equipment>? equipment) =>
+      super.noSuchMethod(Invocation.setter(#equipment, equipment), returnValueForMissingStub: null);
+
+  @override
+  set variationConnectToExercise(int? value) => super.noSuchMethod(
+    Invocation.setter(#variationConnectToExercise, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set variationId(int? variation) => super.noSuchMethod(
+    Invocation.setter(#variationId, variation),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set primaryMuscles(List<_i10.Muscle>? muscles) => super.noSuchMethod(
+    Invocation.setter(#primaryMuscles, muscles),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set secondaryMuscles(List<_i10.Muscle>? muscles) => super.noSuchMethod(
+    Invocation.setter(#secondaryMuscles, muscles),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  bool get hasListeners =>
+      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
+
+  @override
+  void clear() =>
+      super.noSuchMethod(Invocation.method(#clear, []), returnValueForMissingStub: null);
+
+  @override
+  void addExerciseImages(List<_i7.ExerciseSubmissionImage>? images) => super.noSuchMethod(
+    Invocation.method(#addExerciseImages, [images]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void removeImage(String? path) =>
+      super.noSuchMethod(Invocation.method(#removeImage, [path]), returnValueForMissingStub: null);
+
+  @override
+  _i14.Future<int> postExerciseToServer() =>
+      (super.noSuchMethod(
+            Invocation.method(#postExerciseToServer, []),
+            returnValue: _i14.Future<int>.value(0),
+          )
+          as _i14.Future<int>);
+
+  @override
+  _i14.Future<int> addExerciseSubmission() =>
+      (super.noSuchMethod(
+            Invocation.method(#addExerciseSubmission, []),
+            returnValue: _i14.Future<int>.value(0),
+          )
+          as _i14.Future<int>);
+
+  @override
+  _i14.Future<void> addImages(int? exerciseId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addImages, [exerciseId]),
+            returnValue: _i14.Future<void>.value(),
+            returnValueForMissingStub: _i14.Future<void>.value(),
+          )
+          as _i14.Future<void>);
+
+  @override
+  _i14.Future<bool> validateLanguage(String? input, String? languageCode) =>
+      (super.noSuchMethod(
+            Invocation.method(#validateLanguage, [input, languageCode]),
+            returnValue: _i14.Future<bool>.value(false),
+          )
+          as _i14.Future<bool>);
+
+  @override
+  void addListener(_i15.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void removeListener(_i15.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#removeListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void dispose() =>
+      super.noSuchMethod(Invocation.method(#dispose, []), returnValueForMissingStub: null);
+
+  @override
+  void notifyListeners() =>
+      super.noSuchMethod(Invocation.method(#notifyListeners, []), returnValueForMissingStub: null);
+}
+
+/// A class which mocks [WgerBaseProvider].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockWgerBaseProvider extends _i1.Mock implements _i2.WgerBaseProvider {
+  MockWgerBaseProvider() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i4.AuthProvider get auth =>
+      (super.noSuchMethod(
+            Invocation.getter(#auth),
+            returnValue: _FakeAuthProvider_2(this, Invocation.getter(#auth)),
+          )
+          as _i4.AuthProvider);
+
+  @override
+  _i5.Client get client =>
+      (super.noSuchMethod(
+            Invocation.getter(#client),
+            returnValue: _FakeClient_3(this, Invocation.getter(#client)),
+          )
+          as _i5.Client);
+
+  @override
+  set auth(_i4.AuthProvider? value) =>
+      super.noSuchMethod(Invocation.setter(#auth, value), returnValueForMissingStub: null);
+
+  @override
+  set client(_i5.Client? value) =>
+      super.noSuchMethod(Invocation.setter(#client, value), returnValueForMissingStub: null);
+
+  @override
+  Map<String, String> getDefaultHeaders({bool? includeAuth = false}) =>
+      (super.noSuchMethod(
+            Invocation.method(#getDefaultHeaders, [], {#includeAuth: includeAuth}),
+            returnValue: <String, String>{},
+          )
+          as Map<String, String>);
+
+  @override
+  Uri makeUrl(String? path, {int? id, String? objectMethod, Map<String, dynamic>? query}) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #makeUrl,
+              [path],
+              {#id: id, #objectMethod: objectMethod, #query: query},
+            ),
+            returnValue: _FakeUri_4(
+              this,
+              Invocation.method(
+                #makeUrl,
+                [path],
+                {#id: id, #objectMethod: objectMethod, #query: query},
+              ),
+            ),
+          )
+          as Uri);
+
+  @override
+  _i14.Future<dynamic> fetch(Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetch, [uri]),
+            returnValue: _i14.Future<dynamic>.value(),
+          )
+          as _i14.Future<dynamic>);
+
+  @override
+  _i14.Future<List<dynamic>> fetchPaginated(Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchPaginated, [uri]),
+            returnValue: _i14.Future<List<dynamic>>.value(<dynamic>[]),
+          )
+          as _i14.Future<List<dynamic>>);
+
+  @override
+  _i14.Future<Map<String, dynamic>> post(Map<String, dynamic>? data, Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#post, [data, uri]),
+            returnValue: _i14.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+          )
+          as _i14.Future<Map<String, dynamic>>);
+
+  @override
+  _i14.Future<Map<String, dynamic>> patch(Map<String, dynamic>? data, Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#patch, [data, uri]),
+            returnValue: _i14.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+          )
+          as _i14.Future<Map<String, dynamic>>);
+
+  @override
+  _i14.Future<_i5.Response> deleteRequest(String? url, int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteRequest, [url, id]),
+            returnValue: _i14.Future<_i5.Response>.value(
+              _FakeResponse_5(this, Invocation.method(#deleteRequest, [url, id])),
+            ),
+          )
+          as _i14.Future<_i5.Response>);
+}
diff --git a/test/exercises/contribute_exercise_test.dart b/test/exercises/contribute_exercise_test.dart
index f252aa3d..301aaffb 100644
--- a/test/exercises/contribute_exercise_test.dart
+++ b/test/exercises/contribute_exercise_test.dart
@@ -29,10 +29,9 @@ import 'package:wger/screens/add_exercise_screen.dart';
 
 import '../../test_data/exercises.dart';
 import '../../test_data/profile.dart';
-import '../workout/gym_mode_screen_test.mocks.dart';
 import 'contribute_exercise_test.mocks.dart';
 
-@GenerateMocks([AddExerciseProvider, UserProvider])
+@GenerateMocks([AddExerciseProvider, UserProvider, ExercisesProvider])
 void main() {
   final mockAddExerciseProvider = MockAddExerciseProvider();
   final mockExerciseProvider = MockExercisesProvider();
@@ -75,14 +74,14 @@ void main() {
     when(mockExerciseProvider.categories).thenReturn(testCategories);
     when(mockExerciseProvider.muscles).thenReturn(testMuscles);
     when(mockExerciseProvider.equipment).thenReturn(testEquipment);
-    when(mockExerciseProvider.exerciseBasesByVariation).thenReturn({});
+    when(mockExerciseProvider.exerciseByVariation).thenReturn({});
     when(mockExerciseProvider.exercises).thenReturn(getTestExercises());
     when(mockExerciseProvider.languages).thenReturn(testLanguages);
 
     when(mockAddExerciseProvider.equipment).thenReturn([]);
     when(mockAddExerciseProvider.primaryMuscles).thenReturn([]);
     when(mockAddExerciseProvider.secondaryMuscles).thenReturn([]);
-    when(mockAddExerciseProvider.newVariationForExercise).thenReturn(null);
+    when(mockAddExerciseProvider.variationConnectToExercise).thenReturn(null);
 
     // Act
     await tester.pumpWidget(createExerciseScreen());
diff --git a/test/exercises/contribute_exercise_test.mocks.dart b/test/exercises/contribute_exercise_test.mocks.dart
index 6b7eba52..726b8a14 100644
--- a/test/exercises/contribute_exercise_test.mocks.dart
+++ b/test/exercises/contribute_exercise_test.mocks.dart
@@ -1,25 +1,29 @@
-// Mocks generated by Mockito 5.4.4 from annotations
+// Mocks generated by Mockito 5.4.6 from annotations
 // in wger/test/exercises/contribute_exercise_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i13;
-import 'dart:io' as _i10;
-import 'dart:ui' as _i14;
+import 'dart:async' as _i15;
+import 'dart:ui' as _i16;
 
+import 'package:flutter/material.dart' as _i18;
 import 'package:mockito/mockito.dart' as _i1;
-import 'package:wger/models/exercises/alias.dart' as _i6;
-import 'package:wger/models/exercises/category.dart' as _i9;
-import 'package:wger/models/exercises/equipment.dart' as _i11;
-import 'package:wger/models/exercises/exercise.dart' as _i3;
-import 'package:wger/models/exercises/language.dart' as _i8;
-import 'package:wger/models/exercises/muscle.dart' as _i12;
-import 'package:wger/models/exercises/translation.dart' as _i4;
-import 'package:wger/models/exercises/variation.dart' as _i5;
-import 'package:wger/models/user/profile.dart' as _i16;
-import 'package:wger/providers/add_exercise.dart' as _i7;
+import 'package:mockito/src/dummies.dart' as _i13;
+import 'package:shared_preferences/shared_preferences.dart' as _i4;
+import 'package:wger/database/exercises/exercise_database.dart' as _i5;
+import 'package:wger/models/exercises/category.dart' as _i7;
+import 'package:wger/models/exercises/equipment.dart' as _i8;
+import 'package:wger/models/exercises/exercise.dart' as _i6;
+import 'package:wger/models/exercises/exercise_submission.dart' as _i14;
+import 'package:wger/models/exercises/exercise_submission_images.dart' as _i12;
+import 'package:wger/models/exercises/language.dart' as _i10;
+import 'package:wger/models/exercises/muscle.dart' as _i9;
+import 'package:wger/models/exercises/variation.dart' as _i3;
+import 'package:wger/models/user/profile.dart' as _i19;
+import 'package:wger/providers/add_exercise.dart' as _i11;
 import 'package:wger/providers/base_provider.dart' as _i2;
-import 'package:wger/providers/user.dart' as _i15;
+import 'package:wger/providers/exercises.dart' as _i20;
+import 'package:wger/providers/user.dart' as _i17;
 
 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -29,537 +33,866 @@ import 'package:wger/providers/user.dart' as _i15;
 // ignore_for_file: deprecated_member_use_from_same_package
 // ignore_for_file: implementation_imports
 // ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
 // ignore_for_file: camel_case_types
 // ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
 
-class _FakeWgerBaseProvider_0 extends _i1.SmartFake
-    implements _i2.WgerBaseProvider {
-  _FakeWgerBaseProvider_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider {
+  _FakeWgerBaseProvider_0(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
-class _FakeExercise_1 extends _i1.SmartFake implements _i3.Exercise {
-  _FakeExercise_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+class _FakeVariation_1 extends _i1.SmartFake implements _i3.Variation {
+  _FakeVariation_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
-class _FakeTranslation_2 extends _i1.SmartFake implements _i4.Translation {
-  _FakeTranslation_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+class _FakeSharedPreferencesAsync_2 extends _i1.SmartFake implements _i4.SharedPreferencesAsync {
+  _FakeSharedPreferencesAsync_2(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
-class _FakeVariation_3 extends _i1.SmartFake implements _i5.Variation {
-  _FakeVariation_3(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+class _FakeExerciseDatabase_3 extends _i1.SmartFake implements _i5.ExerciseDatabase {
+  _FakeExerciseDatabase_3(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
-class _FakeAlias_4 extends _i1.SmartFake implements _i6.Alias {
-  _FakeAlias_4(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+class _FakeExercise_4 extends _i1.SmartFake implements _i6.Exercise {
+  _FakeExercise_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeExerciseCategory_5 extends _i1.SmartFake implements _i7.ExerciseCategory {
+  _FakeExerciseCategory_5(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeEquipment_6 extends _i1.SmartFake implements _i8.Equipment {
+  _FakeEquipment_6(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeMuscle_7 extends _i1.SmartFake implements _i9.Muscle {
+  _FakeMuscle_7(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeLanguage_8 extends _i1.SmartFake implements _i10.Language {
+  _FakeLanguage_8(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 /// A class which mocks [AddExerciseProvider].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockAddExerciseProvider extends _i1.Mock
-    implements _i7.AddExerciseProvider {
+class MockAddExerciseProvider extends _i1.Mock implements _i11.AddExerciseProvider {
   MockAddExerciseProvider() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_0(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i2.WgerBaseProvider);
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(
+              this,
+              Invocation.getter(#baseProvider),
+            ),
+          )
+          as _i2.WgerBaseProvider);
 
   @override
-  set language(_i8.Language? _language) => super.noSuchMethod(
-        Invocation.setter(
-          #language,
-          _language,
-        ),
-        returnValueForMissingStub: null,
-      );
+  List<_i12.ExerciseSubmissionImage> get exerciseImages =>
+      (super.noSuchMethod(
+            Invocation.getter(#exerciseImages),
+            returnValue: <_i12.ExerciseSubmissionImage>[],
+          )
+          as List<_i12.ExerciseSubmissionImage>);
 
   @override
-  set category(_i9.ExerciseCategory? _category) => super.noSuchMethod(
-        Invocation.setter(
-          #category,
-          _category,
-        ),
-        returnValueForMissingStub: null,
-      );
+  String get author =>
+      (super.noSuchMethod(
+            Invocation.getter(#author),
+            returnValue: _i13.dummyValue<String>(
+              this,
+              Invocation.getter(#author),
+            ),
+          )
+          as String);
 
   @override
-  List<_i10.File> get exerciseImages => (super.noSuchMethod(
-        Invocation.getter(#exerciseImages),
-        returnValue: <_i10.File>[],
-      ) as List<_i10.File>);
+  List<String> get alternateNamesEn =>
+      (super.noSuchMethod(
+            Invocation.getter(#alternateNamesEn),
+            returnValue: <String>[],
+          )
+          as List<String>);
 
   @override
-  set exerciseNameEn(String? name) => super.noSuchMethod(
-        Invocation.setter(
-          #exerciseNameEn,
-          name,
-        ),
-        returnValueForMissingStub: null,
-      );
+  List<String> get alternateNamesTrans =>
+      (super.noSuchMethod(
+            Invocation.getter(#alternateNamesTrans),
+            returnValue: <String>[],
+          )
+          as List<String>);
 
   @override
-  set exerciseNameTrans(String? name) => super.noSuchMethod(
-        Invocation.setter(
-          #exerciseNameTrans,
-          name,
-        ),
-        returnValueForMissingStub: null,
-      );
+  List<_i8.Equipment> get equipment =>
+      (super.noSuchMethod(
+            Invocation.getter(#equipment),
+            returnValue: <_i8.Equipment>[],
+          )
+          as List<_i8.Equipment>);
 
   @override
-  set descriptionEn(String? description) => super.noSuchMethod(
-        Invocation.setter(
-          #descriptionEn,
-          description,
-        ),
-        returnValueForMissingStub: null,
-      );
+  bool get newVariation =>
+      (super.noSuchMethod(Invocation.getter(#newVariation), returnValue: false) as bool);
 
   @override
-  set descriptionTrans(String? description) => super.noSuchMethod(
-        Invocation.setter(
-          #descriptionTrans,
-          description,
-        ),
-        returnValueForMissingStub: null,
-      );
+  _i3.Variation get variation =>
+      (super.noSuchMethod(
+            Invocation.getter(#variation),
+            returnValue: _FakeVariation_1(this, Invocation.getter(#variation)),
+          )
+          as _i3.Variation);
 
   @override
-  set alternateNamesEn(List<String>? names) => super.noSuchMethod(
-        Invocation.setter(
-          #alternateNamesEn,
-          names,
-        ),
-        returnValueForMissingStub: null,
-      );
+  List<_i9.Muscle> get primaryMuscles =>
+      (super.noSuchMethod(
+            Invocation.getter(#primaryMuscles),
+            returnValue: <_i9.Muscle>[],
+          )
+          as List<_i9.Muscle>);
 
   @override
-  set alternateNamesTrans(List<String>? names) => super.noSuchMethod(
-        Invocation.setter(
-          #alternateNamesTrans,
-          names,
-        ),
-        returnValueForMissingStub: null,
-      );
+  List<_i9.Muscle> get secondaryMuscles =>
+      (super.noSuchMethod(
+            Invocation.getter(#secondaryMuscles),
+            returnValue: <_i9.Muscle>[],
+          )
+          as List<_i9.Muscle>);
 
   @override
-  set equipment(List<_i11.Equipment>? equipment) => super.noSuchMethod(
-        Invocation.setter(
-          #equipment,
-          equipment,
-        ),
-        returnValueForMissingStub: null,
-      );
+  _i14.ExerciseSubmissionApi get exerciseApiObject =>
+      (super.noSuchMethod(
+            Invocation.getter(#exerciseApiObject),
+            returnValue: _i13.dummyValue<_i14.ExerciseSubmissionApi>(
+              this,
+              Invocation.getter(#exerciseApiObject),
+            ),
+          )
+          as _i14.ExerciseSubmissionApi);
 
   @override
-  List<_i11.Equipment> get equipment => (super.noSuchMethod(
-        Invocation.getter(#equipment),
-        returnValue: <_i11.Equipment>[],
-      ) as List<_i11.Equipment>);
+  set author(String? value) => super.noSuchMethod(
+    Invocation.setter(#author, value),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  bool get newVariation => (super.noSuchMethod(
-        Invocation.getter(#newVariation),
-        returnValue: false,
-      ) as bool);
+  set exerciseNameEn(String? value) => super.noSuchMethod(
+    Invocation.setter(#exerciseNameEn, value),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  set newVariationForExercise(int? value) => super.noSuchMethod(
-        Invocation.setter(
-          #newVariationForExercise,
-          value,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set exerciseNameTrans(String? value) => super.noSuchMethod(
+    Invocation.setter(#exerciseNameTrans, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set descriptionEn(String? value) => super.noSuchMethod(
+    Invocation.setter(#descriptionEn, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set descriptionTrans(String? value) => super.noSuchMethod(
+    Invocation.setter(#descriptionTrans, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set languageEn(_i10.Language? value) => super.noSuchMethod(
+    Invocation.setter(#languageEn, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set languageTranslation(_i10.Language? value) => super.noSuchMethod(
+    Invocation.setter(#languageTranslation, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set alternateNamesEn(List<String>? value) => super.noSuchMethod(
+    Invocation.setter(#alternateNamesEn, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set alternateNamesTrans(List<String>? value) => super.noSuchMethod(
+    Invocation.setter(#alternateNamesTrans, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set category(_i7.ExerciseCategory? value) => super.noSuchMethod(
+    Invocation.setter(#category, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set equipment(List<_i8.Equipment>? equipment) => super.noSuchMethod(
+    Invocation.setter(#equipment, equipment),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set variationConnectToExercise(int? value) => super.noSuchMethod(
+    Invocation.setter(#variationConnectToExercise, value),
+    returnValueForMissingStub: null,
+  );
 
   @override
   set variationId(int? variation) => super.noSuchMethod(
-        Invocation.setter(
-          #variationId,
-          variation,
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.setter(#variationId, variation),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  _i3.Exercise get exercise => (super.noSuchMethod(
-        Invocation.getter(#exercise),
-        returnValue: _FakeExercise_1(
-          this,
-          Invocation.getter(#exercise),
-        ),
-      ) as _i3.Exercise);
+  set primaryMuscles(List<_i9.Muscle>? muscles) => super.noSuchMethod(
+    Invocation.setter(#primaryMuscles, muscles),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  _i4.Translation get translationEn => (super.noSuchMethod(
-        Invocation.getter(#translationEn),
-        returnValue: _FakeTranslation_2(
-          this,
-          Invocation.getter(#translationEn),
-        ),
-      ) as _i4.Translation);
+  set secondaryMuscles(List<_i9.Muscle>? muscles) => super.noSuchMethod(
+    Invocation.setter(#secondaryMuscles, muscles),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  _i4.Translation get translation => (super.noSuchMethod(
-        Invocation.getter(#translation),
-        returnValue: _FakeTranslation_2(
-          this,
-          Invocation.getter(#translation),
-        ),
-      ) as _i4.Translation);
-
-  @override
-  _i5.Variation get variation => (super.noSuchMethod(
-        Invocation.getter(#variation),
-        returnValue: _FakeVariation_3(
-          this,
-          Invocation.getter(#variation),
-        ),
-      ) as _i5.Variation);
-
-  @override
-  List<_i12.Muscle> get primaryMuscles => (super.noSuchMethod(
-        Invocation.getter(#primaryMuscles),
-        returnValue: <_i12.Muscle>[],
-      ) as List<_i12.Muscle>);
-
-  @override
-  set primaryMuscles(List<_i12.Muscle>? muscles) => super.noSuchMethod(
-        Invocation.setter(
-          #primaryMuscles,
-          muscles,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  List<_i12.Muscle> get secondaryMuscles => (super.noSuchMethod(
-        Invocation.getter(#secondaryMuscles),
-        returnValue: <_i12.Muscle>[],
-      ) as List<_i12.Muscle>);
-
-  @override
-  set secondaryMuscles(List<_i12.Muscle>? muscles) => super.noSuchMethod(
-        Invocation.setter(
-          #secondaryMuscles,
-          muscles,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  bool get hasListeners => (super.noSuchMethod(
-        Invocation.getter(#hasListeners),
-        returnValue: false,
-      ) as bool);
+  bool get hasListeners =>
+      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
 
   @override
   void clear() => super.noSuchMethod(
-        Invocation.method(
-          #clear,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(#clear, []),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  void addExerciseImages(List<_i10.File>? exercises) => super.noSuchMethod(
-        Invocation.method(
-          #addExerciseImages,
-          [exercises],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void addExerciseImages(List<_i12.ExerciseSubmissionImage>? images) => super.noSuchMethod(
+    Invocation.method(#addExerciseImages, [images]),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  void removeExercise(String? path) => super.noSuchMethod(
-        Invocation.method(
-          #removeExercise,
-          [path],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void removeImage(String? path) => super.noSuchMethod(
+    Invocation.method(#removeImage, [path]),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  void printValues() => super.noSuchMethod(
-        Invocation.method(
-          #printValues,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  _i13.Future<int> addExercise() => (super.noSuchMethod(
-        Invocation.method(
-          #addExercise,
-          [],
-        ),
-        returnValue: _i13.Future<int>.value(0),
-      ) as _i13.Future<int>);
-
-  @override
-  _i13.Future<_i3.Exercise> addExerciseBase() => (super.noSuchMethod(
-        Invocation.method(
-          #addExerciseBase,
-          [],
-        ),
-        returnValue: _i13.Future<_i3.Exercise>.value(_FakeExercise_1(
-          this,
-          Invocation.method(
-            #addExerciseBase,
-            [],
-          ),
-        )),
-      ) as _i13.Future<_i3.Exercise>);
-
-  @override
-  _i13.Future<_i5.Variation> addVariation() => (super.noSuchMethod(
-        Invocation.method(
-          #addVariation,
-          [],
-        ),
-        returnValue: _i13.Future<_i5.Variation>.value(_FakeVariation_3(
-          this,
-          Invocation.method(
-            #addVariation,
-            [],
-          ),
-        )),
-      ) as _i13.Future<_i5.Variation>);
-
-  @override
-  _i13.Future<void> addImages(_i3.Exercise? base) => (super.noSuchMethod(
-        Invocation.method(
-          #addImages,
-          [base],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
-
-  @override
-  _i13.Future<_i4.Translation> addExerciseTranslation(
-          _i4.Translation? exercise) =>
+  _i15.Future<int> postExerciseToServer() =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addExerciseTranslation,
-          [exercise],
-        ),
-        returnValue: _i13.Future<_i4.Translation>.value(_FakeTranslation_2(
-          this,
-          Invocation.method(
-            #addExerciseTranslation,
-            [exercise],
-          ),
-        )),
-      ) as _i13.Future<_i4.Translation>);
+            Invocation.method(#postExerciseToServer, []),
+            returnValue: _i15.Future<int>.value(0),
+          )
+          as _i15.Future<int>);
 
   @override
-  _i13.Future<_i6.Alias> addExerciseAlias(
-    String? name,
-    int? exerciseId,
-  ) =>
+  _i15.Future<int> addExerciseSubmission() =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addExerciseAlias,
-          [
-            name,
-            exerciseId,
-          ],
-        ),
-        returnValue: _i13.Future<_i6.Alias>.value(_FakeAlias_4(
-          this,
-          Invocation.method(
-            #addExerciseAlias,
-            [
-              name,
-              exerciseId,
-            ],
-          ),
-        )),
-      ) as _i13.Future<_i6.Alias>);
+            Invocation.method(#addExerciseSubmission, []),
+            returnValue: _i15.Future<int>.value(0),
+          )
+          as _i15.Future<int>);
 
   @override
-  void addListener(_i14.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+  _i15.Future<void> addImages(int? exerciseId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addImages, [exerciseId]),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
 
   @override
-  void removeListener(_i14.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+  _i15.Future<bool> validateLanguage(String? input, String? languageCode) =>
+      (super.noSuchMethod(
+            Invocation.method(#validateLanguage, [input, languageCode]),
+            returnValue: _i15.Future<bool>.value(false),
+          )
+          as _i15.Future<bool>);
+
+  @override
+  void addListener(_i16.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void removeListener(_i16.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#removeListener, [listener]),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(#dispose, []),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(#notifyListeners, []),
+    returnValueForMissingStub: null,
+  );
 }
 
 /// A class which mocks [UserProvider].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockUserProvider extends _i1.Mock implements _i15.UserProvider {
+class MockUserProvider extends _i1.Mock implements _i17.UserProvider {
   MockUserProvider() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_0(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i2.WgerBaseProvider);
+  _i18.ThemeMode get themeMode =>
+      (super.noSuchMethod(
+            Invocation.getter(#themeMode),
+            returnValue: _i18.ThemeMode.system,
+          )
+          as _i18.ThemeMode);
 
   @override
-  set profile(_i16.Profile? _profile) => super.noSuchMethod(
-        Invocation.setter(
-          #profile,
-          _profile,
-        ),
-        returnValueForMissingStub: null,
-      );
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(
+              this,
+              Invocation.getter(#baseProvider),
+            ),
+          )
+          as _i2.WgerBaseProvider);
 
   @override
-  bool get hasListeners => (super.noSuchMethod(
-        Invocation.getter(#hasListeners),
-        returnValue: false,
-      ) as bool);
+  _i4.SharedPreferencesAsync get prefs =>
+      (super.noSuchMethod(
+            Invocation.getter(#prefs),
+            returnValue: _FakeSharedPreferencesAsync_2(
+              this,
+              Invocation.getter(#prefs),
+            ),
+          )
+          as _i4.SharedPreferencesAsync);
+
+  @override
+  set themeMode(_i18.ThemeMode? value) => super.noSuchMethod(
+    Invocation.setter(#themeMode, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set prefs(_i4.SharedPreferencesAsync? value) => super.noSuchMethod(
+    Invocation.setter(#prefs, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set profile(_i19.Profile? value) => super.noSuchMethod(
+    Invocation.setter(#profile, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  bool get hasListeners =>
+      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
 
   @override
   void clear() => super.noSuchMethod(
-        Invocation.method(
-          #clear,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(#clear, []),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  _i13.Future<void> fetchAndSetProfile() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetProfile,
-          [],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+  void setThemeMode(_i18.ThemeMode? mode) => super.noSuchMethod(
+    Invocation.method(#setThemeMode, [mode]),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  _i13.Future<void> saveProfile() => (super.noSuchMethod(
-        Invocation.method(
-          #saveProfile,
-          [],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+  _i15.Future<void> fetchAndSetProfile() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetProfile, []),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
 
   @override
-  _i13.Future<void> verifyEmail() => (super.noSuchMethod(
-        Invocation.method(
-          #verifyEmail,
-          [],
-        ),
-        returnValue: _i13.Future<void>.value(),
-        returnValueForMissingStub: _i13.Future<void>.value(),
-      ) as _i13.Future<void>);
+  _i15.Future<void> saveProfile() =>
+      (super.noSuchMethod(
+            Invocation.method(#saveProfile, []),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
 
   @override
-  void addListener(_i14.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+  _i15.Future<void> verifyEmail() =>
+      (super.noSuchMethod(
+            Invocation.method(#verifyEmail, []),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
 
   @override
-  void removeListener(_i14.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void addListener(_i16.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void removeListener(_i16.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#removeListener, [listener]),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(#dispose, []),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(#notifyListeners, []),
+    returnValueForMissingStub: null,
+  );
+}
+
+/// A class which mocks [ExercisesProvider].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockExercisesProvider extends _i1.Mock implements _i20.ExercisesProvider {
+  MockExercisesProvider() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(
+              this,
+              Invocation.getter(#baseProvider),
+            ),
+          )
+          as _i2.WgerBaseProvider);
+
+  @override
+  _i5.ExerciseDatabase get database =>
+      (super.noSuchMethod(
+            Invocation.getter(#database),
+            returnValue: _FakeExerciseDatabase_3(
+              this,
+              Invocation.getter(#database),
+            ),
+          )
+          as _i5.ExerciseDatabase);
+
+  @override
+  List<_i6.Exercise> get exercises =>
+      (super.noSuchMethod(
+            Invocation.getter(#exercises),
+            returnValue: <_i6.Exercise>[],
+          )
+          as List<_i6.Exercise>);
+
+  @override
+  List<_i6.Exercise> get filteredExercises =>
+      (super.noSuchMethod(
+            Invocation.getter(#filteredExercises),
+            returnValue: <_i6.Exercise>[],
+          )
+          as List<_i6.Exercise>);
+
+  @override
+  Map<int, List<_i6.Exercise>> get exerciseByVariation =>
+      (super.noSuchMethod(
+            Invocation.getter(#exerciseByVariation),
+            returnValue: <int, List<_i6.Exercise>>{},
+          )
+          as Map<int, List<_i6.Exercise>>);
+
+  @override
+  List<_i7.ExerciseCategory> get categories =>
+      (super.noSuchMethod(
+            Invocation.getter(#categories),
+            returnValue: <_i7.ExerciseCategory>[],
+          )
+          as List<_i7.ExerciseCategory>);
+
+  @override
+  List<_i9.Muscle> get muscles =>
+      (super.noSuchMethod(
+            Invocation.getter(#muscles),
+            returnValue: <_i9.Muscle>[],
+          )
+          as List<_i9.Muscle>);
+
+  @override
+  List<_i8.Equipment> get equipment =>
+      (super.noSuchMethod(
+            Invocation.getter(#equipment),
+            returnValue: <_i8.Equipment>[],
+          )
+          as List<_i8.Equipment>);
+
+  @override
+  List<_i10.Language> get languages =>
+      (super.noSuchMethod(
+            Invocation.getter(#languages),
+            returnValue: <_i10.Language>[],
+          )
+          as List<_i10.Language>);
+
+  @override
+  set database(_i5.ExerciseDatabase? value) => super.noSuchMethod(
+    Invocation.setter(#database, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set exercises(List<_i6.Exercise>? value) => super.noSuchMethod(
+    Invocation.setter(#exercises, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set filteredExercises(List<_i6.Exercise>? newFilteredExercises) => super.noSuchMethod(
+    Invocation.setter(#filteredExercises, newFilteredExercises),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set languages(List<_i10.Language>? languages) => super.noSuchMethod(
+    Invocation.setter(#languages, languages),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  bool get hasListeners =>
+      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
+
+  @override
+  _i15.Future<void> setFilters(_i20.Filters? newFilters) =>
+      (super.noSuchMethod(
+            Invocation.method(#setFilters, [newFilters]),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
+
+  @override
+  void initFilters() => super.noSuchMethod(
+    Invocation.method(#initFilters, []),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  _i15.Future<void> findByFilters() =>
+      (super.noSuchMethod(
+            Invocation.method(#findByFilters, []),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
+
+  @override
+  void clear() => super.noSuchMethod(
+    Invocation.method(#clear, []),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  _i6.Exercise findExerciseById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findExerciseById, [id]),
+            returnValue: _FakeExercise_4(
+              this,
+              Invocation.method(#findExerciseById, [id]),
+            ),
+          )
+          as _i6.Exercise);
+
+  @override
+  List<_i6.Exercise> findExercisesByVariationId(
+    int? variationId, {
+    int? exerciseIdToExclude,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #findExercisesByVariationId,
+              [variationId],
+              {#exerciseIdToExclude: exerciseIdToExclude},
+            ),
+            returnValue: <_i6.Exercise>[],
+          )
+          as List<_i6.Exercise>);
+
+  @override
+  _i7.ExerciseCategory findCategoryById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findCategoryById, [id]),
+            returnValue: _FakeExerciseCategory_5(
+              this,
+              Invocation.method(#findCategoryById, [id]),
+            ),
+          )
+          as _i7.ExerciseCategory);
+
+  @override
+  _i8.Equipment findEquipmentById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findEquipmentById, [id]),
+            returnValue: _FakeEquipment_6(
+              this,
+              Invocation.method(#findEquipmentById, [id]),
+            ),
+          )
+          as _i8.Equipment);
+
+  @override
+  _i9.Muscle findMuscleById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findMuscleById, [id]),
+            returnValue: _FakeMuscle_7(
+              this,
+              Invocation.method(#findMuscleById, [id]),
+            ),
+          )
+          as _i9.Muscle);
+
+  @override
+  _i10.Language findLanguageById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findLanguageById, [id]),
+            returnValue: _FakeLanguage_8(
+              this,
+              Invocation.method(#findLanguageById, [id]),
+            ),
+          )
+          as _i10.Language);
+
+  @override
+  _i15.Future<void> fetchAndSetCategoriesFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetCategoriesFromApi, []),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
+
+  @override
+  _i15.Future<void> fetchAndSetMusclesFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetMusclesFromApi, []),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
+
+  @override
+  _i15.Future<void> fetchAndSetEquipmentsFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetEquipmentsFromApi, []),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
+
+  @override
+  _i15.Future<void> fetchAndSetLanguagesFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetLanguagesFromApi, []),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
+
+  @override
+  _i15.Future<void> fetchAndSetAllExercises() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllExercises, []),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
+
+  @override
+  _i15.Future<_i6.Exercise?> fetchAndSetExercise(int? exerciseId) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetExercise, [exerciseId]),
+            returnValue: _i15.Future<_i6.Exercise?>.value(),
+          )
+          as _i15.Future<_i6.Exercise?>);
+
+  @override
+  _i15.Future<_i6.Exercise> handleUpdateExerciseFromApi(
+    _i5.ExerciseDatabase? database,
+    int? exerciseId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#handleUpdateExerciseFromApi, [
+              database,
+              exerciseId,
+            ]),
+            returnValue: _i15.Future<_i6.Exercise>.value(
+              _FakeExercise_4(
+                this,
+                Invocation.method(#handleUpdateExerciseFromApi, [
+                  database,
+                  exerciseId,
+                ]),
+              ),
+            ),
+          )
+          as _i15.Future<_i6.Exercise>);
+
+  @override
+  _i15.Future<void> initCacheTimesLocalPrefs({dynamic forceInit = false}) =>
+      (super.noSuchMethod(
+            Invocation.method(#initCacheTimesLocalPrefs, [], {
+              #forceInit: forceInit,
+            }),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
+
+  @override
+  _i15.Future<void> clearAllCachesAndPrefs() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearAllCachesAndPrefs, []),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
+
+  @override
+  _i15.Future<void> fetchAndSetInitialData() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetInitialData, []),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
+
+  @override
+  _i15.Future<void> setExercisesFromDatabase(
+    _i5.ExerciseDatabase? database, {
+    bool? forceDeleteCache = false,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #setExercisesFromDatabase,
+              [database],
+              {#forceDeleteCache: forceDeleteCache},
+            ),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
+
+  @override
+  _i15.Future<void> updateExerciseCache(_i5.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateExerciseCache, [database]),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
+
+  @override
+  _i15.Future<void> fetchAndSetMuscles(_i5.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetMuscles, [database]),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
+
+  @override
+  _i15.Future<void> fetchAndSetCategories(_i5.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetCategories, [database]),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
+
+  @override
+  _i15.Future<void> fetchAndSetLanguages(_i5.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetLanguages, [database]),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
+
+  @override
+  _i15.Future<void> fetchAndSetEquipments(_i5.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetEquipments, [database]),
+            returnValue: _i15.Future<void>.value(),
+            returnValueForMissingStub: _i15.Future<void>.value(),
+          )
+          as _i15.Future<void>);
+
+  @override
+  _i15.Future<List<_i6.Exercise>> searchExercise(
+    String? name, {
+    String? languageCode = 'en',
+    bool? searchEnglish = false,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #searchExercise,
+              [name],
+              {#languageCode: languageCode, #searchEnglish: searchEnglish},
+            ),
+            returnValue: _i15.Future<List<_i6.Exercise>>.value(
+              <_i6.Exercise>[],
+            ),
+          )
+          as _i15.Future<List<_i6.Exercise>>);
+
+  @override
+  void addListener(_i16.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void removeListener(_i16.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#removeListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void dispose() => super.noSuchMethod(
+    Invocation.method(#dispose, []),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void notifyListeners() => super.noSuchMethod(
+    Invocation.method(#notifyListeners, []),
+    returnValueForMissingStub: null,
+  );
 }
diff --git a/test/exercises/exercise_provider_db_test.dart b/test/exercises/exercise_provider_db_test.dart
index d110749d..3862baa6 100644
--- a/test/exercises/exercise_provider_db_test.dart
+++ b/test/exercises/exercise_provider_db_test.dart
@@ -4,10 +4,12 @@ import 'package:drift/native.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';
-import 'package:shared_preferences/shared_preferences.dart';
+import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
+import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
 import 'package:wger/database/exercises/exercise_database.dart';
 import 'package:wger/helpers/consts.dart';
-import 'package:wger/helpers/misc.dart';
+import 'package:wger/helpers/date.dart';
+import 'package:wger/helpers/shared_preferences.dart';
 import 'package:wger/models/exercises/exercise_api.dart';
 import 'package:wger/models/exercises/muscle.dart';
 import 'package:wger/providers/exercises.dart';
@@ -22,7 +24,7 @@ void main() {
   late ExerciseDatabase database;
 
   const String categoryUrl = 'exercisecategory';
-  const String exerciseBaseInfoUrl = 'exercisebaseinfo';
+  const String exerciseInfoUrl = 'exerciseinfo';
   const String muscleUrl = 'muscle';
   const String equipmentUrl = 'equipment';
   const String languageUrl = 'language';
@@ -36,13 +38,13 @@ void main() {
   final Uri tExerciseInfoUri = Uri(
     scheme: 'http',
     host: 'localhost',
-    path: 'api/v2/$exerciseBaseInfoUrl/',
+    path: 'api/v2/$exerciseInfoUrl/',
   );
 
   final Uri tExerciseInfoDetailUri = Uri(
     scheme: 'http',
     host: 'localhost',
-    path: 'api/v2/$exerciseBaseInfoUrl/9/',
+    path: 'api/v2/$exerciseInfoUrl/9/',
   );
 
   final Uri tMuscleEntriesUri = Uri(
@@ -79,8 +81,8 @@ void main() {
   final Map<String, dynamic> tLanguageMap = jsonDecode(
     fixture('exercises/language_entries.json'),
   );
-  final Map<String, dynamic> tExerciseBaseInfoMap = jsonDecode(
-    fixture('exercises/exercisebaseinfo_response.json'),
+  final Map<String, dynamic> tExerciseInfoMap = jsonDecode(
+    fixture('exercises/exerciseinfo_response.json'),
   );
 
   setUp(() {
@@ -93,39 +95,45 @@ void main() {
     );
 
     WidgetsFlutterBinding.ensureInitialized();
-    SharedPreferences.setMockInitialValues({});
+
+    /// Replacement for SharedPreferences.setMockInitialValues()
+    SharedPreferencesAsyncPlatform.instance = InMemorySharedPreferencesAsync.empty();
 
     // Mock categories
     when(mockBaseProvider.makeUrl(categoryUrl)).thenReturn(tCategoryEntriesUri);
-    when(mockBaseProvider.fetchPaginated(tCategoryEntriesUri))
-        .thenAnswer((_) => Future.value(tCategoryMap['results']));
+    when(
+      mockBaseProvider.fetchPaginated(tCategoryEntriesUri),
+    ).thenAnswer((_) => Future.value(tCategoryMap['results']));
 
     // Mock muscles
     when(mockBaseProvider.makeUrl(muscleUrl)).thenReturn(tMuscleEntriesUri);
-    when(mockBaseProvider.fetchPaginated(tMuscleEntriesUri))
-        .thenAnswer((_) => Future.value(tMuscleMap['results']));
+    when(
+      mockBaseProvider.fetchPaginated(tMuscleEntriesUri),
+    ).thenAnswer((_) => Future.value(tMuscleMap['results']));
 
     // Mock equipment
     when(mockBaseProvider.makeUrl(equipmentUrl)).thenReturn(tEquipmentEntriesUri);
-    when(mockBaseProvider.fetchPaginated(tEquipmentEntriesUri))
-        .thenAnswer((_) => Future.value(tEquipmentMap['results']));
+    when(
+      mockBaseProvider.fetchPaginated(tEquipmentEntriesUri),
+    ).thenAnswer((_) => Future.value(tEquipmentMap['results']));
 
     // Mock languages
-    when(mockBaseProvider.makeUrl(languageUrl, query: anyNamed('query')))
-        .thenReturn(tLanguageEntriesUri);
+    when(
+      mockBaseProvider.makeUrl(languageUrl, query: anyNamed('query')),
+    ).thenReturn(tLanguageEntriesUri);
     when(mockBaseProvider.fetchPaginated(tLanguageEntriesUri)).thenAnswer(
       (_) => Future.value(tLanguageMap['results']),
     );
 
     // Mock base info response
-    when(mockBaseProvider.makeUrl(exerciseBaseInfoUrl)).thenReturn(tExerciseInfoUri);
+    when(mockBaseProvider.makeUrl(exerciseInfoUrl)).thenReturn(tExerciseInfoUri);
     when(mockBaseProvider.fetch(tExerciseInfoUri)).thenAnswer(
-      (_) => Future.value(tExerciseBaseInfoMap),
+      (_) => Future.value(tExerciseInfoMap),
     );
 
-    when(mockBaseProvider.makeUrl(exerciseBaseInfoUrl, id: 9)).thenReturn(tExerciseInfoDetailUri);
+    when(mockBaseProvider.makeUrl(exerciseInfoUrl, id: 9)).thenReturn(tExerciseInfoDetailUri);
     when(mockBaseProvider.fetch(tExerciseInfoDetailUri)).thenAnswer(
-      (_) => Future.value(tExerciseBaseInfoMap),
+      (_) => Future.value(tExerciseInfoMap),
     );
   });
 
@@ -136,14 +144,14 @@ void main() {
   group('Muscles', () {
     test('that fetched data from the API is written to the DB', () async {
       // Arrange
-      final prefs = await SharedPreferences.getInstance();
+      final prefs = PreferenceHelper.asyncPref;
       await provider.initCacheTimesLocalPrefs();
 
       // Act
       await provider.fetchAndSetMuscles(database);
 
       // Assert
-      final updateTime = DateTime.parse(prefs.getString(PREFS_LAST_UPDATED_MUSCLES)!);
+      final updateTime = DateTime.parse((await prefs.getString(PREFS_LAST_UPDATED_MUSCLES))!);
       final valid = DateTime.now().add(const Duration(days: ExercisesProvider.EXERCISE_CACHE_DAYS));
       expect(updateTime.isSameDayAs(valid), true);
 
@@ -168,7 +176,7 @@ void main() {
 
     test('that if there is already valid data in the DB, the API is not hit', () async {
       // Arrange
-      final prefs = await SharedPreferences.getInstance();
+      final prefs = PreferenceHelper.asyncPref;
       await provider.initCacheTimesLocalPrefs();
 
       final valid = DateTime.now().add(const Duration(days: 1));
@@ -185,7 +193,7 @@ void main() {
       await provider.fetchAndSetMuscles(database);
 
       // Assert
-      final updateTime = DateTime.parse(prefs.getString(PREFS_LAST_UPDATED_MUSCLES)!);
+      final updateTime = DateTime.parse((await prefs.getString(PREFS_LAST_UPDATED_MUSCLES))!);
       expect(updateTime.isSameDayAs(valid), true);
 
       expect(provider.muscles.length, 2);
@@ -199,14 +207,14 @@ void main() {
   group('Languages', () {
     test('that fetched data from the API is written to the DB', () async {
       // Arrange
-      final prefs = await SharedPreferences.getInstance();
+      final prefs = PreferenceHelper.asyncPref;
       await provider.initCacheTimesLocalPrefs();
 
       // Act
       await provider.fetchAndSetLanguages(database);
 
       // Assert
-      final updateTime = DateTime.parse(prefs.getString(PREFS_LAST_UPDATED_LANGUAGES)!);
+      final updateTime = DateTime.parse((await prefs.getString(PREFS_LAST_UPDATED_LANGUAGES))!);
       final valid = DateTime.now().add(const Duration(days: ExercisesProvider.EXERCISE_CACHE_DAYS));
       expect(updateTime.isSameDayAs(valid), true);
 
@@ -235,7 +243,7 @@ void main() {
 
     test('that if there is already valid data in the DB, the API is not hit', () async {
       // Arrange
-      final prefs = await SharedPreferences.getInstance();
+      final prefs = PreferenceHelper.asyncPref;
       await provider.initCacheTimesLocalPrefs();
 
       final valid = DateTime.now().add(const Duration(days: 1));
@@ -252,7 +260,7 @@ void main() {
       await provider.fetchAndSetLanguages(database);
 
       // Assert
-      final updateTime = DateTime.parse(prefs.getString(PREFS_LAST_UPDATED_LANGUAGES)!);
+      final updateTime = DateTime.parse((await prefs.getString(PREFS_LAST_UPDATED_LANGUAGES))!);
       expect(updateTime.isSameDayAs(valid), true);
 
       expect(provider.languages.length, 2);
@@ -265,14 +273,14 @@ void main() {
   group('Categories', () {
     test('that fetched data from the API is written to the DB', () async {
       // Arrange
-      final prefs = await SharedPreferences.getInstance();
+      final prefs = PreferenceHelper.asyncPref;
       await provider.initCacheTimesLocalPrefs();
 
       // Act
       await provider.fetchAndSetCategories(database);
 
       // Assert
-      final updateTime = DateTime.parse(prefs.getString(PREFS_LAST_UPDATED_CATEGORIES)!);
+      final updateTime = DateTime.parse((await prefs.getString(PREFS_LAST_UPDATED_CATEGORIES))!);
       final valid = DateTime.now().add(const Duration(days: ExercisesProvider.EXERCISE_CACHE_DAYS));
       expect(updateTime.isSameDayAs(valid), true);
 
@@ -293,7 +301,7 @@ void main() {
 
     test('that if there is already valid data in the DB, the API is not hit', () async {
       // Arrange
-      final prefs = await SharedPreferences.getInstance();
+      final prefs = PreferenceHelper.asyncPref;
       await provider.initCacheTimesLocalPrefs();
 
       final valid = DateTime.now().add(const Duration(days: 1));
@@ -310,7 +318,7 @@ void main() {
       await provider.fetchAndSetCategories(database);
 
       // Assert
-      final updateTime = DateTime.parse(prefs.getString(PREFS_LAST_UPDATED_CATEGORIES)!);
+      final updateTime = DateTime.parse((await prefs.getString(PREFS_LAST_UPDATED_CATEGORIES))!);
       expect(updateTime.isSameDayAs(valid), true);
 
       expect(provider.categories.length, 2);
@@ -324,14 +332,14 @@ void main() {
   group('Equipment', () {
     test('that fetched data from the API is written to the DB', () async {
       // Arrange
-      final prefs = await SharedPreferences.getInstance();
+      final prefs = PreferenceHelper.asyncPref;
       await provider.initCacheTimesLocalPrefs();
 
       // Act
       await provider.fetchAndSetEquipments(database);
 
       // Assert
-      final updateTime = DateTime.parse(prefs.getString(PREFS_LAST_UPDATED_EQUIPMENT)!);
+      final updateTime = DateTime.parse((await prefs.getString(PREFS_LAST_UPDATED_EQUIPMENT))!);
       final valid = DateTime.now().add(const Duration(days: ExercisesProvider.EXERCISE_CACHE_DAYS));
       expect(updateTime.isSameDayAs(valid), true);
 
@@ -354,7 +362,7 @@ void main() {
 
     test('that if there is already valid data in the DB, the API is not hit', () async {
       // Arrange
-      final prefs = await SharedPreferences.getInstance();
+      final prefs = PreferenceHelper.asyncPref;
       await provider.initCacheTimesLocalPrefs();
 
       final valid = DateTime.now().add(const Duration(days: 1));
@@ -371,7 +379,7 @@ void main() {
       await provider.fetchAndSetEquipments(database);
 
       // Assert
-      final updateTime = DateTime.parse(prefs.getString(PREFS_LAST_UPDATED_EQUIPMENT)!);
+      final updateTime = DateTime.parse((await prefs.getString(PREFS_LAST_UPDATED_EQUIPMENT))!);
       expect(updateTime.isSameDayAs(valid), true);
 
       expect(provider.equipment.length, 2);
@@ -385,16 +393,18 @@ void main() {
   group('Exercise cache DB', () {
     test('that if there is already valid data in the DB, the API is not hit', () async {
       // Arrange
-      final prefs = await SharedPreferences.getInstance();
+      final prefs = PreferenceHelper.asyncPref;
       await provider.initCacheTimesLocalPrefs();
       final valid = DateTime.now().add(const Duration(days: 1));
       prefs.setString(PREFS_LAST_UPDATED_LANGUAGES, valid.toIso8601String());
 
-      await database.into(database.exercises).insert(
+      await database
+          .into(database.exercises)
+          .insert(
             ExercisesCompanion.insert(
-              id: tExerciseBaseInfoMap['id'],
-              data: json.encode(tExerciseBaseInfoMap),
-              lastUpdate: DateTime.parse(tExerciseBaseInfoMap['last_update_global']),
+              id: tExerciseInfoMap['id'],
+              data: json.encode(tExerciseInfoMap),
+              lastUpdate: DateTime.parse(tExerciseInfoMap['last_update_global']),
               lastFetched: DateTime.now(),
             ),
           );
@@ -422,11 +432,13 @@ void main() {
     test('fetching a known exercise - no API refresh', () async {
       // Arrange
       provider.languages = testLanguages;
-      await database.into(database.exercises).insert(
+      await database
+          .into(database.exercises)
+          .insert(
             ExercisesCompanion.insert(
-              id: tExerciseBaseInfoMap['id'],
-              data: json.encode(tExerciseBaseInfoMap),
-              lastUpdate: DateTime.parse(tExerciseBaseInfoMap['last_update_global']),
+              id: tExerciseInfoMap['id'],
+              data: json.encode(tExerciseInfoMap),
+              lastUpdate: DateTime.parse(tExerciseInfoMap['last_update_global']),
               lastFetched: DateTime.now().subtract(const Duration(hours: 1)),
             ),
           );
@@ -447,11 +459,13 @@ void main() {
     test('fetching a known exercise - needed API refresh - no new data', () async {
       // Arrange
       provider.languages = testLanguages;
-      await database.into(database.exercises).insert(
+      await database
+          .into(database.exercises)
+          .insert(
             ExercisesCompanion.insert(
-              id: tExerciseBaseInfoMap['id'],
-              data: json.encode(tExerciseBaseInfoMap),
-              lastUpdate: DateTime.parse(tExerciseBaseInfoMap['last_update_global']),
+              id: tExerciseInfoMap['id'],
+              data: json.encode(tExerciseInfoMap),
+              lastUpdate: DateTime.parse(tExerciseInfoMap['last_update_global']),
               lastFetched: DateTime.now().subtract(const Duration(days: 10)),
             ),
           );
@@ -461,8 +475,9 @@ void main() {
 
       // Act
       await provider.handleUpdateExerciseFromApi(database, 9);
-      final exerciseDb = await (database.select(database.exercises)..where((e) => e.id.equals(9)))
-          .getSingleOrNull();
+      final exerciseDb = await (database.select(
+        database.exercises,
+      )..where((e) => e.id.equals(9))).getSingleOrNull();
 
       // Assert
       verify(mockBaseProvider.fetch(any));
@@ -475,10 +490,12 @@ void main() {
     test('fetching a known exercise - needed API refresh - new data from API', () async {
       // Arrange
       provider.languages = testLanguages;
-      final newData = Map.from(tExerciseBaseInfoMap);
+      final newData = Map.from(tExerciseInfoMap);
       newData['uuid'] = 'bf6d5557-1c49-48fd-922e-75d11f81d4eb';
 
-      await database.into(database.exercises).insert(
+      await database
+          .into(database.exercises)
+          .insert(
             ExercisesCompanion.insert(
               id: newData['id'],
               data: json.encode(newData),
@@ -492,8 +509,9 @@ void main() {
 
       // Act
       await provider.handleUpdateExerciseFromApi(database, 9);
-      final exerciseDb = await (database.select(database.exercises)..where((e) => e.id.equals(9)))
-          .getSingleOrNull();
+      final exerciseDb = await (database.select(
+        database.exercises,
+      )..where((e) => e.id.equals(9))).getSingleOrNull();
       final exerciseData = ExerciseApiData.fromString(exerciseDb!.data);
 
       // Assert
diff --git a/test/exercises/exercise_provider_load_test.dart b/test/exercises/exercise_provider_load_test.dart
index 7123cba7..0e4152e6 100644
--- a/test/exercises/exercise_provider_load_test.dart
+++ b/test/exercises/exercise_provider_load_test.dart
@@ -18,22 +18,22 @@ void main() {
   late MockWgerBaseProvider mockBaseProvider;
   late ExercisesProvider provider;
 
-  const String exerciseBaseInfoUrl = 'exercisebaseinfo';
+  const String exerciseInfoUrl = 'exerciseinfo';
 
-  final Uri tExerciseBaseInfoUri = Uri(
+  final Uri tExerciseInfoUri = Uri(
     scheme: 'http',
     host: 'localhost',
-    path: 'api/v2/$exerciseBaseInfoUrl/9/',
+    path: 'api/v2/$exerciseInfoUrl/9/',
   );
 
-  final Uri tExerciseBaseInfoUri2 = Uri(
+  final Uri tExerciseInfoUri2 = Uri(
     scheme: 'http',
     host: 'localhost',
-    path: 'api/v2/$exerciseBaseInfoUrl/1/',
+    path: 'api/v2/$exerciseInfoUrl/1/',
   );
 
   final Map<String, dynamic> tExerciseInfoMap = jsonDecode(
-    fixture('exercises/exercisebaseinfo_response.json'),
+    fixture('exercises/exerciseinfo_response.json'),
   );
 
   setUpAll(() async {
@@ -54,13 +54,15 @@ void main() {
     provider.languages = [tLanguage1, tLanguage2, tLanguage3];
 
     // Mock base info response
-    when(mockBaseProvider.makeUrl(exerciseBaseInfoUrl, id: 9)).thenReturn(tExerciseBaseInfoUri);
-    when(mockBaseProvider.makeUrl(exerciseBaseInfoUrl, id: 1)).thenReturn(tExerciseBaseInfoUri2);
+    when(mockBaseProvider.makeUrl(exerciseInfoUrl, id: 9)).thenReturn(tExerciseInfoUri);
+    when(mockBaseProvider.makeUrl(exerciseInfoUrl, id: 1)).thenReturn(tExerciseInfoUri2);
 
-    when(mockBaseProvider.fetch(tExerciseBaseInfoUri))
-        .thenAnswer((_) => Future.value(tExerciseInfoMap));
-    when(mockBaseProvider.fetch(tExerciseBaseInfoUri2))
-        .thenAnswer((_) => Future.value(tExerciseInfoMap));
+    when(
+      mockBaseProvider.fetch(tExerciseInfoUri),
+    ).thenAnswer((_) => Future.value(tExerciseInfoMap));
+    when(
+      mockBaseProvider.fetch(tExerciseInfoUri2),
+    ).thenAnswer((_) => Future.value(tExerciseInfoMap));
   });
 
   group('Correctly loads and parses data from the server', () {
@@ -69,8 +71,8 @@ void main() {
       final base = await provider.fetchAndSetExercise(1);
 
       // assert
-      verifyNever(provider.baseProvider.fetch(tExerciseBaseInfoUri2));
-      expect(base.id, 1);
+      verifyNever(provider.baseProvider.fetch(tExerciseInfoUri2));
+      expect(base?.id, 1);
     });
 
     test('test that fetchAndSetExerciseBase fetches a new base', () async {
@@ -78,8 +80,8 @@ void main() {
       final base = await provider.fetchAndSetExercise(9);
 
       // assert
-      verify(provider.baseProvider.fetch(tExerciseBaseInfoUri));
-      expect(base.id, 9);
+      verify(provider.baseProvider.fetch(tExerciseInfoUri));
+      expect(base?.id, 9);
     });
 
     test('Load the readExerciseBaseFromBaseInfo parse method', () {
diff --git a/test/exercises/exercise_provider_test.dart b/test/exercises/exercise_provider_test.dart
index 5a24bf43..82a9d861 100644
--- a/test/exercises/exercise_provider_test.dart
+++ b/test/exercises/exercise_provider_test.dart
@@ -5,9 +5,12 @@ import 'package:drift/native.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';
 import 'package:shared_preferences/shared_preferences.dart';
+import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
+import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
 import 'package:wger/database/exercises/exercise_database.dart';
 import 'package:wger/exceptions/no_such_entry_exception.dart';
 import 'package:wger/helpers/consts.dart';
+import 'package:wger/helpers/shared_preferences.dart';
 import 'package:wger/models/exercises/category.dart';
 import 'package:wger/models/exercises/equipment.dart';
 import 'package:wger/models/exercises/muscle.dart';
@@ -23,7 +26,7 @@ void main() {
   late ExercisesProvider provider;
 
   const String categoryUrl = 'exercisecategory';
-  const String exerciseBaseInfoUrl = 'exercisebaseinfo';
+  const String exerciseInfoUrl = 'exerciseinfo';
   const String muscleUrl = 'muscle';
   const String equipmentUrl = 'equipment';
   const String languageUrl = 'language';
@@ -38,7 +41,7 @@ void main() {
   final Uri tExerciseInfoUri = Uri(
     scheme: 'http',
     host: 'localhost',
-    path: 'api/v2/$exerciseBaseInfoUrl/1/',
+    path: 'api/v2/$exerciseInfoUrl/1/',
   );
 
   final Uri tMuscleEntriesUri = Uri(
@@ -80,8 +83,8 @@ void main() {
   final Map<String, dynamic> tLanguageMap = jsonDecode(
     fixture('exercises/language_entries.json'),
   );
-  final Map<String, dynamic> tExerciseBaseInfoMap = jsonDecode(
-    fixture('exercises/exercisebaseinfo_response.json'),
+  final Map<String, dynamic> tExerciseInfoMap = jsonDecode(
+    fixture('exercises/exerciseinfo_response.json'),
   );
 
   setUpAll(() {
@@ -97,35 +100,42 @@ void main() {
     );
     provider.languages = [...testLanguages];
 
-    SharedPreferences.setMockInitialValues({});
+    /// Replacement for SharedPreferences.setMockInitialValues()
+    SharedPreferencesAsyncPlatform.instance = InMemorySharedPreferencesAsync.empty();
     driftRuntimeOptions.dontWarnAboutMultipleDatabases = true;
 
     // Mock categories
     when(mockBaseProvider.makeUrl(categoryUrl)).thenReturn(tCategoryEntriesUri);
-    when(mockBaseProvider.fetchPaginated(tCategoryEntriesUri))
-        .thenAnswer((_) => Future.value(tCategoryMap['results']));
+    when(
+      mockBaseProvider.fetchPaginated(tCategoryEntriesUri),
+    ).thenAnswer((_) => Future.value(tCategoryMap['results']));
 
     // Mock muscles
     when(mockBaseProvider.makeUrl(muscleUrl)).thenReturn(tMuscleEntriesUri);
-    when(mockBaseProvider.fetchPaginated(tMuscleEntriesUri))
-        .thenAnswer((_) => Future.value(tMuscleMap['results']));
+    when(
+      mockBaseProvider.fetchPaginated(tMuscleEntriesUri),
+    ).thenAnswer((_) => Future.value(tMuscleMap['results']));
 
     // Mock equipment
     when(mockBaseProvider.makeUrl(equipmentUrl)).thenReturn(tEquipmentEntriesUri);
-    when(mockBaseProvider.fetchPaginated(tEquipmentEntriesUri))
-        .thenAnswer((_) => Future.value(tEquipmentMap['results']));
+    when(
+      mockBaseProvider.fetchPaginated(tEquipmentEntriesUri),
+    ).thenAnswer((_) => Future.value(tEquipmentMap['results']));
 
     // Mock languages
-    when(mockBaseProvider.makeUrl(languageUrl, query: anyNamed('query')))
-        .thenReturn(tLanguageEntriesUri);
-    when(mockBaseProvider.fetchPaginated(tLanguageEntriesUri))
-        .thenAnswer((_) => Future.value(tLanguageMap['results']));
+    when(
+      mockBaseProvider.makeUrl(languageUrl, query: anyNamed('query')),
+    ).thenReturn(tLanguageEntriesUri);
+    when(
+      mockBaseProvider.fetchPaginated(tLanguageEntriesUri),
+    ).thenAnswer((_) => Future.value(tLanguageMap['results']));
 
     // Mock base info response
-    when(mockBaseProvider.makeUrl(exerciseBaseInfoUrl, id: 1)).thenReturn(tExerciseInfoUri);
-    when(mockBaseProvider.makeUrl(exerciseBaseInfoUrl, id: 2)).thenReturn(tExerciseInfoUri);
-    when(mockBaseProvider.fetch(tExerciseInfoUri))
-        .thenAnswer((_) => Future.value(tExerciseBaseInfoMap));
+    when(mockBaseProvider.makeUrl(exerciseInfoUrl, id: 1)).thenReturn(tExerciseInfoUri);
+    when(mockBaseProvider.makeUrl(exerciseInfoUrl, id: 2)).thenReturn(tExerciseInfoUri);
+    when(
+      mockBaseProvider.fetch(tExerciseInfoUri),
+    ).thenAnswer((_) => Future.value(tExerciseInfoMap));
   });
 
   group('findCategoryById()', () {
@@ -387,57 +397,57 @@ void main() {
     test('initCacheTimesLocalPrefs correctly initalises the cache values', () async {
       // arrange
       const initValue = '2023-01-01T00:00:00.000';
-      final prefs = await SharedPreferences.getInstance();
+      final prefs = PreferenceHelper.asyncPref;
 
       // act
       await provider.initCacheTimesLocalPrefs();
 
       // assert
-      expect(prefs.getString(PREFS_LAST_UPDATED_MUSCLES), initValue);
-      expect(prefs.getString(PREFS_LAST_UPDATED_EQUIPMENT), initValue);
-      expect(prefs.getString(PREFS_LAST_UPDATED_CATEGORIES), initValue);
-      expect(prefs.getString(PREFS_LAST_UPDATED_LANGUAGES), initValue);
+      expect(await prefs.getString(PREFS_LAST_UPDATED_MUSCLES), initValue);
+      expect(await prefs.getString(PREFS_LAST_UPDATED_EQUIPMENT), initValue);
+      expect(await prefs.getString(PREFS_LAST_UPDATED_CATEGORIES), initValue);
+      expect(await prefs.getString(PREFS_LAST_UPDATED_LANGUAGES), initValue);
     });
 
     test('calling initCacheTimesLocalPrefs again does nothing', () async {
       // arrange
-      final prefs = await SharedPreferences.getInstance();
+      final prefs = PreferenceHelper.asyncPref;
       const newValue = '2023-10-10T01:18:35.000';
 
       // act
       await provider.initCacheTimesLocalPrefs();
-      prefs.setString(PREFS_LAST_UPDATED_MUSCLES, newValue);
-      prefs.setString(PREFS_LAST_UPDATED_EQUIPMENT, newValue);
-      prefs.setString(PREFS_LAST_UPDATED_CATEGORIES, newValue);
-      prefs.setString(PREFS_LAST_UPDATED_LANGUAGES, newValue);
+      await prefs.setString(PREFS_LAST_UPDATED_MUSCLES, newValue);
+      await prefs.setString(PREFS_LAST_UPDATED_EQUIPMENT, newValue);
+      await prefs.setString(PREFS_LAST_UPDATED_CATEGORIES, newValue);
+      await prefs.setString(PREFS_LAST_UPDATED_LANGUAGES, newValue);
       await provider.initCacheTimesLocalPrefs();
 
       // Assert
-      expect(prefs.getString(PREFS_LAST_UPDATED_MUSCLES), newValue);
-      expect(prefs.getString(PREFS_LAST_UPDATED_EQUIPMENT), newValue);
-      expect(prefs.getString(PREFS_LAST_UPDATED_CATEGORIES), newValue);
-      expect(prefs.getString(PREFS_LAST_UPDATED_LANGUAGES), newValue);
+      expect(await prefs.getString(PREFS_LAST_UPDATED_MUSCLES), newValue);
+      expect(await prefs.getString(PREFS_LAST_UPDATED_EQUIPMENT), newValue);
+      expect(await prefs.getString(PREFS_LAST_UPDATED_CATEGORIES), newValue);
+      expect(await prefs.getString(PREFS_LAST_UPDATED_LANGUAGES), newValue);
     });
 
     test('calling initCacheTimesLocalPrefs with forceInit replaces the date', () async {
       // arrange
-      final prefs = await SharedPreferences.getInstance();
+      final prefs = PreferenceHelper.asyncPref;
       const initValue = '2023-01-01T00:00:00.000';
       const newValue = '2023-10-10T01:18:35.000';
 
       // act
       await provider.initCacheTimesLocalPrefs();
-      prefs.setString(PREFS_LAST_UPDATED_MUSCLES, newValue);
-      prefs.setString(PREFS_LAST_UPDATED_EQUIPMENT, newValue);
-      prefs.setString(PREFS_LAST_UPDATED_CATEGORIES, newValue);
-      prefs.setString(PREFS_LAST_UPDATED_LANGUAGES, newValue);
+      await prefs.setString(PREFS_LAST_UPDATED_MUSCLES, newValue);
+      await prefs.setString(PREFS_LAST_UPDATED_EQUIPMENT, newValue);
+      await prefs.setString(PREFS_LAST_UPDATED_CATEGORIES, newValue);
+      await prefs.setString(PREFS_LAST_UPDATED_LANGUAGES, newValue);
       await provider.initCacheTimesLocalPrefs(forceInit: true);
 
       // Assert
-      expect(prefs.getString(PREFS_LAST_UPDATED_MUSCLES), initValue);
-      expect(prefs.getString(PREFS_LAST_UPDATED_EQUIPMENT), initValue);
-      expect(prefs.getString(PREFS_LAST_UPDATED_CATEGORIES), initValue);
-      expect(prefs.getString(PREFS_LAST_UPDATED_LANGUAGES), initValue);
+      expect(await prefs.getString(PREFS_LAST_UPDATED_MUSCLES), initValue);
+      expect(await prefs.getString(PREFS_LAST_UPDATED_EQUIPMENT), initValue);
+      expect(await prefs.getString(PREFS_LAST_UPDATED_CATEGORIES), initValue);
+      expect(await prefs.getString(PREFS_LAST_UPDATED_LANGUAGES), initValue);
     });
   });
 }
diff --git a/test/exercises/exercises_detail_widget_test.dart b/test/exercises/exercises_detail_widget_test.dart
index 91be517d..7a6d4d6d 100644
--- a/test/exercises/exercises_detail_widget_test.dart
+++ b/test/exercises/exercises_detail_widget_test.dart
@@ -18,14 +18,17 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
 import 'package:provider/provider.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/providers/exercises.dart';
 import 'package:wger/widgets/exercises/exercises.dart';
 
 import '../../test_data/exercises.dart';
-import '../workout/gym_mode_screen_test.mocks.dart';
+import 'exercises_detail_widget_test.mocks.dart';
 
+@GenerateMocks([ExercisesProvider])
 void main() {
   final mockProvider = MockExercisesProvider();
 
@@ -43,6 +46,8 @@ void main() {
   }
 
   testWidgets('Test the widgets on the exercise detail widget', (WidgetTester tester) async {
+    when(mockProvider.findExercisesByVariationId(any, exerciseIdToExclude: 1)).thenReturn([]);
+
     await tester.pumpWidget(createHomeScreen());
     await tester.pumpAndSettle();
 
diff --git a/test/exercises/exercises_detail_widget_test.mocks.dart b/test/exercises/exercises_detail_widget_test.mocks.dart
new file mode 100644
index 00000000..5c39de2b
--- /dev/null
+++ b/test/exercises/exercises_detail_widget_test.mocks.dart
@@ -0,0 +1,419 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in wger/test/exercises/exercises_detail_widget_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i10;
+import 'dart:ui' as _i11;
+
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:wger/database/exercises/exercise_database.dart' as _i3;
+import 'package:wger/models/exercises/category.dart' as _i5;
+import 'package:wger/models/exercises/equipment.dart' as _i6;
+import 'package:wger/models/exercises/exercise.dart' as _i4;
+import 'package:wger/models/exercises/language.dart' as _i8;
+import 'package:wger/models/exercises/muscle.dart' as _i7;
+import 'package:wger/providers/base_provider.dart' as _i2;
+import 'package:wger/providers/exercises.dart' as _i9;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
+
+class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider {
+  _FakeWgerBaseProvider_0(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeExerciseDatabase_1 extends _i1.SmartFake implements _i3.ExerciseDatabase {
+  _FakeExerciseDatabase_1(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeExercise_2 extends _i1.SmartFake implements _i4.Exercise {
+  _FakeExercise_2(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeExerciseCategory_3 extends _i1.SmartFake implements _i5.ExerciseCategory {
+  _FakeExerciseCategory_3(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeEquipment_4 extends _i1.SmartFake implements _i6.Equipment {
+  _FakeEquipment_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeMuscle_5 extends _i1.SmartFake implements _i7.Muscle {
+  _FakeMuscle_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeLanguage_6 extends _i1.SmartFake implements _i8.Language {
+  _FakeLanguage_6(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+/// A class which mocks [ExercisesProvider].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockExercisesProvider extends _i1.Mock implements _i9.ExercisesProvider {
+  MockExercisesProvider() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(this, Invocation.getter(#baseProvider)),
+          )
+          as _i2.WgerBaseProvider);
+
+  @override
+  _i3.ExerciseDatabase get database =>
+      (super.noSuchMethod(
+            Invocation.getter(#database),
+            returnValue: _FakeExerciseDatabase_1(this, Invocation.getter(#database)),
+          )
+          as _i3.ExerciseDatabase);
+
+  @override
+  List<_i4.Exercise> get exercises =>
+      (super.noSuchMethod(Invocation.getter(#exercises), returnValue: <_i4.Exercise>[])
+          as List<_i4.Exercise>);
+
+  @override
+  List<_i4.Exercise> get filteredExercises =>
+      (super.noSuchMethod(Invocation.getter(#filteredExercises), returnValue: <_i4.Exercise>[])
+          as List<_i4.Exercise>);
+
+  @override
+  Map<int, List<_i4.Exercise>> get exerciseByVariation =>
+      (super.noSuchMethod(
+            Invocation.getter(#exerciseByVariation),
+            returnValue: <int, List<_i4.Exercise>>{},
+          )
+          as Map<int, List<_i4.Exercise>>);
+
+  @override
+  List<_i5.ExerciseCategory> get categories =>
+      (super.noSuchMethod(Invocation.getter(#categories), returnValue: <_i5.ExerciseCategory>[])
+          as List<_i5.ExerciseCategory>);
+
+  @override
+  List<_i7.Muscle> get muscles =>
+      (super.noSuchMethod(Invocation.getter(#muscles), returnValue: <_i7.Muscle>[])
+          as List<_i7.Muscle>);
+
+  @override
+  List<_i6.Equipment> get equipment =>
+      (super.noSuchMethod(Invocation.getter(#equipment), returnValue: <_i6.Equipment>[])
+          as List<_i6.Equipment>);
+
+  @override
+  List<_i8.Language> get languages =>
+      (super.noSuchMethod(Invocation.getter(#languages), returnValue: <_i8.Language>[])
+          as List<_i8.Language>);
+
+  @override
+  set database(_i3.ExerciseDatabase? value) =>
+      super.noSuchMethod(Invocation.setter(#database, value), returnValueForMissingStub: null);
+
+  @override
+  set exercises(List<_i4.Exercise>? value) =>
+      super.noSuchMethod(Invocation.setter(#exercises, value), returnValueForMissingStub: null);
+
+  @override
+  set filteredExercises(List<_i4.Exercise>? newFilteredExercises) => super.noSuchMethod(
+    Invocation.setter(#filteredExercises, newFilteredExercises),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set languages(List<_i8.Language>? languages) =>
+      super.noSuchMethod(Invocation.setter(#languages, languages), returnValueForMissingStub: null);
+
+  @override
+  bool get hasListeners =>
+      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
+
+  @override
+  _i10.Future<void> setFilters(_i9.Filters? newFilters) =>
+      (super.noSuchMethod(
+            Invocation.method(#setFilters, [newFilters]),
+            returnValue: _i10.Future<void>.value(),
+            returnValueForMissingStub: _i10.Future<void>.value(),
+          )
+          as _i10.Future<void>);
+
+  @override
+  void initFilters() =>
+      super.noSuchMethod(Invocation.method(#initFilters, []), returnValueForMissingStub: null);
+
+  @override
+  _i10.Future<void> findByFilters() =>
+      (super.noSuchMethod(
+            Invocation.method(#findByFilters, []),
+            returnValue: _i10.Future<void>.value(),
+            returnValueForMissingStub: _i10.Future<void>.value(),
+          )
+          as _i10.Future<void>);
+
+  @override
+  void clear() =>
+      super.noSuchMethod(Invocation.method(#clear, []), returnValueForMissingStub: null);
+
+  @override
+  _i4.Exercise findExerciseById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findExerciseById, [id]),
+            returnValue: _FakeExercise_2(this, Invocation.method(#findExerciseById, [id])),
+          )
+          as _i4.Exercise);
+
+  @override
+  List<_i4.Exercise> findExercisesByVariationId(int? variationId, {int? exerciseIdToExclude}) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #findExercisesByVariationId,
+              [variationId],
+              {#exerciseIdToExclude: exerciseIdToExclude},
+            ),
+            returnValue: <_i4.Exercise>[],
+          )
+          as List<_i4.Exercise>);
+
+  @override
+  _i5.ExerciseCategory findCategoryById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findCategoryById, [id]),
+            returnValue: _FakeExerciseCategory_3(this, Invocation.method(#findCategoryById, [id])),
+          )
+          as _i5.ExerciseCategory);
+
+  @override
+  _i6.Equipment findEquipmentById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findEquipmentById, [id]),
+            returnValue: _FakeEquipment_4(this, Invocation.method(#findEquipmentById, [id])),
+          )
+          as _i6.Equipment);
+
+  @override
+  _i7.Muscle findMuscleById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findMuscleById, [id]),
+            returnValue: _FakeMuscle_5(this, Invocation.method(#findMuscleById, [id])),
+          )
+          as _i7.Muscle);
+
+  @override
+  _i8.Language findLanguageById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findLanguageById, [id]),
+            returnValue: _FakeLanguage_6(this, Invocation.method(#findLanguageById, [id])),
+          )
+          as _i8.Language);
+
+  @override
+  _i10.Future<void> fetchAndSetCategoriesFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetCategoriesFromApi, []),
+            returnValue: _i10.Future<void>.value(),
+            returnValueForMissingStub: _i10.Future<void>.value(),
+          )
+          as _i10.Future<void>);
+
+  @override
+  _i10.Future<void> fetchAndSetMusclesFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetMusclesFromApi, []),
+            returnValue: _i10.Future<void>.value(),
+            returnValueForMissingStub: _i10.Future<void>.value(),
+          )
+          as _i10.Future<void>);
+
+  @override
+  _i10.Future<void> fetchAndSetEquipmentsFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetEquipmentsFromApi, []),
+            returnValue: _i10.Future<void>.value(),
+            returnValueForMissingStub: _i10.Future<void>.value(),
+          )
+          as _i10.Future<void>);
+
+  @override
+  _i10.Future<void> fetchAndSetLanguagesFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetLanguagesFromApi, []),
+            returnValue: _i10.Future<void>.value(),
+            returnValueForMissingStub: _i10.Future<void>.value(),
+          )
+          as _i10.Future<void>);
+
+  @override
+  _i10.Future<void> fetchAndSetAllExercises() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllExercises, []),
+            returnValue: _i10.Future<void>.value(),
+            returnValueForMissingStub: _i10.Future<void>.value(),
+          )
+          as _i10.Future<void>);
+
+  @override
+  _i10.Future<_i4.Exercise?> fetchAndSetExercise(int? exerciseId) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetExercise, [exerciseId]),
+            returnValue: _i10.Future<_i4.Exercise?>.value(),
+          )
+          as _i10.Future<_i4.Exercise?>);
+
+  @override
+  _i10.Future<_i4.Exercise> handleUpdateExerciseFromApi(
+    _i3.ExerciseDatabase? database,
+    int? exerciseId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#handleUpdateExerciseFromApi, [database, exerciseId]),
+            returnValue: _i10.Future<_i4.Exercise>.value(
+              _FakeExercise_2(
+                this,
+                Invocation.method(#handleUpdateExerciseFromApi, [database, exerciseId]),
+              ),
+            ),
+          )
+          as _i10.Future<_i4.Exercise>);
+
+  @override
+  _i10.Future<void> initCacheTimesLocalPrefs({dynamic forceInit = false}) =>
+      (super.noSuchMethod(
+            Invocation.method(#initCacheTimesLocalPrefs, [], {#forceInit: forceInit}),
+            returnValue: _i10.Future<void>.value(),
+            returnValueForMissingStub: _i10.Future<void>.value(),
+          )
+          as _i10.Future<void>);
+
+  @override
+  _i10.Future<void> clearAllCachesAndPrefs() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearAllCachesAndPrefs, []),
+            returnValue: _i10.Future<void>.value(),
+            returnValueForMissingStub: _i10.Future<void>.value(),
+          )
+          as _i10.Future<void>);
+
+  @override
+  _i10.Future<void> fetchAndSetInitialData() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetInitialData, []),
+            returnValue: _i10.Future<void>.value(),
+            returnValueForMissingStub: _i10.Future<void>.value(),
+          )
+          as _i10.Future<void>);
+
+  @override
+  _i10.Future<void> setExercisesFromDatabase(
+    _i3.ExerciseDatabase? database, {
+    bool? forceDeleteCache = false,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #setExercisesFromDatabase,
+              [database],
+              {#forceDeleteCache: forceDeleteCache},
+            ),
+            returnValue: _i10.Future<void>.value(),
+            returnValueForMissingStub: _i10.Future<void>.value(),
+          )
+          as _i10.Future<void>);
+
+  @override
+  _i10.Future<void> updateExerciseCache(_i3.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateExerciseCache, [database]),
+            returnValue: _i10.Future<void>.value(),
+            returnValueForMissingStub: _i10.Future<void>.value(),
+          )
+          as _i10.Future<void>);
+
+  @override
+  _i10.Future<void> fetchAndSetMuscles(_i3.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetMuscles, [database]),
+            returnValue: _i10.Future<void>.value(),
+            returnValueForMissingStub: _i10.Future<void>.value(),
+          )
+          as _i10.Future<void>);
+
+  @override
+  _i10.Future<void> fetchAndSetCategories(_i3.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetCategories, [database]),
+            returnValue: _i10.Future<void>.value(),
+            returnValueForMissingStub: _i10.Future<void>.value(),
+          )
+          as _i10.Future<void>);
+
+  @override
+  _i10.Future<void> fetchAndSetLanguages(_i3.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetLanguages, [database]),
+            returnValue: _i10.Future<void>.value(),
+            returnValueForMissingStub: _i10.Future<void>.value(),
+          )
+          as _i10.Future<void>);
+
+  @override
+  _i10.Future<void> fetchAndSetEquipments(_i3.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetEquipments, [database]),
+            returnValue: _i10.Future<void>.value(),
+            returnValueForMissingStub: _i10.Future<void>.value(),
+          )
+          as _i10.Future<void>);
+
+  @override
+  _i10.Future<List<_i4.Exercise>> searchExercise(
+    String? name, {
+    String? languageCode = 'en',
+    bool? searchEnglish = false,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #searchExercise,
+              [name],
+              {#languageCode: languageCode, #searchEnglish: searchEnglish},
+            ),
+            returnValue: _i10.Future<List<_i4.Exercise>>.value(<_i4.Exercise>[]),
+          )
+          as _i10.Future<List<_i4.Exercise>>);
+
+  @override
+  void addListener(_i11.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void removeListener(_i11.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#removeListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void dispose() =>
+      super.noSuchMethod(Invocation.method(#dispose, []), returnValueForMissingStub: null);
+
+  @override
+  void notifyListeners() =>
+      super.noSuchMethod(Invocation.method(#notifyListeners, []), returnValueForMissingStub: null);
+}
diff --git a/test/exercises/model_exercise_test.dart b/test/exercises/model_exercise_test.dart
index 2d817ba0..176d0379 100644
--- a/test/exercises/model_exercise_test.dart
+++ b/test/exercises/model_exercise_test.dart
@@ -8,7 +8,7 @@ import '../fixtures/fixture_reader.dart';
 
 void main() {
   final Map<String, dynamic> tExerciseInfoMap = jsonDecode(
-    fixture('exercises/exercisebaseinfo_response.json'),
+    fixture('exercises/exerciseinfo_response.json'),
   );
 
   group('Model tests', () {
@@ -17,13 +17,13 @@ void main() {
       final base = getTestExercises()[1];
 
       // assert
-      expect(base.getExercise('en').id, 5);
-      expect(base.getExercise('en-UK').id, 5);
-      expect(base.getExercise('de').id, 4);
-      expect(base.getExercise('de-AT').id, 4);
-      expect(base.getExercise('fr').id, 3);
-      expect(base.getExercise('fr-FR').id, 3);
-      expect(base.getExercise('pt').id, 5); // English again
+      expect(base.getTranslation('en').id, 5);
+      expect(base.getTranslation('en-UK').id, 5);
+      expect(base.getTranslation('de').id, 4);
+      expect(base.getTranslation('de-AT').id, 4);
+      expect(base.getTranslation('fr').id, 3);
+      expect(base.getTranslation('fr-FR').id, 3);
+      expect(base.getTranslation('pt').id, 5); // English again
     });
 
     test('Load the readExerciseBaseFromBaseInfo parse method', () {
diff --git a/test/fixtures/exercises/exercisebaseinfo_response.json b/test/fixtures/exercises/exerciseinfo_response.json
similarity index 94%
rename from test/fixtures/exercises/exercisebaseinfo_response.json
rename to test/fixtures/exercises/exerciseinfo_response.json
index 7076d729..a0298219 100644
--- a/test/fixtures/exercises/exercisebaseinfo_response.json
+++ b/test/fixtures/exercises/exerciseinfo_response.json
@@ -69,7 +69,7 @@
     {
       "id": 1,
       "uuid": "1f5d2b2f-d4ea-4eeb-9377-56176465e08d",
-      "exercise_base": 9,
+      "exercise": 9,
       "image": "http://localhost:8000/media/exercise-images/9/1f5d2b2f-d4ea-4eeb-9377-56176465e08d.jpg",
       "is_main": true,
       "status": "2",
@@ -78,7 +78,7 @@
     {
       "id": 2,
       "uuid": "ab645585-26ef-4992-a9ec-15425687ece9",
-      "exercise_base": 9,
+      "exercise": 9,
       "image": "http://localhost:8000/media/exercise-images/9/ab645585-26ef-4992-a9ec-15425687ece9.jpg",
       "is_main": false,
       "status": "2",
@@ -87,7 +87,7 @@
     {
       "id": 3,
       "uuid": "d8aa5990-bb47-4111-9823-e2fbd98fe07f",
-      "exercise_base": 9,
+      "exercise": 9,
       "image": "http://localhost:8000/media/exercise-images/9/d8aa5990-bb47-4111-9823-e2fbd98fe07f.jpg",
       "is_main": false,
       "status": "2",
@@ -96,7 +96,7 @@
     {
       "id": 4,
       "uuid": "49a159e1-1e00-409a-81c9-b4d4489fbd67",
-      "exercise_base": 9,
+      "exercise": 9,
       "image": "http://localhost:8000/media/exercise-images/9/49a159e1-1e00-409a-81c9-b4d4489fbd67.jpg",
       "is_main": false,
       "status": "2",
@@ -107,8 +107,8 @@
     {
       "id": 2,
       "uuid": "63e996e9-a772-4ca5-9d09-8b4be03f6be4",
-      "exercise_base": 258,
-      "exercise_base_uuid": "6260e3aa-e46b-4b4b-8ada-58bfd0922d3a",
+      "exercise": 258,
+      "exercise_uuid": "6260e3aa-e46b-4b4b-8ada-58bfd0922d3a",
       "video": "http://localhost:8000/media/exercise-video/258/63e996e9-a772-4ca5-9d09-8b4be03f6be4.MOV",
       "is_main": false,
       "size": 0,
@@ -121,7 +121,7 @@
       "license_author": null
     }
   ],
-  "exercises": [
+  "translations": [
     {
       "id": 345,
       "uuid": "c788d643-150a-4ac7-97ef-84643c6419bf",
@@ -136,22 +136,22 @@
         }
       ],
       "name": "2 Handed Kettlebell Swing",
-      "exercise_base": 9,
+      "exercise": 9,
       "description": "<p>Two Handed Russian Style Kettlebell swing</p>\n<p> </p>\n<p><strong style=\"\">Pizza</strong> (Italian: [ˈpittsa], Neapolitan: [ˈpittsə]) is a dish of Italian origin consisting of a usually round, flat base of leavened wheat-based dough topped with tomatoes, cheese, and often various other ingredients (such as anchovies, mushrooms, onions, olives, pineapple, meat, etc.), which is then baked at a high temperature, traditionally in a wood-fired oven.[1] A small pizza is sometimes called a pizzetta. A person who makes pizza is known as a <strong style=\"\">pizzaiolo</strong>.</p>",
       "notes": [
         {
           "id": 134,
-          "exercise": 345,
+          "translation": 345,
           "comment": "it's important to do the exercise correctly"
         },
         {
           "id": 135,
-          "exercise": 345,
+          "translation": 345,
           "comment": "put a lot of effort into this exercise"
         },
         {
           "id": 136,
-          "exercise": 345,
+          "translation": 345,
           "comment": "have fun"
         }
       ],
@@ -178,17 +178,17 @@
         }
       ],
       "name": "Kettlebell Con Dos Manos",
-      "exercise_base": 9,
+      "exercise": 9,
       "description": "<p>Cualquier descripción aquí...</p>\n<p>La <em style=\"\"><strong>pizza</strong></em> es una preparación culinaria que consiste en un pan plano, habitualmente de forma circular, elaborado con harina de trigo, levadura, agua y sal (a veces aceite de oliva) que tradicionalmente se cubre con salsa de tomate y mozzarella y se hornea a alta temperatura en un horno de leña.2​3​4​ El lugar donde se venden pizzas se denomina «pizzería» y al obrador, «pizzero» (<em style=\"\">pizzaiolo</em> en italiano). Aunque se considera que su origen está en la gastronomía italiana,3​ particularmente la napolitana,2​ su consumo está extendido a casi todos los países del mundo con diversas variantes locales, que incorporan distintos ingredientes para cubrir la masa.1​ Junto con la hamburguesa, la pizza está considerada la comida más difundida del mundo,5​6​ como consecuencia de la diáspora italiana que se estableció en América a lo largo del siglo xx principalmente en Nueva York,3​ Buenos Aires o Chicago.7​8​</p>",
       "notes": [
         {
           "id": 137,
-          "exercise": 856,
+          "translation": 856,
           "comment": "haz el ejercicio correctamente"
         },
         {
           "id": 138,
-          "exercise": 856,
+          "translation": 856,
           "comment": "pasatelo bien!"
         }
       ],
@@ -209,12 +209,12 @@
       "uuid": "2fe5f04b-5c9d-448c-a973-3fad6ddd4f74",
       "aliases": [],
       "name": "Zweihändiges Kettlebell",
-      "exercise_base": 9,
+      "exercise": 9,
       "description": "<p>Irgendeine Beschreibung hier...</p>\n<p>Eine <strong style=\"\">Pizza</strong> (Aussprache [ˈpɪtsa], ital. [ˈpitːsa], deutscher Plural: <em style=\"\">die Pizzas</em> oder <em style=\"\">die Pizzen</em>[1]) ist ein vor dem Backen würzig belegtes Fladenbrot aus einfachem Hefeteig aus der italienischen Küche. Die heutige international verbreitete Variante mit Tomatensauce und Käse als Basis stammt vermutlich aus Neapel. 2017 wurde die neapolitanische Kunst des Pizzabäckers (<em style=\"\">Art of Neapolitan ‘Pizzaiuolo’</em>) von der UNESCO in die repräsentative Liste des immateriellen Kulturerbes der Menschheit aufgenommen.[2]</p>",
       "notes": [
         {
           "id": 139,
-          "exercise": 855,
+          "translation": 855,
           "comment": "mach die Übung richtig"
         }
       ],
diff --git a/test/fixtures/nutrition/ingredient_suggestions.json b/test/fixtures/nutrition/ingredient_suggestions.json
deleted file mode 100644
index b0dafe12..00000000
--- a/test/fixtures/nutrition/ingredient_suggestions.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{"suggestions":[
-  {
-    "value": "'n Dry 100% Rapeseed Oil 1 Litre",
-    "data": {
-      "id": 61810,
-      "name": "'n Dry 100% Rapeseed Oil 1 Litre"
-    }},
-  {
-    "value": "100% Apple & Mango",
-    "data": {
-      "id": 61972,
-      "name": "100% Apple & Mango"
-    }
-  }]
-  }
diff --git a/test/fixtures/nutrition/nutritional_plan_detail_response.json b/test/fixtures/nutrition/nutritional_plan_detail_response.json
index 42b0ab0f..7a1548c9 100644
--- a/test/fixtures/nutrition/nutritional_plan_detail_response.json
+++ b/test/fixtures/nutrition/nutritional_plan_detail_response.json
@@ -2,6 +2,8 @@
   "id": 1,
   "creation_date": "2022-08-09",
   "description": "",
+  "start": "2022-08-01",
+  "end": null,
   "only_logging": false,
   "goal_energy": null,
   "goal_protein": null,
diff --git a/test/fixtures/nutrition/nutritional_plan_info_detail_response.json b/test/fixtures/nutrition/nutritional_plan_info_detail_response.json
index 3c1f0c5e..6d81d3b1 100644
--- a/test/fixtures/nutrition/nutritional_plan_info_detail_response.json
+++ b/test/fixtures/nutrition/nutritional_plan_info_detail_response.json
@@ -2,6 +2,8 @@
     "id": 92547,
     "creation_date": "2024-04-01",
     "description": "first real cut",
+    "start": "2024-04-01",
+    "end": null,
     "only_logging": false,
     "goal_energy": 1600,
     "goal_protein": 150,
diff --git a/test/fixtures/routines/routine_date_sequence_display.json b/test/fixtures/routines/routine_date_sequence_display.json
new file mode 100644
index 00000000..faf59fa8
--- /dev/null
+++ b/test/fixtures/routines/routine_date_sequence_display.json
@@ -0,0 +1,696 @@
+[
+  {
+    "iteration": 1,
+    "date": "2025-01-05",
+    "label": null,
+    "day": {
+      "id": 8,
+      "routine": 2,
+      "order": 1,
+      "name": "Leg day",
+      "description": "Leg day",
+      "is_rest": false,
+      "need_logs_to_advance": false,
+      "type": "custom",
+      "config": null
+    },
+    "slots": [
+      {
+        "comment": "",
+        "is_superset": false,
+        "exercises": [
+          76
+        ],
+        "sets": [
+          {
+            "slot_entry_id": 2,
+            "exercise": 76,
+            "sets": 4,
+            "max_sets": null,
+            "weight": "80.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "4 Sätze, 10 × 80 kg 120s rest",
+            "comment": ""
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "iteration": 1,
+    "date": "2025-01-06",
+    "label": null,
+    "day": {
+      "id": 9,
+      "routine": 2,
+      "order": 2,
+      "name": "",
+      "description": "",
+      "is_rest": true,
+      "need_logs_to_advance": false,
+      "type": "custom",
+      "config": null
+    },
+    "slots": []
+  },
+  {
+    "iteration": 1,
+    "date": "2025-01-07",
+    "label": null,
+    "day": {
+      "id": 10,
+      "routine": 2,
+      "order": 3,
+      "name": "Arms day",
+      "description": "Leg day",
+      "is_rest": false,
+      "need_logs_to_advance": false,
+      "type": "custom",
+      "config": null
+    },
+    "slots": [
+      {
+        "comment": "",
+        "is_superset": false,
+        "exercises": [
+          92
+        ],
+        "sets": [
+          {
+            "slot_entry_id": 3,
+            "exercise": 92,
+            "sets": 4,
+            "max_sets": null,
+            "weight": "20.00",
+            "max_weight": "22.00",
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "4 Sätze, 10 × 20-22 kg 120s rest",
+            "comment": ""
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "iteration": 1,
+    "date": "2025-01-08",
+    "label": null,
+    "day": null,
+    "slots": []
+  },
+  {
+    "iteration": 1,
+    "date": "2025-01-09",
+    "label": null,
+    "day": null,
+    "slots": []
+  },
+  {
+    "iteration": 1,
+    "date": "2025-01-10",
+    "label": null,
+    "day": null,
+    "slots": []
+  },
+  {
+    "iteration": 1,
+    "date": "2025-01-11",
+    "label": null,
+    "day": null,
+    "slots": []
+  },
+  {
+    "iteration": 1,
+    "date": "2025-01-12",
+    "label": null,
+    "day": null,
+    "slots": []
+  },
+  {
+    "iteration": 2,
+    "date": "2025-01-13",
+    "label": null,
+    "day": {
+      "id": 8,
+      "routine": 2,
+      "order": 1,
+      "name": "Leg day",
+      "description": "Leg day",
+      "is_rest": false,
+      "need_logs_to_advance": false,
+      "type": "custom",
+      "config": null
+    },
+    "slots": [
+      {
+        "comment": "",
+        "is_superset": false,
+        "exercises": [
+          76
+        ],
+        "sets": [
+          {
+            "slot_entry_id": 2,
+            "exercise": 76,
+            "sets": 4,
+            "max_sets": null,
+            "weight": "80.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "4 Sätze, 10 × 80 kg 120s rest",
+            "comment": ""
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "iteration": 2,
+    "date": "2025-01-14",
+    "label": null,
+    "day": {
+      "id": 9,
+      "routine": 2,
+      "order": 2,
+      "name": "",
+      "description": "",
+      "is_rest": true,
+      "need_logs_to_advance": false,
+      "type": "custom",
+      "config": null
+    },
+    "slots": []
+  },
+  {
+    "iteration": 2,
+    "date": "2025-01-15",
+    "label": null,
+    "day": {
+      "id": 10,
+      "routine": 2,
+      "order": 3,
+      "name": "Arms day",
+      "description": "Leg day",
+      "is_rest": false,
+      "need_logs_to_advance": false,
+      "type": "custom",
+      "config": null
+    },
+    "slots": [
+      {
+        "comment": "",
+        "is_superset": false,
+        "exercises": [
+          92
+        ],
+        "sets": [
+          {
+            "slot_entry_id": 3,
+            "exercise": 92,
+            "sets": 4,
+            "max_sets": null,
+            "weight": "21.00",
+            "max_weight": "22.00",
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "4 Sätze, 10 × 21-22 kg 120s rest",
+            "comment": ""
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "iteration": 2,
+    "date": "2025-01-16",
+    "label": null,
+    "day": null,
+    "slots": []
+  },
+  {
+    "iteration": 2,
+    "date": "2025-01-17",
+    "label": null,
+    "day": null,
+    "slots": []
+  },
+  {
+    "iteration": 2,
+    "date": "2025-01-18",
+    "label": null,
+    "day": null,
+    "slots": []
+  },
+  {
+    "iteration": 2,
+    "date": "2025-01-19",
+    "label": null,
+    "day": null,
+    "slots": []
+  },
+  {
+    "iteration": 3,
+    "date": "2025-01-20",
+    "label": null,
+    "day": {
+      "id": 8,
+      "routine": 2,
+      "order": 1,
+      "name": "Leg day",
+      "description": "Leg day",
+      "is_rest": false,
+      "need_logs_to_advance": false,
+      "type": "custom",
+      "config": null
+    },
+    "slots": [
+      {
+        "comment": "",
+        "is_superset": false,
+        "exercises": [
+          76
+        ],
+        "sets": [
+          {
+            "slot_entry_id": 2,
+            "exercise": 76,
+            "sets": 4,
+            "max_sets": null,
+            "weight": "80.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "4 Sätze, 10 × 80 kg 120s rest",
+            "comment": ""
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "iteration": 3,
+    "date": "2025-01-21",
+    "label": null,
+    "day": {
+      "id": 9,
+      "routine": 2,
+      "order": 2,
+      "name": "",
+      "description": "",
+      "is_rest": true,
+      "need_logs_to_advance": false,
+      "type": "custom",
+      "config": null
+    },
+    "slots": []
+  },
+  {
+    "iteration": 3,
+    "date": "2025-01-22",
+    "label": null,
+    "day": {
+      "id": 10,
+      "routine": 2,
+      "order": 3,
+      "name": "Arms day",
+      "description": "Leg day",
+      "is_rest": false,
+      "need_logs_to_advance": false,
+      "type": "custom",
+      "config": null
+    },
+    "slots": [
+      {
+        "comment": "",
+        "is_superset": false,
+        "exercises": [
+          92
+        ],
+        "sets": [
+          {
+            "slot_entry_id": 3,
+            "exercise": 92,
+            "sets": 4,
+            "max_sets": null,
+            "weight": "22.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "4 Sätze, 10 × 22 kg 120s rest",
+            "comment": ""
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "iteration": 3,
+    "date": "2025-01-23",
+    "label": null,
+    "day": null,
+    "slots": []
+  },
+  {
+    "iteration": 3,
+    "date": "2025-01-24",
+    "label": null,
+    "day": null,
+    "slots": []
+  },
+  {
+    "iteration": 3,
+    "date": "2025-01-25",
+    "label": null,
+    "day": null,
+    "slots": []
+  },
+  {
+    "iteration": 3,
+    "date": "2025-01-26",
+    "label": null,
+    "day": null,
+    "slots": []
+  },
+  {
+    "iteration": 4,
+    "date": "2025-01-27",
+    "label": null,
+    "day": {
+      "id": 8,
+      "routine": 2,
+      "order": 1,
+      "name": "Leg day",
+      "description": "Leg day",
+      "is_rest": false,
+      "need_logs_to_advance": false,
+      "type": "custom",
+      "config": null
+    },
+    "slots": [
+      {
+        "comment": "",
+        "is_superset": false,
+        "exercises": [
+          76
+        ],
+        "sets": [
+          {
+            "slot_entry_id": 2,
+            "exercise": 76,
+            "sets": 4,
+            "max_sets": null,
+            "weight": "80.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "4 Sätze, 10 × 80 kg 120s rest",
+            "comment": ""
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "iteration": 4,
+    "date": "2025-01-28",
+    "label": null,
+    "day": {
+      "id": 9,
+      "routine": 2,
+      "order": 2,
+      "name": "",
+      "description": "",
+      "is_rest": true,
+      "need_logs_to_advance": false,
+      "type": "custom",
+      "config": null
+    },
+    "slots": []
+  },
+  {
+    "iteration": 4,
+    "date": "2025-01-29",
+    "label": null,
+    "day": {
+      "id": 10,
+      "routine": 2,
+      "order": 3,
+      "name": "Arms day",
+      "description": "Leg day",
+      "is_rest": false,
+      "need_logs_to_advance": false,
+      "type": "custom",
+      "config": null
+    },
+    "slots": [
+      {
+        "comment": "",
+        "is_superset": false,
+        "exercises": [
+          92
+        ],
+        "sets": [
+          {
+            "slot_entry_id": 3,
+            "exercise": 92,
+            "sets": 4,
+            "max_sets": null,
+            "weight": "23.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "4 Sätze, 10 × 23 kg 120s rest",
+            "comment": ""
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "iteration": 4,
+    "date": "2025-01-30",
+    "label": null,
+    "day": null,
+    "slots": []
+  },
+  {
+    "iteration": 4,
+    "date": "2025-01-31",
+    "label": null,
+    "day": null,
+    "slots": []
+  },
+  {
+    "iteration": 4,
+    "date": "2025-02-01",
+    "label": null,
+    "day": null,
+    "slots": []
+  },
+  {
+    "iteration": 4,
+    "date": "2025-02-02",
+    "label": null,
+    "day": null,
+    "slots": []
+  },
+  {
+    "iteration": 5,
+    "date": "2025-02-03",
+    "label": null,
+    "day": {
+      "id": 8,
+      "routine": 2,
+      "order": 1,
+      "name": "Leg day",
+      "description": "Leg day",
+      "is_rest": false,
+      "need_logs_to_advance": false,
+      "type": "custom",
+      "config": null
+    },
+    "slots": [
+      {
+        "comment": "",
+        "is_superset": false,
+        "exercises": [
+          76
+        ],
+        "sets": [
+          {
+            "slot_entry_id": 2,
+            "exercise": 76,
+            "sets": 4,
+            "max_sets": null,
+            "weight": "80.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "4 Sätze, 10 × 80 kg 120s rest",
+            "comment": ""
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "iteration": 5,
+    "date": "2025-02-04",
+    "label": null,
+    "day": {
+      "id": 9,
+      "routine": 2,
+      "order": 2,
+      "name": "",
+      "description": "",
+      "is_rest": true,
+      "need_logs_to_advance": false,
+      "type": "custom",
+      "config": null
+    },
+    "slots": []
+  },
+  {
+    "iteration": 5,
+    "date": "2025-02-05",
+    "label": null,
+    "day": {
+      "id": 10,
+      "routine": 2,
+      "order": 3,
+      "name": "Arms day",
+      "description": "Leg day",
+      "is_rest": false,
+      "need_logs_to_advance": false,
+      "type": "custom",
+      "config": null
+    },
+    "slots": [
+      {
+        "comment": "",
+        "is_superset": false,
+        "exercises": [
+          92
+        ],
+        "sets": [
+          {
+            "slot_entry_id": 3,
+            "exercise": 92,
+            "sets": 4,
+            "max_sets": null,
+            "weight": "24.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "4 Sätze, 10 × 24 kg 120s rest",
+            "comment": ""
+          }
+        ]
+      }
+    ]
+  }
+]
\ No newline at end of file
diff --git a/test/fixtures/routines/routine_date_sequence_gym.json b/test/fixtures/routines/routine_date_sequence_gym.json
new file mode 100644
index 00000000..b1708632
--- /dev/null
+++ b/test/fixtures/routines/routine_date_sequence_gym.json
@@ -0,0 +1,1356 @@
+[
+  {
+    "iteration": 1,
+    "date": "2025-01-05",
+    "label": null,
+    "day": {
+      "id": 8,
+      "routine": 2,
+      "order": 1,
+      "name": "Leg day",
+      "description": "yes, we really do legs today",
+      "is_rest": false,
+      "need_logs_to_advance": false,
+      "type": "custom",
+      "config": null
+    },
+    "slots": [
+      {
+        "comment": "",
+        "is_superset": false,
+        "exercises": [
+          76
+        ],
+        "sets": [
+          {
+            "slot_entry_id": 2,
+            "exercise": 76,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "80.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 80 kg 120s rest",
+            "comment": ""
+          },
+          {
+            "slot_entry_id": 2,
+            "exercise": 76,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "80.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 80 kg 120s rest",
+            "comment": ""
+          },
+          {
+            "slot_entry_id": 2,
+            "exercise": 76,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "80.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 80 kg 120s rest",
+            "comment": ""
+          },
+          {
+            "slot_entry_id": 2,
+            "exercise": 76,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "80.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 80 kg 120s rest",
+            "comment": ""
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "iteration": 1,
+    "date": "2025-01-06",
+    "label": null,
+    "day": {
+      "id": 9,
+      "routine": 2,
+      "order": 2,
+      "name": "",
+      "description": "",
+      "is_rest": true,
+      "need_logs_to_advance": false,
+      "type": "custom",
+      "config": null
+    },
+    "slots": []
+  },
+  {
+    "iteration": 1,
+    "date": "2025-01-07",
+    "label": null,
+    "day": {
+      "id": 10,
+      "routine": 2,
+      "order": 3,
+      "name": "Arms day",
+      "description": "Leg day",
+      "is_rest": false,
+      "need_logs_to_advance": false,
+      "type": "custom",
+      "config": null
+    },
+    "slots": [
+      {
+        "comment": "",
+        "is_superset": false,
+        "exercises": [
+          92
+        ],
+        "sets": [
+          {
+            "slot_entry_id": 3,
+            "exercise": 92,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "20.00",
+            "max_weight": "22.00",
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 20-22 kg 120s rest",
+            "comment": ""
+          },
+          {
+            "slot_entry_id": 3,
+            "exercise": 92,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "20.00",
+            "max_weight": "22.00",
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 20-22 kg 120s rest",
+            "comment": ""
+          },
+          {
+            "slot_entry_id": 3,
+            "exercise": 92,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "20.00",
+            "max_weight": "22.00",
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 20-22 kg 120s rest",
+            "comment": ""
+          },
+          {
+            "slot_entry_id": 3,
+            "exercise": 92,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "20.00",
+            "max_weight": "22.00",
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 20-22 kg 120s rest",
+            "comment": ""
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "iteration": 1,
+    "date": "2025-01-08",
+    "label": null,
+    "day": null,
+    "slots": []
+  },
+  {
+    "iteration": 1,
+    "date": "2025-01-09",
+    "label": null,
+    "day": null,
+    "slots": []
+  },
+  {
+    "iteration": 1,
+    "date": "2025-01-10",
+    "label": null,
+    "day": null,
+    "slots": []
+  },
+  {
+    "iteration": 1,
+    "date": "2025-01-11",
+    "label": null,
+    "day": null,
+    "slots": []
+  },
+  {
+    "iteration": 1,
+    "date": "2025-01-12",
+    "label": null,
+    "day": null,
+    "slots": []
+  },
+  {
+    "iteration": 2,
+    "date": "2025-01-13",
+    "label": null,
+    "day": {
+      "id": 8,
+      "routine": 2,
+      "order": 1,
+      "name": "Leg day",
+      "description": "Leg day",
+      "is_rest": false,
+      "need_logs_to_advance": false,
+      "type": "custom",
+      "config": null
+    },
+    "slots": [
+      {
+        "comment": "",
+        "is_superset": false,
+        "exercises": [
+          76
+        ],
+        "sets": [
+          {
+            "slot_entry_id": 2,
+            "exercise": 76,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "80.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 80 kg 120s rest",
+            "comment": ""
+          },
+          {
+            "slot_entry_id": 2,
+            "exercise": 76,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "80.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 80 kg 120s rest",
+            "comment": ""
+          },
+          {
+            "slot_entry_id": 2,
+            "exercise": 76,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "80.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 80 kg 120s rest",
+            "comment": ""
+          },
+          {
+            "slot_entry_id": 2,
+            "exercise": 76,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "80.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 80 kg 120s rest",
+            "comment": ""
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "iteration": 2,
+    "date": "2025-01-14",
+    "label": null,
+    "day": {
+      "id": 9,
+      "routine": 2,
+      "order": 2,
+      "name": "",
+      "description": "",
+      "is_rest": true,
+      "need_logs_to_advance": false,
+      "type": "custom",
+      "config": null
+    },
+    "slots": []
+  },
+  {
+    "iteration": 2,
+    "date": "2025-01-15",
+    "label": null,
+    "day": {
+      "id": 10,
+      "routine": 2,
+      "order": 3,
+      "name": "Arms day",
+      "description": "Leg day",
+      "is_rest": false,
+      "need_logs_to_advance": false,
+      "type": "custom",
+      "config": null
+    },
+    "slots": [
+      {
+        "comment": "",
+        "is_superset": false,
+        "exercises": [
+          92
+        ],
+        "sets": [
+          {
+            "slot_entry_id": 3,
+            "exercise": 92,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "21.00",
+            "max_weight": "22.00",
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 21-22 kg 120s rest",
+            "comment": ""
+          },
+          {
+            "slot_entry_id": 3,
+            "exercise": 92,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "21.00",
+            "max_weight": "22.00",
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 21-22 kg 120s rest",
+            "comment": ""
+          },
+          {
+            "slot_entry_id": 3,
+            "exercise": 92,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "21.00",
+            "max_weight": "22.00",
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 21-22 kg 120s rest",
+            "comment": ""
+          },
+          {
+            "slot_entry_id": 3,
+            "exercise": 92,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "21.00",
+            "max_weight": "22.00",
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 21-22 kg 120s rest",
+            "comment": ""
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "iteration": 2,
+    "date": "2025-01-16",
+    "label": null,
+    "day": null,
+    "slots": []
+  },
+  {
+    "iteration": 2,
+    "date": "2025-01-17",
+    "label": null,
+    "day": null,
+    "slots": []
+  },
+  {
+    "iteration": 2,
+    "date": "2025-01-18",
+    "label": null,
+    "day": null,
+    "slots": []
+  },
+  {
+    "iteration": 2,
+    "date": "2025-01-19",
+    "label": null,
+    "day": null,
+    "slots": []
+  },
+  {
+    "iteration": 3,
+    "date": "2025-01-20",
+    "label": null,
+    "day": {
+      "id": 8,
+      "routine": 2,
+      "order": 1,
+      "name": "Leg day",
+      "description": "Leg day",
+      "is_rest": false,
+      "need_logs_to_advance": false,
+      "type": "custom",
+      "config": null
+    },
+    "slots": [
+      {
+        "comment": "",
+        "is_superset": false,
+        "exercises": [
+          76
+        ],
+        "sets": [
+          {
+            "slot_entry_id": 2,
+            "exercise": 76,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "80.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 80 kg 120s rest",
+            "comment": ""
+          },
+          {
+            "slot_entry_id": 2,
+            "exercise": 76,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "80.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 80 kg 120s rest",
+            "comment": ""
+          },
+          {
+            "slot_entry_id": 2,
+            "exercise": 76,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "80.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 80 kg 120s rest",
+            "comment": ""
+          },
+          {
+            "slot_entry_id": 2,
+            "exercise": 76,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "80.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 80 kg 120s rest",
+            "comment": ""
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "iteration": 3,
+    "date": "2025-01-21",
+    "label": null,
+    "day": {
+      "id": 9,
+      "routine": 2,
+      "order": 2,
+      "name": "",
+      "description": "",
+      "is_rest": true,
+      "need_logs_to_advance": false,
+      "type": "custom",
+      "config": null
+    },
+    "slots": []
+  },
+  {
+    "iteration": 3,
+    "date": "2025-01-22",
+    "label": null,
+    "day": {
+      "id": 10,
+      "routine": 2,
+      "order": 3,
+      "name": "Arms day",
+      "description": "Leg day",
+      "is_rest": false,
+      "need_logs_to_advance": false,
+      "type": "custom",
+      "config": null
+    },
+    "slots": [
+      {
+        "comment": "",
+        "is_superset": false,
+        "exercises": [
+          92
+        ],
+        "sets": [
+          {
+            "slot_entry_id": 3,
+            "exercise": 92,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "22.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 22 kg 120s rest",
+            "comment": ""
+          },
+          {
+            "slot_entry_id": 3,
+            "exercise": 92,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "22.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 22 kg 120s rest",
+            "comment": ""
+          },
+          {
+            "slot_entry_id": 3,
+            "exercise": 92,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "22.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 22 kg 120s rest",
+            "comment": ""
+          },
+          {
+            "slot_entry_id": 3,
+            "exercise": 92,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "22.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 22 kg 120s rest",
+            "comment": ""
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "iteration": 3,
+    "date": "2025-01-23",
+    "label": null,
+    "day": null,
+    "slots": []
+  },
+  {
+    "iteration": 3,
+    "date": "2025-01-24",
+    "label": null,
+    "day": null,
+    "slots": []
+  },
+  {
+    "iteration": 3,
+    "date": "2025-01-25",
+    "label": null,
+    "day": null,
+    "slots": []
+  },
+  {
+    "iteration": 3,
+    "date": "2025-01-26",
+    "label": null,
+    "day": null,
+    "slots": []
+  },
+  {
+    "iteration": 4,
+    "date": "2025-01-27",
+    "label": null,
+    "day": {
+      "id": 8,
+      "routine": 2,
+      "order": 1,
+      "name": "Leg day",
+      "description": "Leg day",
+      "is_rest": false,
+      "need_logs_to_advance": false,
+      "type": "custom",
+      "config": null
+    },
+    "slots": [
+      {
+        "comment": "",
+        "is_superset": false,
+        "exercises": [
+          76
+        ],
+        "sets": [
+          {
+            "slot_entry_id": 2,
+            "exercise": 76,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "80.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 80 kg 120s rest",
+            "comment": ""
+          },
+          {
+            "slot_entry_id": 2,
+            "exercise": 76,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "80.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 80 kg 120s rest",
+            "comment": ""
+          },
+          {
+            "slot_entry_id": 2,
+            "exercise": 76,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "80.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 80 kg 120s rest",
+            "comment": ""
+          },
+          {
+            "slot_entry_id": 2,
+            "exercise": 76,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "80.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 80 kg 120s rest",
+            "comment": ""
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "iteration": 4,
+    "date": "2025-01-28",
+    "label": null,
+    "day": {
+      "id": 9,
+      "routine": 2,
+      "order": 2,
+      "name": "",
+      "description": "",
+      "is_rest": true,
+      "need_logs_to_advance": false,
+      "type": "custom",
+      "config": null
+    },
+    "slots": []
+  },
+  {
+    "iteration": 4,
+    "date": "2025-01-29",
+    "label": null,
+    "day": {
+      "id": 10,
+      "routine": 2,
+      "order": 3,
+      "name": "Arms day",
+      "description": "Leg day",
+      "is_rest": false,
+      "need_logs_to_advance": false,
+      "type": "custom",
+      "config": null
+    },
+    "slots": [
+      {
+        "comment": "",
+        "is_superset": false,
+        "exercises": [
+          92
+        ],
+        "sets": [
+          {
+            "slot_entry_id": 3,
+            "exercise": 92,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "23.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 23 kg 120s rest",
+            "comment": ""
+          },
+          {
+            "slot_entry_id": 3,
+            "exercise": 92,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "23.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 23 kg 120s rest",
+            "comment": ""
+          },
+          {
+            "slot_entry_id": 3,
+            "exercise": 92,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "23.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 23 kg 120s rest",
+            "comment": ""
+          },
+          {
+            "slot_entry_id": 3,
+            "exercise": 92,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "23.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 23 kg 120s rest",
+            "comment": ""
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "iteration": 4,
+    "date": "2025-01-30",
+    "label": null,
+    "day": null,
+    "slots": []
+  },
+  {
+    "iteration": 4,
+    "date": "2025-01-31",
+    "label": null,
+    "day": null,
+    "slots": []
+  },
+  {
+    "iteration": 4,
+    "date": "2025-02-01",
+    "label": null,
+    "day": null,
+    "slots": []
+  },
+  {
+    "iteration": 4,
+    "date": "2025-02-02",
+    "label": null,
+    "day": null,
+    "slots": []
+  },
+  {
+    "iteration": 5,
+    "date": "2025-02-03",
+    "label": null,
+    "day": {
+      "id": 8,
+      "routine": 2,
+      "order": 1,
+      "name": "Leg day",
+      "description": "Leg day",
+      "is_rest": false,
+      "need_logs_to_advance": false,
+      "type": "custom",
+      "config": null
+    },
+    "slots": [
+      {
+        "comment": "",
+        "is_superset": false,
+        "exercises": [
+          76
+        ],
+        "sets": [
+          {
+            "slot_entry_id": 2,
+            "exercise": 76,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "80.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 80 kg 120s rest",
+            "comment": ""
+          },
+          {
+            "slot_entry_id": 2,
+            "exercise": 76,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "80.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 80 kg 120s rest",
+            "comment": ""
+          },
+          {
+            "slot_entry_id": 2,
+            "exercise": 76,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "80.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 80 kg 120s rest",
+            "comment": ""
+          },
+          {
+            "slot_entry_id": 2,
+            "exercise": 76,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "80.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 80 kg 120s rest",
+            "comment": ""
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "iteration": 5,
+    "date": "2025-02-04",
+    "label": null,
+    "day": {
+      "id": 9,
+      "routine": 2,
+      "order": 2,
+      "name": "",
+      "description": "",
+      "is_rest": true,
+      "need_logs_to_advance": false,
+      "type": "custom",
+      "config": null
+    },
+    "slots": []
+  },
+  {
+    "iteration": 5,
+    "date": "2025-02-05",
+    "label": null,
+    "day": {
+      "id": 10,
+      "routine": 2,
+      "order": 3,
+      "name": "Arms day",
+      "description": "Leg day",
+      "is_rest": false,
+      "need_logs_to_advance": false,
+      "type": "custom",
+      "config": null
+    },
+    "slots": [
+      {
+        "comment": "",
+        "is_superset": false,
+        "exercises": [
+          92
+        ],
+        "sets": [
+          {
+            "slot_entry_id": 3,
+            "exercise": 92,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "24.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 24 kg 120s rest",
+            "comment": ""
+          },
+          {
+            "slot_entry_id": 3,
+            "exercise": 92,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "24.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 24 kg 120s rest",
+            "comment": ""
+          },
+          {
+            "slot_entry_id": 3,
+            "exercise": 92,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "24.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 24 kg 120s rest",
+            "comment": ""
+          },
+          {
+            "slot_entry_id": 3,
+            "exercise": 92,
+            "sets": 1,
+            "max_sets": null,
+            "weight": "24.00",
+            "max_weight": null,
+            "weight_unit": 1,
+            "weight_rounding": null,
+            "repetitions": "10.00",
+            "max_repetitions": null,
+            "repetitions_unit": 1,
+            "repetitions_rounding": null,
+            "rir": null,
+            "max_rir": null,
+            "rpe": null,
+            "rest": "120.00",
+            "max_rest": null,
+            "type": "normal",
+            "text_repr": "10 × 24 kg 120s rest",
+            "comment": ""
+          }
+        ]
+      }
+    ]
+  }
+]
\ No newline at end of file
diff --git a/test/fixtures/routines/routine_logs.json b/test/fixtures/routines/routine_logs.json
new file mode 100644
index 00000000..1835cc3d
--- /dev/null
+++ b/test/fixtures/routines/routine_logs.json
@@ -0,0 +1,284 @@
+[
+  {
+    "session": {
+      "id": 5,
+      "routine": 2,
+      "day": null,
+      "date": "2025-01-06",
+      "notes": null,
+      "impression": "2",
+      "time_start": "20:28:49",
+      "time_end": "23:35:53"
+    },
+    "logs": [
+      {
+        "id": 4,
+        "date": "2025-01-06T00:00:00+01:00",
+        "session": 5,
+        "routine": 2,
+        "iteration": 1,
+        "slot_entry": 2,
+        "next_log": null,
+        "exercise": 76,
+        "repetitions_unit": 1,
+        "repetitions": "11.00",
+        "repetitions_target": "10.00",
+        "weight_unit": 1,
+        "weight": "78.00",
+        "weight_target": "80.00",
+        "rir": "4",
+        "rir_target": null,
+        "rest": 150,
+        "rest_target": 120
+      },
+      {
+        "id": 2,
+        "date": "2025-01-06T00:00:00+01:00",
+        "session": 5,
+        "routine": 2,
+        "iteration": 1,
+        "slot_entry": 2,
+        "next_log": null,
+        "exercise": 76,
+        "repetitions_unit": 1,
+        "repetitions": "12.00",
+        "repetitions_target": "10.00",
+        "weight_unit": 1,
+        "weight": "77.00",
+        "weight_target": "80.00",
+        "rir": "2",
+        "rir_target": null,
+        "rest": 159,
+        "rest_target": 120
+      },
+      {
+        "id": 1,
+        "date": "2025-01-06T00:00:00+01:00",
+        "session": 5,
+        "routine": 2,
+        "iteration": 1,
+        "slot_entry": 2,
+        "next_log": null,
+        "exercise": 76,
+        "repetitions_unit": 1,
+        "repetitions": "12.00",
+        "repetitions_target": "10.00",
+        "weight_unit": 1,
+        "weight": "78.00",
+        "weight_target": "80.00",
+        "rir": "2.5",
+        "rir_target": null,
+        "rest": 143,
+        "rest_target": 120
+      },
+      {
+        "id": 3,
+        "date": "2025-01-06T00:00:00+01:00",
+        "session": 5,
+        "routine": 2,
+        "iteration": 1,
+        "slot_entry": 2,
+        "next_log": null,
+        "exercise": 76,
+        "repetitions_unit": 1,
+        "repetitions": "12.00",
+        "repetitions_target": "10.00",
+        "weight_unit": 1,
+        "weight": "83.00",
+        "weight_target": "80.00",
+        "rir": "0.5",
+        "rir_target": null,
+        "rest": 160,
+        "rest_target": 120
+      }
+    ]
+  },
+  {
+    "session": {
+      "id": 6,
+      "routine": 2,
+      "day": null,
+      "date": "2025-01-08",
+      "notes": null,
+      "impression": "2",
+      "time_start": "12:55:54",
+      "time_end": "14:25:31"
+    },
+    "logs": [
+      {
+        "id": 7,
+        "date": "2025-01-08T00:00:00+01:00",
+        "session": 6,
+        "routine": 2,
+        "iteration": 1,
+        "slot_entry": 3,
+        "next_log": null,
+        "exercise": 76,
+        "repetitions_unit": 1,
+        "repetitions": "10.00",
+        "repetitions_target": "10.00",
+        "weight_unit": 1,
+        "weight": "80.00",
+        "weight_target": "80.00",
+        "rir": "3",
+        "rir_target": null,
+        "rest": 131,
+        "rest_target": 120
+      },
+      {
+        "id": 8,
+        "date": "2025-01-08T00:00:00+01:00",
+        "session": 6,
+        "routine": 2,
+        "iteration": 1,
+        "slot_entry": 3,
+        "next_log": null,
+        "exercise": 76,
+        "repetitions_unit": 1,
+        "repetitions": "11.00",
+        "repetitions_target": "10.00",
+        "weight_unit": 1,
+        "weight": "83.00",
+        "weight_target": "80.00",
+        "rir": "3",
+        "rir_target": null,
+        "rest": 128,
+        "rest_target": 120
+      },
+      {
+        "id": 5,
+        "date": "2025-01-08T00:00:00+01:00",
+        "session": 6,
+        "routine": 2,
+        "iteration": 1,
+        "slot_entry": 3,
+        "next_log": null,
+        "exercise": 76,
+        "repetitions_unit": 1,
+        "repetitions": "11.00",
+        "repetitions_target": "10.00",
+        "weight_unit": 1,
+        "weight": "90.00",
+        "weight_target": "80.00",
+        "rir": "0.5",
+        "rir_target": "0.5",
+        "rest": 121,
+        "rest_target": 120
+      },
+      {
+        "id": 6,
+        "date": "2025-01-08T00:00:00+01:00",
+        "session": 6,
+        "routine": 2,
+        "iteration": 1,
+        "slot_entry": 3,
+        "next_log": null,
+        "exercise": 76,
+        "repetitions_unit": 1,
+        "repetitions": "12.00",
+        "repetitions_target": "10.00",
+        "weight_unit": 1,
+        "weight": "77.00",
+        "weight_target": "80.00",
+        "rir": "1.5",
+        "rir_target": null,
+        "rest": 129,
+        "rest_target": 120
+      }
+    ]
+  },
+  {
+    "session": {
+      "id": 7,
+      "routine": 2,
+      "day": null,
+      "date": "2025-01-13",
+      "notes": null,
+      "impression": "2",
+      "time_start": "18:48:45",
+      "time_end": "20:20:52"
+    },
+    "logs": [
+      {
+        "id": 11,
+        "date": "2025-01-13T00:00:00+01:00",
+        "session": 7,
+        "routine": 2,
+        "iteration": 2,
+        "slot_entry": 2,
+        "next_log": null,
+        "exercise": 76,
+        "repetitions_unit": 1,
+        "repetitions": "9.00",
+        "repetitions_target": "10.00",
+        "weight_unit": 1,
+        "weight": "84.00",
+        "weight_target": "80.00",
+        "rir": "0",
+        "rir_target": null,
+        "rest": 128,
+        "rest_target": 120
+      },
+      {
+        "id": 10,
+        "date": "2025-01-13T00:00:00+01:00",
+        "session": 7,
+        "routine": 2,
+        "iteration": 2,
+        "slot_entry": 2,
+        "next_log": null,
+        "exercise": 76,
+        "repetitions_unit": 1,
+        "repetitions": "10.00",
+        "repetitions_target": "10.00",
+        "weight_unit": 1,
+        "weight": "84.00",
+        "weight_target": "80.00",
+        "rir": "4",
+        "rir_target": null,
+        "rest": 149,
+        "rest_target": 120
+      },
+      {
+        "id": 12,
+        "date": "2025-01-13T00:00:00+01:00",
+        "session": 7,
+        "routine": 2,
+        "iteration": 2,
+        "slot_entry": 2,
+        "next_log": null,
+        "exercise": 76,
+        "repetitions_unit": 1,
+        "repetitions": "10.00",
+        "repetitions_target": "10.00",
+        "weight_unit": 1,
+        "weight": "89.00",
+        "weight_target": "80.00",
+        "rir": "1.5",
+        "rir_target": null,
+        "rest": 120,
+        "rest_target": 120
+      },
+      {
+        "id": 9,
+        "date": "2025-01-13T00:00:00+01:00",
+        "session": 7,
+        "routine": 2,
+        "iteration": 2,
+        "slot_entry": 2,
+        "next_log": null,
+        "exercise": 76,
+        "repetitions_unit": 1,
+        "repetitions": "12.00",
+        "repetitions_target": "10.00",
+        "weight_unit": 1,
+        "weight": "90.00",
+        "weight_target": "80.00",
+        "rir": "2.5",
+        "rir_target": null,
+        "rest": 119,
+        "rest_target": 120
+      }
+    ]
+  }
+]
\ No newline at end of file
diff --git a/test/fixtures/routines/routine_structure.json b/test/fixtures/routines/routine_structure.json
new file mode 100644
index 00000000..aadf28cd
--- /dev/null
+++ b/test/fixtures/routines/routine_structure.json
@@ -0,0 +1,266 @@
+{
+  "id": 101,
+  "name": "Test 123",
+  "description": "",
+  "created": "2025-02-02T17:52:36.245680+01:00",
+  "start": "2025-01-06",
+  "end": "2025-03-28",
+  "fit_in_week": true,
+  "days": [
+    {
+      "id": 8,
+      "routine": 2,
+      "order": 1,
+      "name": "Leg day",
+      "description": "Leg day",
+      "is_rest": false,
+      "need_logs_to_advance": false,
+      "type": "custom",
+      "config": null,
+      "slots": [
+        {
+          "id": 2,
+          "day": 8,
+          "order": 1,
+          "comment": "",
+          "entries": [
+            {
+              "id": 2,
+              "slot": 2,
+              "exercise": 76,
+              "order": 1,
+              "comment": "",
+              "type": "normal",
+              "class_name": null,
+              "config": null,
+              "repetition_unit": 1,
+              "repetition_rounding": null,
+              "repetitions_configs": [
+                {
+                  "id": 2,
+                  "slot_entry": 2,
+                  "iteration": 1,
+                  "value": "10.00",
+                  "operation": "r",
+                  "step": "abs",
+                  "repeat": false,
+                  "requirements": null
+                }
+              ],
+              "max_repetitions_configs": [],
+              "weight_unit": 1,
+              "weight_rounding": null,
+              "weight_configs": [
+                {
+                  "id": 1,
+                  "slot_entry": 2,
+                  "iteration": 1,
+                  "value": "80.00",
+                  "operation": "r",
+                  "step": "abs",
+                  "repeat": false,
+                  "requirements": null
+                }
+              ],
+              "max_weight_configs": [],
+              "set_nr_configs": [
+                {
+                  "id": 2,
+                  "slot_entry": 2,
+                  "iteration": 1,
+                  "value": 4,
+                  "operation": "r",
+                  "step": "abs",
+                  "repeat": false,
+                  "requirements": null
+                }
+              ],
+              "max_set_nr_configs": [],
+              "rir_configs": [],
+              "max_rir_configs": [],
+              "rest_configs": [
+                {
+                  "id": 2,
+                  "slot_entry": 2,
+                  "iteration": 1,
+                  "value": 120,
+                  "operation": "r",
+                  "step": "abs",
+                  "repeat": false,
+                  "requirements": null
+                }
+              ],
+              "max_rest_configs": []
+            }
+          ],
+          "config": null
+        }
+      ]
+    },
+    {
+      "id": 9,
+      "routine": 2,
+      "order": 2,
+      "name": "",
+      "description": "",
+      "is_rest": true,
+      "need_logs_to_advance": false,
+      "type": "custom",
+      "config": null,
+      "slots": []
+    },
+    {
+      "id": 10,
+      "routine": 2,
+      "order": 3,
+      "name": "Arms day",
+      "description": "Leg day",
+      "is_rest": false,
+      "need_logs_to_advance": false,
+      "type": "custom",
+      "config": null,
+      "slots": [
+        {
+          "id": 3,
+          "day": 10,
+          "order": 1,
+          "comment": "",
+          "entries": [
+            {
+              "id": 3,
+              "slot": 3,
+              "exercise": 92,
+              "order": 1,
+              "comment": "",
+              "type": "normal",
+              "class_name": null,
+              "config": null,
+              "repetition_unit": 1,
+              "repetition_rounding": null,
+              "repetitions_configs": [
+                {
+                  "id": 3,
+                  "slot_entry": 3,
+                  "iteration": 1,
+                  "value": "10.00",
+                  "operation": "r",
+                  "step": "abs",
+                  "repeat": false,
+                  "requirements": null
+                }
+              ],
+              "max_repetitions_configs": [],
+              "weight_unit": 1,
+              "weight_rounding": null,
+              "weight_configs": [
+                {
+                  "id": 2,
+                  "slot_entry": 3,
+                  "iteration": 1,
+                  "value": "20.00",
+                  "operation": "r",
+                  "step": "na",
+                  "repeat": false,
+                  "requirements": {
+                    "rules": []
+                  }
+                },
+                {
+                  "id": 7,
+                  "slot_entry": 3,
+                  "iteration": 2,
+                  "value": "1.00",
+                  "operation": "+",
+                  "step": "abs",
+                  "repeat": true,
+                  "requirements": {
+                    "rules": []
+                  }
+                },
+                {
+                  "id": 8,
+                  "slot_entry": 3,
+                  "iteration": 8,
+                  "value": "20.00",
+                  "operation": "r",
+                  "step": "na",
+                  "repeat": false,
+                  "requirements": {
+                    "rules": []
+                  }
+                }
+              ],
+              "max_weight_configs": [
+                {
+                  "id": 1,
+                  "slot_entry": 3,
+                  "iteration": 1,
+                  "value": "22.00",
+                  "operation": "r",
+                  "step": "na",
+                  "repeat": false,
+                  "requirements": {
+                    "rules": []
+                  }
+                },
+                {
+                  "id": 2,
+                  "slot_entry": 3,
+                  "iteration": 2,
+                  "value": "1.00",
+                  "operation": "+",
+                  "step": "abs",
+                  "repeat": true,
+                  "requirements": {
+                    "rules": []
+                  }
+                },
+                {
+                  "id": 3,
+                  "slot_entry": 3,
+                  "iteration": 8,
+                  "value": "22.00",
+                  "operation": "r",
+                  "step": "na",
+                  "repeat": false,
+                  "requirements": {
+                    "rules": []
+                  }
+                }
+              ],
+              "set_nr_configs": [
+                {
+                  "id": 3,
+                  "slot_entry": 3,
+                  "iteration": 1,
+                  "value": 4,
+                  "operation": "r",
+                  "step": "abs",
+                  "repeat": false,
+                  "requirements": null
+                }
+              ],
+              "max_set_nr_configs": [],
+              "rir_configs": [],
+              "max_rir_configs": [],
+              "rest_configs": [
+                {
+                  "id": 3,
+                  "slot_entry": 3,
+                  "iteration": 1,
+                  "value": 120,
+                  "operation": "r",
+                  "step": "abs",
+                  "repeat": false,
+                  "requirements": null
+                }
+              ],
+              "max_rest_configs": []
+            }
+          ],
+          "config": null
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/test/fixtures/routines/slot_entry.json b/test/fixtures/routines/slot_entry.json
new file mode 100644
index 00000000..75b9b193
--- /dev/null
+++ b/test/fixtures/routines/slot_entry.json
@@ -0,0 +1,132 @@
+{
+  "id": 143,
+  "slot": 140,
+  "exercise": 294,
+  "order": 2,
+  "comment": "lorem ipsum",
+  "type": "normal",
+  "class_name": null,
+  "config": null,
+  "repetition_unit": 1,
+  "repetition_rounding": "1.25",
+  "repetitions_configs": [
+    {
+      "id": 139,
+      "slot_entry": 143,
+      "iteration": 1,
+      "value": "2.00",
+      "operation": "r",
+      "step": "na",
+      "need_log_to_apply": false,
+      "repeat": false,
+      "requirements": null
+    }
+  ],
+  "max_repetitions_configs": [
+    {
+      "id": 1,
+      "slot_entry": 143,
+      "iteration": 1,
+      "value": "5.00",
+      "operation": "r",
+      "step": "na",
+      "need_log_to_apply": false,
+      "repeat": false,
+      "requirements": null
+    }
+  ],
+  "weight_unit": 1,
+  "weight_rounding": "2.50",
+  "weight_configs": [
+    {
+      "id": 10,
+      "slot_entry": 143,
+      "iteration": 1,
+      "value": "11.00",
+      "operation": "r",
+      "step": "na",
+      "need_log_to_apply": false,
+      "repeat": false,
+      "requirements": null
+    }
+  ],
+  "max_weight_configs": [
+    {
+      "id": 1,
+      "slot_entry": 143,
+      "iteration": 1,
+      "value": "14.00",
+      "operation": "r",
+      "step": "na",
+      "need_log_to_apply": false,
+      "repeat": false,
+      "requirements": null
+    }
+  ],
+  "set_nr_configs": [
+    {
+      "id": 143,
+      "slot_entry": 143,
+      "iteration": 1,
+      "value": 1,
+      "operation": "r",
+      "step": "na",
+      "need_log_to_apply": false,
+      "repeat": false,
+      "requirements": null
+    }
+  ],
+  "max_set_nr_configs": [
+    {
+      "id": 2,
+      "slot_entry": 143,
+      "iteration": 1,
+      "value": 2,
+      "operation": "r",
+      "step": "na",
+      "need_log_to_apply": false,
+      "repeat": false,
+      "requirements": null
+    }
+  ],
+  "rir_configs": [
+    {
+      "id": 1,
+      "slot_entry": 143,
+      "iteration": 1,
+      "value": "1.0",
+      "operation": "r",
+      "step": "na",
+      "need_log_to_apply": false,
+      "repeat": false,
+      "requirements": null
+    }
+  ],
+  "max_rir_configs": [],
+  "rest_configs": [
+    {
+      "id": 138,
+      "slot_entry": 143,
+      "iteration": 1,
+      "value": 100,
+      "operation": "r",
+      "step": "na",
+      "need_log_to_apply": false,
+      "repeat": false,
+      "requirements": null
+    }
+  ],
+  "max_rest_configs": [
+    {
+      "id": 1,
+      "slot_entry": 143,
+      "iteration": 1,
+      "value": 150,
+      "operation": "r",
+      "step": "na",
+      "need_log_to_apply": false,
+      "repeat": false,
+      "requirements": null
+    }
+  ]
+}
\ No newline at end of file
diff --git a/test/gallery/gallery_form_test.dart b/test/gallery/gallery_form_test.dart
index fc84a3e5..e33c74be 100644
--- a/test/gallery/gallery_form_test.dart
+++ b/test/gallery/gallery_form_test.dart
@@ -17,13 +17,13 @@
  */
 
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
 import 'package:network_image_mock/network_image_mock.dart';
 import 'package:provider/provider.dart';
 import 'package:wger/helpers/consts.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/models/gallery/image.dart' as gallery;
 import 'package:wger/providers/gallery.dart';
 import 'package:wger/widgets/gallery/forms.dart';
diff --git a/test/gallery/gallery_form_test.mocks.dart b/test/gallery/gallery_form_test.mocks.dart
index 4a9db097..27d9e4a9 100644
--- a/test/gallery/gallery_form_test.mocks.dart
+++ b/test/gallery/gallery_form_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.4.4 from annotations
+// Mocks generated by Mockito 5.4.6 from annotations
 // in wger/test/gallery/gallery_form_test.dart.
 // Do not manually edit this file.
 
@@ -21,49 +21,27 @@ import 'package:wger/providers/gallery.dart' as _i4;
 // ignore_for_file: deprecated_member_use_from_same_package
 // ignore_for_file: implementation_imports
 // ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
 // ignore_for_file: camel_case_types
 // ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
 
 class _FakeAuthProvider_0 extends _i1.SmartFake implements _i2.AuthProvider {
-  _FakeAuthProvider_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeAuthProvider_0(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
-  _FakeClient_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeClient_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeUri_2 extends _i1.SmartFake implements Uri {
-  _FakeUri_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeUri_2(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeResponse_3 extends _i1.SmartFake implements _i3.Response {
-  _FakeResponse_3(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeResponse_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 /// A class which mocks [GalleryProvider].
@@ -75,278 +53,168 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider {
   }
 
   @override
-  List<_i5.Image> get images => (super.noSuchMethod(
-        Invocation.getter(#images),
-        returnValue: <_i5.Image>[],
-      ) as List<_i5.Image>);
+  List<_i5.Image> get images =>
+      (super.noSuchMethod(Invocation.getter(#images), returnValue: <_i5.Image>[])
+          as List<_i5.Image>);
 
   @override
-  set images(List<_i5.Image>? _images) => super.noSuchMethod(
-        Invocation.setter(
-          #images,
-          _images,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set images(List<_i5.Image>? value) =>
+      super.noSuchMethod(Invocation.setter(#images, value), returnValueForMissingStub: null);
 
   @override
-  _i2.AuthProvider get auth => (super.noSuchMethod(
-        Invocation.getter(#auth),
-        returnValue: _FakeAuthProvider_0(
-          this,
-          Invocation.getter(#auth),
-        ),
-      ) as _i2.AuthProvider);
-
-  @override
-  set auth(_i2.AuthProvider? _auth) => super.noSuchMethod(
-        Invocation.setter(
-          #auth,
-          _auth,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  _i3.Client get client => (super.noSuchMethod(
-        Invocation.getter(#client),
-        returnValue: _FakeClient_1(
-          this,
-          Invocation.getter(#client),
-        ),
-      ) as _i3.Client);
-
-  @override
-  set client(_i3.Client? _client) => super.noSuchMethod(
-        Invocation.setter(
-          #client,
-          _client,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  bool get hasListeners => (super.noSuchMethod(
-        Invocation.getter(#hasListeners),
-        returnValue: false,
-      ) as bool);
-
-  @override
-  void clear() => super.noSuchMethod(
-        Invocation.method(
-          #clear,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  _i6.Future<void> fetchAndSetGallery() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetGallery,
-          [],
-        ),
-        returnValue: _i6.Future<void>.value(),
-        returnValueForMissingStub: _i6.Future<void>.value(),
-      ) as _i6.Future<void>);
-
-  @override
-  _i6.Future<void> addImage(
-    _i5.Image? image,
-    _i7.XFile? imageFile,
-  ) =>
+  _i2.AuthProvider get auth =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addImage,
-          [
-            image,
-            imageFile,
-          ],
-        ),
-        returnValue: _i6.Future<void>.value(),
-        returnValueForMissingStub: _i6.Future<void>.value(),
-      ) as _i6.Future<void>);
+            Invocation.getter(#auth),
+            returnValue: _FakeAuthProvider_0(this, Invocation.getter(#auth)),
+          )
+          as _i2.AuthProvider);
 
   @override
-  _i6.Future<void> editImage(
-    _i5.Image? image,
-    _i7.XFile? imageFile,
-  ) =>
+  _i3.Client get client =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editImage,
-          [
-            image,
-            imageFile,
-          ],
-        ),
-        returnValue: _i6.Future<void>.value(),
-        returnValueForMissingStub: _i6.Future<void>.value(),
-      ) as _i6.Future<void>);
+            Invocation.getter(#client),
+            returnValue: _FakeClient_1(this, Invocation.getter(#client)),
+          )
+          as _i3.Client);
 
   @override
-  _i6.Future<void> deleteImage(_i5.Image? image) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteImage,
-          [image],
-        ),
-        returnValue: _i6.Future<void>.value(),
-        returnValueForMissingStub: _i6.Future<void>.value(),
-      ) as _i6.Future<void>);
+  set auth(_i2.AuthProvider? value) =>
+      super.noSuchMethod(Invocation.setter(#auth, value), returnValueForMissingStub: null);
+
+  @override
+  set client(_i3.Client? value) =>
+      super.noSuchMethod(Invocation.setter(#client, value), returnValueForMissingStub: null);
+
+  @override
+  bool get hasListeners =>
+      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
+
+  @override
+  void clear() =>
+      super.noSuchMethod(Invocation.method(#clear, []), returnValueForMissingStub: null);
+
+  @override
+  _i6.Future<void> fetchAndSetGallery() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetGallery, []),
+            returnValue: _i6.Future<void>.value(),
+            returnValueForMissingStub: _i6.Future<void>.value(),
+          )
+          as _i6.Future<void>);
+
+  @override
+  _i6.Future<void> addImage(_i5.Image? image, _i7.XFile? imageFile) =>
+      (super.noSuchMethod(
+            Invocation.method(#addImage, [image, imageFile]),
+            returnValue: _i6.Future<void>.value(),
+            returnValueForMissingStub: _i6.Future<void>.value(),
+          )
+          as _i6.Future<void>);
+
+  @override
+  _i6.Future<void> editImage(_i5.Image? image, _i7.XFile? imageFile) =>
+      (super.noSuchMethod(
+            Invocation.method(#editImage, [image, imageFile]),
+            returnValue: _i6.Future<void>.value(),
+            returnValueForMissingStub: _i6.Future<void>.value(),
+          )
+          as _i6.Future<void>);
+
+  @override
+  _i6.Future<void> deleteImage(_i5.Image? image) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteImage, [image]),
+            returnValue: _i6.Future<void>.value(),
+            returnValueForMissingStub: _i6.Future<void>.value(),
+          )
+          as _i6.Future<void>);
 
   @override
   Map<String, String> getDefaultHeaders({bool? includeAuth = false}) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #getDefaultHeaders,
-          [],
-          {#includeAuth: includeAuth},
-        ),
-        returnValue: <String, String>{},
-      ) as Map<String, String>);
+            Invocation.method(#getDefaultHeaders, [], {#includeAuth: includeAuth}),
+            returnValue: <String, String>{},
+          )
+          as Map<String, String>);
 
   @override
-  Uri makeUrl(
-    String? path, {
-    int? id,
-    String? objectMethod,
-    Map<String, dynamic>? query,
-  }) =>
+  Uri makeUrl(String? path, {int? id, String? objectMethod, Map<String, dynamic>? query}) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #makeUrl,
-          [path],
-          {
-            #id: id,
-            #objectMethod: objectMethod,
-            #query: query,
-          },
-        ),
-        returnValue: _FakeUri_2(
-          this,
-          Invocation.method(
-            #makeUrl,
-            [path],
-            {
-              #id: id,
-              #objectMethod: objectMethod,
-              #query: query,
-            },
-          ),
-        ),
-      ) as Uri);
+            Invocation.method(
+              #makeUrl,
+              [path],
+              {#id: id, #objectMethod: objectMethod, #query: query},
+            ),
+            returnValue: _FakeUri_2(
+              this,
+              Invocation.method(
+                #makeUrl,
+                [path],
+                {#id: id, #objectMethod: objectMethod, #query: query},
+              ),
+            ),
+          )
+          as Uri);
 
   @override
-  _i6.Future<Map<String, dynamic>> fetch(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetch,
-          [uri],
-        ),
-        returnValue:
-            _i6.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i6.Future<Map<String, dynamic>>);
-
-  @override
-  _i6.Future<List<dynamic>> fetchPaginated(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchPaginated,
-          [uri],
-        ),
-        returnValue: _i6.Future<List<dynamic>>.value(<dynamic>[]),
-      ) as _i6.Future<List<dynamic>>);
-
-  @override
-  _i6.Future<Map<String, dynamic>> post(
-    Map<String, dynamic>? data,
-    Uri? uri,
-  ) =>
+  _i6.Future<dynamic> fetch(Uri? uri) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #post,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue:
-            _i6.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i6.Future<Map<String, dynamic>>);
+            Invocation.method(#fetch, [uri]),
+            returnValue: _i6.Future<dynamic>.value(),
+          )
+          as _i6.Future<dynamic>);
 
   @override
-  _i6.Future<Map<String, dynamic>> patch(
-    Map<String, dynamic>? data,
-    Uri? uri,
-  ) =>
+  _i6.Future<List<dynamic>> fetchPaginated(Uri? uri) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #patch,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue:
-            _i6.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i6.Future<Map<String, dynamic>>);
+            Invocation.method(#fetchPaginated, [uri]),
+            returnValue: _i6.Future<List<dynamic>>.value(<dynamic>[]),
+          )
+          as _i6.Future<List<dynamic>>);
 
   @override
-  _i6.Future<_i3.Response> deleteRequest(
-    String? url,
-    int? id,
-  ) =>
+  _i6.Future<Map<String, dynamic>> post(Map<String, dynamic>? data, Uri? uri) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteRequest,
-          [
-            url,
-            id,
-          ],
-        ),
-        returnValue: _i6.Future<_i3.Response>.value(_FakeResponse_3(
-          this,
-          Invocation.method(
-            #deleteRequest,
-            [
-              url,
-              id,
-            ],
-          ),
-        )),
-      ) as _i6.Future<_i3.Response>);
+            Invocation.method(#post, [data, uri]),
+            returnValue: _i6.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+          )
+          as _i6.Future<Map<String, dynamic>>);
+
+  @override
+  _i6.Future<Map<String, dynamic>> patch(Map<String, dynamic>? data, Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#patch, [data, uri]),
+            returnValue: _i6.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+          )
+          as _i6.Future<Map<String, dynamic>>);
+
+  @override
+  _i6.Future<_i3.Response> deleteRequest(String? url, int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteRequest, [url, id]),
+            returnValue: _i6.Future<_i3.Response>.value(
+              _FakeResponse_3(this, Invocation.method(#deleteRequest, [url, id])),
+            ),
+          )
+          as _i6.Future<_i3.Response>);
 
   @override
   void addListener(_i8.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void removeListener(_i8.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(#removeListener, [listener]),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void dispose() =>
+      super.noSuchMethod(Invocation.method(#dispose, []), returnValueForMissingStub: null);
 
   @override
-  void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void notifyListeners() =>
+      super.noSuchMethod(Invocation.method(#notifyListeners, []), returnValueForMissingStub: null);
 }
diff --git a/test/gallery/gallery_provider_test.dart b/test/gallery/gallery_provider_test.dart
index b0e067b6..3fbb0f04 100644
--- a/test/gallery/gallery_provider_test.dart
+++ b/test/gallery/gallery_provider_test.dart
@@ -30,18 +30,22 @@ void main() {
     test('Test that fetch and set gallery', () async {
       final client = MockClient();
 
-      when(client.get(
-        Uri.https('localhost', 'api/v2/gallery/'),
-        headers: anyNamed('headers'),
-      )).thenAnswer((_) async => http.Response(
-            '{"count":1,"next":null,"previous":null,"results":['
-            '{"id":58,'
-            '"date":"2022-01-09",'
-            '"image":"https://wger.de/media/gallery/170335/d2b9c9e0-d541-41ae-8786-a2ab459e3538.jpg",'
-            '"description":"eggsaddjujuit\'ddayhadIforcanview",'
-            '"height":1280,"width":960}]}',
-            200,
-          ));
+      when(
+        client.get(
+          Uri.https('localhost', 'api/v2/gallery/'),
+          headers: anyNamed('headers'),
+        ),
+      ).thenAnswer(
+        (_) async => http.Response(
+          '{"count":1,"next":null,"previous":null,"results":['
+          '{"id":58,'
+          '"date":"2022-01-09",'
+          '"image":"https://wger.de/media/gallery/170335/d2b9c9e0-d541-41ae-8786-a2ab459e3538.jpg",'
+          '"description":"eggsaddjujuit\'ddayhadIforcanview",'
+          '"height":1280,"width":960}]}',
+          200,
+        ),
+      );
 
       final galleryProvider = GalleryProvider(testAuthProvider, [], client);
 
@@ -54,17 +58,21 @@ void main() {
     test('Test that delete gallery photo', () async {
       final client = MockClient();
 
-      when(client.delete(
-        Uri.https('localhost', 'api/v2/gallery/58/'),
-        headers: anyNamed('headers'),
-      )).thenAnswer((_) async => http.Response(
-            '{"id":58,'
-            '"date":"2022-01-09",'
-            '"image":"https://wger.de/media/gallery/170335/d2b9c9e0-d541-41ae-8786-a2ab459e3538.jpg",'
-            '"description":"eggsaddjujuit\'ddayhadIforcanview",'
-            '"height":1280,"width":960}',
-            200,
-          ));
+      when(
+        client.delete(
+          Uri.https('localhost', 'api/v2/gallery/58/'),
+          headers: anyNamed('headers'),
+        ),
+      ).thenAnswer(
+        (_) async => http.Response(
+          '{"id":58,'
+          '"date":"2022-01-09",'
+          '"image":"https://wger.de/media/gallery/170335/d2b9c9e0-d541-41ae-8786-a2ab459e3538.jpg",'
+          '"description":"eggsaddjujuit\'ddayhadIforcanview",'
+          '"height":1280,"width":960}',
+          200,
+        ),
+      );
 
       final galleryProvider = GalleryProvider(testAuthProvider, [], client);
 
diff --git a/test/gallery/gallery_screen_test.dart b/test/gallery/gallery_screen_test.dart
index 08186601..b7b01458 100644
--- a/test/gallery/gallery_screen_test.dart
+++ b/test/gallery/gallery_screen_test.dart
@@ -25,7 +25,6 @@ import 'package:network_image_mock/network_image_mock.dart';
 import 'package:provider/provider.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/providers/gallery.dart';
-import 'package:wger/screens/form_screen.dart';
 import 'package:wger/widgets/gallery/overview.dart';
 
 import '../../test_data/gallery.dart';
@@ -40,7 +39,7 @@ void main() {
     when(mockGalleryProvider.images).thenAnswer((_) => getTestImages());
   });
 
-  Widget createScreen({locale = 'en'}) {
+  Widget renderScreen({locale = 'en'}) {
     return ChangeNotifierProvider<GalleryProvider>(
       create: (context) => mockGalleryProvider,
       child: MaterialApp(
@@ -48,51 +47,38 @@ void main() {
         localizationsDelegates: AppLocalizations.localizationsDelegates,
         supportedLocales: AppLocalizations.supportedLocales,
         home: const Gallery(),
-        routes: {FormScreen.routeName: (ctx) => const FormScreen()},
+      ),
+    );
+  }
+
+  Widget renderDetail({locale = 'en'}) {
+    return ChangeNotifierProvider<GalleryProvider>(
+      create: (context) => mockGalleryProvider,
+      child: MaterialApp(
+        locale: Locale(locale),
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: ImageDetail(image: getTestImages()[0]),
       ),
     );
   }
 
   testWidgets('Test the widgets on the gallery screen', (WidgetTester tester) async {
-    await mockNetworkImagesFor(() => tester.pumpWidget(createScreen()));
+    await mockNetworkImagesFor(() => tester.pumpWidget(renderScreen()));
 
     expect(find.byType(SliverMasonryGrid), findsOneWidget);
     expect(find.byType(GestureDetector, skipOffstage: false), findsNWidgets(4));
   });
 
-  testWidgets('Test opening the form for an existing image', (WidgetTester tester) async {
-    await mockNetworkImagesFor(() => tester.pumpWidget(createScreen()));
-
-    await tester.tap(find.byKey(const Key('image-1')));
-    await tester.pumpAndSettle();
-
-    // Detail dialog opens
-    expect(find.byKey(const Key('image-1-detail')), findsOneWidget);
-    expect(find.byType(Image), findsNWidgets(5)); // four in the overview, one in the popup
-    expect(find.text('A very cool image from the gym'), findsOneWidget);
-    expect(find.byIcon(Icons.edit), findsOneWidget);
-    expect(find.byIcon(Icons.delete), findsOneWidget);
-
-    // Edit form opens
-    await tester.tap(find.byIcon(Icons.edit));
-    await tester.pumpAndSettle();
-
-    expect(find.text('A very cool image from the gym'), findsOneWidget);
-    expect(find.byType(TextFormField), findsNWidgets(2));
-    expect(find.byType(ElevatedButton), findsOneWidget);
-  });
-
   testWidgets('Tests the localization of dates - EN', (WidgetTester tester) async {
-    await mockNetworkImagesFor(() => tester.pumpWidget(createScreen()));
-    await tester.tap(find.byKey(const Key('image-1')));
+    await mockNetworkImagesFor(() => tester.pumpWidget(renderDetail()));
     await tester.pumpAndSettle();
 
     expect(find.text('5/30/2021'), findsOneWidget);
   });
 
   testWidgets('Tests the localization of dates - DE', (WidgetTester tester) async {
-    await mockNetworkImagesFor(() => tester.pumpWidget(createScreen(locale: 'de')));
-    await tester.tap(find.byKey(const Key('image-1')));
+    await mockNetworkImagesFor(() => tester.pumpWidget(renderDetail(locale: 'de')));
     await tester.pumpAndSettle();
 
     expect(find.text('30.5.2021'), findsOneWidget);
diff --git a/test/gallery/gallery_screen_test.mocks.dart b/test/gallery/gallery_screen_test.mocks.dart
index 546c056e..2d230b91 100644
--- a/test/gallery/gallery_screen_test.mocks.dart
+++ b/test/gallery/gallery_screen_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.4.4 from annotations
+// Mocks generated by Mockito 5.4.6 from annotations
 // in wger/test/gallery/gallery_screen_test.dart.
 // Do not manually edit this file.
 
@@ -21,49 +21,27 @@ import 'package:wger/providers/gallery.dart' as _i4;
 // ignore_for_file: deprecated_member_use_from_same_package
 // ignore_for_file: implementation_imports
 // ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
 // ignore_for_file: camel_case_types
 // ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
 
 class _FakeAuthProvider_0 extends _i1.SmartFake implements _i2.AuthProvider {
-  _FakeAuthProvider_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeAuthProvider_0(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
-  _FakeClient_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeClient_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeUri_2 extends _i1.SmartFake implements Uri {
-  _FakeUri_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeUri_2(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeResponse_3 extends _i1.SmartFake implements _i3.Response {
-  _FakeResponse_3(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeResponse_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 /// A class which mocks [GalleryProvider].
@@ -75,278 +53,168 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider {
   }
 
   @override
-  List<_i5.Image> get images => (super.noSuchMethod(
-        Invocation.getter(#images),
-        returnValue: <_i5.Image>[],
-      ) as List<_i5.Image>);
+  List<_i5.Image> get images =>
+      (super.noSuchMethod(Invocation.getter(#images), returnValue: <_i5.Image>[])
+          as List<_i5.Image>);
 
   @override
-  set images(List<_i5.Image>? _images) => super.noSuchMethod(
-        Invocation.setter(
-          #images,
-          _images,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set images(List<_i5.Image>? value) =>
+      super.noSuchMethod(Invocation.setter(#images, value), returnValueForMissingStub: null);
 
   @override
-  _i2.AuthProvider get auth => (super.noSuchMethod(
-        Invocation.getter(#auth),
-        returnValue: _FakeAuthProvider_0(
-          this,
-          Invocation.getter(#auth),
-        ),
-      ) as _i2.AuthProvider);
-
-  @override
-  set auth(_i2.AuthProvider? _auth) => super.noSuchMethod(
-        Invocation.setter(
-          #auth,
-          _auth,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  _i3.Client get client => (super.noSuchMethod(
-        Invocation.getter(#client),
-        returnValue: _FakeClient_1(
-          this,
-          Invocation.getter(#client),
-        ),
-      ) as _i3.Client);
-
-  @override
-  set client(_i3.Client? _client) => super.noSuchMethod(
-        Invocation.setter(
-          #client,
-          _client,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  bool get hasListeners => (super.noSuchMethod(
-        Invocation.getter(#hasListeners),
-        returnValue: false,
-      ) as bool);
-
-  @override
-  void clear() => super.noSuchMethod(
-        Invocation.method(
-          #clear,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  _i6.Future<void> fetchAndSetGallery() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetGallery,
-          [],
-        ),
-        returnValue: _i6.Future<void>.value(),
-        returnValueForMissingStub: _i6.Future<void>.value(),
-      ) as _i6.Future<void>);
-
-  @override
-  _i6.Future<void> addImage(
-    _i5.Image? image,
-    _i7.XFile? imageFile,
-  ) =>
+  _i2.AuthProvider get auth =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addImage,
-          [
-            image,
-            imageFile,
-          ],
-        ),
-        returnValue: _i6.Future<void>.value(),
-        returnValueForMissingStub: _i6.Future<void>.value(),
-      ) as _i6.Future<void>);
+            Invocation.getter(#auth),
+            returnValue: _FakeAuthProvider_0(this, Invocation.getter(#auth)),
+          )
+          as _i2.AuthProvider);
 
   @override
-  _i6.Future<void> editImage(
-    _i5.Image? image,
-    _i7.XFile? imageFile,
-  ) =>
+  _i3.Client get client =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editImage,
-          [
-            image,
-            imageFile,
-          ],
-        ),
-        returnValue: _i6.Future<void>.value(),
-        returnValueForMissingStub: _i6.Future<void>.value(),
-      ) as _i6.Future<void>);
+            Invocation.getter(#client),
+            returnValue: _FakeClient_1(this, Invocation.getter(#client)),
+          )
+          as _i3.Client);
 
   @override
-  _i6.Future<void> deleteImage(_i5.Image? image) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteImage,
-          [image],
-        ),
-        returnValue: _i6.Future<void>.value(),
-        returnValueForMissingStub: _i6.Future<void>.value(),
-      ) as _i6.Future<void>);
+  set auth(_i2.AuthProvider? value) =>
+      super.noSuchMethod(Invocation.setter(#auth, value), returnValueForMissingStub: null);
+
+  @override
+  set client(_i3.Client? value) =>
+      super.noSuchMethod(Invocation.setter(#client, value), returnValueForMissingStub: null);
+
+  @override
+  bool get hasListeners =>
+      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
+
+  @override
+  void clear() =>
+      super.noSuchMethod(Invocation.method(#clear, []), returnValueForMissingStub: null);
+
+  @override
+  _i6.Future<void> fetchAndSetGallery() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetGallery, []),
+            returnValue: _i6.Future<void>.value(),
+            returnValueForMissingStub: _i6.Future<void>.value(),
+          )
+          as _i6.Future<void>);
+
+  @override
+  _i6.Future<void> addImage(_i5.Image? image, _i7.XFile? imageFile) =>
+      (super.noSuchMethod(
+            Invocation.method(#addImage, [image, imageFile]),
+            returnValue: _i6.Future<void>.value(),
+            returnValueForMissingStub: _i6.Future<void>.value(),
+          )
+          as _i6.Future<void>);
+
+  @override
+  _i6.Future<void> editImage(_i5.Image? image, _i7.XFile? imageFile) =>
+      (super.noSuchMethod(
+            Invocation.method(#editImage, [image, imageFile]),
+            returnValue: _i6.Future<void>.value(),
+            returnValueForMissingStub: _i6.Future<void>.value(),
+          )
+          as _i6.Future<void>);
+
+  @override
+  _i6.Future<void> deleteImage(_i5.Image? image) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteImage, [image]),
+            returnValue: _i6.Future<void>.value(),
+            returnValueForMissingStub: _i6.Future<void>.value(),
+          )
+          as _i6.Future<void>);
 
   @override
   Map<String, String> getDefaultHeaders({bool? includeAuth = false}) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #getDefaultHeaders,
-          [],
-          {#includeAuth: includeAuth},
-        ),
-        returnValue: <String, String>{},
-      ) as Map<String, String>);
+            Invocation.method(#getDefaultHeaders, [], {#includeAuth: includeAuth}),
+            returnValue: <String, String>{},
+          )
+          as Map<String, String>);
 
   @override
-  Uri makeUrl(
-    String? path, {
-    int? id,
-    String? objectMethod,
-    Map<String, dynamic>? query,
-  }) =>
+  Uri makeUrl(String? path, {int? id, String? objectMethod, Map<String, dynamic>? query}) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #makeUrl,
-          [path],
-          {
-            #id: id,
-            #objectMethod: objectMethod,
-            #query: query,
-          },
-        ),
-        returnValue: _FakeUri_2(
-          this,
-          Invocation.method(
-            #makeUrl,
-            [path],
-            {
-              #id: id,
-              #objectMethod: objectMethod,
-              #query: query,
-            },
-          ),
-        ),
-      ) as Uri);
+            Invocation.method(
+              #makeUrl,
+              [path],
+              {#id: id, #objectMethod: objectMethod, #query: query},
+            ),
+            returnValue: _FakeUri_2(
+              this,
+              Invocation.method(
+                #makeUrl,
+                [path],
+                {#id: id, #objectMethod: objectMethod, #query: query},
+              ),
+            ),
+          )
+          as Uri);
 
   @override
-  _i6.Future<Map<String, dynamic>> fetch(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetch,
-          [uri],
-        ),
-        returnValue:
-            _i6.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i6.Future<Map<String, dynamic>>);
-
-  @override
-  _i6.Future<List<dynamic>> fetchPaginated(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchPaginated,
-          [uri],
-        ),
-        returnValue: _i6.Future<List<dynamic>>.value(<dynamic>[]),
-      ) as _i6.Future<List<dynamic>>);
-
-  @override
-  _i6.Future<Map<String, dynamic>> post(
-    Map<String, dynamic>? data,
-    Uri? uri,
-  ) =>
+  _i6.Future<dynamic> fetch(Uri? uri) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #post,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue:
-            _i6.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i6.Future<Map<String, dynamic>>);
+            Invocation.method(#fetch, [uri]),
+            returnValue: _i6.Future<dynamic>.value(),
+          )
+          as _i6.Future<dynamic>);
 
   @override
-  _i6.Future<Map<String, dynamic>> patch(
-    Map<String, dynamic>? data,
-    Uri? uri,
-  ) =>
+  _i6.Future<List<dynamic>> fetchPaginated(Uri? uri) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #patch,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue:
-            _i6.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i6.Future<Map<String, dynamic>>);
+            Invocation.method(#fetchPaginated, [uri]),
+            returnValue: _i6.Future<List<dynamic>>.value(<dynamic>[]),
+          )
+          as _i6.Future<List<dynamic>>);
 
   @override
-  _i6.Future<_i3.Response> deleteRequest(
-    String? url,
-    int? id,
-  ) =>
+  _i6.Future<Map<String, dynamic>> post(Map<String, dynamic>? data, Uri? uri) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteRequest,
-          [
-            url,
-            id,
-          ],
-        ),
-        returnValue: _i6.Future<_i3.Response>.value(_FakeResponse_3(
-          this,
-          Invocation.method(
-            #deleteRequest,
-            [
-              url,
-              id,
-            ],
-          ),
-        )),
-      ) as _i6.Future<_i3.Response>);
+            Invocation.method(#post, [data, uri]),
+            returnValue: _i6.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+          )
+          as _i6.Future<Map<String, dynamic>>);
+
+  @override
+  _i6.Future<Map<String, dynamic>> patch(Map<String, dynamic>? data, Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#patch, [data, uri]),
+            returnValue: _i6.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+          )
+          as _i6.Future<Map<String, dynamic>>);
+
+  @override
+  _i6.Future<_i3.Response> deleteRequest(String? url, int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteRequest, [url, id]),
+            returnValue: _i6.Future<_i3.Response>.value(
+              _FakeResponse_3(this, Invocation.method(#deleteRequest, [url, id])),
+            ),
+          )
+          as _i6.Future<_i3.Response>);
 
   @override
   void addListener(_i8.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void removeListener(_i8.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(#removeListener, [listener]),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void dispose() =>
+      super.noSuchMethod(Invocation.method(#dispose, []), returnValueForMissingStub: null);
 
   @override
-  void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void notifyListeners() =>
+      super.noSuchMethod(Invocation.method(#notifyListeners, []), returnValueForMissingStub: null);
 }
diff --git a/test/helpers/colors_test.dart b/test/helpers/colors_test.dart
index 12803e45..6dc2e6c7 100644
--- a/test/helpers/colors_test.dart
+++ b/test/helpers/colors_test.dart
@@ -1,78 +1,106 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:wger/helpers/colors.dart';
 
 void main() {
   group('generateChartColors', () {
-    test('should generate 3 colors for 3 items using iterator', () {
+    test('should generate 3 colors for 3 items', () {
       final iterator = generateChartColors(3).iterator;
       final expectedColors = LIST_OF_COLORS3.iterator;
 
-      while (iterator.moveNext() && expectedColors.moveNext()) {
+      while (expectedColors.moveNext()) {
+        expect(iterator.moveNext(), isTrue);
         expect(iterator.current, equals(expectedColors.current));
       }
 
-      expect(iterator.moveNext(), isFalse);
-      expect(expectedColors.moveNext(), isFalse);
+      expect(iterator.moveNext(), isTrue);
+      expect(iterator.current, equals(Colors.black));
     });
 
-    test('should generate 5 colors for 5 items using iterator', () {
+    test('should generate 5 colors for 5 items', () {
       final iterator = generateChartColors(5).iterator;
       final expectedColors = LIST_OF_COLORS5.iterator;
 
-      while (iterator.moveNext() && expectedColors.moveNext()) {
+      while (expectedColors.moveNext()) {
+        expect(iterator.moveNext(), isTrue);
         expect(iterator.current, equals(expectedColors.current));
       }
 
-      expect(iterator.moveNext(), isFalse);
-      expect(expectedColors.moveNext(), isFalse);
+      expect(iterator.moveNext(), isTrue);
+      expect(iterator.current, equals(Colors.black));
     });
 
-    test('should generate 8 colors for 8 items using iterator', () {
+    test('should generate 8 colors for 8 items', () {
       final iterator = generateChartColors(8).iterator;
       final expectedColors = LIST_OF_COLORS8.iterator;
 
-      while (iterator.moveNext() && expectedColors.moveNext()) {
+      while (expectedColors.moveNext()) {
+        expect(iterator.moveNext(), isTrue);
         expect(iterator.current, equals(expectedColors.current));
       }
 
-      expect(iterator.moveNext(), isFalse);
-      expect(expectedColors.moveNext(), isFalse);
+      expect(iterator.moveNext(), isTrue);
+      expect(iterator.current, equals(Colors.black));
     });
 
-    test('should generate 8 colors for more than 8 items using iterator', () {
+    test('should generate surplus color for more than 8 items', () {
       final iterator = generateChartColors(10).iterator;
       final expectedColors = LIST_OF_COLORS8.iterator;
 
-      while (iterator.moveNext() && expectedColors.moveNext()) {
+      while (expectedColors.moveNext()) {
+        expect(iterator.moveNext(), isTrue);
         expect(iterator.current, equals(expectedColors.current));
       }
 
-      expect(iterator.moveNext(), isFalse);
-      expect(expectedColors.moveNext(), isFalse);
+      // After exhausting the 8 colors, it should always return black
+      for (int i = 0; i < 12; i++) {
+        expect(iterator.moveNext(), isTrue);
+        expect(iterator.current, equals(Colors.black));
+      }
     });
 
-    test('should generate 8 colors for 0 items using iterator', () {
+    test('should generate 3 colors for 0 items', () {
       final iterator = generateChartColors(0).iterator;
       final expectedColors = LIST_OF_COLORS3.iterator;
 
-      while (iterator.moveNext() && expectedColors.moveNext()) {
+      while (expectedColors.moveNext()) {
+        expect(iterator.moveNext(), isTrue);
         expect(iterator.current, equals(expectedColors.current));
       }
 
-      expect(iterator.moveNext(), isFalse);
-      expect(expectedColors.moveNext(), isFalse);
+      expect(iterator.moveNext(), isTrue);
+      expect(iterator.current, equals(Colors.black));
     });
 
-    test('should generate 8 colors for negative items using iterator', () {
+    test('should generate 3 colors for negative number of items', () {
       final iterator = generateChartColors(-5).iterator;
       final expectedColors = LIST_OF_COLORS3.iterator;
 
-      while (iterator.moveNext() && expectedColors.moveNext()) {
+      while (expectedColors.moveNext()) {
+        expect(iterator.moveNext(), isTrue);
         expect(iterator.current, equals(expectedColors.current));
       }
 
-      expect(iterator.moveNext(), isFalse);
-      expect(expectedColors.moveNext(), isFalse);
+      expect(iterator.moveNext(), isTrue);
+      expect(iterator.current, equals(Colors.black));
     });
   });
 }
diff --git a/test/workout/set_model_test.dart b/test/helpers/date_test.dart
similarity index 68%
rename from test/workout/set_model_test.dart
rename to test/helpers/date_test.dart
index b055d149..49eed706 100644
--- a/test/workout/set_model_test.dart
+++ b/test/helpers/date_test.dart
@@ -1,6 +1,6 @@
 /*
  * This file is part of wger Workout Manager <https://github.com/wger-project>.
- * Copyright (C) 2020, 2021 wger Team
+ * Copyright (C) wger Team
  *
  * wger Workout Manager is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -17,17 +17,15 @@
  */
 
 import 'package:flutter_test/flutter_test.dart';
-
-import '../../test_data/workouts.dart';
+import 'package:wger/helpers/date.dart';
 
 void main() {
-  group('Test the getSmartTextRepr method for a set', () {
-    test('Repetitions and weigh units', () {
-      final workout = getWorkout();
-      final set = workout.days.first.sets.first;
-      final exercise1 = set.exerciseBasesObj[0];
-
-      expect(set.getSmartTextRepr(exercise1), '6 × 80 kg  (3 RiR)');
+  group('getDateTimeFromDateAndTime', () {
+    test('should correctly generate a DateTime', () {
+      expect(
+        getDateTimeFromDateAndTime('2025-05-16', '17:02'),
+        DateTime(2025, 5, 16, 17, 2),
+      );
     });
   });
 }
diff --git a/test/helpers/json_test.dart b/test/helpers/json_test.dart
index 66787dc5..098d8e67 100644
--- a/test/helpers/json_test.dart
+++ b/test/helpers/json_test.dart
@@ -1,3 +1,21 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:wger/helpers/json.dart';
@@ -30,12 +48,21 @@ void main() {
 
     group('toDate', () {
       test('should return null for null input', () {
-        expect(toDate(null), isNull);
+        expect(dateToYYYYMMDD(null), isNull);
       });
 
       test('should format DateTime to yyyy-MM-dd', () {
         final dateTime = DateTime(2022, 1, 30);
-        expect(toDate(dateTime), '2022-01-30');
+        expect(dateToYYYYMMDD(dateTime), '2022-01-30');
+      });
+    });
+
+    group('dateToIsoWithTimezone', () {
+      test('should format DateTime to a string with timezone', () {
+        expect(
+          dateToUtcIso8601(DateTime.parse('2025-05-16T18:15:00+02:00')),
+          '2025-05-16T16:15:00.000Z',
+        );
       });
     });
 
diff --git a/test/helpers/logs_test.dart b/test/helpers/logs_test.dart
new file mode 100644
index 00000000..2db46cc4
--- /dev/null
+++ b/test/helpers/logs_test.dart
@@ -0,0 +1,56 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:logging/logging.dart';
+import 'package:wger/helpers/logs.dart';
+
+void main() {
+  group('log store test cases', () {
+    late InMemoryLogStore logStore;
+
+    setUp(() {
+      logStore = InMemoryLogStore();
+      logStore.clear();
+    });
+
+    test('class returns a singleton', () {
+      final logStore1 = InMemoryLogStore();
+      final logStore2 = InMemoryLogStore();
+      expect(identical(logStore1, logStore2), true);
+    });
+
+    test('correctly adds LogRecords', () {
+      logStore.add(LogRecord(Level.FINE, 'this is fine!!!', 'testLogger'));
+      logStore.add(LogRecord(Level.INFO, 'this is a test', 'testLogger'));
+
+      expect(logStore.logs.length, 2);
+      expect(logStore.getFormattedLogs(minLevel: Level.INFO).length, 1);
+      expect(logStore.getFormattedLogs(minLevel: Level.FINE).length, 2);
+    });
+
+    test('total number of logs is limited', () {
+      for (var i = 0; i < 600; i++) {
+        logStore.add(LogRecord(Level.INFO, 'this is log $i', 'testLogger'));
+      }
+
+      expect(logStore.logs.length, 500);
+      expect(logStore.logs.first.message, 'this is log 100');
+    });
+  });
+}
diff --git a/test/helpers/measurements_test.dart b/test/helpers/measurements_test.dart
new file mode 100644
index 00000000..ddf0886a
--- /dev/null
+++ b/test/helpers/measurements_test.dart
@@ -0,0 +1,90 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:wger/helpers/consts.dart';
+import 'package:wger/helpers/measurements.dart';
+import 'package:wger/widgets/measurements/charts.dart';
+
+void main() {
+  group('whereDateWithInterpolation', () {
+    // Helper to create entries
+    MeasurementChartEntry entry(num value, DateTime date) => MeasurementChartEntry(value, date);
+
+    // Test: No interpolation needed, exact start and end dates exist
+    test('returns entries within range when start and end exist', () {
+      final entries = [
+        entry(10, DateTime(2023, 1, 1)),
+        entry(20, DateTime(2023, 1, 2)),
+        entry(30, DateTime(2023, 1, 3)),
+      ];
+      final result = entries.whereDateWithInterpolation(DateTime(2023, 1, 1), DateTime(2023, 1, 3));
+
+      // Entries on start and end date should be included if they exist
+      expect(result.first.value, 10);
+      expect(result.last.value, 20);
+    });
+
+    // Test: Interpolates start if missing
+    test('interpolates start if missing', () {
+      final entries = [
+        entry(10, DateTime(2023, 1, 1)),
+        entry(30, DateTime(2023, 1, 3)),
+      ];
+      final result = entries.whereDateWithInterpolation(DateTime(2023, 1, 2), DateTime(2023, 1, 3));
+
+      // Only the interpolated value for 2nd Jan is included
+      expect(result.length, 1);
+      expect(result.first.value, closeTo(20, 0.0001));
+      expect(result.first.date.millisecond, INTERPOLATION_MARKER);
+      expect(result.first.date.day, 2);
+    });
+
+    // Test: Interpolates end if missing
+    test('interpolates end if missing', () {
+      final entries = [
+        entry(10, DateTime(2023, 1, 1)),
+        entry(30, DateTime(2023, 1, 3)),
+      ];
+      final result = entries.whereDateWithInterpolation(DateTime(2023, 1, 1), DateTime(2023, 1, 2));
+      // Should include the entry for 1st Jan and an interpolated value for 2nd Jan
+      expect(result.length, 2);
+      expect(result.first.value, 10);
+      expect(result.first.date.day, 1);
+      expect(result.last.value, closeTo(20, 0.0001));
+      expect(result.last.date.day, 2);
+    });
+
+    // Test: No interpolation if out of bounds
+    test('returns empty if no data in range', () {
+      final entries = [
+        entry(10, DateTime(2023, 1, 1)),
+        entry(20, DateTime(2023, 1, 2)),
+      ];
+      final result = entries.whereDateWithInterpolation(DateTime(2023, 2, 1), DateTime(2023, 2, 2));
+      expect(result, isEmpty);
+    });
+
+    // Test: Only start interpolation if data exists before and after
+    test('does not interpolate if no data before start', () {
+      final entries = [
+        entry(10, DateTime(2023, 1, 2)),
+        entry(20, DateTime(2023, 1, 3)),
+      ];
+      final result = entries.whereDateWithInterpolation(DateTime(2023, 1, 1), DateTime(2023, 1, 3));
+      // No interpolation possible for Jan 1, only entry for Jan 2 is included
+      expect(result.length, 1);
+      expect(result.first.date.day, 2);
+    });
+
+    // Test: Only end interpolation if data exists before and after
+    test('does not interpolate if no data after end', () {
+      final entries = [
+        entry(10, DateTime(2023, 1, 1)),
+        entry(20, DateTime(2023, 1, 2)),
+      ];
+      final result = entries.whereDateWithInterpolation(DateTime(2023, 1, 1), DateTime(2023, 1, 3));
+      // No interpolation possible for Jan 3, only entries for Jan 1 and Jan 2 are included
+      expect(result.length, 2);
+      expect(result.first.date.day, 1);
+      expect(result.last.date.day, 2);
+    });
+  });
+}
diff --git a/test/measurements/measurement_categories_screen_test.mocks.dart b/test/measurements/measurement_categories_screen_test.mocks.dart
index 79c88136..92778b41 100644
--- a/test/measurements/measurement_categories_screen_test.mocks.dart
+++ b/test/measurements/measurement_categories_screen_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.4.4 from annotations
+// Mocks generated by Mockito 5.4.6 from annotations
 // in wger/test/measurements/measurement_categories_screen_test.dart.
 // Do not manually edit this file.
 
@@ -20,183 +20,134 @@ import 'package:wger/providers/measurement.dart' as _i4;
 // ignore_for_file: deprecated_member_use_from_same_package
 // ignore_for_file: implementation_imports
 // ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
 // ignore_for_file: camel_case_types
 // ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
 
-class _FakeWgerBaseProvider_0 extends _i1.SmartFake
-    implements _i2.WgerBaseProvider {
-  _FakeWgerBaseProvider_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider {
+  _FakeWgerBaseProvider_0(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
-class _FakeMeasurementCategory_1 extends _i1.SmartFake
-    implements _i3.MeasurementCategory {
-  _FakeMeasurementCategory_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+class _FakeMeasurementCategory_1 extends _i1.SmartFake implements _i3.MeasurementCategory {
+  _FakeMeasurementCategory_1(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 /// A class which mocks [MeasurementProvider].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockMeasurementProvider extends _i1.Mock
-    implements _i4.MeasurementProvider {
+class MockMeasurementProvider extends _i1.Mock implements _i4.MeasurementProvider {
   MockMeasurementProvider() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_0(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i2.WgerBaseProvider);
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(this, Invocation.getter(#baseProvider)),
+          )
+          as _i2.WgerBaseProvider);
 
   @override
-  List<_i3.MeasurementCategory> get categories => (super.noSuchMethod(
-        Invocation.getter(#categories),
-        returnValue: <_i3.MeasurementCategory>[],
-      ) as List<_i3.MeasurementCategory>);
+  List<_i3.MeasurementCategory> get categories =>
+      (super.noSuchMethod(Invocation.getter(#categories), returnValue: <_i3.MeasurementCategory>[])
+          as List<_i3.MeasurementCategory>);
 
   @override
-  bool get hasListeners => (super.noSuchMethod(
-        Invocation.getter(#hasListeners),
-        returnValue: false,
-      ) as bool);
+  bool get hasListeners =>
+      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
 
   @override
-  void clear() => super.noSuchMethod(
-        Invocation.method(
-          #clear,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void clear() =>
+      super.noSuchMethod(Invocation.method(#clear, []), returnValueForMissingStub: null);
 
   @override
-  _i3.MeasurementCategory findCategoryById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findCategoryById,
-          [id],
-        ),
-        returnValue: _FakeMeasurementCategory_1(
-          this,
-          Invocation.method(
-            #findCategoryById,
-            [id],
-          ),
-        ),
-      ) as _i3.MeasurementCategory);
+  _i3.MeasurementCategory findCategoryById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findCategoryById, [id]),
+            returnValue: _FakeMeasurementCategory_1(
+              this,
+              Invocation.method(#findCategoryById, [id]),
+            ),
+          )
+          as _i3.MeasurementCategory);
 
   @override
-  _i5.Future<void> fetchAndSetCategories() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetCategories,
-          [],
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+  _i5.Future<void> fetchAndSetCategories() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetCategories, []),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
 
   @override
-  _i5.Future<void> fetchAndSetCategoryEntries(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetCategoryEntries,
-          [id],
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+  _i5.Future<void> fetchAndSetCategoryEntries(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetCategoryEntries, [id]),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
 
   @override
-  _i5.Future<void> fetchAndSetAllCategoriesAndEntries() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllCategoriesAndEntries,
-          [],
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+  _i5.Future<void> fetchAndSetAllCategoriesAndEntries() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllCategoriesAndEntries, []),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
 
   @override
   _i5.Future<void> addCategory(_i3.MeasurementCategory? category) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addCategory,
-          [category],
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+            Invocation.method(#addCategory, [category]),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
 
   @override
-  _i5.Future<void> deleteCategory(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteCategory,
-          [id],
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
-
-  @override
-  _i5.Future<void> editCategory(
-    int? id,
-    String? newName,
-    String? newUnit,
-  ) =>
+  _i5.Future<void> deleteCategory(int? id) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editCategory,
-          [
-            id,
-            newName,
-            newUnit,
-          ],
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+            Invocation.method(#deleteCategory, [id]),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
 
   @override
-  _i5.Future<void> addEntry(_i6.MeasurementEntry? entry) => (super.noSuchMethod(
-        Invocation.method(
-          #addEntry,
-          [entry],
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
-
-  @override
-  _i5.Future<void> deleteEntry(
-    int? id,
-    int? categoryId,
-  ) =>
+  _i5.Future<void> editCategory(int? id, String? newName, String? newUnit) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteEntry,
-          [
-            id,
-            categoryId,
-          ],
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+            Invocation.method(#editCategory, [id, newName, newUnit]),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+
+  @override
+  _i5.Future<void> addEntry(_i6.MeasurementEntry? entry) =>
+      (super.noSuchMethod(
+            Invocation.method(#addEntry, [entry]),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+
+  @override
+  _i5.Future<void> deleteEntry(int? id, int? categoryId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteEntry, [id, categoryId]),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
 
   @override
   _i5.Future<void> editEntry(
@@ -207,53 +158,29 @@ class MockMeasurementProvider extends _i1.Mock
     DateTime? newDate,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #editEntry,
-          [
-            id,
-            categoryId,
-            newValue,
-            newNotes,
-            newDate,
-          ],
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+            Invocation.method(#editEntry, [id, categoryId, newValue, newNotes, newDate]),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
 
   @override
   void addListener(_i7.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void removeListener(_i7.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(#removeListener, [listener]),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void dispose() =>
+      super.noSuchMethod(Invocation.method(#dispose, []), returnValueForMissingStub: null);
 
   @override
-  void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void notifyListeners() =>
+      super.noSuchMethod(Invocation.method(#notifyListeners, []), returnValueForMissingStub: null);
 }
diff --git a/test/measurements/measurement_entries_screen_test.dart b/test/measurements/measurement_entries_screen_test.dart
index f99a7694..4a721c51 100644
--- a/test/measurements/measurement_entries_screen_test.dart
+++ b/test/measurements/measurement_entries_screen_test.dart
@@ -56,6 +56,7 @@ void main() {
 
     mockNutritionPlansProvider = MockNutritionPlansProvider();
     when(mockNutritionPlansProvider.currentPlan).thenReturn(null);
+    when(mockNutritionPlansProvider.items).thenReturn([]);
   });
 
   Widget createHomeScreen({locale = 'en'}) {
@@ -93,7 +94,7 @@ void main() {
     expect(find.text('body fat'), findsOneWidget);
 
     // Entries
-    expect(find.text('15.0 %'), findsNWidgets(1));
+    expect(find.text('15 %'), findsNWidgets(1));
   });
 
   testWidgets('Tests the localization of dates - EN', (WidgetTester tester) async {
diff --git a/test/measurements/measurement_provider_test.dart b/test/measurements/measurement_provider_test.dart
index 90f60bc1..799ac261 100644
--- a/test/measurements/measurement_provider_test.dart
+++ b/test/measurements/measurement_provider_test.dart
@@ -6,6 +6,7 @@ import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
 import 'package:wger/exceptions/http_exception.dart';
 import 'package:wger/exceptions/no_such_entry_exception.dart';
+import 'package:wger/helpers/consts.dart';
 import 'package:wger/models/measurements/measurement_category.dart';
 import 'package:wger/models/measurements/measurement_entry.dart';
 import 'package:wger/providers/base_provider.dart';
@@ -14,8 +15,6 @@ import 'package:wger/providers/measurement.dart';
 import '../fixtures/fixture_reader.dart';
 import 'measurement_provider_test.mocks.dart';
 
-// class MockWgerBaseProvider extends Mock implements WgerBaseProvider {}
-
 @GenerateMocks([WgerBaseProvider])
 void main() {
   late MeasurementProvider measurementProvider;
@@ -24,8 +23,9 @@ void main() {
   const String categoryUrl = 'measurement-category';
   const String entryUrl = 'measurement';
   final Uri tCategoryUri = Uri();
-  final Map<String, dynamic> tMeasurementCategoryMap =
-      jsonDecode(fixture('measurement/measurement_category_entries.json'));
+  final Map<String, dynamic> tMeasurementCategoryMap = jsonDecode(
+    fixture('measurement/measurement_category_entries.json'),
+  );
   final Uri tCategoryEntriesUri = Uri(
     scheme: 'http',
     host: 'tedmosbyisajerk.com',
@@ -34,30 +34,40 @@ void main() {
   );
 
   const int tCategoryId = 1;
-  const MeasurementCategory tMeasurementCategory =
-      MeasurementCategory(id: 1, name: 'Strength', unit: 'kN');
+  const MeasurementCategory tMeasurementCategory = MeasurementCategory(
+    id: 1,
+    name: 'Strength',
+    unit: 'kN',
+  );
   final List<MeasurementCategory> tMeasurementCategories = [
     const MeasurementCategory(id: 1, name: 'Strength', unit: 'kN'),
     const MeasurementCategory(id: 2, name: 'Biceps', unit: 'cm'),
   ];
-  final Map<String, dynamic> tMeasurementCategoriesMap =
-      jsonDecode(fixture('measurement/measurement_categories.json'));
+  final Map<String, dynamic> tMeasurementCategoriesMap = jsonDecode(
+    fixture('measurement/measurement_categories.json'),
+  );
 
   setUp(() {
     mockWgerBaseProvider = MockWgerBaseProvider();
     measurementProvider = MeasurementProvider(mockWgerBaseProvider);
 
     when(mockWgerBaseProvider.makeUrl(any)).thenReturn(tCategoryUri);
-    when(mockWgerBaseProvider.makeUrl(any, id: anyNamed('id'))).thenReturn(tCategoryUri);
-    when(mockWgerBaseProvider.fetch(any))
-        .thenAnswer((realInvocation) => Future.value(tMeasurementCategoriesMap));
+    when(
+      mockWgerBaseProvider.makeUrl(any, id: anyNamed('id'), query: anyNamed('query')),
+    ).thenReturn(tCategoryUri);
+    when(
+      mockWgerBaseProvider.fetchPaginated(any),
+    ).thenAnswer((realInvocation) => Future.value(tMeasurementCategoriesMap['results']));
 
-    when(mockWgerBaseProvider.makeUrl(entryUrl, query: anyNamed('query')))
-        .thenReturn(tCategoryEntriesUri);
-    when(mockWgerBaseProvider.makeUrl(entryUrl, id: anyNamed('id'), query: anyNamed('query')))
-        .thenReturn(tCategoryEntriesUri);
-    when(mockWgerBaseProvider.fetch(tCategoryEntriesUri))
-        .thenAnswer((realInvocation) => Future.value(tMeasurementCategoryMap));
+    when(
+      mockWgerBaseProvider.makeUrl(entryUrl, query: anyNamed('query')),
+    ).thenReturn(tCategoryEntriesUri);
+    when(
+      mockWgerBaseProvider.makeUrl(entryUrl, id: anyNamed('id'), query: anyNamed('query')),
+    ).thenReturn(tCategoryEntriesUri);
+    when(
+      mockWgerBaseProvider.fetchPaginated(tCategoryEntriesUri),
+    ).thenAnswer((realInvocation) => Future.value(tMeasurementCategoryMap['results']));
   });
 
   group('clear()', () {
@@ -100,7 +110,7 @@ void main() {
       await measurementProvider.fetchAndSetCategories();
 
       // assert
-      verify(mockWgerBaseProvider.makeUrl(categoryUrl));
+      verify(mockWgerBaseProvider.makeUrl(categoryUrl, query: {'limit': API_MAX_PAGE_SIZE}));
     });
 
     test('should fetch data from api', () async {
@@ -108,7 +118,7 @@ void main() {
       await measurementProvider.fetchAndSetCategories();
 
       // assert
-      verify(mockWgerBaseProvider.fetch(tCategoryUri));
+      verify(mockWgerBaseProvider.fetchPaginated(tCategoryUri));
     });
 
     test('should set categories', () async {
@@ -130,7 +140,12 @@ void main() {
       await measurementProvider.fetchAndSetCategoryEntries(tCategoryId);
 
       // assert
-      verify(mockWgerBaseProvider.makeUrl(entryUrl, query: {'category': tCategoryId.toString()}));
+      verify(
+        mockWgerBaseProvider.makeUrl(
+          entryUrl,
+          query: {'category': tCategoryId.toString(), 'limit': API_MAX_PAGE_SIZE},
+        ),
+      );
     });
 
     test('should fetch categories entries for id', () async {
@@ -138,28 +153,33 @@ void main() {
       await measurementProvider.fetchAndSetCategoryEntries(tCategoryId);
 
       // assert
-      verify(mockWgerBaseProvider.fetch(tCategoryEntriesUri));
+      verify(mockWgerBaseProvider.fetchPaginated(tCategoryEntriesUri));
     });
 
     test('should add entries to category in list', () async {
       // arrange
       final List<MeasurementCategory> tMeasurementCategories = [
-        MeasurementCategory(id: 1, name: 'Strength', unit: 'kN', entries: [
-          MeasurementEntry(
-            id: 1,
-            category: 1,
-            date: DateTime(2021, 7, 21),
-            value: 10,
-            notes: 'Some important notes',
-          ),
-          MeasurementEntry(
-            id: 2,
-            category: 1,
-            date: DateTime(2021, 7, 10),
-            value: 15.00,
-            notes: '',
-          ),
-        ]),
+        MeasurementCategory(
+          id: 1,
+          name: 'Strength',
+          unit: 'kN',
+          entries: [
+            MeasurementEntry(
+              id: 1,
+              category: 1,
+              date: DateTime(2021, 7, 21),
+              value: 10,
+              notes: 'Some important notes',
+            ),
+            MeasurementEntry(
+              id: 2,
+              category: 1,
+              date: DateTime(2021, 7, 10),
+              value: 15.00,
+              notes: '',
+            ),
+          ],
+        ),
         const MeasurementCategory(id: 2, name: 'Biceps', unit: 'cm'),
       ];
 
@@ -172,20 +192,26 @@ void main() {
   });
 
   group('addCategory()', () {
-    const MeasurementCategory tMeasurementCategoryWithoutId =
-        MeasurementCategory(id: null, name: 'Strength', unit: 'kN');
-    final Map<String, dynamic> tMeasurementCategoryMap =
-        jsonDecode(fixture('measurement/measurement_category.json'));
-    final Map<String, dynamic> tMeasurementCategoryMapWithoutId =
-        jsonDecode(fixture('measurement/measurement_category_without_id_to_json.json'));
+    const MeasurementCategory tMeasurementCategoryWithoutId = MeasurementCategory(
+      id: null,
+      name: 'Strength',
+      unit: 'kN',
+    );
+    final Map<String, dynamic> tMeasurementCategoryMap = jsonDecode(
+      fixture('measurement/measurement_category.json'),
+    );
+    final Map<String, dynamic> tMeasurementCategoryMapWithoutId = jsonDecode(
+      fixture('measurement/measurement_category_without_id_to_json.json'),
+    );
     final List<MeasurementCategory> tMeasurementCategoriesAdded = [
       const MeasurementCategory(id: 2, name: 'Biceps', unit: 'cm'),
       const MeasurementCategory(id: 1, name: 'Strength', unit: 'kN'),
       const MeasurementCategory(id: 1, name: 'Strength', unit: 'kN'),
     ];
     setUp(() {
-      when(mockWgerBaseProvider.post(any, any))
-          .thenAnswer((realInvocation) => Future.value(tMeasurementCategoryMap));
+      when(
+        mockWgerBaseProvider.post(any, any),
+      ).thenAnswer((realInvocation) => Future.value(tMeasurementCategoryMap));
     });
 
     test("should post the MeasurementCategorie's Map", () async {
@@ -219,8 +245,9 @@ void main() {
       'should remove a MeasurementCategory from the categories list for an id and call the api to remove the MeasurementCategory',
       () async {
         // arrange
-        when(mockWgerBaseProvider.deleteRequest(any, any))
-            .thenAnswer((realInvocation) => Future.value(Response('', 200)));
+        when(
+          mockWgerBaseProvider.deleteRequest(any, any),
+        ).thenAnswer((realInvocation) => Future.value(Response('', 200)));
 
         final List<MeasurementCategory> tMeasurementCategoriesOneDeleted = [
           const MeasurementCategory(id: 2, name: 'Biceps', unit: 'cm'),
@@ -259,13 +286,16 @@ void main() {
   group('editCategory()', () {
     const String tCategoryEditedName = 'Triceps';
     const String tCategoryEditedUnit = 'm';
-    final Map<String, dynamic> tCategoryMapEditedToJson =
-        jsonDecode(fixture('measurement/measurement_category_edited_to_json.json'));
-    final Map<String, dynamic> tCategoryMapEdited =
-        jsonDecode(fixture('measurement/measurement_category_edited.json'));
+    final Map<String, dynamic> tCategoryMapEditedToJson = jsonDecode(
+      fixture('measurement/measurement_category_edited_to_json.json'),
+    );
+    final Map<String, dynamic> tCategoryMapEdited = jsonDecode(
+      fixture('measurement/measurement_category_edited.json'),
+    );
     setUp(() async {
-      when(mockWgerBaseProvider.patch(any, any))
-          .thenAnswer((realInvocation) => Future.value(tCategoryMapEdited));
+      when(
+        mockWgerBaseProvider.patch(any, any),
+      ).thenAnswer((realInvocation) => Future.value(tCategoryMapEdited));
       await measurementProvider.fetchAndSetCategories();
     });
     test('should add the new MeasurementCategory and remove the old one', () async {
@@ -333,33 +363,40 @@ void main() {
     );
 
     final List<MeasurementCategory> tMeasurementCategories = [
-      MeasurementCategory(id: 1, name: 'Strength', unit: 'kN', entries: [
-        MeasurementEntry(
-          id: 1,
-          category: 1,
-          date: DateTime(2021, 7, 21),
-          value: 10,
-          notes: 'Some important notes',
-        ),
-        MeasurementEntry(
-          id: 2,
-          category: 1,
-          date: DateTime(2021, 7, 10),
-          value: 15.00,
-          notes: '',
-        ),
-        tMeasurementEntry,
-      ]),
+      MeasurementCategory(
+        id: 1,
+        name: 'Strength',
+        unit: 'kN',
+        entries: [
+          MeasurementEntry(
+            id: 1,
+            category: 1,
+            date: DateTime(2021, 7, 21),
+            value: 10,
+            notes: 'Some important notes',
+          ),
+          MeasurementEntry(
+            id: 2,
+            category: 1,
+            date: DateTime(2021, 7, 10),
+            value: 15.00,
+            notes: '',
+          ),
+          tMeasurementEntry,
+        ],
+      ),
       const MeasurementCategory(id: 2, name: 'Biceps', unit: 'cm'),
     ];
 
     setUp(() async {
       await measurementProvider.fetchAndSetCategories();
 
-      final Map<String, dynamic> measurementEntryMap =
-          jsonDecode(fixture('measurement/measurement_entry.json'));
-      when(mockWgerBaseProvider.post(any, any))
-          .thenAnswer((realInvocation) => Future.value(measurementEntryMap));
+      final Map<String, dynamic> measurementEntryMap = jsonDecode(
+        fixture('measurement/measurement_entry.json'),
+      );
+      when(
+        mockWgerBaseProvider.post(any, any),
+      ).thenAnswer((realInvocation) => Future.value(measurementEntryMap));
     });
 
     test('should make the post url', () async {
@@ -372,8 +409,9 @@ void main() {
 
     test('should post the MeasurementEntryMap', () async {
       // arrange
-      final Map<String, dynamic> measurementEntryMapWithoutId =
-          jsonDecode(fixture('measurement/measurement_entry_without_id.json'));
+      final Map<String, dynamic> measurementEntryMapWithoutId = jsonDecode(
+        fixture('measurement/measurement_entry_without_id.json'),
+      );
 
       // act
       await measurementProvider.addEntry(tMeasurementEntryWithoutId);
@@ -405,10 +443,12 @@ void main() {
         value: 15.00,
         notes: '',
       );
-      final Map<String, dynamic> measurementEntryMapWrongCategory =
-          jsonDecode(fixture('measurement/measurement_entry_wrong_category.json'));
-      when(mockWgerBaseProvider.post(any, any))
-          .thenAnswer((realInvocation) => Future.value(measurementEntryMapWrongCategory));
+      final Map<String, dynamic> measurementEntryMapWrongCategory = jsonDecode(
+        fixture('measurement/measurement_entry_wrong_category.json'),
+      );
+      when(
+        mockWgerBaseProvider.post(any, any),
+      ).thenAnswer((realInvocation) => Future.value(measurementEntryMapWrongCategory));
 
       // act & assert
       expect(
@@ -421,15 +461,20 @@ void main() {
   group('deleteEntry()', () {
     const int tEntryId = 2;
     final List<MeasurementCategory> tMeasurementCategories = [
-      MeasurementCategory(id: 1, name: 'Strength', unit: 'kN', entries: [
-        MeasurementEntry(
-          id: 1,
-          category: 1,
-          date: DateTime(2021, 7, 21),
-          value: 10,
-          notes: 'Some important notes',
-        ),
-      ]),
+      MeasurementCategory(
+        id: 1,
+        name: 'Strength',
+        unit: 'kN',
+        entries: [
+          MeasurementEntry(
+            id: 1,
+            category: 1,
+            date: DateTime(2021, 7, 21),
+            value: 10,
+            notes: 'Some important notes',
+          ),
+        ],
+      ),
       const MeasurementCategory(id: 2, name: 'Biceps', unit: 'cm'),
     ];
 
@@ -437,8 +482,9 @@ void main() {
       await measurementProvider.fetchAndSetCategories();
       await measurementProvider.fetchAndSetCategoryEntries(tCategoryId);
 
-      when(mockWgerBaseProvider.deleteRequest(any, any))
-          .thenAnswer((realInvocation) => Future.value(Response('', 200)));
+      when(
+        mockWgerBaseProvider.deleteRequest(any, any),
+      ).thenAnswer((realInvocation) => Future.value(Response('', 200)));
     });
 
     test("should remove a MeasurementEntry from the category's entries List for an id", () async {
@@ -481,22 +527,27 @@ void main() {
       () {
         // arrange
         final List<MeasurementCategory> tMeasurementCategories = [
-          MeasurementCategory(id: 1, name: 'Strength', unit: 'kN', entries: [
-            MeasurementEntry(
-              id: 1,
-              category: 1,
-              date: DateTime(2021, 7, 21),
-              value: 10,
-              notes: 'Some important notes',
-            ),
-            MeasurementEntry(
-              id: 2,
-              category: 1,
-              date: DateTime(2021, 7, 10),
-              value: 15.00,
-              notes: '',
-            ),
-          ]),
+          MeasurementCategory(
+            id: 1,
+            name: 'Strength',
+            unit: 'kN',
+            entries: [
+              MeasurementEntry(
+                id: 1,
+                category: 1,
+                date: DateTime(2021, 7, 21),
+                value: 10,
+                notes: 'Some important notes',
+              ),
+              MeasurementEntry(
+                id: 2,
+                category: 1,
+                date: DateTime(2021, 7, 10),
+                value: 15.00,
+                notes: '',
+              ),
+            ],
+          ),
           const MeasurementCategory(id: 2, name: 'Biceps', unit: 'cm'),
         ];
         when(mockWgerBaseProvider.deleteRequest(any, any)).thenThrow(WgerHttpException('{}'));
@@ -522,33 +573,40 @@ void main() {
     const num tEntryEditedValue = 23;
     final DateTime tEntryEditedDate = DateTime(2021, 07, 21);
     const String tEntryEditedNote = 'I just wanted to edit this to see what happens';
-    final Map<String, dynamic> tEntryMapEdited =
-        jsonDecode(fixture('measurement/measurement_entry_edited.json'));
+    final Map<String, dynamic> tEntryMapEdited = jsonDecode(
+      fixture('measurement/measurement_entry_edited.json'),
+    );
     setUp(() async {
-      when(mockWgerBaseProvider.patch(any, any))
-          .thenAnswer((realInvocation) => Future.value(tEntryMapEdited));
+      when(
+        mockWgerBaseProvider.patch(any, any),
+      ).thenAnswer((realInvocation) => Future.value(tEntryMapEdited));
       await measurementProvider.fetchAndSetCategories();
       await measurementProvider.fetchAndSetCategoryEntries(1);
     });
     test('should add the new MeasurementEntry and remove the old one', () async {
       // arrange
       final List<MeasurementCategory> tMeasurementCategoriesEdited = [
-        MeasurementCategory(id: 1, name: 'Strength', unit: 'kN', entries: [
-          MeasurementEntry(
-            id: 1,
-            category: 1,
-            date: DateTime(2021, 7, 21),
-            value: 23,
-            notes: 'I just wanted to edit this to see what happens',
-          ),
-          MeasurementEntry(
-            id: 2,
-            category: 1,
-            date: DateTime(2021, 7, 10),
-            value: 15.00,
-            notes: '',
-          ),
-        ]),
+        MeasurementCategory(
+          id: 1,
+          name: 'Strength',
+          unit: 'kN',
+          entries: [
+            MeasurementEntry(
+              id: 1,
+              category: 1,
+              date: DateTime(2021, 7, 21),
+              value: 23,
+              notes: 'I just wanted to edit this to see what happens',
+            ),
+            MeasurementEntry(
+              id: 2,
+              category: 1,
+              date: DateTime(2021, 7, 10),
+              value: 15.00,
+              notes: '',
+            ),
+          ],
+        ),
         const MeasurementCategory(id: 2, name: 'Biceps', unit: 'cm'),
       ];
 
diff --git a/test/measurements/measurement_provider_test.mocks.dart b/test/measurements/measurement_provider_test.mocks.dart
index bb54e9ec..4b890228 100644
--- a/test/measurements/measurement_provider_test.mocks.dart
+++ b/test/measurements/measurement_provider_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.4.4 from annotations
+// Mocks generated by Mockito 5.4.6 from annotations
 // in wger/test/measurements/measurement_provider_test.dart.
 // Do not manually edit this file.
 
@@ -18,49 +18,27 @@ import 'package:wger/providers/base_provider.dart' as _i4;
 // ignore_for_file: deprecated_member_use_from_same_package
 // ignore_for_file: implementation_imports
 // ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
 // ignore_for_file: camel_case_types
 // ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
 
 class _FakeAuthProvider_0 extends _i1.SmartFake implements _i2.AuthProvider {
-  _FakeAuthProvider_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeAuthProvider_0(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
-  _FakeClient_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeClient_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeUri_2 extends _i1.SmartFake implements Uri {
-  _FakeUri_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeUri_2(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeResponse_3 extends _i1.SmartFake implements _i3.Response {
-  _FakeResponse_3(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeResponse_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 /// A class which mocks [WgerBaseProvider].
@@ -72,158 +50,95 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
   }
 
   @override
-  _i2.AuthProvider get auth => (super.noSuchMethod(
-        Invocation.getter(#auth),
-        returnValue: _FakeAuthProvider_0(
-          this,
-          Invocation.getter(#auth),
-        ),
-      ) as _i2.AuthProvider);
+  _i2.AuthProvider get auth =>
+      (super.noSuchMethod(
+            Invocation.getter(#auth),
+            returnValue: _FakeAuthProvider_0(this, Invocation.getter(#auth)),
+          )
+          as _i2.AuthProvider);
 
   @override
-  set auth(_i2.AuthProvider? _auth) => super.noSuchMethod(
-        Invocation.setter(
-          #auth,
-          _auth,
-        ),
-        returnValueForMissingStub: null,
-      );
+  _i3.Client get client =>
+      (super.noSuchMethod(
+            Invocation.getter(#client),
+            returnValue: _FakeClient_1(this, Invocation.getter(#client)),
+          )
+          as _i3.Client);
 
   @override
-  _i3.Client get client => (super.noSuchMethod(
-        Invocation.getter(#client),
-        returnValue: _FakeClient_1(
-          this,
-          Invocation.getter(#client),
-        ),
-      ) as _i3.Client);
+  set auth(_i2.AuthProvider? value) =>
+      super.noSuchMethod(Invocation.setter(#auth, value), returnValueForMissingStub: null);
 
   @override
-  set client(_i3.Client? _client) => super.noSuchMethod(
-        Invocation.setter(
-          #client,
-          _client,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set client(_i3.Client? value) =>
+      super.noSuchMethod(Invocation.setter(#client, value), returnValueForMissingStub: null);
 
   @override
   Map<String, String> getDefaultHeaders({bool? includeAuth = false}) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #getDefaultHeaders,
-          [],
-          {#includeAuth: includeAuth},
-        ),
-        returnValue: <String, String>{},
-      ) as Map<String, String>);
+            Invocation.method(#getDefaultHeaders, [], {#includeAuth: includeAuth}),
+            returnValue: <String, String>{},
+          )
+          as Map<String, String>);
 
   @override
-  Uri makeUrl(
-    String? path, {
-    int? id,
-    String? objectMethod,
-    Map<String, dynamic>? query,
-  }) =>
+  Uri makeUrl(String? path, {int? id, String? objectMethod, Map<String, dynamic>? query}) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #makeUrl,
-          [path],
-          {
-            #id: id,
-            #objectMethod: objectMethod,
-            #query: query,
-          },
-        ),
-        returnValue: _FakeUri_2(
-          this,
-          Invocation.method(
-            #makeUrl,
-            [path],
-            {
-              #id: id,
-              #objectMethod: objectMethod,
-              #query: query,
-            },
-          ),
-        ),
-      ) as Uri);
+            Invocation.method(
+              #makeUrl,
+              [path],
+              {#id: id, #objectMethod: objectMethod, #query: query},
+            ),
+            returnValue: _FakeUri_2(
+              this,
+              Invocation.method(
+                #makeUrl,
+                [path],
+                {#id: id, #objectMethod: objectMethod, #query: query},
+              ),
+            ),
+          )
+          as Uri);
 
   @override
-  _i5.Future<Map<String, dynamic>> fetch(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetch,
-          [uri],
-        ),
-        returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
-
-  @override
-  _i5.Future<List<dynamic>> fetchPaginated(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchPaginated,
-          [uri],
-        ),
-        returnValue: _i5.Future<List<dynamic>>.value(<dynamic>[]),
-      ) as _i5.Future<List<dynamic>>);
-
-  @override
-  _i5.Future<Map<String, dynamic>> post(
-    Map<String, dynamic>? data,
-    Uri? uri,
-  ) =>
+  _i5.Future<dynamic> fetch(Uri? uri) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #post,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            Invocation.method(#fetch, [uri]),
+            returnValue: _i5.Future<dynamic>.value(),
+          )
+          as _i5.Future<dynamic>);
 
   @override
-  _i5.Future<Map<String, dynamic>> patch(
-    Map<String, dynamic>? data,
-    Uri? uri,
-  ) =>
+  _i5.Future<List<dynamic>> fetchPaginated(Uri? uri) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #patch,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            Invocation.method(#fetchPaginated, [uri]),
+            returnValue: _i5.Future<List<dynamic>>.value(<dynamic>[]),
+          )
+          as _i5.Future<List<dynamic>>);
 
   @override
-  _i5.Future<_i3.Response> deleteRequest(
-    String? url,
-    int? id,
-  ) =>
+  _i5.Future<Map<String, dynamic>> post(Map<String, dynamic>? data, Uri? uri) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteRequest,
-          [
-            url,
-            id,
-          ],
-        ),
-        returnValue: _i5.Future<_i3.Response>.value(_FakeResponse_3(
-          this,
-          Invocation.method(
-            #deleteRequest,
-            [
-              url,
-              id,
-            ],
-          ),
-        )),
-      ) as _i5.Future<_i3.Response>);
+            Invocation.method(#post, [data, uri]),
+            returnValue: _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+          )
+          as _i5.Future<Map<String, dynamic>>);
+
+  @override
+  _i5.Future<Map<String, dynamic>> patch(Map<String, dynamic>? data, Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#patch, [data, uri]),
+            returnValue: _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+          )
+          as _i5.Future<Map<String, dynamic>>);
+
+  @override
+  _i5.Future<_i3.Response> deleteRequest(String? url, int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteRequest, [url, id]),
+            returnValue: _i5.Future<_i3.Response>.value(
+              _FakeResponse_3(this, Invocation.method(#deleteRequest, [url, id])),
+            ),
+          )
+          as _i5.Future<_i3.Response>);
 }
diff --git a/test/nutrition/goldens/nutritional_plan_1_default_view.png b/test/nutrition/goldens/nutritional_plan_1_default_view.png
index 09745b0c..f021c9f1 100644
Binary files a/test/nutrition/goldens/nutritional_plan_1_default_view.png and b/test/nutrition/goldens/nutritional_plan_1_default_view.png differ
diff --git a/test/nutrition/goldens/nutritional_plan_2_one_meal_with_ingredients.png b/test/nutrition/goldens/nutritional_plan_2_one_meal_with_ingredients.png
index 09a8c964..ab57450a 100644
Binary files a/test/nutrition/goldens/nutritional_plan_2_one_meal_with_ingredients.png and b/test/nutrition/goldens/nutritional_plan_2_one_meal_with_ingredients.png differ
diff --git a/test/nutrition/goldens/nutritional_plan_3_both_meals_with_ingredients.png b/test/nutrition/goldens/nutritional_plan_3_both_meals_with_ingredients.png
index 9ef95623..02b148cd 100644
Binary files a/test/nutrition/goldens/nutritional_plan_3_both_meals_with_ingredients.png and b/test/nutrition/goldens/nutritional_plan_3_both_meals_with_ingredients.png differ
diff --git a/test/nutrition/nutrition_provider_test.dart b/test/nutrition/nutrition_provider_test.dart
index d7922df2..bc5d8dd9 100644
--- a/test/nutrition/nutrition_provider_test.dart
+++ b/test/nutrition/nutrition_provider_test.dart
@@ -5,12 +5,14 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';
 import 'package:wger/database/ingredients/ingredients_database.dart';
 import 'package:wger/models/nutrition/ingredient.dart';
+import 'package:wger/models/nutrition/nutritional_plan.dart';
 import 'package:wger/providers/nutrition.dart';
 
 import '../fixtures/fixture_reader.dart';
 import '../measurements/measurement_provider_test.mocks.dart';
 
 void main() {
+  final now = DateTime.now();
   late NutritionPlansProvider nutritionProvider;
   late MockWgerBaseProvider mockWgerBaseProvider;
   late IngredientDatabase database;
@@ -80,8 +82,9 @@ void main() {
     when(mockWgerBaseProvider.makeUrl(planInfoUrl, id: anyNamed('id'))).thenReturn(planInfoUri);
     when(mockWgerBaseProvider.makeUrl(planUrl, id: anyNamed('id'))).thenReturn(planUri);
     when(mockWgerBaseProvider.makeUrl(diaryUrl, query: anyNamed('query'))).thenReturn(diaryUri);
-    when(mockWgerBaseProvider.makeUrl(ingredientInfoUrl, id: anyNamed('id')))
-        .thenReturn(ingredientUri);
+    when(
+      mockWgerBaseProvider.makeUrl(ingredientInfoUrl, id: anyNamed('id')),
+    ).thenReturn(ingredientUri);
     when(mockWgerBaseProvider.fetch(planInfoUri)).thenAnswer(
       (realInvocation) => Future.value(nutritionalPlanInfoResponse),
     );
@@ -110,11 +113,121 @@ void main() {
     });
   });
 
+  group('currentPlan', () {
+    test('gibt den aktiven Plan zurück, wenn nur einer aktiv ist', () {
+      final plan = NutritionalPlan(
+        id: 1,
+        description: 'Aktiver Plan',
+        startDate: now.subtract(const Duration(days: 1)),
+        endDate: now.add(const Duration(days: 1)),
+        creationDate: now.subtract(const Duration(days: 2)),
+      );
+      nutritionProvider = NutritionPlansProvider(mockWgerBaseProvider, [plan], database: database);
+      expect(nutritionProvider.currentPlan, equals(plan));
+    });
+
+    test('gibt den neuesten aktiven Plan zurück, wenn mehrere aktiv sind', () {
+      final olderPlan = NutritionalPlan(
+        id: 1,
+        description: 'Älterer aktiver Plan',
+        startDate: now.subtract(const Duration(days: 10)),
+        endDate: now.add(const Duration(days: 10)),
+        creationDate: now.subtract(const Duration(days: 10)),
+      );
+      final newerPlan = NutritionalPlan(
+        id: 2,
+        description: 'Neuerer aktiver Plan',
+        startDate: now.subtract(const Duration(days: 5)),
+        endDate: now.add(const Duration(days: 5)),
+        creationDate: now.subtract(const Duration(days: 2)),
+      );
+      nutritionProvider = NutritionPlansProvider(mockWgerBaseProvider, [
+        olderPlan,
+        newerPlan,
+      ], database: database);
+      expect(nutritionProvider.currentPlan, equals(newerPlan));
+    });
+  });
+
+  group('currentPlan correctly returns the active plan', () {
+    test('no plans available -> null', () {
+      nutritionProvider = NutritionPlansProvider(mockWgerBaseProvider, [], database: database);
+      expect(nutritionProvider.currentPlan, isNull);
+    });
+
+    test('no active plan -> null', () {
+      final plans = [
+        NutritionalPlan(
+          id: 1,
+          description: 'plan 1',
+          startDate: now.subtract(const Duration(days: 30)),
+          endDate: now.subtract(const Duration(days: 5)),
+        ),
+        NutritionalPlan(
+          id: 2,
+          description: 'plan 2',
+          startDate: now.add(const Duration(days: 100)),
+          endDate: now.add(const Duration(days: 50)),
+        ),
+      ];
+      nutritionProvider = NutritionPlansProvider(mockWgerBaseProvider, plans, database: database);
+      expect(nutritionProvider.currentPlan, isNull);
+    });
+
+    test('active plan exists -> return it', () {
+      final plan = NutritionalPlan(
+        description: 'Active plan',
+        startDate: now.subtract(const Duration(days: 10)),
+        endDate: now.add(const Duration(days: 10)),
+      );
+      nutritionProvider = NutritionPlansProvider(mockWgerBaseProvider, [plan], database: database);
+      expect(nutritionProvider.currentPlan, equals(plan));
+    });
+
+    test('inactive plans are ignored', () {
+      final inactivePlan = NutritionalPlan(
+        description: 'Inactive plan',
+        startDate: now.subtract(const Duration(days: 10)),
+        endDate: now.add(const Duration(days: 5)),
+      );
+      final plan = NutritionalPlan(
+        description: 'Active plan',
+        startDate: now.subtract(const Duration(days: 10)),
+        endDate: now.add(const Duration(days: 10)),
+      );
+      nutritionProvider = NutritionPlansProvider(mockWgerBaseProvider, [
+        plan,
+        inactivePlan,
+      ], database: database);
+      expect(nutritionProvider.currentPlan, equals(plan));
+    });
+
+    test('several active plans exists -> return newest', () {
+      final olderPlan = NutritionalPlan(
+        description: 'Old active plan',
+        startDate: now.subtract(const Duration(days: 10)),
+        endDate: now.add(const Duration(days: 10)),
+      );
+      final newerPlan = NutritionalPlan(
+        description: 'Newer active plan',
+        startDate: now.subtract(const Duration(days: 5)),
+        endDate: now.add(const Duration(days: 5)),
+      );
+      nutritionProvider = NutritionPlansProvider(mockWgerBaseProvider, [
+        olderPlan,
+        newerPlan,
+      ], database: database);
+      expect(nutritionProvider.currentPlan, equals(newerPlan));
+    });
+  });
+
   group('Ingredient cache DB', () {
     test('that if there is already valid data in the DB, the API is not hit', () async {
       // Arrange
       nutritionProvider.ingredients = [];
-      await database.into(database.ingredients).insert(
+      await database
+          .into(database.ingredients)
+          .insert(
             IngredientsCompanion.insert(
               id: ingredient59887Response['id'],
               data: json.encode(ingredient59887Response),
@@ -135,7 +248,9 @@ void main() {
     test('fetching an ingredient not present in the DB, the API is hit', () async {
       // Arrange
       nutritionProvider.ingredients = [];
-      await database.into(database.ingredients).insert(
+      await database
+          .into(database.ingredients)
+          .insert(
             IngredientsCompanion.insert(
               id: ingredient59887Response['id'],
               data: json.encode(ingredient59887Response),
diff --git a/test/nutrition/nutritional_meal_form_test.dart b/test/nutrition/nutritional_meal_form_test.dart
index 79d6c0f7..4054ab87 100644
--- a/test/nutrition/nutritional_meal_form_test.dart
+++ b/test/nutrition/nutritional_meal_form_test.dart
@@ -41,13 +41,13 @@ void main() {
   var plan1 = NutritionalPlan.empty();
   var meal1 = Meal();
 
-  when(mockNutrition.editMeal(any)).thenAnswer((_) => Future.value(Meal()));
-  when(mockNutrition.addMeal(any, any)).thenAnswer((_) => Future.value(Meal()));
-
   setUp(() {
     plan1 = getNutritionalPlan();
     meal1 = plan1.meals.first;
     mockNutrition = MockNutritionPlansProvider();
+
+    when(mockNutrition.editMeal(any)).thenAnswer((_) => Future.value(Meal()));
+    when(mockNutrition.addMeal(any, any)).thenAnswer((_) => Future.value(Meal()));
   });
 
   Widget createFormScreen(Meal meal, {locale = 'en'}) {
diff --git a/test/nutrition/nutritional_meal_form_test.mocks.dart b/test/nutrition/nutritional_meal_form_test.mocks.dart
index 08ce46e6..9b9252c2 100644
--- a/test/nutrition/nutritional_meal_form_test.mocks.dart
+++ b/test/nutrition/nutritional_meal_form_test.mocks.dart
@@ -1,14 +1,13 @@
-// Mocks generated by Mockito 5.4.4 from annotations
+// Mocks generated by Mockito 5.4.6 from annotations
 // in wger/test/nutrition/nutritional_meal_form_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i9;
-import 'dart:ui' as _i11;
+import 'dart:ui' as _i10;
 
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:wger/database/ingredients/ingredients_database.dart' as _i3;
-import 'package:wger/models/exercises/ingredient_api.dart' as _i10;
 import 'package:wger/models/nutrition/ingredient.dart' as _i7;
 import 'package:wger/models/nutrition/meal.dart' as _i5;
 import 'package:wger/models/nutrition/meal_item.dart' as _i6;
@@ -24,308 +23,224 @@ import 'package:wger/providers/nutrition.dart' as _i8;
 // ignore_for_file: deprecated_member_use_from_same_package
 // ignore_for_file: implementation_imports
 // ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
 // ignore_for_file: camel_case_types
 // ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
 
-class _FakeWgerBaseProvider_0 extends _i1.SmartFake
-    implements _i2.WgerBaseProvider {
-  _FakeWgerBaseProvider_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider {
+  _FakeWgerBaseProvider_0(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
-class _FakeIngredientDatabase_1 extends _i1.SmartFake
-    implements _i3.IngredientDatabase {
-  _FakeIngredientDatabase_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+class _FakeIngredientDatabase_1 extends _i1.SmartFake implements _i3.IngredientDatabase {
+  _FakeIngredientDatabase_1(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
-class _FakeNutritionalPlan_2 extends _i1.SmartFake
-    implements _i4.NutritionalPlan {
-  _FakeNutritionalPlan_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+class _FakeNutritionalPlan_2 extends _i1.SmartFake implements _i4.NutritionalPlan {
+  _FakeNutritionalPlan_2(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeMeal_3 extends _i1.SmartFake implements _i5.Meal {
-  _FakeMeal_3(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeMeal_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeMealItem_4 extends _i1.SmartFake implements _i6.MealItem {
-  _FakeMealItem_4(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeMealItem_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeIngredient_5 extends _i1.SmartFake implements _i7.Ingredient {
-  _FakeIngredient_5(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeIngredient_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 /// A class which mocks [NutritionPlansProvider].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockNutritionPlansProvider extends _i1.Mock
-    implements _i8.NutritionPlansProvider {
+class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansProvider {
   MockNutritionPlansProvider() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_0(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i2.WgerBaseProvider);
-
-  @override
-  _i3.IngredientDatabase get database => (super.noSuchMethod(
-        Invocation.getter(#database),
-        returnValue: _FakeIngredientDatabase_1(
-          this,
-          Invocation.getter(#database),
-        ),
-      ) as _i3.IngredientDatabase);
-
-  @override
-  set database(_i3.IngredientDatabase? _database) => super.noSuchMethod(
-        Invocation.setter(
-          #database,
-          _database,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  List<_i7.Ingredient> get ingredients => (super.noSuchMethod(
-        Invocation.getter(#ingredients),
-        returnValue: <_i7.Ingredient>[],
-      ) as List<_i7.Ingredient>);
-
-  @override
-  set ingredients(List<_i7.Ingredient>? _ingredients) => super.noSuchMethod(
-        Invocation.setter(
-          #ingredients,
-          _ingredients,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  List<_i4.NutritionalPlan> get items => (super.noSuchMethod(
-        Invocation.getter(#items),
-        returnValue: <_i4.NutritionalPlan>[],
-      ) as List<_i4.NutritionalPlan>);
-
-  @override
-  bool get hasListeners => (super.noSuchMethod(
-        Invocation.getter(#hasListeners),
-        returnValue: false,
-      ) as bool);
-
-  @override
-  void clear() => super.noSuchMethod(
-        Invocation.method(
-          #clear,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  _i9.Stream<_i4.NutritionalPlan?> watchNutritionPlan(String? id) =>
+  _i2.WgerBaseProvider get baseProvider =>
       (super.noSuchMethod(
-        Invocation.method(
-          #watchNutritionPlan,
-          [id],
-        ),
-        returnValue: _i9.Stream<_i4.NutritionalPlan?>.empty(),
-      ) as _i9.Stream<_i4.NutritionalPlan?>);
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(this, Invocation.getter(#baseProvider)),
+          )
+          as _i2.WgerBaseProvider);
 
   @override
-  _i9.Stream<_i4.NutritionalPlan> watchNutritionPlanLast() =>
+  _i3.IngredientDatabase get database =>
       (super.noSuchMethod(
-        Invocation.method(
-          #watchNutritionPlanLast,
-          [],
-        ),
-        returnValue: _i9.Stream<_i4.NutritionalPlan>.empty(),
-      ) as _i9.Stream<_i4.NutritionalPlan>);
+            Invocation.getter(#database),
+            returnValue: _FakeIngredientDatabase_1(this, Invocation.getter(#database)),
+          )
+          as _i3.IngredientDatabase);
 
   @override
-  _i9.Stream<List<_i4.NutritionalPlan>> watchNutritionPlans() =>
+  List<_i7.Ingredient> get ingredients =>
+      (super.noSuchMethod(Invocation.getter(#ingredients), returnValue: <_i7.Ingredient>[])
+          as List<_i7.Ingredient>);
+
+  @override
+  List<_i4.NutritionalPlan> get items =>
+      (super.noSuchMethod(Invocation.getter(#items), returnValue: <_i4.NutritionalPlan>[])
+          as List<_i4.NutritionalPlan>);
+
+  @override
+  set database(_i3.IngredientDatabase? value) =>
+      super.noSuchMethod(Invocation.setter(#database, value), returnValueForMissingStub: null);
+
+  @override
+  set ingredients(List<_i7.Ingredient>? value) =>
+      super.noSuchMethod(Invocation.setter(#ingredients, value), returnValueForMissingStub: null);
+
+  @override
+  bool get hasListeners =>
+      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
+
+  @override
+  void clear() =>
+      super.noSuchMethod(Invocation.method(#clear, []), returnValueForMissingStub: null);
+
+  @override
+  _i4.NutritionalPlan findById(int? id) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #watchNutritionPlans,
-          [],
-        ),
-        returnValue: _i9.Stream<List<_i4.NutritionalPlan>>.empty(),
-      ) as _i9.Stream<List<_i4.NutritionalPlan>>);
+            Invocation.method(#findById, [id]),
+            returnValue: _FakeNutritionalPlan_2(this, Invocation.method(#findById, [id])),
+          )
+          as _i4.NutritionalPlan);
+
+  @override
+  _i5.Meal? findMealById(int? id) =>
+      (super.noSuchMethod(Invocation.method(#findMealById, [id])) as _i5.Meal?);
+
+  @override
+  _i9.Future<void> fetchAndSetAllPlansSparse() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllPlansSparse, []),
+            returnValue: _i9.Future<void>.value(),
+            returnValueForMissingStub: _i9.Future<void>.value(),
+          )
+          as _i9.Future<void>);
+
+  @override
+  _i9.Future<void> fetchAndSetAllPlansFull() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllPlansFull, []),
+            returnValue: _i9.Future<void>.value(),
+            returnValueForMissingStub: _i9.Future<void>.value(),
+          )
+          as _i9.Future<void>);
+
+  @override
+  _i9.Future<_i4.NutritionalPlan> fetchAndSetPlanSparse(int? planId) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetPlanSparse, [planId]),
+            returnValue: _i9.Future<_i4.NutritionalPlan>.value(
+              _FakeNutritionalPlan_2(this, Invocation.method(#fetchAndSetPlanSparse, [planId])),
+            ),
+          )
+          as _i9.Future<_i4.NutritionalPlan>);
+
+  @override
+  _i9.Future<_i4.NutritionalPlan> fetchAndSetPlanFull(int? planId) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetPlanFull, [planId]),
+            returnValue: _i9.Future<_i4.NutritionalPlan>.value(
+              _FakeNutritionalPlan_2(this, Invocation.method(#fetchAndSetPlanFull, [planId])),
+            ),
+          )
+          as _i9.Future<_i4.NutritionalPlan>);
 
   @override
   _i9.Future<_i4.NutritionalPlan> addPlan(_i4.NutritionalPlan? planData) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addPlan,
-          [planData],
-        ),
-        returnValue:
-            _i9.Future<_i4.NutritionalPlan>.value(_FakeNutritionalPlan_2(
-          this,
-          Invocation.method(
-            #addPlan,
-            [planData],
-          ),
-        )),
-      ) as _i9.Future<_i4.NutritionalPlan>);
+            Invocation.method(#addPlan, [planData]),
+            returnValue: _i9.Future<_i4.NutritionalPlan>.value(
+              _FakeNutritionalPlan_2(this, Invocation.method(#addPlan, [planData])),
+            ),
+          )
+          as _i9.Future<_i4.NutritionalPlan>);
 
   @override
-  _i9.Future<void> editPlan(_i4.NutritionalPlan? plan) => (super.noSuchMethod(
-        Invocation.method(
-          #editPlan,
-          [plan],
-        ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
-
-  @override
-  _i9.Future<void> deletePlan(String? id) => (super.noSuchMethod(
-        Invocation.method(
-          #deletePlan,
-          [id],
-        ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
-
-  @override
-  _i9.Future<_i5.Meal> addMeal(
-    _i5.Meal? meal,
-    String? planId,
-  ) =>
+  _i9.Future<void> editPlan(_i4.NutritionalPlan? plan) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addMeal,
-          [
-            meal,
-            planId,
-          ],
-        ),
-        returnValue: _i9.Future<_i5.Meal>.value(_FakeMeal_3(
-          this,
-          Invocation.method(
-            #addMeal,
-            [
-              meal,
-              planId,
-            ],
-          ),
-        )),
-      ) as _i9.Future<_i5.Meal>);
+            Invocation.method(#editPlan, [plan]),
+            returnValue: _i9.Future<void>.value(),
+            returnValueForMissingStub: _i9.Future<void>.value(),
+          )
+          as _i9.Future<void>);
 
   @override
-  _i9.Future<_i5.Meal> editMeal(_i5.Meal? meal) => (super.noSuchMethod(
-        Invocation.method(
-          #editMeal,
-          [meal],
-        ),
-        returnValue: _i9.Future<_i5.Meal>.value(_FakeMeal_3(
-          this,
-          Invocation.method(
-            #editMeal,
-            [meal],
-          ),
-        )),
-      ) as _i9.Future<_i5.Meal>);
-
-  @override
-  _i9.Future<void> deleteMeal(_i5.Meal? meal) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteMeal,
-          [meal],
-        ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
-
-  @override
-  _i9.Future<_i6.MealItem> addMealItem(
-    _i6.MealItem? mealItem,
-    _i5.Meal? meal,
-  ) =>
+  _i9.Future<void> deletePlan(int? id) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addMealItem,
-          [
-            mealItem,
-            meal,
-          ],
-        ),
-        returnValue: _i9.Future<_i6.MealItem>.value(_FakeMealItem_4(
-          this,
-          Invocation.method(
-            #addMealItem,
-            [
-              mealItem,
-              meal,
-            ],
-          ),
-        )),
-      ) as _i9.Future<_i6.MealItem>);
+            Invocation.method(#deletePlan, [id]),
+            returnValue: _i9.Future<void>.value(),
+            returnValueForMissingStub: _i9.Future<void>.value(),
+          )
+          as _i9.Future<void>);
+
+  @override
+  _i9.Future<_i5.Meal> addMeal(_i5.Meal? meal, int? planId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addMeal, [meal, planId]),
+            returnValue: _i9.Future<_i5.Meal>.value(
+              _FakeMeal_3(this, Invocation.method(#addMeal, [meal, planId])),
+            ),
+          )
+          as _i9.Future<_i5.Meal>);
+
+  @override
+  _i9.Future<_i5.Meal> editMeal(_i5.Meal? meal) =>
+      (super.noSuchMethod(
+            Invocation.method(#editMeal, [meal]),
+            returnValue: _i9.Future<_i5.Meal>.value(
+              _FakeMeal_3(this, Invocation.method(#editMeal, [meal])),
+            ),
+          )
+          as _i9.Future<_i5.Meal>);
+
+  @override
+  _i9.Future<void> deleteMeal(_i5.Meal? meal) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteMeal, [meal]),
+            returnValue: _i9.Future<void>.value(),
+            returnValueForMissingStub: _i9.Future<void>.value(),
+          )
+          as _i9.Future<void>);
+
+  @override
+  _i9.Future<_i6.MealItem> addMealItem(_i6.MealItem? mealItem, _i5.Meal? meal) =>
+      (super.noSuchMethod(
+            Invocation.method(#addMealItem, [mealItem, meal]),
+            returnValue: _i9.Future<_i6.MealItem>.value(
+              _FakeMealItem_4(this, Invocation.method(#addMealItem, [mealItem, meal])),
+            ),
+          )
+          as _i9.Future<_i6.MealItem>);
 
   @override
   _i9.Future<void> deleteMealItem(_i6.MealItem? mealItem) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteMealItem,
-          [mealItem],
-        ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+            Invocation.method(#deleteMealItem, [mealItem]),
+            returnValue: _i9.Future<void>.value(),
+            returnValueForMissingStub: _i9.Future<void>.value(),
+          )
+          as _i9.Future<void>);
 
   @override
-  _i9.Future<void> clearIngredientCache() => (super.noSuchMethod(
-        Invocation.method(
-          #clearIngredientCache,
-          [],
-        ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+  _i9.Future<void> clearIngredientCache() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearIngredientCache, []),
+            returnValue: _i9.Future<void>.value(),
+            returnValueForMissingStub: _i9.Future<void>.value(),
+          )
+          as _i9.Future<void>);
 
   @override
   _i9.Future<_i7.Ingredient> fetchIngredient(
@@ -333,150 +248,106 @@ class MockNutritionPlansProvider extends _i1.Mock
     _i3.IngredientDatabase? database,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #fetchIngredient,
-          [ingredientId],
-          {#database: database},
-        ),
-        returnValue: _i9.Future<_i7.Ingredient>.value(_FakeIngredient_5(
-          this,
-          Invocation.method(
-            #fetchIngredient,
-            [ingredientId],
-            {#database: database},
-          ),
-        )),
-      ) as _i9.Future<_i7.Ingredient>);
+            Invocation.method(#fetchIngredient, [ingredientId], {#database: database}),
+            returnValue: _i9.Future<_i7.Ingredient>.value(
+              _FakeIngredient_5(
+                this,
+                Invocation.method(#fetchIngredient, [ingredientId], {#database: database}),
+              ),
+            ),
+          )
+          as _i9.Future<_i7.Ingredient>);
 
   @override
-  _i9.Future<void> fetchIngredientsFromCache() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchIngredientsFromCache,
-          [],
-        ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+  _i9.Future<void> fetchIngredientsFromCache() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchIngredientsFromCache, []),
+            returnValue: _i9.Future<void>.value(),
+            returnValueForMissingStub: _i9.Future<void>.value(),
+          )
+          as _i9.Future<void>);
 
   @override
-  _i9.Future<List<_i10.IngredientApiSearchEntry>> searchIngredient(
+  _i9.Future<List<_i7.Ingredient>> searchIngredient(
     String? name, {
-    String? languageCode = r'en',
+    String? languageCode = 'en',
     bool? searchEnglish = false,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #searchIngredient,
-          [name],
-          {
-            #languageCode: languageCode,
-            #searchEnglish: searchEnglish,
-          },
-        ),
-        returnValue: _i9.Future<List<_i10.IngredientApiSearchEntry>>.value(
-            <_i10.IngredientApiSearchEntry>[]),
-      ) as _i9.Future<List<_i10.IngredientApiSearchEntry>>);
+            Invocation.method(
+              #searchIngredient,
+              [name],
+              {#languageCode: languageCode, #searchEnglish: searchEnglish},
+            ),
+            returnValue: _i9.Future<List<_i7.Ingredient>>.value(<_i7.Ingredient>[]),
+          )
+          as _i9.Future<List<_i7.Ingredient>>);
 
   @override
-  _i9.Future<_i7.Ingredient?> searchIngredientWithCode(String? code) =>
+  _i9.Future<_i7.Ingredient?> searchIngredientWithBarcode(String? barcode) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #searchIngredientWithCode,
-          [code],
-        ),
-        returnValue: _i9.Future<_i7.Ingredient?>.value(),
-      ) as _i9.Future<_i7.Ingredient?>);
+            Invocation.method(#searchIngredientWithBarcode, [barcode]),
+            returnValue: _i9.Future<_i7.Ingredient?>.value(),
+          )
+          as _i9.Future<_i7.Ingredient?>);
 
   @override
-  _i9.Future<void> logMealToDiary(_i5.Meal? meal) => (super.noSuchMethod(
-        Invocation.method(
-          #logMealToDiary,
-          [meal],
-        ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+  _i9.Future<void> logMealToDiary(_i5.Meal? meal, DateTime? mealDateTime) =>
+      (super.noSuchMethod(
+            Invocation.method(#logMealToDiary, [meal, mealDateTime]),
+            returnValue: _i9.Future<void>.value(),
+            returnValueForMissingStub: _i9.Future<void>.value(),
+          )
+          as _i9.Future<void>);
 
   @override
   _i9.Future<void> logIngredientToDiary(
     _i6.MealItem? mealItem,
-    String? planId, [
+    int? planId, [
     DateTime? dateTime,
   ]) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #logIngredientToDiary,
-          [
-            mealItem,
-            planId,
-            dateTime,
-          ],
-        ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+            Invocation.method(#logIngredientToDiary, [mealItem, planId, dateTime]),
+            returnValue: _i9.Future<void>.value(),
+            returnValueForMissingStub: _i9.Future<void>.value(),
+          )
+          as _i9.Future<void>);
 
   @override
-  _i9.Future<void> deleteLog(
-    String? logId,
-    String? planId,
-  ) =>
+  _i9.Future<void> deleteLog(int? logId, int? planId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteLog,
-          [
-            logId,
-            planId,
-          ],
-        ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+            Invocation.method(#deleteLog, [logId, planId]),
+            returnValue: _i9.Future<void>.value(),
+            returnValueForMissingStub: _i9.Future<void>.value(),
+          )
+          as _i9.Future<void>);
 
   @override
   _i9.Future<void> fetchAndSetLogs(_i4.NutritionalPlan? plan) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetLogs,
-          [plan],
-        ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+            Invocation.method(#fetchAndSetLogs, [plan]),
+            returnValue: _i9.Future<void>.value(),
+            returnValueForMissingStub: _i9.Future<void>.value(),
+          )
+          as _i9.Future<void>);
 
   @override
-  void addListener(_i11.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void addListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  void removeListener(_i11.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void removeListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#removeListener, [listener]),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void dispose() =>
+      super.noSuchMethod(Invocation.method(#dispose, []), returnValueForMissingStub: null);
 
   @override
-  void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void notifyListeners() =>
+      super.noSuchMethod(Invocation.method(#notifyListeners, []), returnValueForMissingStub: null);
 }
diff --git a/test/nutrition/nutritional_meal_item_form_test.dart b/test/nutrition/nutritional_meal_item_form_test.dart
index e5ee091a..ae38d483 100644
--- a/test/nutrition/nutritional_meal_item_form_test.dart
+++ b/test/nutrition/nutritional_meal_item_form_test.dart
@@ -10,7 +10,6 @@ import 'package:network_image_mock/network_image_mock.dart';
 import 'package:provider/provider.dart';
 import 'package:wger/helpers/consts.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
-import 'package:wger/models/exercises/ingredient_api.dart';
 import 'package:wger/models/nutrition/ingredient.dart';
 import 'package:wger/models/nutrition/meal.dart';
 import 'package:wger/models/nutrition/meal_item.dart';
@@ -71,9 +70,11 @@ void main() {
     final MealItem mealItem = MealItem(ingredientId: ingredient.id, amount: 2);
     mockNutrition = MockNutritionPlansProvider();
 
-    when(mockNutrition.searchIngredientWithCode('123')).thenAnswer((_) => Future.value(ingredient));
-    when(mockNutrition.searchIngredientWithCode('')).thenAnswer((_) => Future.value(null));
-    when(mockNutrition.searchIngredientWithCode('222')).thenAnswer((_) => Future.value(null));
+    when(
+      mockNutrition.searchIngredientWithBarcode('123'),
+    ).thenAnswer((_) => Future.value(ingredient));
+    when(mockNutrition.searchIngredientWithBarcode('')).thenAnswer((_) => Future.value(null));
+    when(mockNutrition.searchIngredientWithBarcode('222')).thenAnswer((_) => Future.value(null));
     when(
       mockNutrition.searchIngredient(
         any,
@@ -81,11 +82,7 @@ void main() {
         searchEnglish: anyNamed('searchEnglish'),
       ),
     ).thenAnswer(
-      (_) => Future.value(
-        IngredientApiSearch.fromJson(
-          json.decode(fixture('nutrition/ingredient_suggestions')),
-        ).suggestions,
-      ),
+      (_) => Future.value([ingredient1, ingredient2]),
     );
 
     when(mockNutrition.addMealItem(any, meal1)).thenAnswer((_) => Future.value(mealItem));
@@ -104,7 +101,7 @@ void main() {
         home: Scaffold(
           body: Scrollable(
             viewportBuilder: (BuildContext context, ViewportOffset position) =>
-                MealItemForm(meal, const [], code, test),
+                getMealItemForm(meal, const [], code, test),
           ),
         ),
         routes: {NutritionalPlanScreen.routeName: (ctx) => const NutritionalPlanScreen()},
@@ -116,7 +113,7 @@ void main() {
     await tester.pumpWidget(createMealItemFormScreen(meal1, '', true));
     await tester.pumpAndSettle();
 
-    expect(find.byType(TypeAheadField<IngredientApiSearchEntry>), findsOneWidget);
+    expect(find.byType(TypeAheadField<Ingredient>), findsOneWidget);
     expect(find.byType(TextFormField), findsWidgets);
     expect(find.byKey(const Key('scan-button')), findsOneWidget);
     expect(find.byKey(const Key(SUBMIT_BUTTON_KEY_NAME)), findsOneWidget);
@@ -314,13 +311,13 @@ void main() {
 
       await tester.enterText(find.byKey(const Key('field-weight')), '2');
 
-      // once ID and weight are set, it'll fetchIngredient and show macros preview and ingredient image
-      when(mockNutrition.fetchIngredient(1)).thenAnswer(
-        (_) => Future.value(
-          Ingredient.fromJson(jsonDecode(fixture('nutrition/ingredientinfo_59887.json'))),
-        ),
-      );
-      await mockNetworkImagesFor(() => tester.pumpAndSettle());
+        // once ID and weight are set, it'll fetchIngredient and show macros preview and ingredient image
+        when(mockNutrition.fetchIngredient(1)).thenAnswer(
+          (_) => Future.value(
+            Ingredient.fromJson(jsonDecode(fixture('nutrition/ingredientinfo_59887.json'))),
+          ),
+        );
+        await mockNetworkImagesFor(() => tester.pumpAndSettle());
 
       expect(find.byKey(const Key('ingredient-scan-result-dialog')), findsNothing);
 
diff --git a/test/nutrition/nutritional_plan_form_test.dart b/test/nutrition/nutritional_plan_form_test.dart
index 30910594..489fe3eb 100644
--- a/test/nutrition/nutritional_plan_form_test.dart
+++ b/test/nutrition/nutritional_plan_form_test.dart
@@ -37,15 +37,17 @@ void main() {
   final plan1 = NutritionalPlan(
     id: 'deadbeef',
     creationDate: DateTime(2021, 1, 1),
+    startDate: DateTime(2021, 1, 1),
+    endDate: DateTime(2021, 2, 10),
     description: 'test plan 1',
   );
   final plan2 = NutritionalPlan.empty();
 
-  when(mockNutrition.editPlan(any)).thenAnswer((_) => Future.value(plan1));
-  when(mockNutrition.addPlan(any)).thenAnswer((_) => Future.value(plan2));
-
   setUp(() {
     mockNutrition = MockNutritionPlansProvider();
+
+    when(mockNutrition.editPlan(any)).thenAnswer((_) => Future.value(plan1));
+    when(mockNutrition.addPlan(any)).thenAnswer((_) => Future.value(plan1));
   });
 
   Widget createHomeScreen(NutritionalPlan plan, {locale = 'en'}) {
@@ -68,7 +70,7 @@ void main() {
     await tester.pumpWidget(createHomeScreen(plan1));
     await tester.pumpAndSettle();
 
-    expect(find.byType(TextFormField), findsOneWidget);
+    expect(find.byType(TextFormField), findsNWidgets(3));
     expect(find.byType(ElevatedButton), findsOneWidget);
     expect(find.byKey(const Key(SUBMIT_BUTTON_KEY_NAME)), findsOneWidget);
   });
@@ -77,11 +79,10 @@ void main() {
     await tester.pumpWidget(createHomeScreen(plan1));
     await tester.pumpAndSettle();
 
-    expect(
-      find.text('test plan 1'),
-      findsOneWidget,
-      reason: 'Description of existing nutritional plan is filled in',
-    );
+    expect(find.text('test plan 1'), findsOneWidget, reason: 'Description is filled in');
+    expect(find.text('1/1/2021'), findsOneWidget, reason: 'Start date is filled in');
+    expect(find.text('2/10/2021'), findsOneWidget, reason: 'End date is filled in');
+
     await tester.enterText(find.byKey(const Key('field-description')), 'New description');
     await tester.tap(find.byKey(const Key(SUBMIT_BUTTON_KEY_NAME)));
 
@@ -95,7 +96,7 @@ void main() {
     // https://stackoverflow.com/questions/50704647/how-to-test-navigation-via-navigator-in-flutter
 
     // Detail page
-    //await tester.pumpAndSettle();
+    // await tester.pumpAndSettle();
     //expect(
     // find.text(('New description')),
     //findsOneWidget,
@@ -107,7 +108,12 @@ void main() {
     await tester.pumpWidget(createHomeScreen(plan2));
     await tester.pumpAndSettle();
 
-    expect(find.text(''), findsOneWidget, reason: 'New nutritional plan has no description');
+    expect(
+      find.text(''),
+      findsNWidgets(2),
+      reason: 'New nutritional plan needs description, and end date',
+    );
+    // there's also the start date, but it will have a value depending on 'now'
     await tester.enterText(find.byKey(const Key('field-description')), 'New cool plan');
     await tester.tap(find.byKey(const Key(SUBMIT_BUTTON_KEY_NAME)));
 
@@ -115,8 +121,8 @@ void main() {
     verifyNever(mockNutrition.editPlan(any));
     verify(mockNutrition.addPlan(any));
 
-    // Detail page
-    await tester.pumpAndSettle();
-    expect(find.text('New cool plan'), findsOneWidget, reason: 'Nutritional plan detail page');
+    // TODO: detail page
+    // await tester.pumpAndSettle();
+    // expect(find.text('New cool plan'), findsOneWidget, reason: 'Nutritional plan detail page');
   });
 }
diff --git a/test/nutrition/nutritional_plan_form_test.mocks.dart b/test/nutrition/nutritional_plan_form_test.mocks.dart
index 735d1537..801f58c3 100644
--- a/test/nutrition/nutritional_plan_form_test.mocks.dart
+++ b/test/nutrition/nutritional_plan_form_test.mocks.dart
@@ -1,14 +1,13 @@
-// Mocks generated by Mockito 5.4.4 from annotations
+// Mocks generated by Mockito 5.4.6 from annotations
 // in wger/test/nutrition/nutritional_plan_form_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i9;
-import 'dart:ui' as _i11;
+import 'dart:ui' as _i10;
 
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:wger/database/ingredients/ingredients_database.dart' as _i3;
-import 'package:wger/models/exercises/ingredient_api.dart' as _i10;
 import 'package:wger/models/nutrition/ingredient.dart' as _i7;
 import 'package:wger/models/nutrition/meal.dart' as _i5;
 import 'package:wger/models/nutrition/meal_item.dart' as _i6;
@@ -24,308 +23,224 @@ import 'package:wger/providers/nutrition.dart' as _i8;
 // ignore_for_file: deprecated_member_use_from_same_package
 // ignore_for_file: implementation_imports
 // ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
 // ignore_for_file: camel_case_types
 // ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
 
-class _FakeWgerBaseProvider_0 extends _i1.SmartFake
-    implements _i2.WgerBaseProvider {
-  _FakeWgerBaseProvider_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider {
+  _FakeWgerBaseProvider_0(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
-class _FakeIngredientDatabase_1 extends _i1.SmartFake
-    implements _i3.IngredientDatabase {
-  _FakeIngredientDatabase_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+class _FakeIngredientDatabase_1 extends _i1.SmartFake implements _i3.IngredientDatabase {
+  _FakeIngredientDatabase_1(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
-class _FakeNutritionalPlan_2 extends _i1.SmartFake
-    implements _i4.NutritionalPlan {
-  _FakeNutritionalPlan_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+class _FakeNutritionalPlan_2 extends _i1.SmartFake implements _i4.NutritionalPlan {
+  _FakeNutritionalPlan_2(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeMeal_3 extends _i1.SmartFake implements _i5.Meal {
-  _FakeMeal_3(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeMeal_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeMealItem_4 extends _i1.SmartFake implements _i6.MealItem {
-  _FakeMealItem_4(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeMealItem_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeIngredient_5 extends _i1.SmartFake implements _i7.Ingredient {
-  _FakeIngredient_5(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeIngredient_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 /// A class which mocks [NutritionPlansProvider].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockNutritionPlansProvider extends _i1.Mock
-    implements _i8.NutritionPlansProvider {
+class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansProvider {
   MockNutritionPlansProvider() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_0(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i2.WgerBaseProvider);
-
-  @override
-  _i3.IngredientDatabase get database => (super.noSuchMethod(
-        Invocation.getter(#database),
-        returnValue: _FakeIngredientDatabase_1(
-          this,
-          Invocation.getter(#database),
-        ),
-      ) as _i3.IngredientDatabase);
-
-  @override
-  set database(_i3.IngredientDatabase? _database) => super.noSuchMethod(
-        Invocation.setter(
-          #database,
-          _database,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  List<_i7.Ingredient> get ingredients => (super.noSuchMethod(
-        Invocation.getter(#ingredients),
-        returnValue: <_i7.Ingredient>[],
-      ) as List<_i7.Ingredient>);
-
-  @override
-  set ingredients(List<_i7.Ingredient>? _ingredients) => super.noSuchMethod(
-        Invocation.setter(
-          #ingredients,
-          _ingredients,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  List<_i4.NutritionalPlan> get items => (super.noSuchMethod(
-        Invocation.getter(#items),
-        returnValue: <_i4.NutritionalPlan>[],
-      ) as List<_i4.NutritionalPlan>);
-
-  @override
-  bool get hasListeners => (super.noSuchMethod(
-        Invocation.getter(#hasListeners),
-        returnValue: false,
-      ) as bool);
-
-  @override
-  void clear() => super.noSuchMethod(
-        Invocation.method(
-          #clear,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  _i9.Stream<_i4.NutritionalPlan?> watchNutritionPlan(String? id) =>
+  _i2.WgerBaseProvider get baseProvider =>
       (super.noSuchMethod(
-        Invocation.method(
-          #watchNutritionPlan,
-          [id],
-        ),
-        returnValue: _i9.Stream<_i4.NutritionalPlan?>.empty(),
-      ) as _i9.Stream<_i4.NutritionalPlan?>);
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(this, Invocation.getter(#baseProvider)),
+          )
+          as _i2.WgerBaseProvider);
 
   @override
-  _i9.Stream<_i4.NutritionalPlan> watchNutritionPlanLast() =>
+  _i3.IngredientDatabase get database =>
       (super.noSuchMethod(
-        Invocation.method(
-          #watchNutritionPlanLast,
-          [],
-        ),
-        returnValue: _i9.Stream<_i4.NutritionalPlan>.empty(),
-      ) as _i9.Stream<_i4.NutritionalPlan>);
+            Invocation.getter(#database),
+            returnValue: _FakeIngredientDatabase_1(this, Invocation.getter(#database)),
+          )
+          as _i3.IngredientDatabase);
 
   @override
-  _i9.Stream<List<_i4.NutritionalPlan>> watchNutritionPlans() =>
+  List<_i7.Ingredient> get ingredients =>
+      (super.noSuchMethod(Invocation.getter(#ingredients), returnValue: <_i7.Ingredient>[])
+          as List<_i7.Ingredient>);
+
+  @override
+  List<_i4.NutritionalPlan> get items =>
+      (super.noSuchMethod(Invocation.getter(#items), returnValue: <_i4.NutritionalPlan>[])
+          as List<_i4.NutritionalPlan>);
+
+  @override
+  set database(_i3.IngredientDatabase? value) =>
+      super.noSuchMethod(Invocation.setter(#database, value), returnValueForMissingStub: null);
+
+  @override
+  set ingredients(List<_i7.Ingredient>? value) =>
+      super.noSuchMethod(Invocation.setter(#ingredients, value), returnValueForMissingStub: null);
+
+  @override
+  bool get hasListeners =>
+      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
+
+  @override
+  void clear() =>
+      super.noSuchMethod(Invocation.method(#clear, []), returnValueForMissingStub: null);
+
+  @override
+  _i4.NutritionalPlan findById(int? id) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #watchNutritionPlans,
-          [],
-        ),
-        returnValue: _i9.Stream<List<_i4.NutritionalPlan>>.empty(),
-      ) as _i9.Stream<List<_i4.NutritionalPlan>>);
+            Invocation.method(#findById, [id]),
+            returnValue: _FakeNutritionalPlan_2(this, Invocation.method(#findById, [id])),
+          )
+          as _i4.NutritionalPlan);
+
+  @override
+  _i5.Meal? findMealById(int? id) =>
+      (super.noSuchMethod(Invocation.method(#findMealById, [id])) as _i5.Meal?);
+
+  @override
+  _i9.Future<void> fetchAndSetAllPlansSparse() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllPlansSparse, []),
+            returnValue: _i9.Future<void>.value(),
+            returnValueForMissingStub: _i9.Future<void>.value(),
+          )
+          as _i9.Future<void>);
+
+  @override
+  _i9.Future<void> fetchAndSetAllPlansFull() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllPlansFull, []),
+            returnValue: _i9.Future<void>.value(),
+            returnValueForMissingStub: _i9.Future<void>.value(),
+          )
+          as _i9.Future<void>);
+
+  @override
+  _i9.Future<_i4.NutritionalPlan> fetchAndSetPlanSparse(int? planId) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetPlanSparse, [planId]),
+            returnValue: _i9.Future<_i4.NutritionalPlan>.value(
+              _FakeNutritionalPlan_2(this, Invocation.method(#fetchAndSetPlanSparse, [planId])),
+            ),
+          )
+          as _i9.Future<_i4.NutritionalPlan>);
+
+  @override
+  _i9.Future<_i4.NutritionalPlan> fetchAndSetPlanFull(int? planId) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetPlanFull, [planId]),
+            returnValue: _i9.Future<_i4.NutritionalPlan>.value(
+              _FakeNutritionalPlan_2(this, Invocation.method(#fetchAndSetPlanFull, [planId])),
+            ),
+          )
+          as _i9.Future<_i4.NutritionalPlan>);
 
   @override
   _i9.Future<_i4.NutritionalPlan> addPlan(_i4.NutritionalPlan? planData) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addPlan,
-          [planData],
-        ),
-        returnValue:
-            _i9.Future<_i4.NutritionalPlan>.value(_FakeNutritionalPlan_2(
-          this,
-          Invocation.method(
-            #addPlan,
-            [planData],
-          ),
-        )),
-      ) as _i9.Future<_i4.NutritionalPlan>);
+            Invocation.method(#addPlan, [planData]),
+            returnValue: _i9.Future<_i4.NutritionalPlan>.value(
+              _FakeNutritionalPlan_2(this, Invocation.method(#addPlan, [planData])),
+            ),
+          )
+          as _i9.Future<_i4.NutritionalPlan>);
 
   @override
-  _i9.Future<void> editPlan(_i4.NutritionalPlan? plan) => (super.noSuchMethod(
-        Invocation.method(
-          #editPlan,
-          [plan],
-        ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
-
-  @override
-  _i9.Future<void> deletePlan(String? id) => (super.noSuchMethod(
-        Invocation.method(
-          #deletePlan,
-          [id],
-        ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
-
-  @override
-  _i9.Future<_i5.Meal> addMeal(
-    _i5.Meal? meal,
-    String? planId,
-  ) =>
+  _i9.Future<void> editPlan(_i4.NutritionalPlan? plan) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addMeal,
-          [
-            meal,
-            planId,
-          ],
-        ),
-        returnValue: _i9.Future<_i5.Meal>.value(_FakeMeal_3(
-          this,
-          Invocation.method(
-            #addMeal,
-            [
-              meal,
-              planId,
-            ],
-          ),
-        )),
-      ) as _i9.Future<_i5.Meal>);
+            Invocation.method(#editPlan, [plan]),
+            returnValue: _i9.Future<void>.value(),
+            returnValueForMissingStub: _i9.Future<void>.value(),
+          )
+          as _i9.Future<void>);
 
   @override
-  _i9.Future<_i5.Meal> editMeal(_i5.Meal? meal) => (super.noSuchMethod(
-        Invocation.method(
-          #editMeal,
-          [meal],
-        ),
-        returnValue: _i9.Future<_i5.Meal>.value(_FakeMeal_3(
-          this,
-          Invocation.method(
-            #editMeal,
-            [meal],
-          ),
-        )),
-      ) as _i9.Future<_i5.Meal>);
-
-  @override
-  _i9.Future<void> deleteMeal(_i5.Meal? meal) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteMeal,
-          [meal],
-        ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
-
-  @override
-  _i9.Future<_i6.MealItem> addMealItem(
-    _i6.MealItem? mealItem,
-    _i5.Meal? meal,
-  ) =>
+  _i9.Future<void> deletePlan(int? id) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addMealItem,
-          [
-            mealItem,
-            meal,
-          ],
-        ),
-        returnValue: _i9.Future<_i6.MealItem>.value(_FakeMealItem_4(
-          this,
-          Invocation.method(
-            #addMealItem,
-            [
-              mealItem,
-              meal,
-            ],
-          ),
-        )),
-      ) as _i9.Future<_i6.MealItem>);
+            Invocation.method(#deletePlan, [id]),
+            returnValue: _i9.Future<void>.value(),
+            returnValueForMissingStub: _i9.Future<void>.value(),
+          )
+          as _i9.Future<void>);
+
+  @override
+  _i9.Future<_i5.Meal> addMeal(_i5.Meal? meal, int? planId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addMeal, [meal, planId]),
+            returnValue: _i9.Future<_i5.Meal>.value(
+              _FakeMeal_3(this, Invocation.method(#addMeal, [meal, planId])),
+            ),
+          )
+          as _i9.Future<_i5.Meal>);
+
+  @override
+  _i9.Future<_i5.Meal> editMeal(_i5.Meal? meal) =>
+      (super.noSuchMethod(
+            Invocation.method(#editMeal, [meal]),
+            returnValue: _i9.Future<_i5.Meal>.value(
+              _FakeMeal_3(this, Invocation.method(#editMeal, [meal])),
+            ),
+          )
+          as _i9.Future<_i5.Meal>);
+
+  @override
+  _i9.Future<void> deleteMeal(_i5.Meal? meal) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteMeal, [meal]),
+            returnValue: _i9.Future<void>.value(),
+            returnValueForMissingStub: _i9.Future<void>.value(),
+          )
+          as _i9.Future<void>);
+
+  @override
+  _i9.Future<_i6.MealItem> addMealItem(_i6.MealItem? mealItem, _i5.Meal? meal) =>
+      (super.noSuchMethod(
+            Invocation.method(#addMealItem, [mealItem, meal]),
+            returnValue: _i9.Future<_i6.MealItem>.value(
+              _FakeMealItem_4(this, Invocation.method(#addMealItem, [mealItem, meal])),
+            ),
+          )
+          as _i9.Future<_i6.MealItem>);
 
   @override
   _i9.Future<void> deleteMealItem(_i6.MealItem? mealItem) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteMealItem,
-          [mealItem],
-        ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+            Invocation.method(#deleteMealItem, [mealItem]),
+            returnValue: _i9.Future<void>.value(),
+            returnValueForMissingStub: _i9.Future<void>.value(),
+          )
+          as _i9.Future<void>);
 
   @override
-  _i9.Future<void> clearIngredientCache() => (super.noSuchMethod(
-        Invocation.method(
-          #clearIngredientCache,
-          [],
-        ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+  _i9.Future<void> clearIngredientCache() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearIngredientCache, []),
+            returnValue: _i9.Future<void>.value(),
+            returnValueForMissingStub: _i9.Future<void>.value(),
+          )
+          as _i9.Future<void>);
 
   @override
   _i9.Future<_i7.Ingredient> fetchIngredient(
@@ -333,150 +248,106 @@ class MockNutritionPlansProvider extends _i1.Mock
     _i3.IngredientDatabase? database,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #fetchIngredient,
-          [ingredientId],
-          {#database: database},
-        ),
-        returnValue: _i9.Future<_i7.Ingredient>.value(_FakeIngredient_5(
-          this,
-          Invocation.method(
-            #fetchIngredient,
-            [ingredientId],
-            {#database: database},
-          ),
-        )),
-      ) as _i9.Future<_i7.Ingredient>);
+            Invocation.method(#fetchIngredient, [ingredientId], {#database: database}),
+            returnValue: _i9.Future<_i7.Ingredient>.value(
+              _FakeIngredient_5(
+                this,
+                Invocation.method(#fetchIngredient, [ingredientId], {#database: database}),
+              ),
+            ),
+          )
+          as _i9.Future<_i7.Ingredient>);
 
   @override
-  _i9.Future<void> fetchIngredientsFromCache() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchIngredientsFromCache,
-          [],
-        ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+  _i9.Future<void> fetchIngredientsFromCache() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchIngredientsFromCache, []),
+            returnValue: _i9.Future<void>.value(),
+            returnValueForMissingStub: _i9.Future<void>.value(),
+          )
+          as _i9.Future<void>);
 
   @override
-  _i9.Future<List<_i10.IngredientApiSearchEntry>> searchIngredient(
+  _i9.Future<List<_i7.Ingredient>> searchIngredient(
     String? name, {
-    String? languageCode = r'en',
+    String? languageCode = 'en',
     bool? searchEnglish = false,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #searchIngredient,
-          [name],
-          {
-            #languageCode: languageCode,
-            #searchEnglish: searchEnglish,
-          },
-        ),
-        returnValue: _i9.Future<List<_i10.IngredientApiSearchEntry>>.value(
-            <_i10.IngredientApiSearchEntry>[]),
-      ) as _i9.Future<List<_i10.IngredientApiSearchEntry>>);
+            Invocation.method(
+              #searchIngredient,
+              [name],
+              {#languageCode: languageCode, #searchEnglish: searchEnglish},
+            ),
+            returnValue: _i9.Future<List<_i7.Ingredient>>.value(<_i7.Ingredient>[]),
+          )
+          as _i9.Future<List<_i7.Ingredient>>);
 
   @override
-  _i9.Future<_i7.Ingredient?> searchIngredientWithCode(String? code) =>
+  _i9.Future<_i7.Ingredient?> searchIngredientWithBarcode(String? barcode) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #searchIngredientWithCode,
-          [code],
-        ),
-        returnValue: _i9.Future<_i7.Ingredient?>.value(),
-      ) as _i9.Future<_i7.Ingredient?>);
+            Invocation.method(#searchIngredientWithBarcode, [barcode]),
+            returnValue: _i9.Future<_i7.Ingredient?>.value(),
+          )
+          as _i9.Future<_i7.Ingredient?>);
 
   @override
-  _i9.Future<void> logMealToDiary(_i5.Meal? meal) => (super.noSuchMethod(
-        Invocation.method(
-          #logMealToDiary,
-          [meal],
-        ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+  _i9.Future<void> logMealToDiary(_i5.Meal? meal, DateTime? mealDateTime) =>
+      (super.noSuchMethod(
+            Invocation.method(#logMealToDiary, [meal, mealDateTime]),
+            returnValue: _i9.Future<void>.value(),
+            returnValueForMissingStub: _i9.Future<void>.value(),
+          )
+          as _i9.Future<void>);
 
   @override
   _i9.Future<void> logIngredientToDiary(
     _i6.MealItem? mealItem,
-    String? planId, [
+    int? planId, [
     DateTime? dateTime,
   ]) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #logIngredientToDiary,
-          [
-            mealItem,
-            planId,
-            dateTime,
-          ],
-        ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+            Invocation.method(#logIngredientToDiary, [mealItem, planId, dateTime]),
+            returnValue: _i9.Future<void>.value(),
+            returnValueForMissingStub: _i9.Future<void>.value(),
+          )
+          as _i9.Future<void>);
 
   @override
-  _i9.Future<void> deleteLog(
-    String? logId,
-    String? planId,
-  ) =>
+  _i9.Future<void> deleteLog(int? logId, int? planId) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteLog,
-          [
-            logId,
-            planId,
-          ],
-        ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+            Invocation.method(#deleteLog, [logId, planId]),
+            returnValue: _i9.Future<void>.value(),
+            returnValueForMissingStub: _i9.Future<void>.value(),
+          )
+          as _i9.Future<void>);
 
   @override
   _i9.Future<void> fetchAndSetLogs(_i4.NutritionalPlan? plan) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetLogs,
-          [plan],
-        ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+            Invocation.method(#fetchAndSetLogs, [plan]),
+            returnValue: _i9.Future<void>.value(),
+            returnValueForMissingStub: _i9.Future<void>.value(),
+          )
+          as _i9.Future<void>);
 
   @override
-  void addListener(_i11.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void addListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  void removeListener(_i11.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void removeListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#removeListener, [listener]),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void dispose() =>
+      super.noSuchMethod(Invocation.method(#dispose, []), returnValueForMissingStub: null);
 
   @override
-  void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void notifyListeners() =>
+      super.noSuchMethod(Invocation.method(#notifyListeners, []), returnValueForMissingStub: null);
 }
diff --git a/test/nutrition/nutritional_plan_model_test.dart b/test/nutrition/nutritional_plan_model_test.dart
index ac35a162..40069d16 100644
--- a/test/nutrition/nutritional_plan_model_test.dart
+++ b/test/nutrition/nutritional_plan_model_test.dart
@@ -51,6 +51,7 @@ void main() {
         NutritionalPlan(
           description: '3 macros and energy defined',
           creationDate: DateTime(2024, 5, 4),
+          startDate: DateTime(2024, 5, 4),
           goalProtein: 150,
           goalCarbohydrates: 100,
           goalFat: 100,
@@ -69,6 +70,7 @@ void main() {
         NutritionalPlan(
           description: '2 macros and energy defined',
           creationDate: DateTime(2024, 5, 4),
+          startDate: DateTime(2024, 5, 4),
           goalProtein: 100,
           goalCarbohydrates: 100,
           goalEnergy: 1700,
@@ -86,6 +88,7 @@ void main() {
         NutritionalPlan(
           description: '3 macros defined',
           creationDate: DateTime(2024, 5, 4),
+          startDate: DateTime(2024, 5, 4),
           goalProtein: 100,
           goalCarbohydrates: 100,
           goalFat: 10,
diff --git a/test/nutrition/nutritional_plan_screen_test.dart b/test/nutrition/nutritional_plan_screen_test.dart
index 0c51c121..bccd7b53 100644
--- a/test/nutrition/nutritional_plan_screen_test.dart
+++ b/test/nutrition/nutritional_plan_screen_test.dart
@@ -16,10 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import 'dart:io';
+
 import 'package:drift/native.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:golden_toolkit/golden_toolkit.dart';
 import 'package:http/http.dart' as http;
 import 'package:mockito/annotations.dart';
 import 'package:provider/provider.dart';
@@ -54,13 +55,18 @@ void main() {
     return MultiProvider(
       providers: [
         ChangeNotifierProvider<NutritionPlansProvider>(
-          create: (context) => NutritionPlansProvider(mockBaseProvider, [], database: database),
+          create: (context) => NutritionPlansProvider(
+            mockBaseProvider,
+            [],
+            database: database,
+          ),
         ),
         ChangeNotifierProvider<BodyWeightProvider>(
           create: (context) => BodyWeightProvider(mockBaseProvider),
         ),
       ],
       child: MaterialApp(
+        key: GlobalKey(),
         locale: Locale(locale),
         localizationsDelegates: AppLocalizations.localizationsDelegates,
         supportedLocales: AppLocalizations.supportedLocales,
@@ -78,59 +84,81 @@ void main() {
     );
   }
 
-  testGoldens('Test the widgets on the nutritional plan screen', (tester) async {
-    await loadAppFonts();
-    final globalKey = GlobalKey();
-    await tester.pumpWidgetBuilder(
-      Material(key: globalKey),
-      wrapper: materialAppWrapper(localizations: [AppLocalizations.delegate]),
-      surfaceSize: const Size(500, 1000),
-    );
-    await tester.pumpWidget(createNutritionalPlan());
-    await tester.tap(find.byType(TextButton));
-    await tester.pumpAndSettle();
+  testWidgets(
+    'Test the widgets on the nutritional plan screen',
+    (tester) async {
+      tester.view.physicalSize = const Size(500, 1000);
+      tester.view.devicePixelRatio = 1.0; // Ensure correct pixel ratio
 
-    await screenMatchesGolden(tester, 'nutritional_plan_1_default_view');
+      await tester.pumpWidget(createNutritionalPlan());
+      await tester.tap(find.byType(TextButton));
+      await tester.pumpAndSettle();
 
-    // Default view shows plan description, info button, and no ingredients
-    expect(find.text('Less fat, more protein'), findsOneWidget);
-    expect(find.byIcon(Icons.info_outline), findsNWidgets(3)); // 2 meals, 1 "other logs"
-    expect(find.byIcon(Icons.info), findsNothing);
-    expect(find.text('100g Water'), findsNothing);
-    expect(find.text('75g Burger soup'), findsNothing);
+      if (Platform.isLinux) {
+        await expectLater(
+          find.byType(NutritionalPlanScreen),
+          matchesGoldenFile('goldens/nutritional_plan_1_default_view.png'),
+        );
+      }
 
-    // tap the first info button changes it and reveals ingredients for the first meal
-    var infoOutlineButtons = find.byIcon(Icons.info_outline);
-    await tester.tap(infoOutlineButtons.first); // 2nd button shows up also, but is off-screen
-    await tester.pumpAndSettle();
-    await screenMatchesGolden(tester, 'nutritional_plan_2_one_meal_with_ingredients');
+      // Default view shows plan description, info button, and no ingredients
+      expect(find.text('Less fat, more protein'), findsOneWidget);
+      expect(find.byIcon(Icons.info_outline), findsNWidgets(3)); // 2 meals, 1 "other logs"
+      expect(find.byIcon(Icons.info), findsNothing);
+      expect(find.text('100g Water'), findsNothing);
+      expect(find.text('75g Burger soup'), findsNothing);
 
-    // Ingredients show up now
-    expect(find.text('100g Water'), findsOneWidget);
-    expect(find.text('75g Burger soup'), findsOneWidget);
+      // tap the first info button changes it and reveals ingredients for the first meal
+      var infoOutlineButtons = find.byIcon(Icons.info_outline);
+      await tester.tap(infoOutlineButtons.first); // 2nd button shows up also, but is off-screen
+      await tester.pumpAndSettle();
 
-    // .. and the button icon has changed
-    expect(find.byIcon(Icons.info_outline), findsNWidgets(2));
-    expect(find.byIcon(Icons.info), findsOneWidget);
+      if (Platform.isLinux) {
+        await expectLater(
+          find.byType(NutritionalPlanScreen),
+          matchesGoldenFile('goldens/nutritional_plan_2_one_meal_with_ingredients.png'),
+        );
+      }
 
-    // the goals widget pushes this content down a bit.
-    // let's first find our icon (note: the previous icon no longer matches)
-    infoOutlineButtons = find.byIcon(Icons.info_outline);
+      // Ingredients show up now
+      expect(find.text('100g Water'), findsOneWidget);
+      expect(find.text('75g Burger soup'), findsOneWidget);
 
-    await tester.scrollUntilVisible(infoOutlineButtons.first, 30);
-    expect(find.text('300g Broccoli cake'), findsNothing);
+      // .. and the button icon has changed
+      expect(find.byIcon(Icons.info_outline), findsNWidgets(2));
+      expect(find.byIcon(Icons.info), findsOneWidget);
 
-    await tester.tap(infoOutlineButtons.first);
-    await tester.pumpAndSettle();
-    await screenMatchesGolden(tester, 'nutritional_plan_3_both_meals_with_ingredients');
-    expect(find.byIcon(Icons.info_outline), findsOneWidget);
-    expect(find.byIcon(Icons.info), findsNWidgets(2));
+      // the goals widget pushes this content down a bit.
+      // let's first find our icon (note: the previous icon no longer matches)
+      infoOutlineButtons = find.byIcon(Icons.info_outline);
 
-    await tester.scrollUntilVisible(find.text('300g Broccoli cake'), 30);
-    expect(find.text('300g Broccoli cake'), findsOneWidget);
+      await tester.scrollUntilVisible(infoOutlineButtons.first, 30);
+      expect(find.text('300g Broccoli cake'), findsNothing);
 
-    expect(find.byType(Card), findsNWidgets(3));
-  });
+      await tester.tap(infoOutlineButtons.first);
+      await tester.pumpAndSettle();
+
+      if (Platform.isLinux) {
+        await expectLater(
+          find.byType(MaterialApp),
+          matchesGoldenFile('goldens/nutritional_plan_3_both_meals_with_ingredients.png'),
+        );
+      }
+
+      expect(find.byIcon(Icons.info_outline), findsOneWidget);
+      expect(find.byIcon(Icons.info), findsNWidgets(2));
+
+      await tester.scrollUntilVisible(find.text('300g Broccoli cake'), 30);
+      expect(find.text('300g Broccoli cake'), findsOneWidget);
+
+      expect(find.byType(Card), findsNWidgets(3));
+
+      // Restore the original window size.
+      tester.view.resetPhysicalSize();
+      tester.view.resetDevicePixelRatio();
+    },
+    tags: ['golden'],
+  );
 
   testWidgets('Tests the localization of times - EN', (WidgetTester tester) async {
     await tester.pumpWidget(createNutritionalPlan());
diff --git a/test/nutrition/nutritional_plan_screen_test.mocks.dart b/test/nutrition/nutritional_plan_screen_test.mocks.dart
index 57c8ebeb..a2f4f529 100644
--- a/test/nutrition/nutritional_plan_screen_test.mocks.dart
+++ b/test/nutrition/nutritional_plan_screen_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.4.4 from annotations
+// Mocks generated by Mockito 5.4.6 from annotations
 // in wger/test/nutrition/nutritional_plan_screen_test.dart.
 // Do not manually edit this file.
 
@@ -23,60 +23,32 @@ import 'package:wger/providers/base_provider.dart' as _i4;
 // ignore_for_file: deprecated_member_use_from_same_package
 // ignore_for_file: implementation_imports
 // ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
 // ignore_for_file: camel_case_types
 // ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
 
 class _FakeAuthProvider_0 extends _i1.SmartFake implements _i2.AuthProvider {
-  _FakeAuthProvider_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeAuthProvider_0(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
-  _FakeClient_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeClient_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeUri_2 extends _i1.SmartFake implements Uri {
-  _FakeUri_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeUri_2(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeResponse_3 extends _i1.SmartFake implements _i3.Response {
-  _FakeResponse_3(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeResponse_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
-class _FakeStreamedResponse_4 extends _i1.SmartFake
-    implements _i3.StreamedResponse {
-  _FakeStreamedResponse_4(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+class _FakeStreamedResponse_4 extends _i1.SmartFake implements _i3.StreamedResponse {
+  _FakeStreamedResponse_4(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 /// A class which mocks [WgerBaseProvider].
@@ -88,160 +60,97 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
   }
 
   @override
-  _i2.AuthProvider get auth => (super.noSuchMethod(
-        Invocation.getter(#auth),
-        returnValue: _FakeAuthProvider_0(
-          this,
-          Invocation.getter(#auth),
-        ),
-      ) as _i2.AuthProvider);
+  _i2.AuthProvider get auth =>
+      (super.noSuchMethod(
+            Invocation.getter(#auth),
+            returnValue: _FakeAuthProvider_0(this, Invocation.getter(#auth)),
+          )
+          as _i2.AuthProvider);
 
   @override
-  set auth(_i2.AuthProvider? _auth) => super.noSuchMethod(
-        Invocation.setter(
-          #auth,
-          _auth,
-        ),
-        returnValueForMissingStub: null,
-      );
+  _i3.Client get client =>
+      (super.noSuchMethod(
+            Invocation.getter(#client),
+            returnValue: _FakeClient_1(this, Invocation.getter(#client)),
+          )
+          as _i3.Client);
 
   @override
-  _i3.Client get client => (super.noSuchMethod(
-        Invocation.getter(#client),
-        returnValue: _FakeClient_1(
-          this,
-          Invocation.getter(#client),
-        ),
-      ) as _i3.Client);
+  set auth(_i2.AuthProvider? value) =>
+      super.noSuchMethod(Invocation.setter(#auth, value), returnValueForMissingStub: null);
 
   @override
-  set client(_i3.Client? _client) => super.noSuchMethod(
-        Invocation.setter(
-          #client,
-          _client,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set client(_i3.Client? value) =>
+      super.noSuchMethod(Invocation.setter(#client, value), returnValueForMissingStub: null);
 
   @override
   Map<String, String> getDefaultHeaders({bool? includeAuth = false}) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #getDefaultHeaders,
-          [],
-          {#includeAuth: includeAuth},
-        ),
-        returnValue: <String, String>{},
-      ) as Map<String, String>);
+            Invocation.method(#getDefaultHeaders, [], {#includeAuth: includeAuth}),
+            returnValue: <String, String>{},
+          )
+          as Map<String, String>);
 
   @override
-  Uri makeUrl(
-    String? path, {
-    int? id,
-    String? objectMethod,
-    Map<String, dynamic>? query,
-  }) =>
+  Uri makeUrl(String? path, {int? id, String? objectMethod, Map<String, dynamic>? query}) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #makeUrl,
-          [path],
-          {
-            #id: id,
-            #objectMethod: objectMethod,
-            #query: query,
-          },
-        ),
-        returnValue: _FakeUri_2(
-          this,
-          Invocation.method(
-            #makeUrl,
-            [path],
-            {
-              #id: id,
-              #objectMethod: objectMethod,
-              #query: query,
-            },
-          ),
-        ),
-      ) as Uri);
+            Invocation.method(
+              #makeUrl,
+              [path],
+              {#id: id, #objectMethod: objectMethod, #query: query},
+            ),
+            returnValue: _FakeUri_2(
+              this,
+              Invocation.method(
+                #makeUrl,
+                [path],
+                {#id: id, #objectMethod: objectMethod, #query: query},
+              ),
+            ),
+          )
+          as Uri);
 
   @override
-  _i5.Future<Map<String, dynamic>> fetch(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetch,
-          [uri],
-        ),
-        returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
-
-  @override
-  _i5.Future<List<dynamic>> fetchPaginated(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchPaginated,
-          [uri],
-        ),
-        returnValue: _i5.Future<List<dynamic>>.value(<dynamic>[]),
-      ) as _i5.Future<List<dynamic>>);
-
-  @override
-  _i5.Future<Map<String, dynamic>> post(
-    Map<String, dynamic>? data,
-    Uri? uri,
-  ) =>
+  _i5.Future<dynamic> fetch(Uri? uri) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #post,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            Invocation.method(#fetch, [uri]),
+            returnValue: _i5.Future<dynamic>.value(),
+          )
+          as _i5.Future<dynamic>);
 
   @override
-  _i5.Future<Map<String, dynamic>> patch(
-    Map<String, dynamic>? data,
-    Uri? uri,
-  ) =>
+  _i5.Future<List<dynamic>> fetchPaginated(Uri? uri) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #patch,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            Invocation.method(#fetchPaginated, [uri]),
+            returnValue: _i5.Future<List<dynamic>>.value(<dynamic>[]),
+          )
+          as _i5.Future<List<dynamic>>);
 
   @override
-  _i5.Future<_i3.Response> deleteRequest(
-    String? url,
-    int? id,
-  ) =>
+  _i5.Future<Map<String, dynamic>> post(Map<String, dynamic>? data, Uri? uri) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteRequest,
-          [
-            url,
-            id,
-          ],
-        ),
-        returnValue: _i5.Future<_i3.Response>.value(_FakeResponse_3(
-          this,
-          Invocation.method(
-            #deleteRequest,
-            [
-              url,
-              id,
-            ],
-          ),
-        )),
-      ) as _i5.Future<_i3.Response>);
+            Invocation.method(#post, [data, uri]),
+            returnValue: _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+          )
+          as _i5.Future<Map<String, dynamic>>);
+
+  @override
+  _i5.Future<Map<String, dynamic>> patch(Map<String, dynamic>? data, Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#patch, [data, uri]),
+            returnValue: _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+          )
+          as _i5.Future<Map<String, dynamic>>);
+
+  @override
+  _i5.Future<_i3.Response> deleteRequest(String? url, int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteRequest, [url, id]),
+            returnValue: _i5.Future<_i3.Response>.value(
+              _FakeResponse_3(this, Invocation.method(#deleteRequest, [url, id])),
+            ),
+          )
+          as _i5.Future<_i3.Response>);
 }
 
 /// A class which mocks [AuthProvider].
@@ -253,276 +162,191 @@ class MockAuthProvider extends _i1.Mock implements _i2.AuthProvider {
   }
 
   @override
-  set token(String? _token) => super.noSuchMethod(
-        Invocation.setter(
-          #token,
-          _token,
-        ),
-        returnValueForMissingStub: null,
-      );
+  Map<String, String> get metadata =>
+      (super.noSuchMethod(Invocation.getter(#metadata), returnValue: <String, String>{})
+          as Map<String, String>);
 
   @override
-  set serverUrl(String? _serverUrl) => super.noSuchMethod(
-        Invocation.setter(
-          #serverUrl,
-          _serverUrl,
-        ),
-        returnValueForMissingStub: null,
-      );
+  _i2.AuthState get state =>
+      (super.noSuchMethod(Invocation.getter(#state), returnValue: _i2.AuthState.updateRequired)
+          as _i2.AuthState);
 
   @override
-  set serverVersion(String? _serverVersion) => super.noSuchMethod(
-        Invocation.setter(
-          #serverVersion,
-          _serverVersion,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  set applicationVersion(_i6.PackageInfo? _applicationVersion) =>
-      super.noSuchMethod(
-        Invocation.setter(
-          #applicationVersion,
-          _applicationVersion,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  Map<String, String> get metadata => (super.noSuchMethod(
-        Invocation.getter(#metadata),
-        returnValue: <String, String>{},
-      ) as Map<String, String>);
-
-  @override
-  set metadata(Map<String, String>? _metadata) => super.noSuchMethod(
-        Invocation.setter(
-          #metadata,
-          _metadata,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  _i3.Client get client => (super.noSuchMethod(
-        Invocation.getter(#client),
-        returnValue: _FakeClient_1(
-          this,
-          Invocation.getter(#client),
-        ),
-      ) as _i3.Client);
-
-  @override
-  set client(_i3.Client? _client) => super.noSuchMethod(
-        Invocation.setter(
-          #client,
-          _client,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  bool get dataInit => (super.noSuchMethod(
-        Invocation.getter(#dataInit),
-        returnValue: false,
-      ) as bool);
-
-  @override
-  set dataInit(bool? _dataInit) => super.noSuchMethod(
-        Invocation.setter(
-          #dataInit,
-          _dataInit,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  bool get isAuth => (super.noSuchMethod(
-        Invocation.getter(#isAuth),
-        returnValue: false,
-      ) as bool);
-
-  @override
-  bool get hasListeners => (super.noSuchMethod(
-        Invocation.getter(#hasListeners),
-        returnValue: false,
-      ) as bool);
-
-  @override
-  _i5.Future<void> setServerVersion() => (super.noSuchMethod(
-        Invocation.method(
-          #setServerVersion,
-          [],
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
-
-  @override
-  _i5.Future<void> setApplicationVersion() => (super.noSuchMethod(
-        Invocation.method(
-          #setApplicationVersion,
-          [],
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
-
-  @override
-  _i5.Future<void> initVersions(String? serverUrl) => (super.noSuchMethod(
-        Invocation.method(
-          #initVersions,
-          [serverUrl],
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
-
-  @override
-  _i5.Future<bool> applicationUpdateRequired([
-    String? version,
-    Map<String, String>? metadata,
-  ]) =>
+  _i3.Client get client =>
       (super.noSuchMethod(
-        Invocation.method(
-          #applicationUpdateRequired,
-          [
-            version,
-            metadata,
-          ],
-        ),
-        returnValue: _i5.Future<bool>.value(false),
-      ) as _i5.Future<bool>);
+            Invocation.getter(#client),
+            returnValue: _FakeClient_1(this, Invocation.getter(#client)),
+          )
+          as _i3.Client);
 
   @override
-  _i5.Future<Map<String, _i2.LoginActions>> register({
+  bool get dataInit =>
+      (super.noSuchMethod(Invocation.getter(#dataInit), returnValue: false) as bool);
+
+  @override
+  bool get isAuth => (super.noSuchMethod(Invocation.getter(#isAuth), returnValue: false) as bool);
+
+  @override
+  set token(String? value) =>
+      super.noSuchMethod(Invocation.setter(#token, value), returnValueForMissingStub: null);
+
+  @override
+  set serverUrl(String? value) =>
+      super.noSuchMethod(Invocation.setter(#serverUrl, value), returnValueForMissingStub: null);
+
+  @override
+  set serverVersion(String? value) =>
+      super.noSuchMethod(Invocation.setter(#serverVersion, value), returnValueForMissingStub: null);
+
+  @override
+  set applicationVersion(_i6.PackageInfo? value) => super.noSuchMethod(
+    Invocation.setter(#applicationVersion, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set metadata(Map<String, String>? value) =>
+      super.noSuchMethod(Invocation.setter(#metadata, value), returnValueForMissingStub: null);
+
+  @override
+  set state(_i2.AuthState? value) =>
+      super.noSuchMethod(Invocation.setter(#state, value), returnValueForMissingStub: null);
+
+  @override
+  set client(_i3.Client? value) =>
+      super.noSuchMethod(Invocation.setter(#client, value), returnValueForMissingStub: null);
+
+  @override
+  set dataInit(bool? value) =>
+      super.noSuchMethod(Invocation.setter(#dataInit, value), returnValueForMissingStub: null);
+
+  @override
+  bool get hasListeners =>
+      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
+
+  @override
+  _i5.Future<void> setServerVersion() =>
+      (super.noSuchMethod(
+            Invocation.method(#setServerVersion, []),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+
+  @override
+  _i5.Future<void> setApplicationVersion() =>
+      (super.noSuchMethod(
+            Invocation.method(#setApplicationVersion, []),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+
+  @override
+  _i5.Future<void> initVersions(String? serverUrl) =>
+      (super.noSuchMethod(
+            Invocation.method(#initVersions, [serverUrl]),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+
+  @override
+  _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<_i2.LoginActions> register({
     required String? username,
     required String? password,
     required String? email,
     required String? serverUrl,
-    String? locale = r'en',
+    String? locale = 'en',
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #register,
-          [],
-          {
-            #username: username,
-            #password: password,
-            #email: email,
-            #serverUrl: serverUrl,
-            #locale: locale,
-          },
-        ),
-        returnValue: _i5.Future<Map<String, _i2.LoginActions>>.value(
-            <String, _i2.LoginActions>{}),
-      ) as _i5.Future<Map<String, _i2.LoginActions>>);
+            Invocation.method(#register, [], {
+              #username: username,
+              #password: password,
+              #email: email,
+              #serverUrl: serverUrl,
+              #locale: locale,
+            }),
+            returnValue: _i5.Future<_i2.LoginActions>.value(_i2.LoginActions.update),
+          )
+          as _i5.Future<_i2.LoginActions>);
 
   @override
-  _i5.Future<Map<String, _i2.LoginActions>> login(
+  _i5.Future<_i2.LoginActions> login(
     String? username,
     String? password,
     String? serverUrl,
+    String? apiToken,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #login,
-          [
-            username,
-            password,
-            serverUrl,
-          ],
-        ),
-        returnValue: _i5.Future<Map<String, _i2.LoginActions>>.value(
-            <String, _i2.LoginActions>{}),
-      ) as _i5.Future<Map<String, _i2.LoginActions>>);
+            Invocation.method(#login, [username, password, serverUrl, apiToken]),
+            returnValue: _i5.Future<_i2.LoginActions>.value(_i2.LoginActions.update),
+          )
+          as _i5.Future<_i2.LoginActions>);
 
   @override
-  _i5.Future<String> getServerUrlFromPrefs() => (super.noSuchMethod(
-        Invocation.method(
-          #getServerUrlFromPrefs,
-          [],
-        ),
-        returnValue: _i5.Future<String>.value(_i7.dummyValue<String>(
-          this,
-          Invocation.method(
-            #getServerUrlFromPrefs,
-            [],
-          ),
-        )),
-      ) as _i5.Future<String>);
+  _i5.Future<String> getServerUrlFromPrefs() =>
+      (super.noSuchMethod(
+            Invocation.method(#getServerUrlFromPrefs, []),
+            returnValue: _i5.Future<String>.value(
+              _i7.dummyValue<String>(this, Invocation.method(#getServerUrlFromPrefs, [])),
+            ),
+          )
+          as _i5.Future<String>);
 
   @override
-  _i5.Future<bool> tryAutoLogin() => (super.noSuchMethod(
-        Invocation.method(
-          #tryAutoLogin,
-          [],
-        ),
-        returnValue: _i5.Future<bool>.value(false),
-      ) as _i5.Future<bool>);
+  _i5.Future<void> tryAutoLogin() =>
+      (super.noSuchMethod(
+            Invocation.method(#tryAutoLogin, []),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
 
   @override
-  _i5.Future<void> logout({bool? shouldNotify = true}) => (super.noSuchMethod(
-        Invocation.method(
-          #logout,
-          [],
-          {#shouldNotify: shouldNotify},
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+  _i5.Future<void> logout({bool? shouldNotify = true}) =>
+      (super.noSuchMethod(
+            Invocation.method(#logout, [], {#shouldNotify: shouldNotify}),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
 
   @override
-  String getAppNameHeader() => (super.noSuchMethod(
-        Invocation.method(
-          #getAppNameHeader,
-          [],
-        ),
-        returnValue: _i7.dummyValue<String>(
-          this,
-          Invocation.method(
-            #getAppNameHeader,
-            [],
-          ),
-        ),
-      ) as String);
+  String getAppNameHeader() =>
+      (super.noSuchMethod(
+            Invocation.method(#getAppNameHeader, []),
+            returnValue: _i7.dummyValue<String>(this, Invocation.method(#getAppNameHeader, [])),
+          )
+          as String);
 
   @override
   void addListener(_i8.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void removeListener(_i8.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(#removeListener, [listener]),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void dispose() =>
+      super.noSuchMethod(Invocation.method(#dispose, []), returnValueForMissingStub: null);
 
   @override
-  void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void notifyListeners() =>
+      super.noSuchMethod(Invocation.method(#notifyListeners, []), returnValueForMissingStub: null);
 }
 
 /// A class which mocks [Client].
@@ -534,46 +358,24 @@ class MockClient extends _i1.Mock implements _i3.Client {
   }
 
   @override
-  _i5.Future<_i3.Response> head(
-    Uri? url, {
-    Map<String, String>? headers,
-  }) =>
+  _i5.Future<_i3.Response> head(Uri? url, {Map<String, String>? headers}) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #head,
-          [url],
-          {#headers: headers},
-        ),
-        returnValue: _i5.Future<_i3.Response>.value(_FakeResponse_3(
-          this,
-          Invocation.method(
-            #head,
-            [url],
-            {#headers: headers},
-          ),
-        )),
-      ) as _i5.Future<_i3.Response>);
+            Invocation.method(#head, [url], {#headers: headers}),
+            returnValue: _i5.Future<_i3.Response>.value(
+              _FakeResponse_3(this, Invocation.method(#head, [url], {#headers: headers})),
+            ),
+          )
+          as _i5.Future<_i3.Response>);
 
   @override
-  _i5.Future<_i3.Response> get(
-    Uri? url, {
-    Map<String, String>? headers,
-  }) =>
+  _i5.Future<_i3.Response> get(Uri? url, {Map<String, String>? headers}) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #get,
-          [url],
-          {#headers: headers},
-        ),
-        returnValue: _i5.Future<_i3.Response>.value(_FakeResponse_3(
-          this,
-          Invocation.method(
-            #get,
-            [url],
-            {#headers: headers},
-          ),
-        )),
-      ) as _i5.Future<_i3.Response>);
+            Invocation.method(#get, [url], {#headers: headers}),
+            returnValue: _i5.Future<_i3.Response>.value(
+              _FakeResponse_3(this, Invocation.method(#get, [url], {#headers: headers})),
+            ),
+          )
+          as _i5.Future<_i3.Response>);
 
   @override
   _i5.Future<_i3.Response> post(
@@ -583,28 +385,19 @@ class MockClient extends _i1.Mock implements _i3.Client {
     _i9.Encoding? encoding,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #post,
-          [url],
-          {
-            #headers: headers,
-            #body: body,
-            #encoding: encoding,
-          },
-        ),
-        returnValue: _i5.Future<_i3.Response>.value(_FakeResponse_3(
-          this,
-          Invocation.method(
-            #post,
-            [url],
-            {
-              #headers: headers,
-              #body: body,
-              #encoding: encoding,
-            },
-          ),
-        )),
-      ) as _i5.Future<_i3.Response>);
+            Invocation.method(#post, [url], {#headers: headers, #body: body, #encoding: encoding}),
+            returnValue: _i5.Future<_i3.Response>.value(
+              _FakeResponse_3(
+                this,
+                Invocation.method(
+                  #post,
+                  [url],
+                  {#headers: headers, #body: body, #encoding: encoding},
+                ),
+              ),
+            ),
+          )
+          as _i5.Future<_i3.Response>);
 
   @override
   _i5.Future<_i3.Response> put(
@@ -614,28 +407,19 @@ class MockClient extends _i1.Mock implements _i3.Client {
     _i9.Encoding? encoding,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #put,
-          [url],
-          {
-            #headers: headers,
-            #body: body,
-            #encoding: encoding,
-          },
-        ),
-        returnValue: _i5.Future<_i3.Response>.value(_FakeResponse_3(
-          this,
-          Invocation.method(
-            #put,
-            [url],
-            {
-              #headers: headers,
-              #body: body,
-              #encoding: encoding,
-            },
-          ),
-        )),
-      ) as _i5.Future<_i3.Response>);
+            Invocation.method(#put, [url], {#headers: headers, #body: body, #encoding: encoding}),
+            returnValue: _i5.Future<_i3.Response>.value(
+              _FakeResponse_3(
+                this,
+                Invocation.method(
+                  #put,
+                  [url],
+                  {#headers: headers, #body: body, #encoding: encoding},
+                ),
+              ),
+            ),
+          )
+          as _i5.Future<_i3.Response>);
 
   @override
   _i5.Future<_i3.Response> patch(
@@ -645,28 +429,19 @@ class MockClient extends _i1.Mock implements _i3.Client {
     _i9.Encoding? encoding,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #patch,
-          [url],
-          {
-            #headers: headers,
-            #body: body,
-            #encoding: encoding,
-          },
-        ),
-        returnValue: _i5.Future<_i3.Response>.value(_FakeResponse_3(
-          this,
-          Invocation.method(
-            #patch,
-            [url],
-            {
-              #headers: headers,
-              #body: body,
-              #encoding: encoding,
-            },
-          ),
-        )),
-      ) as _i5.Future<_i3.Response>);
+            Invocation.method(#patch, [url], {#headers: headers, #body: body, #encoding: encoding}),
+            returnValue: _i5.Future<_i3.Response>.value(
+              _FakeResponse_3(
+                this,
+                Invocation.method(
+                  #patch,
+                  [url],
+                  {#headers: headers, #body: body, #encoding: encoding},
+                ),
+              ),
+            ),
+          )
+          as _i5.Future<_i3.Response>);
 
   @override
   _i5.Future<_i3.Response> delete(
@@ -676,87 +451,53 @@ class MockClient extends _i1.Mock implements _i3.Client {
     _i9.Encoding? encoding,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #delete,
-          [url],
-          {
-            #headers: headers,
-            #body: body,
-            #encoding: encoding,
-          },
-        ),
-        returnValue: _i5.Future<_i3.Response>.value(_FakeResponse_3(
-          this,
-          Invocation.method(
-            #delete,
-            [url],
-            {
-              #headers: headers,
-              #body: body,
-              #encoding: encoding,
-            },
-          ),
-        )),
-      ) as _i5.Future<_i3.Response>);
+            Invocation.method(
+              #delete,
+              [url],
+              {#headers: headers, #body: body, #encoding: encoding},
+            ),
+            returnValue: _i5.Future<_i3.Response>.value(
+              _FakeResponse_3(
+                this,
+                Invocation.method(
+                  #delete,
+                  [url],
+                  {#headers: headers, #body: body, #encoding: encoding},
+                ),
+              ),
+            ),
+          )
+          as _i5.Future<_i3.Response>);
 
   @override
-  _i5.Future<String> read(
-    Uri? url, {
-    Map<String, String>? headers,
-  }) =>
+  _i5.Future<String> read(Uri? url, {Map<String, String>? headers}) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #read,
-          [url],
-          {#headers: headers},
-        ),
-        returnValue: _i5.Future<String>.value(_i7.dummyValue<String>(
-          this,
-          Invocation.method(
-            #read,
-            [url],
-            {#headers: headers},
-          ),
-        )),
-      ) as _i5.Future<String>);
+            Invocation.method(#read, [url], {#headers: headers}),
+            returnValue: _i5.Future<String>.value(
+              _i7.dummyValue<String>(this, Invocation.method(#read, [url], {#headers: headers})),
+            ),
+          )
+          as _i5.Future<String>);
 
   @override
-  _i5.Future<_i10.Uint8List> readBytes(
-    Uri? url, {
-    Map<String, String>? headers,
-  }) =>
+  _i5.Future<_i10.Uint8List> readBytes(Uri? url, {Map<String, String>? headers}) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #readBytes,
-          [url],
-          {#headers: headers},
-        ),
-        returnValue: _i5.Future<_i10.Uint8List>.value(_i10.Uint8List(0)),
-      ) as _i5.Future<_i10.Uint8List>);
+            Invocation.method(#readBytes, [url], {#headers: headers}),
+            returnValue: _i5.Future<_i10.Uint8List>.value(_i10.Uint8List(0)),
+          )
+          as _i5.Future<_i10.Uint8List>);
 
   @override
   _i5.Future<_i3.StreamedResponse> send(_i3.BaseRequest? request) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #send,
-          [request],
-        ),
-        returnValue:
-            _i5.Future<_i3.StreamedResponse>.value(_FakeStreamedResponse_4(
-          this,
-          Invocation.method(
-            #send,
-            [request],
-          ),
-        )),
-      ) as _i5.Future<_i3.StreamedResponse>);
+            Invocation.method(#send, [request]),
+            returnValue: _i5.Future<_i3.StreamedResponse>.value(
+              _FakeStreamedResponse_4(this, Invocation.method(#send, [request])),
+            ),
+          )
+          as _i5.Future<_i3.StreamedResponse>);
 
   @override
-  void close() => super.noSuchMethod(
-        Invocation.method(
-          #close,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void close() =>
+      super.noSuchMethod(Invocation.method(#close, []), returnValueForMissingStub: null);
 }
diff --git a/test/nutrition/nutritional_plans_screen_test.dart b/test/nutrition/nutritional_plans_screen_test.dart
index 8a3ee4e2..3161ebd0 100644
--- a/test/nutrition/nutritional_plans_screen_test.dart
+++ b/test/nutrition/nutritional_plans_screen_test.dart
@@ -26,9 +26,12 @@ import 'package:provider/provider.dart';
 import 'package:wger/database/ingredients/ingredients_database.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/models/nutrition/nutritional_plan.dart';
+import 'package:wger/models/user/profile.dart';
 import 'package:wger/providers/auth.dart';
 import 'package:wger/providers/base_provider.dart';
+import 'package:wger/providers/body_weight.dart';
 import 'package:wger/providers/nutrition.dart';
+import 'package:wger/providers/user.dart';
 import 'package:wger/screens/form_screen.dart';
 import 'package:wger/screens/nutritional_plans_screen.dart';
 import 'package:wger/widgets/nutrition/forms.dart';
@@ -55,25 +58,53 @@ void main() {
       client.delete(any, headers: anyNamed('headers')),
     ).thenAnswer((_) async => http.Response('', 200));
 
-    when(mockBaseProvider.deleteRequest(any, any)).thenAnswer((_) async => http.Response('', 200));
+    when(mockBaseProvider.deleteRequest(any, any)).thenAnswer(
+      (_) async => http.Response('', 200),
+    );
 
     when(mockAuthProvider.token).thenReturn('1234');
     when(mockAuthProvider.serverUrl).thenReturn('http://localhost');
     when(mockAuthProvider.getAppNameHeader()).thenReturn('wger app');
 
-    return ChangeNotifierProvider<NutritionPlansProvider>(
-      create: (context) => NutritionPlansProvider(mockBaseProvider, [
-        NutritionalPlan(
-          id: 'deadbeefa',
-          description: 'test plan 1',
-          creationDate: DateTime(2021, 01, 01),
+    return MultiProvider(
+      providers: [
+        ChangeNotifierProvider<NutritionPlansProvider>(
+          create: (context) => NutritionPlansProvider(
+            mockBaseProvider,
+            [
+              NutritionalPlan(
+                id: 1,
+                description: 'test plan 1',
+                creationDate: DateTime(2021, 01, 01),
+                startDate: DateTime(2021, 01, 01),
+              ),
+              NutritionalPlan(
+                id: 2,
+                description: 'test plan 2',
+                creationDate: DateTime(2021, 01, 10),
+                startDate: DateTime(2021, 01, 10),
+              ),
+            ],
+            database: database,
+          ),
         ),
-        NutritionalPlan(
-          id: 'deadbeefb',
-          description: 'test plan 2',
-          creationDate: DateTime(2021, 01, 10),
+        ChangeNotifierProvider<BodyWeightProvider>(
+          create: (context) => BodyWeightProvider(mockBaseProvider),
         ),
-      ], database: database),
+        ChangeNotifierProvider<UserProvider>(
+          create: (context) =>
+              UserProvider(
+                  mockBaseProvider,
+                )
+                ..profile = Profile(
+                  username: 'test',
+                  emailVerified: true,
+                  isTrustworthy: true,
+                  email: 'test@example.com',
+                  weightUnitStr: 'kg',
+                ),
+        ),
+      ],
       child: MaterialApp(
         locale: Locale(locale),
         localizationsDelegates: AppLocalizations.localizationsDelegates,
@@ -121,14 +152,16 @@ void main() {
   testWidgets('Tests the localization of dates - EN', (WidgetTester tester) async {
     await tester.pumpWidget(createHomeScreen());
 
-    expect(find.text('1/1/2021'), findsOneWidget);
-    expect(find.text('1/10/2021'), findsOneWidget);
+    // note .. "(open ended)" at the time, depending on localisation strings
+    expect(find.textContaining('from 1/1/2021 ('), findsOneWidget);
+    expect(find.textContaining('from 1/10/2021 ('), findsOneWidget);
   });
 
   testWidgets('Tests the localization of dates - DE', (WidgetTester tester) async {
     await tester.pumpWidget(createHomeScreen(locale: 'de'));
+    // note .. "(open ended)" at the time, depending on localisation strings
 
-    expect(find.text('1.1.2021'), findsOneWidget);
-    expect(find.text('10.1.2021'), findsOneWidget);
+    expect(find.textContaining('from 1.1.2021 ('), findsOneWidget);
+    expect(find.textContaining('from 10.1.2021 ('), findsOneWidget);
   });
 }
diff --git a/test/nutrition/nutritional_plans_screen_test.mocks.dart b/test/nutrition/nutritional_plans_screen_test.mocks.dart
index aa705cfb..5c63832f 100644
--- a/test/nutrition/nutritional_plans_screen_test.mocks.dart
+++ b/test/nutrition/nutritional_plans_screen_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.4.4 from annotations
+// Mocks generated by Mockito 5.4.6 from annotations
 // in wger/test/nutrition/nutritional_plans_screen_test.dart.
 // Do not manually edit this file.
 
@@ -23,60 +23,32 @@ import 'package:wger/providers/base_provider.dart' as _i8;
 // ignore_for_file: deprecated_member_use_from_same_package
 // ignore_for_file: implementation_imports
 // ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
 // ignore_for_file: camel_case_types
 // ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
 
 class _FakeClient_0 extends _i1.SmartFake implements _i2.Client {
-  _FakeClient_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeClient_0(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeAuthProvider_1 extends _i1.SmartFake implements _i3.AuthProvider {
-  _FakeAuthProvider_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeAuthProvider_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeUri_2 extends _i1.SmartFake implements Uri {
-  _FakeUri_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeUri_2(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeResponse_3 extends _i1.SmartFake implements _i2.Response {
-  _FakeResponse_3(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeResponse_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
-class _FakeStreamedResponse_4 extends _i1.SmartFake
-    implements _i2.StreamedResponse {
-  _FakeStreamedResponse_4(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+class _FakeStreamedResponse_4 extends _i1.SmartFake implements _i2.StreamedResponse {
+  _FakeStreamedResponse_4(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 /// A class which mocks [AuthProvider].
@@ -88,276 +60,191 @@ class MockAuthProvider extends _i1.Mock implements _i3.AuthProvider {
   }
 
   @override
-  set token(String? _token) => super.noSuchMethod(
-        Invocation.setter(
-          #token,
-          _token,
-        ),
-        returnValueForMissingStub: null,
-      );
+  Map<String, String> get metadata =>
+      (super.noSuchMethod(Invocation.getter(#metadata), returnValue: <String, String>{})
+          as Map<String, String>);
 
   @override
-  set serverUrl(String? _serverUrl) => super.noSuchMethod(
-        Invocation.setter(
-          #serverUrl,
-          _serverUrl,
-        ),
-        returnValueForMissingStub: null,
-      );
+  _i3.AuthState get state =>
+      (super.noSuchMethod(Invocation.getter(#state), returnValue: _i3.AuthState.updateRequired)
+          as _i3.AuthState);
 
   @override
-  set serverVersion(String? _serverVersion) => super.noSuchMethod(
-        Invocation.setter(
-          #serverVersion,
-          _serverVersion,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  set applicationVersion(_i4.PackageInfo? _applicationVersion) =>
-      super.noSuchMethod(
-        Invocation.setter(
-          #applicationVersion,
-          _applicationVersion,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  Map<String, String> get metadata => (super.noSuchMethod(
-        Invocation.getter(#metadata),
-        returnValue: <String, String>{},
-      ) as Map<String, String>);
-
-  @override
-  set metadata(Map<String, String>? _metadata) => super.noSuchMethod(
-        Invocation.setter(
-          #metadata,
-          _metadata,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  _i2.Client get client => (super.noSuchMethod(
-        Invocation.getter(#client),
-        returnValue: _FakeClient_0(
-          this,
-          Invocation.getter(#client),
-        ),
-      ) as _i2.Client);
-
-  @override
-  set client(_i2.Client? _client) => super.noSuchMethod(
-        Invocation.setter(
-          #client,
-          _client,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  bool get dataInit => (super.noSuchMethod(
-        Invocation.getter(#dataInit),
-        returnValue: false,
-      ) as bool);
-
-  @override
-  set dataInit(bool? _dataInit) => super.noSuchMethod(
-        Invocation.setter(
-          #dataInit,
-          _dataInit,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  bool get isAuth => (super.noSuchMethod(
-        Invocation.getter(#isAuth),
-        returnValue: false,
-      ) as bool);
-
-  @override
-  bool get hasListeners => (super.noSuchMethod(
-        Invocation.getter(#hasListeners),
-        returnValue: false,
-      ) as bool);
-
-  @override
-  _i5.Future<void> setServerVersion() => (super.noSuchMethod(
-        Invocation.method(
-          #setServerVersion,
-          [],
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
-
-  @override
-  _i5.Future<void> setApplicationVersion() => (super.noSuchMethod(
-        Invocation.method(
-          #setApplicationVersion,
-          [],
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
-
-  @override
-  _i5.Future<void> initVersions(String? serverUrl) => (super.noSuchMethod(
-        Invocation.method(
-          #initVersions,
-          [serverUrl],
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
-
-  @override
-  _i5.Future<bool> applicationUpdateRequired([
-    String? version,
-    Map<String, String>? metadata,
-  ]) =>
+  _i2.Client get client =>
       (super.noSuchMethod(
-        Invocation.method(
-          #applicationUpdateRequired,
-          [
-            version,
-            metadata,
-          ],
-        ),
-        returnValue: _i5.Future<bool>.value(false),
-      ) as _i5.Future<bool>);
+            Invocation.getter(#client),
+            returnValue: _FakeClient_0(this, Invocation.getter(#client)),
+          )
+          as _i2.Client);
 
   @override
-  _i5.Future<Map<String, _i3.LoginActions>> register({
+  bool get dataInit =>
+      (super.noSuchMethod(Invocation.getter(#dataInit), returnValue: false) as bool);
+
+  @override
+  bool get isAuth => (super.noSuchMethod(Invocation.getter(#isAuth), returnValue: false) as bool);
+
+  @override
+  set token(String? value) =>
+      super.noSuchMethod(Invocation.setter(#token, value), returnValueForMissingStub: null);
+
+  @override
+  set serverUrl(String? value) =>
+      super.noSuchMethod(Invocation.setter(#serverUrl, value), returnValueForMissingStub: null);
+
+  @override
+  set serverVersion(String? value) =>
+      super.noSuchMethod(Invocation.setter(#serverVersion, value), returnValueForMissingStub: null);
+
+  @override
+  set applicationVersion(_i4.PackageInfo? value) => super.noSuchMethod(
+    Invocation.setter(#applicationVersion, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set metadata(Map<String, String>? value) =>
+      super.noSuchMethod(Invocation.setter(#metadata, value), returnValueForMissingStub: null);
+
+  @override
+  set state(_i3.AuthState? value) =>
+      super.noSuchMethod(Invocation.setter(#state, value), returnValueForMissingStub: null);
+
+  @override
+  set client(_i2.Client? value) =>
+      super.noSuchMethod(Invocation.setter(#client, value), returnValueForMissingStub: null);
+
+  @override
+  set dataInit(bool? value) =>
+      super.noSuchMethod(Invocation.setter(#dataInit, value), returnValueForMissingStub: null);
+
+  @override
+  bool get hasListeners =>
+      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
+
+  @override
+  _i5.Future<void> setServerVersion() =>
+      (super.noSuchMethod(
+            Invocation.method(#setServerVersion, []),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+
+  @override
+  _i5.Future<void> setApplicationVersion() =>
+      (super.noSuchMethod(
+            Invocation.method(#setApplicationVersion, []),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+
+  @override
+  _i5.Future<void> initVersions(String? serverUrl) =>
+      (super.noSuchMethod(
+            Invocation.method(#initVersions, [serverUrl]),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+
+  @override
+  _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<_i3.LoginActions> register({
     required String? username,
     required String? password,
     required String? email,
     required String? serverUrl,
-    String? locale = r'en',
+    String? locale = 'en',
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #register,
-          [],
-          {
-            #username: username,
-            #password: password,
-            #email: email,
-            #serverUrl: serverUrl,
-            #locale: locale,
-          },
-        ),
-        returnValue: _i5.Future<Map<String, _i3.LoginActions>>.value(
-            <String, _i3.LoginActions>{}),
-      ) as _i5.Future<Map<String, _i3.LoginActions>>);
+            Invocation.method(#register, [], {
+              #username: username,
+              #password: password,
+              #email: email,
+              #serverUrl: serverUrl,
+              #locale: locale,
+            }),
+            returnValue: _i5.Future<_i3.LoginActions>.value(_i3.LoginActions.update),
+          )
+          as _i5.Future<_i3.LoginActions>);
 
   @override
-  _i5.Future<Map<String, _i3.LoginActions>> login(
+  _i5.Future<_i3.LoginActions> login(
     String? username,
     String? password,
     String? serverUrl,
+    String? apiToken,
   ) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #login,
-          [
-            username,
-            password,
-            serverUrl,
-          ],
-        ),
-        returnValue: _i5.Future<Map<String, _i3.LoginActions>>.value(
-            <String, _i3.LoginActions>{}),
-      ) as _i5.Future<Map<String, _i3.LoginActions>>);
+            Invocation.method(#login, [username, password, serverUrl, apiToken]),
+            returnValue: _i5.Future<_i3.LoginActions>.value(_i3.LoginActions.update),
+          )
+          as _i5.Future<_i3.LoginActions>);
 
   @override
-  _i5.Future<String> getServerUrlFromPrefs() => (super.noSuchMethod(
-        Invocation.method(
-          #getServerUrlFromPrefs,
-          [],
-        ),
-        returnValue: _i5.Future<String>.value(_i6.dummyValue<String>(
-          this,
-          Invocation.method(
-            #getServerUrlFromPrefs,
-            [],
-          ),
-        )),
-      ) as _i5.Future<String>);
+  _i5.Future<String> getServerUrlFromPrefs() =>
+      (super.noSuchMethod(
+            Invocation.method(#getServerUrlFromPrefs, []),
+            returnValue: _i5.Future<String>.value(
+              _i6.dummyValue<String>(this, Invocation.method(#getServerUrlFromPrefs, [])),
+            ),
+          )
+          as _i5.Future<String>);
 
   @override
-  _i5.Future<bool> tryAutoLogin() => (super.noSuchMethod(
-        Invocation.method(
-          #tryAutoLogin,
-          [],
-        ),
-        returnValue: _i5.Future<bool>.value(false),
-      ) as _i5.Future<bool>);
+  _i5.Future<void> tryAutoLogin() =>
+      (super.noSuchMethod(
+            Invocation.method(#tryAutoLogin, []),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
 
   @override
-  _i5.Future<void> logout({bool? shouldNotify = true}) => (super.noSuchMethod(
-        Invocation.method(
-          #logout,
-          [],
-          {#shouldNotify: shouldNotify},
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+  _i5.Future<void> logout({bool? shouldNotify = true}) =>
+      (super.noSuchMethod(
+            Invocation.method(#logout, [], {#shouldNotify: shouldNotify}),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
 
   @override
-  String getAppNameHeader() => (super.noSuchMethod(
-        Invocation.method(
-          #getAppNameHeader,
-          [],
-        ),
-        returnValue: _i6.dummyValue<String>(
-          this,
-          Invocation.method(
-            #getAppNameHeader,
-            [],
-          ),
-        ),
-      ) as String);
+  String getAppNameHeader() =>
+      (super.noSuchMethod(
+            Invocation.method(#getAppNameHeader, []),
+            returnValue: _i6.dummyValue<String>(this, Invocation.method(#getAppNameHeader, [])),
+          )
+          as String);
 
   @override
   void addListener(_i7.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
 
   @override
   void removeListener(_i7.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+    Invocation.method(#removeListener, [listener]),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void dispose() =>
+      super.noSuchMethod(Invocation.method(#dispose, []), returnValueForMissingStub: null);
 
   @override
-  void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void notifyListeners() =>
+      super.noSuchMethod(Invocation.method(#notifyListeners, []), returnValueForMissingStub: null);
 }
 
 /// A class which mocks [WgerBaseProvider].
@@ -369,160 +256,97 @@ class MockWgerBaseProvider extends _i1.Mock implements _i8.WgerBaseProvider {
   }
 
   @override
-  _i3.AuthProvider get auth => (super.noSuchMethod(
-        Invocation.getter(#auth),
-        returnValue: _FakeAuthProvider_1(
-          this,
-          Invocation.getter(#auth),
-        ),
-      ) as _i3.AuthProvider);
+  _i3.AuthProvider get auth =>
+      (super.noSuchMethod(
+            Invocation.getter(#auth),
+            returnValue: _FakeAuthProvider_1(this, Invocation.getter(#auth)),
+          )
+          as _i3.AuthProvider);
 
   @override
-  set auth(_i3.AuthProvider? _auth) => super.noSuchMethod(
-        Invocation.setter(
-          #auth,
-          _auth,
-        ),
-        returnValueForMissingStub: null,
-      );
+  _i2.Client get client =>
+      (super.noSuchMethod(
+            Invocation.getter(#client),
+            returnValue: _FakeClient_0(this, Invocation.getter(#client)),
+          )
+          as _i2.Client);
 
   @override
-  _i2.Client get client => (super.noSuchMethod(
-        Invocation.getter(#client),
-        returnValue: _FakeClient_0(
-          this,
-          Invocation.getter(#client),
-        ),
-      ) as _i2.Client);
+  set auth(_i3.AuthProvider? value) =>
+      super.noSuchMethod(Invocation.setter(#auth, value), returnValueForMissingStub: null);
 
   @override
-  set client(_i2.Client? _client) => super.noSuchMethod(
-        Invocation.setter(
-          #client,
-          _client,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set client(_i2.Client? value) =>
+      super.noSuchMethod(Invocation.setter(#client, value), returnValueForMissingStub: null);
 
   @override
   Map<String, String> getDefaultHeaders({bool? includeAuth = false}) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #getDefaultHeaders,
-          [],
-          {#includeAuth: includeAuth},
-        ),
-        returnValue: <String, String>{},
-      ) as Map<String, String>);
+            Invocation.method(#getDefaultHeaders, [], {#includeAuth: includeAuth}),
+            returnValue: <String, String>{},
+          )
+          as Map<String, String>);
 
   @override
-  Uri makeUrl(
-    String? path, {
-    int? id,
-    String? objectMethod,
-    Map<String, dynamic>? query,
-  }) =>
+  Uri makeUrl(String? path, {int? id, String? objectMethod, Map<String, dynamic>? query}) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #makeUrl,
-          [path],
-          {
-            #id: id,
-            #objectMethod: objectMethod,
-            #query: query,
-          },
-        ),
-        returnValue: _FakeUri_2(
-          this,
-          Invocation.method(
-            #makeUrl,
-            [path],
-            {
-              #id: id,
-              #objectMethod: objectMethod,
-              #query: query,
-            },
-          ),
-        ),
-      ) as Uri);
+            Invocation.method(
+              #makeUrl,
+              [path],
+              {#id: id, #objectMethod: objectMethod, #query: query},
+            ),
+            returnValue: _FakeUri_2(
+              this,
+              Invocation.method(
+                #makeUrl,
+                [path],
+                {#id: id, #objectMethod: objectMethod, #query: query},
+              ),
+            ),
+          )
+          as Uri);
 
   @override
-  _i5.Future<Map<String, dynamic>> fetch(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetch,
-          [uri],
-        ),
-        returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
-
-  @override
-  _i5.Future<List<dynamic>> fetchPaginated(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchPaginated,
-          [uri],
-        ),
-        returnValue: _i5.Future<List<dynamic>>.value(<dynamic>[]),
-      ) as _i5.Future<List<dynamic>>);
-
-  @override
-  _i5.Future<Map<String, dynamic>> post(
-    Map<String, dynamic>? data,
-    Uri? uri,
-  ) =>
+  _i5.Future<dynamic> fetch(Uri? uri) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #post,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            Invocation.method(#fetch, [uri]),
+            returnValue: _i5.Future<dynamic>.value(),
+          )
+          as _i5.Future<dynamic>);
 
   @override
-  _i5.Future<Map<String, dynamic>> patch(
-    Map<String, dynamic>? data,
-    Uri? uri,
-  ) =>
+  _i5.Future<List<dynamic>> fetchPaginated(Uri? uri) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #patch,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            Invocation.method(#fetchPaginated, [uri]),
+            returnValue: _i5.Future<List<dynamic>>.value(<dynamic>[]),
+          )
+          as _i5.Future<List<dynamic>>);
 
   @override
-  _i5.Future<_i2.Response> deleteRequest(
-    String? url,
-    int? id,
-  ) =>
+  _i5.Future<Map<String, dynamic>> post(Map<String, dynamic>? data, Uri? uri) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteRequest,
-          [
-            url,
-            id,
-          ],
-        ),
-        returnValue: _i5.Future<_i2.Response>.value(_FakeResponse_3(
-          this,
-          Invocation.method(
-            #deleteRequest,
-            [
-              url,
-              id,
-            ],
-          ),
-        )),
-      ) as _i5.Future<_i2.Response>);
+            Invocation.method(#post, [data, uri]),
+            returnValue: _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+          )
+          as _i5.Future<Map<String, dynamic>>);
+
+  @override
+  _i5.Future<Map<String, dynamic>> patch(Map<String, dynamic>? data, Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#patch, [data, uri]),
+            returnValue: _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+          )
+          as _i5.Future<Map<String, dynamic>>);
+
+  @override
+  _i5.Future<_i2.Response> deleteRequest(String? url, int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteRequest, [url, id]),
+            returnValue: _i5.Future<_i2.Response>.value(
+              _FakeResponse_3(this, Invocation.method(#deleteRequest, [url, id])),
+            ),
+          )
+          as _i5.Future<_i2.Response>);
 }
 
 /// A class which mocks [Client].
@@ -534,46 +358,24 @@ class MockClient extends _i1.Mock implements _i2.Client {
   }
 
   @override
-  _i5.Future<_i2.Response> head(
-    Uri? url, {
-    Map<String, String>? headers,
-  }) =>
+  _i5.Future<_i2.Response> head(Uri? url, {Map<String, String>? headers}) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #head,
-          [url],
-          {#headers: headers},
-        ),
-        returnValue: _i5.Future<_i2.Response>.value(_FakeResponse_3(
-          this,
-          Invocation.method(
-            #head,
-            [url],
-            {#headers: headers},
-          ),
-        )),
-      ) as _i5.Future<_i2.Response>);
+            Invocation.method(#head, [url], {#headers: headers}),
+            returnValue: _i5.Future<_i2.Response>.value(
+              _FakeResponse_3(this, Invocation.method(#head, [url], {#headers: headers})),
+            ),
+          )
+          as _i5.Future<_i2.Response>);
 
   @override
-  _i5.Future<_i2.Response> get(
-    Uri? url, {
-    Map<String, String>? headers,
-  }) =>
+  _i5.Future<_i2.Response> get(Uri? url, {Map<String, String>? headers}) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #get,
-          [url],
-          {#headers: headers},
-        ),
-        returnValue: _i5.Future<_i2.Response>.value(_FakeResponse_3(
-          this,
-          Invocation.method(
-            #get,
-            [url],
-            {#headers: headers},
-          ),
-        )),
-      ) as _i5.Future<_i2.Response>);
+            Invocation.method(#get, [url], {#headers: headers}),
+            returnValue: _i5.Future<_i2.Response>.value(
+              _FakeResponse_3(this, Invocation.method(#get, [url], {#headers: headers})),
+            ),
+          )
+          as _i5.Future<_i2.Response>);
 
   @override
   _i5.Future<_i2.Response> post(
@@ -583,28 +385,19 @@ class MockClient extends _i1.Mock implements _i2.Client {
     _i9.Encoding? encoding,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #post,
-          [url],
-          {
-            #headers: headers,
-            #body: body,
-            #encoding: encoding,
-          },
-        ),
-        returnValue: _i5.Future<_i2.Response>.value(_FakeResponse_3(
-          this,
-          Invocation.method(
-            #post,
-            [url],
-            {
-              #headers: headers,
-              #body: body,
-              #encoding: encoding,
-            },
-          ),
-        )),
-      ) as _i5.Future<_i2.Response>);
+            Invocation.method(#post, [url], {#headers: headers, #body: body, #encoding: encoding}),
+            returnValue: _i5.Future<_i2.Response>.value(
+              _FakeResponse_3(
+                this,
+                Invocation.method(
+                  #post,
+                  [url],
+                  {#headers: headers, #body: body, #encoding: encoding},
+                ),
+              ),
+            ),
+          )
+          as _i5.Future<_i2.Response>);
 
   @override
   _i5.Future<_i2.Response> put(
@@ -614,28 +407,19 @@ class MockClient extends _i1.Mock implements _i2.Client {
     _i9.Encoding? encoding,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #put,
-          [url],
-          {
-            #headers: headers,
-            #body: body,
-            #encoding: encoding,
-          },
-        ),
-        returnValue: _i5.Future<_i2.Response>.value(_FakeResponse_3(
-          this,
-          Invocation.method(
-            #put,
-            [url],
-            {
-              #headers: headers,
-              #body: body,
-              #encoding: encoding,
-            },
-          ),
-        )),
-      ) as _i5.Future<_i2.Response>);
+            Invocation.method(#put, [url], {#headers: headers, #body: body, #encoding: encoding}),
+            returnValue: _i5.Future<_i2.Response>.value(
+              _FakeResponse_3(
+                this,
+                Invocation.method(
+                  #put,
+                  [url],
+                  {#headers: headers, #body: body, #encoding: encoding},
+                ),
+              ),
+            ),
+          )
+          as _i5.Future<_i2.Response>);
 
   @override
   _i5.Future<_i2.Response> patch(
@@ -645,28 +429,19 @@ class MockClient extends _i1.Mock implements _i2.Client {
     _i9.Encoding? encoding,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #patch,
-          [url],
-          {
-            #headers: headers,
-            #body: body,
-            #encoding: encoding,
-          },
-        ),
-        returnValue: _i5.Future<_i2.Response>.value(_FakeResponse_3(
-          this,
-          Invocation.method(
-            #patch,
-            [url],
-            {
-              #headers: headers,
-              #body: body,
-              #encoding: encoding,
-            },
-          ),
-        )),
-      ) as _i5.Future<_i2.Response>);
+            Invocation.method(#patch, [url], {#headers: headers, #body: body, #encoding: encoding}),
+            returnValue: _i5.Future<_i2.Response>.value(
+              _FakeResponse_3(
+                this,
+                Invocation.method(
+                  #patch,
+                  [url],
+                  {#headers: headers, #body: body, #encoding: encoding},
+                ),
+              ),
+            ),
+          )
+          as _i5.Future<_i2.Response>);
 
   @override
   _i5.Future<_i2.Response> delete(
@@ -676,87 +451,53 @@ class MockClient extends _i1.Mock implements _i2.Client {
     _i9.Encoding? encoding,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #delete,
-          [url],
-          {
-            #headers: headers,
-            #body: body,
-            #encoding: encoding,
-          },
-        ),
-        returnValue: _i5.Future<_i2.Response>.value(_FakeResponse_3(
-          this,
-          Invocation.method(
-            #delete,
-            [url],
-            {
-              #headers: headers,
-              #body: body,
-              #encoding: encoding,
-            },
-          ),
-        )),
-      ) as _i5.Future<_i2.Response>);
+            Invocation.method(
+              #delete,
+              [url],
+              {#headers: headers, #body: body, #encoding: encoding},
+            ),
+            returnValue: _i5.Future<_i2.Response>.value(
+              _FakeResponse_3(
+                this,
+                Invocation.method(
+                  #delete,
+                  [url],
+                  {#headers: headers, #body: body, #encoding: encoding},
+                ),
+              ),
+            ),
+          )
+          as _i5.Future<_i2.Response>);
 
   @override
-  _i5.Future<String> read(
-    Uri? url, {
-    Map<String, String>? headers,
-  }) =>
+  _i5.Future<String> read(Uri? url, {Map<String, String>? headers}) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #read,
-          [url],
-          {#headers: headers},
-        ),
-        returnValue: _i5.Future<String>.value(_i6.dummyValue<String>(
-          this,
-          Invocation.method(
-            #read,
-            [url],
-            {#headers: headers},
-          ),
-        )),
-      ) as _i5.Future<String>);
+            Invocation.method(#read, [url], {#headers: headers}),
+            returnValue: _i5.Future<String>.value(
+              _i6.dummyValue<String>(this, Invocation.method(#read, [url], {#headers: headers})),
+            ),
+          )
+          as _i5.Future<String>);
 
   @override
-  _i5.Future<_i10.Uint8List> readBytes(
-    Uri? url, {
-    Map<String, String>? headers,
-  }) =>
+  _i5.Future<_i10.Uint8List> readBytes(Uri? url, {Map<String, String>? headers}) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #readBytes,
-          [url],
-          {#headers: headers},
-        ),
-        returnValue: _i5.Future<_i10.Uint8List>.value(_i10.Uint8List(0)),
-      ) as _i5.Future<_i10.Uint8List>);
+            Invocation.method(#readBytes, [url], {#headers: headers}),
+            returnValue: _i5.Future<_i10.Uint8List>.value(_i10.Uint8List(0)),
+          )
+          as _i5.Future<_i10.Uint8List>);
 
   @override
   _i5.Future<_i2.StreamedResponse> send(_i2.BaseRequest? request) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #send,
-          [request],
-        ),
-        returnValue:
-            _i5.Future<_i2.StreamedResponse>.value(_FakeStreamedResponse_4(
-          this,
-          Invocation.method(
-            #send,
-            [request],
-          ),
-        )),
-      ) as _i5.Future<_i2.StreamedResponse>);
+            Invocation.method(#send, [request]),
+            returnValue: _i5.Future<_i2.StreamedResponse>.value(
+              _FakeStreamedResponse_4(this, Invocation.method(#send, [request])),
+            ),
+          )
+          as _i5.Future<_i2.StreamedResponse>);
 
   @override
-  void close() => super.noSuchMethod(
-        Invocation.method(
-          #close,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void close() =>
+      super.noSuchMethod(Invocation.method(#close, []), returnValueForMissingStub: null);
 }
diff --git a/test/other/base_provider_test.dart b/test/other/base_provider_test.dart
index 3f3376d2..154a0b51 100644
--- a/test/other/base_provider_test.dart
+++ b/test/other/base_provider_test.dart
@@ -124,12 +124,15 @@ void main() {
         query: 'limit=20&offset=40',
       );
 
-      when(mockHttpClient.get(paginationUri1, headers: anyNamed('headers')))
-          .thenAnswer((_) => Future.value(response1));
-      when(mockHttpClient.get(paginationUri2, headers: anyNamed('headers')))
-          .thenAnswer((_) => Future.value(response2));
-      when(mockHttpClient.get(paginationUri3, headers: anyNamed('headers')))
-          .thenAnswer((_) => Future.value(response3));
+      when(
+        mockHttpClient.get(paginationUri1, headers: anyNamed('headers')),
+      ).thenAnswer((_) => Future.value(response1));
+      when(
+        mockHttpClient.get(paginationUri2, headers: anyNamed('headers')),
+      ).thenAnswer((_) => Future.value(response2));
+      when(
+        mockHttpClient.get(paginationUri3, headers: anyNamed('headers')),
+      ).thenAnswer((_) => Future.value(response3));
 
       // Act
       final WgerBaseProvider provider = WgerBaseProvider(testAuthProvider, mockHttpClient);
diff --git a/test/other/base_provider_test.mocks.dart b/test/other/base_provider_test.mocks.dart
index fef5e102..fd0d9ae9 100644
--- a/test/other/base_provider_test.mocks.dart
+++ b/test/other/base_provider_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.4.4 from annotations
+// Mocks generated by Mockito 5.4.6 from annotations
 // in wger/test/other/base_provider_test.dart.
 // Do not manually edit this file.
 
@@ -19,30 +19,20 @@ import 'package:mockito/src/dummies.dart' as _i5;
 // ignore_for_file: deprecated_member_use_from_same_package
 // ignore_for_file: implementation_imports
 // ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
 // ignore_for_file: camel_case_types
 // ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
 
 class _FakeResponse_0 extends _i1.SmartFake implements _i2.Response {
-  _FakeResponse_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeResponse_0(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
-class _FakeStreamedResponse_1 extends _i1.SmartFake
-    implements _i2.StreamedResponse {
-  _FakeStreamedResponse_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+class _FakeStreamedResponse_1 extends _i1.SmartFake implements _i2.StreamedResponse {
+  _FakeStreamedResponse_1(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 /// A class which mocks [Client].
@@ -54,46 +44,24 @@ class MockClient extends _i1.Mock implements _i2.Client {
   }
 
   @override
-  _i3.Future<_i2.Response> head(
-    Uri? url, {
-    Map<String, String>? headers,
-  }) =>
+  _i3.Future<_i2.Response> head(Uri? url, {Map<String, String>? headers}) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #head,
-          [url],
-          {#headers: headers},
-        ),
-        returnValue: _i3.Future<_i2.Response>.value(_FakeResponse_0(
-          this,
-          Invocation.method(
-            #head,
-            [url],
-            {#headers: headers},
-          ),
-        )),
-      ) as _i3.Future<_i2.Response>);
+            Invocation.method(#head, [url], {#headers: headers}),
+            returnValue: _i3.Future<_i2.Response>.value(
+              _FakeResponse_0(this, Invocation.method(#head, [url], {#headers: headers})),
+            ),
+          )
+          as _i3.Future<_i2.Response>);
 
   @override
-  _i3.Future<_i2.Response> get(
-    Uri? url, {
-    Map<String, String>? headers,
-  }) =>
+  _i3.Future<_i2.Response> get(Uri? url, {Map<String, String>? headers}) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #get,
-          [url],
-          {#headers: headers},
-        ),
-        returnValue: _i3.Future<_i2.Response>.value(_FakeResponse_0(
-          this,
-          Invocation.method(
-            #get,
-            [url],
-            {#headers: headers},
-          ),
-        )),
-      ) as _i3.Future<_i2.Response>);
+            Invocation.method(#get, [url], {#headers: headers}),
+            returnValue: _i3.Future<_i2.Response>.value(
+              _FakeResponse_0(this, Invocation.method(#get, [url], {#headers: headers})),
+            ),
+          )
+          as _i3.Future<_i2.Response>);
 
   @override
   _i3.Future<_i2.Response> post(
@@ -103,28 +71,19 @@ class MockClient extends _i1.Mock implements _i2.Client {
     _i4.Encoding? encoding,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #post,
-          [url],
-          {
-            #headers: headers,
-            #body: body,
-            #encoding: encoding,
-          },
-        ),
-        returnValue: _i3.Future<_i2.Response>.value(_FakeResponse_0(
-          this,
-          Invocation.method(
-            #post,
-            [url],
-            {
-              #headers: headers,
-              #body: body,
-              #encoding: encoding,
-            },
-          ),
-        )),
-      ) as _i3.Future<_i2.Response>);
+            Invocation.method(#post, [url], {#headers: headers, #body: body, #encoding: encoding}),
+            returnValue: _i3.Future<_i2.Response>.value(
+              _FakeResponse_0(
+                this,
+                Invocation.method(
+                  #post,
+                  [url],
+                  {#headers: headers, #body: body, #encoding: encoding},
+                ),
+              ),
+            ),
+          )
+          as _i3.Future<_i2.Response>);
 
   @override
   _i3.Future<_i2.Response> put(
@@ -134,28 +93,19 @@ class MockClient extends _i1.Mock implements _i2.Client {
     _i4.Encoding? encoding,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #put,
-          [url],
-          {
-            #headers: headers,
-            #body: body,
-            #encoding: encoding,
-          },
-        ),
-        returnValue: _i3.Future<_i2.Response>.value(_FakeResponse_0(
-          this,
-          Invocation.method(
-            #put,
-            [url],
-            {
-              #headers: headers,
-              #body: body,
-              #encoding: encoding,
-            },
-          ),
-        )),
-      ) as _i3.Future<_i2.Response>);
+            Invocation.method(#put, [url], {#headers: headers, #body: body, #encoding: encoding}),
+            returnValue: _i3.Future<_i2.Response>.value(
+              _FakeResponse_0(
+                this,
+                Invocation.method(
+                  #put,
+                  [url],
+                  {#headers: headers, #body: body, #encoding: encoding},
+                ),
+              ),
+            ),
+          )
+          as _i3.Future<_i2.Response>);
 
   @override
   _i3.Future<_i2.Response> patch(
@@ -165,28 +115,19 @@ class MockClient extends _i1.Mock implements _i2.Client {
     _i4.Encoding? encoding,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #patch,
-          [url],
-          {
-            #headers: headers,
-            #body: body,
-            #encoding: encoding,
-          },
-        ),
-        returnValue: _i3.Future<_i2.Response>.value(_FakeResponse_0(
-          this,
-          Invocation.method(
-            #patch,
-            [url],
-            {
-              #headers: headers,
-              #body: body,
-              #encoding: encoding,
-            },
-          ),
-        )),
-      ) as _i3.Future<_i2.Response>);
+            Invocation.method(#patch, [url], {#headers: headers, #body: body, #encoding: encoding}),
+            returnValue: _i3.Future<_i2.Response>.value(
+              _FakeResponse_0(
+                this,
+                Invocation.method(
+                  #patch,
+                  [url],
+                  {#headers: headers, #body: body, #encoding: encoding},
+                ),
+              ),
+            ),
+          )
+          as _i3.Future<_i2.Response>);
 
   @override
   _i3.Future<_i2.Response> delete(
@@ -196,87 +137,53 @@ class MockClient extends _i1.Mock implements _i2.Client {
     _i4.Encoding? encoding,
   }) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #delete,
-          [url],
-          {
-            #headers: headers,
-            #body: body,
-            #encoding: encoding,
-          },
-        ),
-        returnValue: _i3.Future<_i2.Response>.value(_FakeResponse_0(
-          this,
-          Invocation.method(
-            #delete,
-            [url],
-            {
-              #headers: headers,
-              #body: body,
-              #encoding: encoding,
-            },
-          ),
-        )),
-      ) as _i3.Future<_i2.Response>);
+            Invocation.method(
+              #delete,
+              [url],
+              {#headers: headers, #body: body, #encoding: encoding},
+            ),
+            returnValue: _i3.Future<_i2.Response>.value(
+              _FakeResponse_0(
+                this,
+                Invocation.method(
+                  #delete,
+                  [url],
+                  {#headers: headers, #body: body, #encoding: encoding},
+                ),
+              ),
+            ),
+          )
+          as _i3.Future<_i2.Response>);
 
   @override
-  _i3.Future<String> read(
-    Uri? url, {
-    Map<String, String>? headers,
-  }) =>
+  _i3.Future<String> read(Uri? url, {Map<String, String>? headers}) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #read,
-          [url],
-          {#headers: headers},
-        ),
-        returnValue: _i3.Future<String>.value(_i5.dummyValue<String>(
-          this,
-          Invocation.method(
-            #read,
-            [url],
-            {#headers: headers},
-          ),
-        )),
-      ) as _i3.Future<String>);
+            Invocation.method(#read, [url], {#headers: headers}),
+            returnValue: _i3.Future<String>.value(
+              _i5.dummyValue<String>(this, Invocation.method(#read, [url], {#headers: headers})),
+            ),
+          )
+          as _i3.Future<String>);
 
   @override
-  _i3.Future<_i6.Uint8List> readBytes(
-    Uri? url, {
-    Map<String, String>? headers,
-  }) =>
+  _i3.Future<_i6.Uint8List> readBytes(Uri? url, {Map<String, String>? headers}) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #readBytes,
-          [url],
-          {#headers: headers},
-        ),
-        returnValue: _i3.Future<_i6.Uint8List>.value(_i6.Uint8List(0)),
-      ) as _i3.Future<_i6.Uint8List>);
+            Invocation.method(#readBytes, [url], {#headers: headers}),
+            returnValue: _i3.Future<_i6.Uint8List>.value(_i6.Uint8List(0)),
+          )
+          as _i3.Future<_i6.Uint8List>);
 
   @override
   _i3.Future<_i2.StreamedResponse> send(_i2.BaseRequest? request) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #send,
-          [request],
-        ),
-        returnValue:
-            _i3.Future<_i2.StreamedResponse>.value(_FakeStreamedResponse_1(
-          this,
-          Invocation.method(
-            #send,
-            [request],
-          ),
-        )),
-      ) as _i3.Future<_i2.StreamedResponse>);
+            Invocation.method(#send, [request]),
+            returnValue: _i3.Future<_i2.StreamedResponse>.value(
+              _FakeStreamedResponse_1(this, Invocation.method(#send, [request])),
+            ),
+          )
+          as _i3.Future<_i2.StreamedResponse>);
 
   @override
-  void close() => super.noSuchMethod(
-        Invocation.method(
-          #close,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void close() =>
+      super.noSuchMethod(Invocation.method(#close, []), returnValueForMissingStub: null);
 }
diff --git a/test/providers/plate_calculator_test.dart b/test/providers/plate_calculator_test.dart
new file mode 100644
index 00000000..1be3d070
--- /dev/null
+++ b/test/providers/plate_calculator_test.dart
@@ -0,0 +1,123 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart'; // Added for annotations
+import 'package:mockito/mockito.dart'; // Added for mockito
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:wger/helpers/consts.dart';
+import 'package:wger/providers/plate_weights.dart';
+
+import 'plate_calculator_test.mocks.dart';
+
+@GenerateMocks([SharedPreferencesAsync])
+void main() {
+  group('PlateWeightsNotifier', () {
+    late PlateCalculatorNotifier notifier;
+    late MockSharedPreferencesAsync mockPrefs;
+
+    setUp(() {
+      mockPrefs = MockSharedPreferencesAsync();
+      when(mockPrefs.getString(PREFS_KEY_PLATES)).thenAnswer((_) async => null);
+      when(mockPrefs.setString(any, any)).thenAnswer((_) async => true);
+
+      notifier = PlateCalculatorNotifier(prefs: mockPrefs);
+    });
+
+    test('toggleSelection adds and removes plates', () async {
+      // Test adding a plate
+      await notifier.toggleSelection(0.5);
+      expect(notifier.state.selectedPlates.contains(0.5), true);
+
+      // Test removing a plate
+      await notifier.toggleSelection(0.5);
+      expect(notifier.state.selectedPlates.contains(0.5), false);
+    });
+
+    test('unitChange updates state correctly', () {
+      // Change to imperial
+      notifier.setWeight(123);
+      notifier.unitChange(unit: WeightUnitEnum.lb);
+      expect(notifier.state.isMetric, false);
+      expect(notifier.state.totalWeight, 0);
+      expect(notifier.state.selectedPlates, DEFAULT_LB_PLATES);
+      expect(notifier.state.barWeight, DEFAULT_BAR_WEIGHT_LB);
+      expect(notifier.state.availablePlates, notifier.state.availablePlatesLb);
+
+      // Change back to metric
+      notifier.setWeight(123);
+      notifier.unitChange(unit: WeightUnitEnum.kg);
+      expect(notifier.state.isMetric, true);
+      expect(notifier.state.totalWeight, 0);
+      expect(notifier.state.selectedPlates, DEFAULT_KG_PLATES);
+      expect(notifier.state.barWeight, DEFAULT_BAR_WEIGHT_KG);
+      expect(notifier.state.availablePlates, notifier.state.availablePlatesKg);
+    });
+
+    test('setWeight updates totalWeight', () {
+      notifier.setWeight(100);
+      expect(notifier.state.totalWeight, 100);
+    });
+  });
+
+  group('PlateWeightsState', () {
+    test('copyWith creates a new instance with updated values', () {
+      final initialState = PlateCalculatorState();
+      final updatedState = initialState.copyWith(
+        isMetric: false,
+        totalWeight: 100,
+        barWeight: 15,
+        selectedPlates: [1, 2, 3],
+      );
+
+      expect(updatedState.isMetric, false);
+      expect(updatedState.barWeight, 15);
+      expect(updatedState.totalWeight, 100);
+      expect(updatedState.selectedPlates, [1, 2, 3]);
+    });
+
+    test('toJson returns correct map', () {
+      final state = PlateCalculatorState(isMetric: false, selectedPlates: [10, 20]);
+      final json = state.toJson();
+      expect(json['isMetric'], false);
+      expect(json['barWeight'], DEFAULT_BAR_WEIGHT_LB);
+      expect(json['selectedPlates'], [10, 20]);
+    });
+
+    test('barWeight returns correct default value based on isMetric', () {
+      final metricState = PlateCalculatorState(isMetric: true);
+      expect(metricState.barWeight, DEFAULT_BAR_WEIGHT_KG);
+
+      final imperialState = PlateCalculatorState(isMetric: false);
+      expect(imperialState.barWeight, DEFAULT_BAR_WEIGHT_LB);
+    });
+
+    test('availablePlates returns correct default list based on isMetric', () {
+      final metricState = PlateCalculatorState(isMetric: true);
+      expect(metricState.availablePlates, metricState.availablePlatesKg);
+
+      final imperialState = PlateCalculatorState(isMetric: false);
+      expect(imperialState.availablePlates, metricState.availablePlatesLb);
+    });
+
+    test('getColor returns correct color - 1', () {
+      final metricState = PlateCalculatorState(isMetric: true);
+      expect(metricState.getColor(20), Colors.blue);
+      expect(metricState.getColor(10), Colors.green);
+      expect(metricState.getColor(0.1), Colors.grey, reason: 'Fallback color');
+
+      final imperialState = PlateCalculatorState(isMetric: false);
+      expect(imperialState.getColor(45), Colors.blue);
+      expect(imperialState.getColor(35), Colors.yellow);
+      expect(imperialState.getColor(0.1), Colors.grey, reason: 'Fallback color');
+    });
+
+    test('getColor returns correct color - 2', () {
+      final metricState = PlateCalculatorState(isMetric: true, useColors: false);
+      expect(metricState.getColor(20), Colors.grey);
+      expect(metricState.getColor(10), Colors.grey);
+
+      final imperialState = PlateCalculatorState(isMetric: false, useColors: false);
+      expect(imperialState.getColor(45), Colors.grey);
+      expect(imperialState.getColor(25), Colors.grey);
+    });
+  });
+}
diff --git a/test/providers/plate_calculator_test.mocks.dart b/test/providers/plate_calculator_test.mocks.dart
new file mode 100644
index 00000000..57fd2a99
--- /dev/null
+++ b/test/providers/plate_calculator_test.mocks.dart
@@ -0,0 +1,158 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in wger/test/providers/plate_calculator_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i3;
+
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:shared_preferences/src/shared_preferences_async.dart' as _i2;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
+
+/// A class which mocks [SharedPreferencesAsync].
+///
+/// See the documentation for Mockito's code generation for more information.
+// ignore: must_be_immutable
+class MockSharedPreferencesAsync extends _i1.Mock implements _i2.SharedPreferencesAsync {
+  MockSharedPreferencesAsync() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i3.Future<Set<String>> getKeys({Set<String>? allowList}) =>
+      (super.noSuchMethod(
+            Invocation.method(#getKeys, [], {#allowList: allowList}),
+            returnValue: _i3.Future<Set<String>>.value(<String>{}),
+          )
+          as _i3.Future<Set<String>>);
+
+  @override
+  _i3.Future<Map<String, Object?>> getAll({Set<String>? allowList}) =>
+      (super.noSuchMethod(
+            Invocation.method(#getAll, [], {#allowList: allowList}),
+            returnValue: _i3.Future<Map<String, Object?>>.value(<String, Object?>{}),
+          )
+          as _i3.Future<Map<String, Object?>>);
+
+  @override
+  _i3.Future<bool?> getBool(String? key) =>
+      (super.noSuchMethod(
+            Invocation.method(#getBool, [key]),
+            returnValue: _i3.Future<bool?>.value(),
+          )
+          as _i3.Future<bool?>);
+
+  @override
+  _i3.Future<int?> getInt(String? key) =>
+      (super.noSuchMethod(Invocation.method(#getInt, [key]), returnValue: _i3.Future<int?>.value())
+          as _i3.Future<int?>);
+
+  @override
+  _i3.Future<double?> getDouble(String? key) =>
+      (super.noSuchMethod(
+            Invocation.method(#getDouble, [key]),
+            returnValue: _i3.Future<double?>.value(),
+          )
+          as _i3.Future<double?>);
+
+  @override
+  _i3.Future<String?> getString(String? key) =>
+      (super.noSuchMethod(
+            Invocation.method(#getString, [key]),
+            returnValue: _i3.Future<String?>.value(),
+          )
+          as _i3.Future<String?>);
+
+  @override
+  _i3.Future<List<String>?> getStringList(String? key) =>
+      (super.noSuchMethod(
+            Invocation.method(#getStringList, [key]),
+            returnValue: _i3.Future<List<String>?>.value(),
+          )
+          as _i3.Future<List<String>?>);
+
+  @override
+  _i3.Future<bool> containsKey(String? key) =>
+      (super.noSuchMethod(
+            Invocation.method(#containsKey, [key]),
+            returnValue: _i3.Future<bool>.value(false),
+          )
+          as _i3.Future<bool>);
+
+  @override
+  _i3.Future<void> setBool(String? key, bool? value) =>
+      (super.noSuchMethod(
+            Invocation.method(#setBool, [key, value]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> setInt(String? key, int? value) =>
+      (super.noSuchMethod(
+            Invocation.method(#setInt, [key, value]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> setDouble(String? key, double? value) =>
+      (super.noSuchMethod(
+            Invocation.method(#setDouble, [key, value]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> setString(String? key, String? value) =>
+      (super.noSuchMethod(
+            Invocation.method(#setString, [key, value]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> setStringList(String? key, List<String>? value) =>
+      (super.noSuchMethod(
+            Invocation.method(#setStringList, [key, value]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> remove(String? key) =>
+      (super.noSuchMethod(
+            Invocation.method(#remove, [key]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> clear({Set<String>? allowList}) =>
+      (super.noSuchMethod(
+            Invocation.method(#clear, [], {#allowList: allowList}),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+}
diff --git a/test/routine/day_form_test.dart b/test/routine/day_form_test.dart
new file mode 100644
index 00000000..7f33b7e0
--- /dev/null
+++ b/test/routine/day_form_test.dart
@@ -0,0 +1,110 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+import 'package:provider/provider.dart';
+import 'package:wger/helpers/consts.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/workouts/day.dart';
+import 'package:wger/providers/routines.dart';
+import 'package:wger/widgets/routines/forms/day.dart';
+
+import '../../test_data/routines.dart';
+import 'routine_edit_test.mocks.dart';
+
+@GenerateMocks([RoutinesProvider])
+void main() {
+  late MockRoutinesProvider mockRoutinesProvider;
+
+  setUp(() {
+    mockRoutinesProvider = MockRoutinesProvider();
+    when(mockRoutinesProvider.editDay(any)).thenAnswer((_) async => getTestRoutine().days[0]);
+  });
+
+  Widget renderWidget() {
+    return ChangeNotifierProvider<RoutinesProvider>.value(
+      value: mockRoutinesProvider,
+      child: MaterialApp(
+        locale: const Locale('en'),
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: Scaffold(
+          body: SingleChildScrollView(child: DayFormWidget(day: getTestRoutine().days[0])),
+        ),
+      ),
+    );
+  }
+
+  group('DayFormWidget test', () {
+    testWidgets('Fields are disabled for rest days', (WidgetTester tester) async {
+      await tester.pumpWidget(renderWidget());
+      await tester.pumpAndSettle();
+      await tester.tap(find.byKey(const Key('field-is-rest-day')));
+      await tester.pumpAndSettle();
+
+      final nameField = find.byKey(const Key('field-name'));
+      final TextFormField nameTextField = tester.widget(nameField);
+      expect(nameTextField.enabled, isFalse);
+
+      final descriptionField = find.byKey(const Key('field-description'));
+      final TextFormField descriptionTextField = tester.widget(descriptionField);
+      expect(descriptionTextField.enabled, isFalse);
+
+      final switchListTileFinder = find.byKey(const Key('field-need-logs-to-advance'));
+      final SwitchListTile switchListTile = tester.widget(switchListTileFinder);
+      expect(switchListTile.onChanged, isNull);
+    });
+
+    testWidgets('Call server', (WidgetTester tester) async {
+      await tester.pumpWidget(renderWidget());
+      await tester.pumpAndSettle();
+
+      final nameField = find.byKey(const Key('field-name'));
+      await tester.enterText(nameField, '');
+      await tester.enterText(nameField, 'Day 1');
+
+      final descriptionField = find.byKey(const Key('field-description'));
+      await tester.enterText(descriptionField, '');
+      await tester.enterText(descriptionField, 'Day 1 description');
+
+      await tester.tap(find.byKey(const Key('field-day-type')));
+      await tester.pumpAndSettle();
+      await tester.tap(find.byKey(const Key('day-type-option-hiit')));
+      await tester.pumpAndSettle();
+
+      await tester.tap(find.byKey(const Key(SUBMIT_BUTTON_KEY_NAME)));
+      await tester.pumpAndSettle();
+
+      verify(
+        mockRoutinesProvider.editDay(
+          argThat(
+            isA<Day>()
+                .having((d) => d.routineId, 'routineId', 1)
+                .having((d) => d.id, 'id', 1)
+                .having((d) => d.name, 'name', 'Day 1')
+                .having((d) => d.description, 'description', 'Day 1 description')
+                .having((d) => d.type, 'type', DayType.hiit),
+          ),
+        ),
+      );
+    });
+  });
+}
diff --git a/test/routine/day_form_test.mocks.dart b/test/routine/day_form_test.mocks.dart
new file mode 100644
index 00000000..1bfb6f5a
--- /dev/null
+++ b/test/routine/day_form_test.mocks.dart
@@ -0,0 +1,594 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in wger/test/routine/day_form_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i13;
+import 'dart:ui' as _i17;
+
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:mockito/src/dummies.dart' as _i16;
+import 'package:wger/models/exercises/exercise.dart' as _i15;
+import 'package:wger/models/workouts/base_config.dart' as _i9;
+import 'package:wger/models/workouts/day.dart' as _i6;
+import 'package:wger/models/workouts/day_data.dart' as _i14;
+import 'package:wger/models/workouts/log.dart' as _i11;
+import 'package:wger/models/workouts/repetition_unit.dart' as _i4;
+import 'package:wger/models/workouts/routine.dart' as _i5;
+import 'package:wger/models/workouts/session.dart' as _i10;
+import 'package:wger/models/workouts/slot.dart' as _i7;
+import 'package:wger/models/workouts/slot_entry.dart' as _i8;
+import 'package:wger/models/workouts/weight_unit.dart' as _i3;
+import 'package:wger/providers/base_provider.dart' as _i2;
+import 'package:wger/providers/routines.dart' as _i12;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
+
+class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider {
+  _FakeWgerBaseProvider_0(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeWeightUnit_1 extends _i1.SmartFake implements _i3.WeightUnit {
+  _FakeWeightUnit_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeRepetitionUnit_2 extends _i1.SmartFake implements _i4.RepetitionUnit {
+  _FakeRepetitionUnit_2(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeRoutine_3 extends _i1.SmartFake implements _i5.Routine {
+  _FakeRoutine_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeDay_4 extends _i1.SmartFake implements _i6.Day {
+  _FakeDay_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeSlot_5 extends _i1.SmartFake implements _i7.Slot {
+  _FakeSlot_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeSlotEntry_6 extends _i1.SmartFake implements _i8.SlotEntry {
+  _FakeSlotEntry_6(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeBaseConfig_7 extends _i1.SmartFake implements _i9.BaseConfig {
+  _FakeBaseConfig_7(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeWorkoutSession_8 extends _i1.SmartFake implements _i10.WorkoutSession {
+  _FakeWorkoutSession_8(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeLog_9 extends _i1.SmartFake implements _i11.Log {
+  _FakeLog_9(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+/// A class which mocks [RoutinesProvider].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
+  MockRoutinesProvider() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(
+              this,
+              Invocation.getter(#baseProvider),
+            ),
+          )
+          as _i2.WgerBaseProvider);
+
+  @override
+  List<_i5.Routine> get items =>
+      (super.noSuchMethod(
+            Invocation.getter(#items),
+            returnValue: <_i5.Routine>[],
+          )
+          as List<_i5.Routine>);
+
+  @override
+  List<_i3.WeightUnit> get weightUnits =>
+      (super.noSuchMethod(
+            Invocation.getter(#weightUnits),
+            returnValue: <_i3.WeightUnit>[],
+          )
+          as List<_i3.WeightUnit>);
+
+  @override
+  _i3.WeightUnit get defaultWeightUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultWeightUnit),
+            returnValue: _FakeWeightUnit_1(
+              this,
+              Invocation.getter(#defaultWeightUnit),
+            ),
+          )
+          as _i3.WeightUnit);
+
+  @override
+  List<_i4.RepetitionUnit> get repetitionUnits =>
+      (super.noSuchMethod(
+            Invocation.getter(#repetitionUnits),
+            returnValue: <_i4.RepetitionUnit>[],
+          )
+          as List<_i4.RepetitionUnit>);
+
+  @override
+  _i4.RepetitionUnit get defaultRepetitionUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultRepetitionUnit),
+            returnValue: _FakeRepetitionUnit_2(
+              this,
+              Invocation.getter(#defaultRepetitionUnit),
+            ),
+          )
+          as _i4.RepetitionUnit);
+
+  @override
+  set activeRoutine(_i5.Routine? value) => super.noSuchMethod(
+    Invocation.setter(#activeRoutine, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set weightUnits(List<_i3.WeightUnit>? weightUnits) => super.noSuchMethod(
+    Invocation.setter(#weightUnits, weightUnits),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set repetitionUnits(List<_i4.RepetitionUnit>? repetitionUnits) => super.noSuchMethod(
+    Invocation.setter(#repetitionUnits, repetitionUnits),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  bool get hasListeners =>
+      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
+
+  @override
+  void clear() => super.noSuchMethod(
+    Invocation.method(#clear, []),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  _i3.WeightUnit findWeightUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findWeightUnitById, [id]),
+            returnValue: _FakeWeightUnit_1(
+              this,
+              Invocation.method(#findWeightUnitById, [id]),
+            ),
+          )
+          as _i3.WeightUnit);
+
+  @override
+  _i4.RepetitionUnit findRepetitionUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findRepetitionUnitById, [id]),
+            returnValue: _FakeRepetitionUnit_2(
+              this,
+              Invocation.method(#findRepetitionUnitById, [id]),
+            ),
+          )
+          as _i4.RepetitionUnit);
+
+  @override
+  List<_i5.Routine> getPlans() =>
+      (super.noSuchMethod(
+            Invocation.method(#getPlans, []),
+            returnValue: <_i5.Routine>[],
+          )
+          as List<_i5.Routine>);
+
+  @override
+  _i5.Routine findById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findById, [id]),
+            returnValue: _FakeRoutine_3(
+              this,
+              Invocation.method(#findById, [id]),
+            ),
+          )
+          as _i5.Routine);
+
+  @override
+  int findIndexById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findIndexById, [id]),
+            returnValue: 0,
+          )
+          as int);
+
+  @override
+  _i13.Future<void> fetchAndSetAllRoutinesFull() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesFull, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetAllRoutinesSparse() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesSparse, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> setExercisesAndUnits(
+    List<_i14.DayData>? entries, {
+    Map<int, _i15.Exercise>? exercises,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #setExercisesAndUnits,
+              [entries],
+              {#exercises: exercises},
+            ),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetRoutineSparse, [planId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(
+                this,
+                Invocation.method(#fetchAndSetRoutineSparse, [planId]),
+              ),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
+
+  @override
+  _i13.Future<_i5.Routine> fetchAndSetRoutineFull(int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetRoutineFull, [routineId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(
+                this,
+                Invocation.method(#fetchAndSetRoutineFull, [routineId]),
+              ),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
+
+  @override
+  _i13.Future<_i5.Routine> addRoutine(_i5.Routine? routine) =>
+      (super.noSuchMethod(
+            Invocation.method(#addRoutine, [routine]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#addRoutine, [routine])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
+
+  @override
+  _i13.Future<void> editRoutine(_i5.Routine? routine) =>
+      (super.noSuchMethod(
+            Invocation.method(#editRoutine, [routine]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> deleteRoutine(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteRoutine, [id]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetRepetitionUnits() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetRepetitionUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetWeightUnits() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetWeightUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetUnits() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i6.Day> addDay(_i6.Day? day) =>
+      (super.noSuchMethod(
+            Invocation.method(#addDay, [day]),
+            returnValue: _i13.Future<_i6.Day>.value(
+              _FakeDay_4(this, Invocation.method(#addDay, [day])),
+            ),
+          )
+          as _i13.Future<_i6.Day>);
+
+  @override
+  _i13.Future<void> editDay(_i6.Day? day) =>
+      (super.noSuchMethod(
+            Invocation.method(#editDay, [day]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editDays(List<_i6.Day>? days) =>
+      (super.noSuchMethod(
+            Invocation.method(#editDays, [days]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> deleteDay(int? dayId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteDay, [dayId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i7.Slot> addSlot(_i7.Slot? slot, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSlot, [slot, routineId]),
+            returnValue: _i13.Future<_i7.Slot>.value(
+              _FakeSlot_5(this, Invocation.method(#addSlot, [slot, routineId])),
+            ),
+          )
+          as _i13.Future<_i7.Slot>);
+
+  @override
+  _i13.Future<void> deleteSlot(int? slotId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlot, [slotId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlot(_i7.Slot? slot, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlot, [slot, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlots(List<_i7.Slot>? slots, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlots, [slots, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i8.SlotEntry> addSlotEntry(
+    _i8.SlotEntry? entry,
+    int? routineId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<_i8.SlotEntry>.value(
+              _FakeSlotEntry_6(
+                this,
+                Invocation.method(#addSlotEntry, [entry, routineId]),
+              ),
+            ),
+          )
+          as _i13.Future<_i8.SlotEntry>);
+
+  @override
+  _i13.Future<void> deleteSlotEntry(int? id, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlotEntry, [id, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlotEntry(_i8.SlotEntry? entry, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  String getConfigUrl(_i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#getConfigUrl, [type]),
+            returnValue: _i16.dummyValue<String>(
+              this,
+              Invocation.method(#getConfigUrl, [type]),
+            ),
+          )
+          as String);
+
+  @override
+  _i13.Future<_i9.BaseConfig> editConfig(
+    _i9.BaseConfig? config,
+    _i8.ConfigType? type,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#editConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(
+                this,
+                Invocation.method(#editConfig, [config, type]),
+              ),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<_i9.BaseConfig> addConfig(
+    _i9.BaseConfig? config,
+    _i8.ConfigType? type,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(
+                this,
+                Invocation.method(#addConfig, [config, type]),
+              ),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<void> deleteConfig(int? id, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteConfig, [id, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> handleConfig(
+    _i8.SlotEntry? entry,
+    num? value,
+    _i8.ConfigType? type,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#handleConfig, [entry, value, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<List<_i10.WorkoutSession>> fetchSessionData() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchSessionData, []),
+            returnValue: _i13.Future<List<_i10.WorkoutSession>>.value(
+              <_i10.WorkoutSession>[],
+            ),
+          )
+          as _i13.Future<List<_i10.WorkoutSession>>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> addSession(
+    _i10.WorkoutSession? session,
+    int? routineId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSession, [session, routineId]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(
+                this,
+                Invocation.method(#addSession, [session, routineId]),
+              ),
+            ),
+          )
+          as _i13.Future<_i10.WorkoutSession>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> editSession(_i10.WorkoutSession? session) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSession, [session]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(
+                this,
+                Invocation.method(#editSession, [session]),
+              ),
+            ),
+          )
+          as _i13.Future<_i10.WorkoutSession>);
+
+  @override
+  _i13.Future<_i11.Log> addLog(_i11.Log? log) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLog, [log]),
+            returnValue: _i13.Future<_i11.Log>.value(
+              _FakeLog_9(this, Invocation.method(#addLog, [log])),
+            ),
+          )
+          as _i13.Future<_i11.Log>);
+
+  @override
+  _i13.Future<void> deleteLog(int? logId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLog, [logId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  void addListener(_i17.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void removeListener(_i17.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#removeListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void dispose() => super.noSuchMethod(
+    Invocation.method(#dispose, []),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void notifyListeners() => super.noSuchMethod(
+    Invocation.method(#notifyListeners, []),
+    returnValueForMissingStub: null,
+  );
+}
diff --git a/test/routine/forms/session_form_test.dart b/test/routine/forms/session_form_test.dart
new file mode 100644
index 00000000..53302ea9
--- /dev/null
+++ b/test/routine/forms/session_form_test.dart
@@ -0,0 +1,148 @@
+// test/widgets/routines/forms/session_form_test.dart
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+import 'package:provider/provider.dart';
+import 'package:wger/exceptions/http_exception.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/workouts/session.dart';
+import 'package:wger/providers/routines.dart';
+import 'package:wger/widgets/routines/forms/session.dart';
+
+import 'session_form_test.mocks.dart';
+
+@GenerateMocks([RoutinesProvider])
+void main() {
+  late MockRoutinesProvider mockRoutinesProvider;
+
+  setUp(() {
+    mockRoutinesProvider = MockRoutinesProvider();
+  });
+
+  Future<void> pumpSessionForm(
+    WidgetTester tester, {
+    WorkoutSession? session,
+    int routineId = 1,
+    Function()? onSaved,
+  }) async {
+    await tester.pumpWidget(
+      MultiProvider(
+        providers: [
+          ChangeNotifierProvider<RoutinesProvider>.value(
+            value: mockRoutinesProvider,
+          ),
+        ],
+        child: MaterialApp(
+          localizationsDelegates: AppLocalizations.localizationsDelegates,
+          supportedLocales: AppLocalizations.supportedLocales,
+          home: Scaffold(
+            body: SessionForm(
+              routineId,
+              session: session,
+              onSaved: onSaved,
+            ),
+          ),
+        ),
+      ),
+    );
+
+    await tester.pumpAndSettle();
+  }
+
+  group('SessionForm', () {
+    testWidgets('renders correctly for an existing session', (WidgetTester tester) async {
+      //Arrange
+      final existingSession = WorkoutSession(
+        id: 1,
+        routineId: 1,
+        notes: 'Existing notes',
+        impression: 1,
+        date: DateTime.now(),
+        timeStart: const TimeOfDay(hour: 10, minute: 0),
+        timeEnd: const TimeOfDay(hour: 11, minute: 0),
+      );
+
+      //Act
+      await pumpSessionForm(tester, session: existingSession);
+
+      //Assert
+      expect(find.widgetWithText(TextFormField, 'Existing notes'), findsOneWidget);
+      final toggleButtons = tester.widget<ToggleButtons>(find.byType(ToggleButtons));
+      expect(toggleButtons.isSelected, [true, false, false]); // Bad impression
+      expect(find.widgetWithText(TextFormField, '10:00'), findsOneWidget);
+      expect(find.widgetWithText(TextFormField, '11:00'), findsOneWidget);
+    });
+
+    testWidgets('saves a new session', (WidgetTester tester) async {
+      // Arrange
+      bool onSavedCalled = false;
+      await pumpSessionForm(tester, onSaved: () => onSavedCalled = true);
+
+      when(mockRoutinesProvider.addSession(any, any)).thenAnswer(
+        (_) async => WorkoutSession(id: 1, routineId: 1, date: DateTime.now()),
+      );
+
+      // Act
+      await tester.enterText(find.widgetWithText(TextFormField, 'Notes'), 'New session notes');
+      await tester.tap(find.byKey(const ValueKey('save-button')));
+      await tester.pumpAndSettle();
+
+      // Assert
+      verify(mockRoutinesProvider.addSession(any, 1)).called(1);
+      expect(onSavedCalled, isTrue);
+    });
+
+    testWidgets('saves an existing session', (WidgetTester tester) async {
+      // Arrange
+      bool onSavedCalled = false;
+      final existingSession = WorkoutSession(
+        id: 1,
+        routineId: 1,
+        notes: 'Old notes',
+        impression: 2,
+        date: DateTime.now(),
+      );
+      when(mockRoutinesProvider.editSession(any)).thenAnswer(
+        (_) async => WorkoutSession(
+          id: 1,
+          routineId: 1,
+          date: DateTime.now(),
+        ),
+      );
+
+      // Act
+      await pumpSessionForm(
+        tester,
+        session: existingSession,
+        onSaved: () => onSavedCalled = true,
+      );
+      await tester.enterText(find.widgetWithText(TextFormField, 'Old notes'), 'Updated notes');
+      await tester.tap(find.byKey(const ValueKey('save-button')));
+      await tester.pumpAndSettle();
+
+      // Assert
+      final captured =
+          verify(mockRoutinesProvider.editSession(captureAny)).captured.single as WorkoutSession;
+      expect(captured.notes, 'Updated notes');
+      expect(onSavedCalled, isTrue);
+    });
+
+    testWidgets('shows server side error messages', (WidgetTester tester) async {
+      // Arrange
+      await pumpSessionForm(tester);
+      when(mockRoutinesProvider.addSession(any, any)).thenThrow(
+        WgerHttpException.fromMap({
+          'name': ['The name is not valid'],
+        }),
+      );
+
+      // Act
+      await tester.tap(find.byKey(const ValueKey('save-button')));
+      await tester.pumpAndSettle();
+
+      // Assert
+      expect(find.text('The name is not valid'), findsOneWidget, reason: 'Error message is shown');
+    });
+  });
+}
diff --git a/test/routine/forms/session_form_test.mocks.dart b/test/routine/forms/session_form_test.mocks.dart
new file mode 100644
index 00000000..c167ffaa
--- /dev/null
+++ b/test/routine/forms/session_form_test.mocks.dart
@@ -0,0 +1,509 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in wger/test/routine/forms/session_form_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i13;
+import 'dart:ui' as _i17;
+
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:mockito/src/dummies.dart' as _i16;
+import 'package:wger/models/exercises/exercise.dart' as _i15;
+import 'package:wger/models/workouts/base_config.dart' as _i9;
+import 'package:wger/models/workouts/day.dart' as _i6;
+import 'package:wger/models/workouts/day_data.dart' as _i14;
+import 'package:wger/models/workouts/log.dart' as _i11;
+import 'package:wger/models/workouts/repetition_unit.dart' as _i4;
+import 'package:wger/models/workouts/routine.dart' as _i5;
+import 'package:wger/models/workouts/session.dart' as _i10;
+import 'package:wger/models/workouts/slot.dart' as _i7;
+import 'package:wger/models/workouts/slot_entry.dart' as _i8;
+import 'package:wger/models/workouts/weight_unit.dart' as _i3;
+import 'package:wger/providers/base_provider.dart' as _i2;
+import 'package:wger/providers/routines.dart' as _i12;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
+
+class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider {
+  _FakeWgerBaseProvider_0(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeWeightUnit_1 extends _i1.SmartFake implements _i3.WeightUnit {
+  _FakeWeightUnit_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeRepetitionUnit_2 extends _i1.SmartFake implements _i4.RepetitionUnit {
+  _FakeRepetitionUnit_2(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeRoutine_3 extends _i1.SmartFake implements _i5.Routine {
+  _FakeRoutine_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeDay_4 extends _i1.SmartFake implements _i6.Day {
+  _FakeDay_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeSlot_5 extends _i1.SmartFake implements _i7.Slot {
+  _FakeSlot_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeSlotEntry_6 extends _i1.SmartFake implements _i8.SlotEntry {
+  _FakeSlotEntry_6(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeBaseConfig_7 extends _i1.SmartFake implements _i9.BaseConfig {
+  _FakeBaseConfig_7(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeWorkoutSession_8 extends _i1.SmartFake implements _i10.WorkoutSession {
+  _FakeWorkoutSession_8(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeLog_9 extends _i1.SmartFake implements _i11.Log {
+  _FakeLog_9(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+/// A class which mocks [RoutinesProvider].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
+  MockRoutinesProvider() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(this, Invocation.getter(#baseProvider)),
+          )
+          as _i2.WgerBaseProvider);
+
+  @override
+  List<_i5.Routine> get items =>
+      (super.noSuchMethod(Invocation.getter(#items), returnValue: <_i5.Routine>[])
+          as List<_i5.Routine>);
+
+  @override
+  List<_i3.WeightUnit> get weightUnits =>
+      (super.noSuchMethod(Invocation.getter(#weightUnits), returnValue: <_i3.WeightUnit>[])
+          as List<_i3.WeightUnit>);
+
+  @override
+  _i3.WeightUnit get defaultWeightUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultWeightUnit),
+            returnValue: _FakeWeightUnit_1(this, Invocation.getter(#defaultWeightUnit)),
+          )
+          as _i3.WeightUnit);
+
+  @override
+  List<_i4.RepetitionUnit> get repetitionUnits =>
+      (super.noSuchMethod(Invocation.getter(#repetitionUnits), returnValue: <_i4.RepetitionUnit>[])
+          as List<_i4.RepetitionUnit>);
+
+  @override
+  _i4.RepetitionUnit get defaultRepetitionUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultRepetitionUnit),
+            returnValue: _FakeRepetitionUnit_2(this, Invocation.getter(#defaultRepetitionUnit)),
+          )
+          as _i4.RepetitionUnit);
+
+  @override
+  set activeRoutine(_i5.Routine? value) =>
+      super.noSuchMethod(Invocation.setter(#activeRoutine, value), returnValueForMissingStub: null);
+
+  @override
+  set weightUnits(List<_i3.WeightUnit>? weightUnits) => super.noSuchMethod(
+    Invocation.setter(#weightUnits, weightUnits),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set repetitionUnits(List<_i4.RepetitionUnit>? repetitionUnits) => super.noSuchMethod(
+    Invocation.setter(#repetitionUnits, repetitionUnits),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  bool get hasListeners =>
+      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
+
+  @override
+  void clear() =>
+      super.noSuchMethod(Invocation.method(#clear, []), returnValueForMissingStub: null);
+
+  @override
+  _i3.WeightUnit findWeightUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findWeightUnitById, [id]),
+            returnValue: _FakeWeightUnit_1(this, Invocation.method(#findWeightUnitById, [id])),
+          )
+          as _i3.WeightUnit);
+
+  @override
+  _i4.RepetitionUnit findRepetitionUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findRepetitionUnitById, [id]),
+            returnValue: _FakeRepetitionUnit_2(
+              this,
+              Invocation.method(#findRepetitionUnitById, [id]),
+            ),
+          )
+          as _i4.RepetitionUnit);
+
+  @override
+  List<_i5.Routine> getPlans() =>
+      (super.noSuchMethod(Invocation.method(#getPlans, []), returnValue: <_i5.Routine>[])
+          as List<_i5.Routine>);
+
+  @override
+  _i5.Routine findById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findById, [id]),
+            returnValue: _FakeRoutine_3(this, Invocation.method(#findById, [id])),
+          )
+          as _i5.Routine);
+
+  @override
+  int findIndexById(int? id) =>
+      (super.noSuchMethod(Invocation.method(#findIndexById, [id]), returnValue: 0) as int);
+
+  @override
+  _i13.Future<void> fetchAndSetAllRoutinesFull() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesFull, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetAllRoutinesSparse() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesSparse, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> setExercisesAndUnits(
+    List<_i14.DayData>? entries, {
+    Map<int, _i15.Exercise>? exercises,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#setExercisesAndUnits, [entries], {#exercises: exercises}),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetRoutineSparse, [planId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#fetchAndSetRoutineSparse, [planId])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
+
+  @override
+  _i13.Future<_i5.Routine> fetchAndSetRoutineFull(int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetRoutineFull, [routineId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#fetchAndSetRoutineFull, [routineId])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
+
+  @override
+  _i13.Future<_i5.Routine> addRoutine(_i5.Routine? routine) =>
+      (super.noSuchMethod(
+            Invocation.method(#addRoutine, [routine]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#addRoutine, [routine])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
+
+  @override
+  _i13.Future<void> editRoutine(_i5.Routine? routine) =>
+      (super.noSuchMethod(
+            Invocation.method(#editRoutine, [routine]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> deleteRoutine(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteRoutine, [id]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetRepetitionUnits() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetRepetitionUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetWeightUnits() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetWeightUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetUnits() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i6.Day> addDay(_i6.Day? day) =>
+      (super.noSuchMethod(
+            Invocation.method(#addDay, [day]),
+            returnValue: _i13.Future<_i6.Day>.value(
+              _FakeDay_4(this, Invocation.method(#addDay, [day])),
+            ),
+          )
+          as _i13.Future<_i6.Day>);
+
+  @override
+  _i13.Future<void> editDay(_i6.Day? day) =>
+      (super.noSuchMethod(
+            Invocation.method(#editDay, [day]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editDays(List<_i6.Day>? days) =>
+      (super.noSuchMethod(
+            Invocation.method(#editDays, [days]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> deleteDay(int? dayId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteDay, [dayId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i7.Slot> addSlot(_i7.Slot? slot, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSlot, [slot, routineId]),
+            returnValue: _i13.Future<_i7.Slot>.value(
+              _FakeSlot_5(this, Invocation.method(#addSlot, [slot, routineId])),
+            ),
+          )
+          as _i13.Future<_i7.Slot>);
+
+  @override
+  _i13.Future<void> deleteSlot(int? slotId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlot, [slotId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlot(_i7.Slot? slot, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlot, [slot, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlots(List<_i7.Slot>? slots, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlots, [slots, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i8.SlotEntry> addSlotEntry(_i8.SlotEntry? entry, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<_i8.SlotEntry>.value(
+              _FakeSlotEntry_6(this, Invocation.method(#addSlotEntry, [entry, routineId])),
+            ),
+          )
+          as _i13.Future<_i8.SlotEntry>);
+
+  @override
+  _i13.Future<void> deleteSlotEntry(int? id, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlotEntry, [id, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlotEntry(_i8.SlotEntry? entry, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  String getConfigUrl(_i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#getConfigUrl, [type]),
+            returnValue: _i16.dummyValue<String>(this, Invocation.method(#getConfigUrl, [type])),
+          )
+          as String);
+
+  @override
+  _i13.Future<_i9.BaseConfig> editConfig(_i9.BaseConfig? config, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#editConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(this, Invocation.method(#editConfig, [config, type])),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<_i9.BaseConfig> addConfig(_i9.BaseConfig? config, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#addConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(this, Invocation.method(#addConfig, [config, type])),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<void> deleteConfig(int? id, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteConfig, [id, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> handleConfig(_i8.SlotEntry? entry, num? value, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#handleConfig, [entry, value, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<List<_i10.WorkoutSession>> fetchSessionData() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchSessionData, []),
+            returnValue: _i13.Future<List<_i10.WorkoutSession>>.value(<_i10.WorkoutSession>[]),
+          )
+          as _i13.Future<List<_i10.WorkoutSession>>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> addSession(_i10.WorkoutSession? session, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSession, [session, routineId]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(this, Invocation.method(#addSession, [session, routineId])),
+            ),
+          )
+          as _i13.Future<_i10.WorkoutSession>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> editSession(_i10.WorkoutSession? session) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSession, [session]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(this, Invocation.method(#editSession, [session])),
+            ),
+          )
+          as _i13.Future<_i10.WorkoutSession>);
+
+  @override
+  _i13.Future<_i11.Log> addLog(_i11.Log? log) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLog, [log]),
+            returnValue: _i13.Future<_i11.Log>.value(
+              _FakeLog_9(this, Invocation.method(#addLog, [log])),
+            ),
+          )
+          as _i13.Future<_i11.Log>);
+
+  @override
+  _i13.Future<void> deleteLog(int? logId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLog, [logId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  void addListener(_i17.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void removeListener(_i17.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#removeListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void dispose() =>
+      super.noSuchMethod(Invocation.method(#dispose, []), returnValueForMissingStub: null);
+
+  @override
+  void notifyListeners() =>
+      super.noSuchMethod(Invocation.method(#notifyListeners, []), returnValueForMissingStub: null);
+}
diff --git a/test/routine/goldens/routine_logs_screen_detail.png b/test/routine/goldens/routine_logs_screen_detail.png
new file mode 100644
index 00000000..0edaa0a2
Binary files /dev/null and b/test/routine/goldens/routine_logs_screen_detail.png differ
diff --git a/test/routine/goldens/routine_screen_detail.png b/test/routine/goldens/routine_screen_detail.png
new file mode 100644
index 00000000..d3f5cb48
Binary files /dev/null and b/test/routine/goldens/routine_screen_detail.png differ
diff --git a/test/routine/gym_mode_screen_test.dart b/test/routine/gym_mode_screen_test.dart
new file mode 100644
index 00000000..8c332e1f
--- /dev/null
+++ b/test/routine/gym_mode_screen_test.dart
@@ -0,0 +1,298 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:clock/clock.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart' as riverpod;
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+import 'package:provider/provider.dart';
+import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
+import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/providers/base_provider.dart';
+import 'package:wger/providers/exercises.dart';
+import 'package:wger/providers/routines.dart';
+import 'package:wger/screens/gym_mode.dart';
+import 'package:wger/screens/routine_screen.dart';
+import 'package:wger/widgets/routines/forms/reps_unit.dart';
+import 'package:wger/widgets/routines/forms/rir.dart';
+import 'package:wger/widgets/routines/forms/weight_unit.dart';
+import 'package:wger/widgets/routines/gym_mode/exercise_overview.dart';
+import 'package:wger/widgets/routines/gym_mode/log_page.dart';
+import 'package:wger/widgets/routines/gym_mode/session_page.dart';
+import 'package:wger/widgets/routines/gym_mode/start_page.dart';
+import 'package:wger/widgets/routines/gym_mode/timer.dart';
+
+import '../../test_data/exercises.dart';
+import '../../test_data/routines.dart';
+import 'gym_mode_screen_test.mocks.dart';
+
+@GenerateMocks([WgerBaseProvider, ExercisesProvider, RoutinesProvider])
+void main() {
+  final key = GlobalKey<NavigatorState>();
+
+  final mockRoutinesProvider = MockRoutinesProvider();
+  final mockExerciseProvider = MockExercisesProvider();
+  final testRoutine = getTestRoutine();
+  final testExercises = getTestExercises();
+
+  setUp(() {
+    when(mockRoutinesProvider.findById(any)).thenReturn(testRoutine);
+    when(mockRoutinesProvider.items).thenReturn([testRoutine]);
+    when(mockRoutinesProvider.repetitionUnits).thenReturn(testRepetitionUnits);
+    when(mockRoutinesProvider.findRepetitionUnitById(1)).thenReturn(testRepetitionUnit1);
+    when(mockRoutinesProvider.weightUnits).thenReturn(testWeightUnits);
+    when(mockRoutinesProvider.findWeightUnitById(1)).thenReturn(testWeightUnit1);
+    when(
+      mockRoutinesProvider.fetchAndSetRoutineFull(any),
+    ).thenAnswer((_) => Future.value(testRoutine));
+
+    SharedPreferencesAsyncPlatform.instance = InMemorySharedPreferencesAsync.empty();
+  });
+
+  Widget renderGymMode({locale = 'en'}) {
+    return ChangeNotifierProvider<RoutinesProvider>(
+      create: (context) => mockRoutinesProvider,
+      child: ChangeNotifierProvider<ExercisesProvider>(
+        create: (context) => mockExerciseProvider,
+        child: riverpod.ProviderScope(
+          child: MaterialApp(
+            locale: Locale(locale),
+            localizationsDelegates: AppLocalizations.localizationsDelegates,
+            supportedLocales: AppLocalizations.supportedLocales,
+            navigatorKey: key,
+            home: TextButton(
+              onPressed: () => key.currentState!.push(
+                MaterialPageRoute<void>(
+                  settings: const RouteSettings(arguments: GymModeArguments(1, 1, 1)),
+                  builder: (_) => const GymModeScreen(),
+                ),
+              ),
+              child: const SizedBox(),
+            ),
+            routes: {RoutineScreen.routeName: (ctx) => const RoutineScreen()},
+          ),
+        ),
+      ),
+    );
+  }
+
+  testWidgets('Test the widgets on the gym mode screen', (WidgetTester tester) async {
+    when(mockExerciseProvider.findExerciseById(1)).thenReturn(testExercises[0]);
+    when(mockExerciseProvider.findExerciseById(6)).thenReturn(testExercises[5]);
+    when(
+      mockExerciseProvider.findExercisesByVariationId(
+        null,
+        exerciseIdToExclude: anyNamed('exerciseIdToExclude'),
+      ),
+    ).thenReturn([]);
+
+    await withClock(Clock.fixed(DateTime(2025, 3, 29, 14, 33)), () async {
+      await tester.pumpWidget(renderGymMode());
+
+      await tester.pumpAndSettle();
+      await tester.tap(find.byType(TextButton));
+
+      await tester.pumpAndSettle();
+      //await tester.ensureVisible(find.byKey(Key(key as String)));
+      //
+      // Start page
+      //
+      expect(find.byType(StartPage), findsOneWidget);
+      expect(find.text('Your workout today'), findsOneWidget);
+      expect(find.text('Bench press'), findsOneWidget);
+      expect(find.text('Side raises'), findsOneWidget);
+      expect(find.byIcon(Icons.close), findsOneWidget);
+      expect(find.byIcon(Icons.toc), findsOneWidget);
+      expect(find.byIcon(Icons.chevron_left), findsNothing);
+      expect(find.byIcon(Icons.chevron_right), findsOneWidget);
+      await tester.tap(find.byIcon(Icons.chevron_right));
+      await tester.pumpAndSettle();
+
+      //
+      // Bench press - exercise overview page
+      //
+      expect(find.text('Bench press'), findsOneWidget);
+      expect(find.byType(ExerciseOverview), findsOneWidget);
+      expect(find.byIcon(Icons.close), findsOneWidget);
+      expect(find.byIcon(Icons.toc), findsOneWidget);
+      expect(find.byIcon(Icons.chevron_left), findsOneWidget);
+      expect(find.byIcon(Icons.chevron_right), findsOneWidget);
+      await tester.drag(find.byType(ExerciseOverview), const Offset(-500.0, 0.0));
+      await tester.pumpAndSettle();
+
+      //
+      // Bench press - Log
+      //
+      expect(find.text('Bench press'), findsOneWidget);
+      expect(find.byType(LogPage), findsOneWidget);
+      expect(find.byType(Form), findsOneWidget);
+      // print(find.byType(Form));
+      expect(find.byType(ListTile), findsNWidgets(3), reason: 'Two logs and the switch tile');
+      expect(find.text('10 × 10 kg  (1.5 RiR)'), findsOneWidget);
+      expect(find.text('12 × 10 kg  (2 RiR)'), findsOneWidget);
+      expect(find.text('Make sure to warm up'), findsOneWidget, reason: 'Set comment');
+      expect(find.byIcon(Icons.close), findsOneWidget);
+      expect(find.byIcon(Icons.toc), findsOneWidget);
+      expect(find.byIcon(Icons.chevron_left), findsOneWidget);
+      expect(find.byIcon(Icons.chevron_right), findsOneWidget);
+
+      // Form shows only weight and reps
+      expect(find.byType(SwitchListTile), findsOneWidget);
+      expect(find.byType(TextFormField), findsNWidgets(2));
+      expect(find.byType(RepetitionUnitInputWidget), findsNothing);
+      expect(find.byType(WeightUnitInputWidget), findsNothing);
+      expect(find.byType(RiRInputWidget), findsNothing);
+
+      // Form shows unit and rir after tapping the toggle button
+      await tester.tap(find.byType(SwitchListTile));
+      await tester.pump();
+      expect(find.byType(RepetitionUnitInputWidget), findsOneWidget);
+      expect(find.byType(WeightUnitInputWidget), findsOneWidget);
+      expect(find.byType(RiRInputWidget), findsOneWidget);
+      await tester.drag(find.byType(LogPage), const Offset(-500.0, 0.0));
+      await tester.pumpAndSettle();
+
+      //
+      // Bench press - pause
+      //
+      expect(find.text('Pause'), findsOneWidget);
+      expect(find.byType(TimerCountdownWidget), findsOneWidget);
+      expect(find.byIcon(Icons.close), findsOneWidget);
+      expect(find.byIcon(Icons.toc), findsOneWidget);
+      expect(find.byIcon(Icons.chevron_left), findsOneWidget);
+      expect(find.byIcon(Icons.chevron_right), findsOneWidget);
+      await tester.tap(find.byIcon(Icons.chevron_right));
+      await tester.pumpAndSettle();
+
+      //
+      // Bench press - log
+      //
+      expect(find.text('Bench press'), findsOneWidget);
+      expect(find.byType(LogPage), findsOneWidget);
+      expect(find.byType(Form), findsOneWidget);
+      await tester.drag(find.byType(LogPage), const Offset(-500.0, 0.0));
+      await tester.pumpAndSettle();
+
+      //
+      // Pause
+      //
+      expect(find.text('Pause'), findsOneWidget);
+      expect(find.byType(TimerCountdownWidget), findsOneWidget);
+      expect(find.byIcon(Icons.chevron_left), findsOneWidget);
+      expect(find.byIcon(Icons.close), findsOneWidget);
+      expect(find.byIcon(Icons.chevron_right), findsOneWidget);
+      await tester.tap(find.byIcon(Icons.chevron_right));
+      await tester.pumpAndSettle();
+
+      //
+      // Bench press - log
+      //
+      expect(find.text('Bench press'), findsOneWidget);
+      expect(find.byType(LogPage), findsOneWidget);
+      expect(find.byType(Form), findsOneWidget);
+      await tester.tap(find.byIcon(Icons.chevron_right));
+      await tester.pumpAndSettle();
+
+      //
+      // Pause
+      //
+      expect(find.text('Pause'), findsOneWidget);
+      expect(find.byType(TimerCountdownWidget), findsOneWidget);
+      await tester.tap(find.byIcon(Icons.chevron_right));
+      await tester.pumpAndSettle();
+
+      //
+      // Side raises - overview
+      //
+      expect(find.text('Side raises'), findsOneWidget);
+      expect(find.byType(ExerciseOverview), findsOneWidget);
+      await tester.tap(find.byIcon(Icons.chevron_right));
+      await tester.pumpAndSettle();
+
+      //
+      // Side raises - log
+      //
+      expect(find.text('Side raises'), findsOneWidget);
+      expect(find.byType(LogPage), findsOneWidget);
+      await tester.tap(find.byIcon(Icons.chevron_right));
+      await tester.pumpAndSettle();
+
+      //
+      // Side raises - timer
+      //
+      expect(find.byType(TimerWidget), findsOneWidget);
+      await tester.tap(find.byIcon(Icons.chevron_right));
+      await tester.pumpAndSettle();
+
+      //
+      // Side raises - log
+      //
+      expect(find.text('Side raises'), findsOneWidget);
+      expect(find.byType(LogPage), findsOneWidget);
+      await tester.tap(find.byIcon(Icons.chevron_right));
+      await tester.pumpAndSettle();
+
+      //
+      // Side raises - timer
+      //
+      expect(find.byType(TimerWidget), findsOneWidget);
+      await tester.tap(find.byIcon(Icons.chevron_right));
+      await tester.pumpAndSettle();
+
+      //
+      // Side raises - log
+      //
+      expect(find.text('Side raises'), findsOneWidget);
+      expect(find.byType(LogPage), findsOneWidget);
+      await tester.tap(find.byIcon(Icons.chevron_right));
+      await tester.pumpAndSettle();
+
+      //
+      // Side raises - timer
+      //
+      expect(find.byType(TimerWidget), findsOneWidget);
+      await tester.tap(find.byIcon(Icons.chevron_right));
+      await tester.pumpAndSettle();
+
+      //
+      // Session
+      //
+      expect(find.text('Workout session'), findsOneWidget);
+      expect(find.byType(SessionPage), findsOneWidget);
+      expect(find.byType(Form), findsOneWidget);
+      expect(find.byIcon(Icons.sentiment_very_dissatisfied), findsOneWidget);
+      expect(find.byIcon(Icons.sentiment_neutral), findsOneWidget);
+      expect(find.byIcon(Icons.sentiment_very_satisfied), findsOneWidget);
+      expect(
+        find.text('14:33'),
+        findsNWidgets(2),
+        reason: 'start and end time are the same',
+      );
+      final toggleButtons = tester.widget<ToggleButtons>(find.byType(ToggleButtons));
+      expect(toggleButtons.isSelected[1], isTrue);
+      expect(find.byIcon(Icons.chevron_left), findsOneWidget);
+      expect(find.byIcon(Icons.close), findsOneWidget);
+      expect(find.byIcon(Icons.chevron_right), findsNothing);
+
+      //
+    });
+  });
+}
diff --git a/test/routine/gym_mode_screen_test.mocks.dart b/test/routine/gym_mode_screen_test.mocks.dart
new file mode 100644
index 00000000..400d7e1f
--- /dev/null
+++ b/test/routine/gym_mode_screen_test.mocks.dart
@@ -0,0 +1,1195 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in wger/test/routine/gym_mode_screen_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i20;
+import 'dart:ui' as _i22;
+
+import 'package:http/http.dart' as _i3;
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:mockito/src/dummies.dart' as _i25;
+import 'package:wger/database/exercises/exercise_database.dart' as _i5;
+import 'package:wger/models/exercises/category.dart' as _i7;
+import 'package:wger/models/exercises/equipment.dart' as _i8;
+import 'package:wger/models/exercises/exercise.dart' as _i6;
+import 'package:wger/models/exercises/language.dart' as _i10;
+import 'package:wger/models/exercises/muscle.dart' as _i9;
+import 'package:wger/models/workouts/base_config.dart' as _i17;
+import 'package:wger/models/workouts/day.dart' as _i14;
+import 'package:wger/models/workouts/day_data.dart' as _i24;
+import 'package:wger/models/workouts/log.dart' as _i19;
+import 'package:wger/models/workouts/repetition_unit.dart' as _i12;
+import 'package:wger/models/workouts/routine.dart' as _i13;
+import 'package:wger/models/workouts/session.dart' as _i18;
+import 'package:wger/models/workouts/slot.dart' as _i15;
+import 'package:wger/models/workouts/slot_entry.dart' as _i16;
+import 'package:wger/models/workouts/weight_unit.dart' as _i11;
+import 'package:wger/providers/auth.dart' as _i2;
+import 'package:wger/providers/base_provider.dart' as _i4;
+import 'package:wger/providers/exercises.dart' as _i21;
+import 'package:wger/providers/routines.dart' as _i23;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
+
+class _FakeAuthProvider_0 extends _i1.SmartFake implements _i2.AuthProvider {
+  _FakeAuthProvider_0(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
+  _FakeClient_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeUri_2 extends _i1.SmartFake implements Uri {
+  _FakeUri_2(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeResponse_3 extends _i1.SmartFake implements _i3.Response {
+  _FakeResponse_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeWgerBaseProvider_4 extends _i1.SmartFake implements _i4.WgerBaseProvider {
+  _FakeWgerBaseProvider_4(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeExerciseDatabase_5 extends _i1.SmartFake implements _i5.ExerciseDatabase {
+  _FakeExerciseDatabase_5(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeExercise_6 extends _i1.SmartFake implements _i6.Exercise {
+  _FakeExercise_6(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeExerciseCategory_7 extends _i1.SmartFake implements _i7.ExerciseCategory {
+  _FakeExerciseCategory_7(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeEquipment_8 extends _i1.SmartFake implements _i8.Equipment {
+  _FakeEquipment_8(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeMuscle_9 extends _i1.SmartFake implements _i9.Muscle {
+  _FakeMuscle_9(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeLanguage_10 extends _i1.SmartFake implements _i10.Language {
+  _FakeLanguage_10(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeWeightUnit_11 extends _i1.SmartFake implements _i11.WeightUnit {
+  _FakeWeightUnit_11(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeRepetitionUnit_12 extends _i1.SmartFake implements _i12.RepetitionUnit {
+  _FakeRepetitionUnit_12(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeRoutine_13 extends _i1.SmartFake implements _i13.Routine {
+  _FakeRoutine_13(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeDay_14 extends _i1.SmartFake implements _i14.Day {
+  _FakeDay_14(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeSlot_15 extends _i1.SmartFake implements _i15.Slot {
+  _FakeSlot_15(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeSlotEntry_16 extends _i1.SmartFake implements _i16.SlotEntry {
+  _FakeSlotEntry_16(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeBaseConfig_17 extends _i1.SmartFake implements _i17.BaseConfig {
+  _FakeBaseConfig_17(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeWorkoutSession_18 extends _i1.SmartFake implements _i18.WorkoutSession {
+  _FakeWorkoutSession_18(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeLog_19 extends _i1.SmartFake implements _i19.Log {
+  _FakeLog_19(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+/// A class which mocks [WgerBaseProvider].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
+  MockWgerBaseProvider() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i2.AuthProvider get auth =>
+      (super.noSuchMethod(
+            Invocation.getter(#auth),
+            returnValue: _FakeAuthProvider_0(this, Invocation.getter(#auth)),
+          )
+          as _i2.AuthProvider);
+
+  @override
+  _i3.Client get client =>
+      (super.noSuchMethod(
+            Invocation.getter(#client),
+            returnValue: _FakeClient_1(this, Invocation.getter(#client)),
+          )
+          as _i3.Client);
+
+  @override
+  set auth(_i2.AuthProvider? value) => super.noSuchMethod(
+    Invocation.setter(#auth, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set client(_i3.Client? value) => super.noSuchMethod(
+    Invocation.setter(#client, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  Map<String, String> getDefaultHeaders({bool? includeAuth = false}) =>
+      (super.noSuchMethod(
+            Invocation.method(#getDefaultHeaders, [], {
+              #includeAuth: includeAuth,
+            }),
+            returnValue: <String, String>{},
+          )
+          as Map<String, String>);
+
+  @override
+  Uri makeUrl(
+    String? path, {
+    int? id,
+    String? objectMethod,
+    Map<String, dynamic>? query,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #makeUrl,
+              [path],
+              {#id: id, #objectMethod: objectMethod, #query: query},
+            ),
+            returnValue: _FakeUri_2(
+              this,
+              Invocation.method(
+                #makeUrl,
+                [path],
+                {#id: id, #objectMethod: objectMethod, #query: query},
+              ),
+            ),
+          )
+          as Uri);
+
+  @override
+  _i20.Future<dynamic> fetch(Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetch, [uri]),
+            returnValue: _i20.Future<dynamic>.value(),
+          )
+          as _i20.Future<dynamic>);
+
+  @override
+  _i20.Future<List<dynamic>> fetchPaginated(Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchPaginated, [uri]),
+            returnValue: _i20.Future<List<dynamic>>.value(<dynamic>[]),
+          )
+          as _i20.Future<List<dynamic>>);
+
+  @override
+  _i20.Future<Map<String, dynamic>> post(
+    Map<String, dynamic>? data,
+    Uri? uri,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#post, [data, uri]),
+            returnValue: _i20.Future<Map<String, dynamic>>.value(
+              <String, dynamic>{},
+            ),
+          )
+          as _i20.Future<Map<String, dynamic>>);
+
+  @override
+  _i20.Future<Map<String, dynamic>> patch(
+    Map<String, dynamic>? data,
+    Uri? uri,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#patch, [data, uri]),
+            returnValue: _i20.Future<Map<String, dynamic>>.value(
+              <String, dynamic>{},
+            ),
+          )
+          as _i20.Future<Map<String, dynamic>>);
+
+  @override
+  _i20.Future<_i3.Response> deleteRequest(String? url, int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteRequest, [url, id]),
+            returnValue: _i20.Future<_i3.Response>.value(
+              _FakeResponse_3(
+                this,
+                Invocation.method(#deleteRequest, [url, id]),
+              ),
+            ),
+          )
+          as _i20.Future<_i3.Response>);
+}
+
+/// A class which mocks [ExercisesProvider].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockExercisesProvider extends _i1.Mock implements _i21.ExercisesProvider {
+  MockExercisesProvider() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i4.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_4(
+              this,
+              Invocation.getter(#baseProvider),
+            ),
+          )
+          as _i4.WgerBaseProvider);
+
+  @override
+  _i5.ExerciseDatabase get database =>
+      (super.noSuchMethod(
+            Invocation.getter(#database),
+            returnValue: _FakeExerciseDatabase_5(
+              this,
+              Invocation.getter(#database),
+            ),
+          )
+          as _i5.ExerciseDatabase);
+
+  @override
+  List<_i6.Exercise> get exercises =>
+      (super.noSuchMethod(
+            Invocation.getter(#exercises),
+            returnValue: <_i6.Exercise>[],
+          )
+          as List<_i6.Exercise>);
+
+  @override
+  List<_i6.Exercise> get filteredExercises =>
+      (super.noSuchMethod(
+            Invocation.getter(#filteredExercises),
+            returnValue: <_i6.Exercise>[],
+          )
+          as List<_i6.Exercise>);
+
+  @override
+  Map<int, List<_i6.Exercise>> get exerciseByVariation =>
+      (super.noSuchMethod(
+            Invocation.getter(#exerciseByVariation),
+            returnValue: <int, List<_i6.Exercise>>{},
+          )
+          as Map<int, List<_i6.Exercise>>);
+
+  @override
+  List<_i7.ExerciseCategory> get categories =>
+      (super.noSuchMethod(
+            Invocation.getter(#categories),
+            returnValue: <_i7.ExerciseCategory>[],
+          )
+          as List<_i7.ExerciseCategory>);
+
+  @override
+  List<_i9.Muscle> get muscles =>
+      (super.noSuchMethod(
+            Invocation.getter(#muscles),
+            returnValue: <_i9.Muscle>[],
+          )
+          as List<_i9.Muscle>);
+
+  @override
+  List<_i8.Equipment> get equipment =>
+      (super.noSuchMethod(
+            Invocation.getter(#equipment),
+            returnValue: <_i8.Equipment>[],
+          )
+          as List<_i8.Equipment>);
+
+  @override
+  List<_i10.Language> get languages =>
+      (super.noSuchMethod(
+            Invocation.getter(#languages),
+            returnValue: <_i10.Language>[],
+          )
+          as List<_i10.Language>);
+
+  @override
+  set database(_i5.ExerciseDatabase? value) => super.noSuchMethod(
+    Invocation.setter(#database, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set exercises(List<_i6.Exercise>? value) => super.noSuchMethod(
+    Invocation.setter(#exercises, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set filteredExercises(List<_i6.Exercise>? newFilteredExercises) => super.noSuchMethod(
+    Invocation.setter(#filteredExercises, newFilteredExercises),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set languages(List<_i10.Language>? languages) => super.noSuchMethod(
+    Invocation.setter(#languages, languages),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  bool get hasListeners =>
+      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
+
+  @override
+  _i20.Future<void> setFilters(_i21.Filters? newFilters) =>
+      (super.noSuchMethod(
+            Invocation.method(#setFilters, [newFilters]),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  void initFilters() => super.noSuchMethod(
+    Invocation.method(#initFilters, []),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  _i20.Future<void> findByFilters() =>
+      (super.noSuchMethod(
+            Invocation.method(#findByFilters, []),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  void clear() => super.noSuchMethod(
+    Invocation.method(#clear, []),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  _i6.Exercise findExerciseById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findExerciseById, [id]),
+            returnValue: _FakeExercise_6(
+              this,
+              Invocation.method(#findExerciseById, [id]),
+            ),
+          )
+          as _i6.Exercise);
+
+  @override
+  List<_i6.Exercise> findExercisesByVariationId(
+    int? variationId, {
+    int? exerciseIdToExclude,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #findExercisesByVariationId,
+              [variationId],
+              {#exerciseIdToExclude: exerciseIdToExclude},
+            ),
+            returnValue: <_i6.Exercise>[],
+          )
+          as List<_i6.Exercise>);
+
+  @override
+  _i7.ExerciseCategory findCategoryById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findCategoryById, [id]),
+            returnValue: _FakeExerciseCategory_7(
+              this,
+              Invocation.method(#findCategoryById, [id]),
+            ),
+          )
+          as _i7.ExerciseCategory);
+
+  @override
+  _i8.Equipment findEquipmentById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findEquipmentById, [id]),
+            returnValue: _FakeEquipment_8(
+              this,
+              Invocation.method(#findEquipmentById, [id]),
+            ),
+          )
+          as _i8.Equipment);
+
+  @override
+  _i9.Muscle findMuscleById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findMuscleById, [id]),
+            returnValue: _FakeMuscle_9(
+              this,
+              Invocation.method(#findMuscleById, [id]),
+            ),
+          )
+          as _i9.Muscle);
+
+  @override
+  _i10.Language findLanguageById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findLanguageById, [id]),
+            returnValue: _FakeLanguage_10(
+              this,
+              Invocation.method(#findLanguageById, [id]),
+            ),
+          )
+          as _i10.Language);
+
+  @override
+  _i20.Future<void> fetchAndSetCategoriesFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetCategoriesFromApi, []),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<void> fetchAndSetMusclesFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetMusclesFromApi, []),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<void> fetchAndSetEquipmentsFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetEquipmentsFromApi, []),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<void> fetchAndSetLanguagesFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetLanguagesFromApi, []),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<void> fetchAndSetAllExercises() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllExercises, []),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<_i6.Exercise?> fetchAndSetExercise(int? exerciseId) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetExercise, [exerciseId]),
+            returnValue: _i20.Future<_i6.Exercise?>.value(),
+          )
+          as _i20.Future<_i6.Exercise?>);
+
+  @override
+  _i20.Future<_i6.Exercise> handleUpdateExerciseFromApi(
+    _i5.ExerciseDatabase? database,
+    int? exerciseId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#handleUpdateExerciseFromApi, [
+              database,
+              exerciseId,
+            ]),
+            returnValue: _i20.Future<_i6.Exercise>.value(
+              _FakeExercise_6(
+                this,
+                Invocation.method(#handleUpdateExerciseFromApi, [
+                  database,
+                  exerciseId,
+                ]),
+              ),
+            ),
+          )
+          as _i20.Future<_i6.Exercise>);
+
+  @override
+  _i20.Future<void> initCacheTimesLocalPrefs({dynamic forceInit = false}) =>
+      (super.noSuchMethod(
+            Invocation.method(#initCacheTimesLocalPrefs, [], {
+              #forceInit: forceInit,
+            }),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<void> clearAllCachesAndPrefs() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearAllCachesAndPrefs, []),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<void> fetchAndSetInitialData() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetInitialData, []),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<void> setExercisesFromDatabase(
+    _i5.ExerciseDatabase? database, {
+    bool? forceDeleteCache = false,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #setExercisesFromDatabase,
+              [database],
+              {#forceDeleteCache: forceDeleteCache},
+            ),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<void> updateExerciseCache(_i5.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateExerciseCache, [database]),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<void> fetchAndSetMuscles(_i5.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetMuscles, [database]),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<void> fetchAndSetCategories(_i5.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetCategories, [database]),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<void> fetchAndSetLanguages(_i5.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetLanguages, [database]),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<void> fetchAndSetEquipments(_i5.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetEquipments, [database]),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<List<_i6.Exercise>> searchExercise(
+    String? name, {
+    String? languageCode = 'en',
+    bool? searchEnglish = false,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #searchExercise,
+              [name],
+              {#languageCode: languageCode, #searchEnglish: searchEnglish},
+            ),
+            returnValue: _i20.Future<List<_i6.Exercise>>.value(
+              <_i6.Exercise>[],
+            ),
+          )
+          as _i20.Future<List<_i6.Exercise>>);
+
+  @override
+  void addListener(_i22.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void removeListener(_i22.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#removeListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void dispose() => super.noSuchMethod(
+    Invocation.method(#dispose, []),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void notifyListeners() => super.noSuchMethod(
+    Invocation.method(#notifyListeners, []),
+    returnValueForMissingStub: null,
+  );
+}
+
+/// A class which mocks [RoutinesProvider].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockRoutinesProvider extends _i1.Mock implements _i23.RoutinesProvider {
+  MockRoutinesProvider() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i4.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_4(
+              this,
+              Invocation.getter(#baseProvider),
+            ),
+          )
+          as _i4.WgerBaseProvider);
+
+  @override
+  List<_i13.Routine> get items =>
+      (super.noSuchMethod(
+            Invocation.getter(#items),
+            returnValue: <_i13.Routine>[],
+          )
+          as List<_i13.Routine>);
+
+  @override
+  List<_i11.WeightUnit> get weightUnits =>
+      (super.noSuchMethod(
+            Invocation.getter(#weightUnits),
+            returnValue: <_i11.WeightUnit>[],
+          )
+          as List<_i11.WeightUnit>);
+
+  @override
+  _i11.WeightUnit get defaultWeightUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultWeightUnit),
+            returnValue: _FakeWeightUnit_11(
+              this,
+              Invocation.getter(#defaultWeightUnit),
+            ),
+          )
+          as _i11.WeightUnit);
+
+  @override
+  List<_i12.RepetitionUnit> get repetitionUnits =>
+      (super.noSuchMethod(
+            Invocation.getter(#repetitionUnits),
+            returnValue: <_i12.RepetitionUnit>[],
+          )
+          as List<_i12.RepetitionUnit>);
+
+  @override
+  _i12.RepetitionUnit get defaultRepetitionUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultRepetitionUnit),
+            returnValue: _FakeRepetitionUnit_12(
+              this,
+              Invocation.getter(#defaultRepetitionUnit),
+            ),
+          )
+          as _i12.RepetitionUnit);
+
+  @override
+  set activeRoutine(_i13.Routine? value) => super.noSuchMethod(
+    Invocation.setter(#activeRoutine, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set weightUnits(List<_i11.WeightUnit>? weightUnits) => super.noSuchMethod(
+    Invocation.setter(#weightUnits, weightUnits),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set repetitionUnits(List<_i12.RepetitionUnit>? repetitionUnits) => super.noSuchMethod(
+    Invocation.setter(#repetitionUnits, repetitionUnits),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  bool get hasListeners =>
+      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
+
+  @override
+  void clear() => super.noSuchMethod(
+    Invocation.method(#clear, []),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  _i11.WeightUnit findWeightUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findWeightUnitById, [id]),
+            returnValue: _FakeWeightUnit_11(
+              this,
+              Invocation.method(#findWeightUnitById, [id]),
+            ),
+          )
+          as _i11.WeightUnit);
+
+  @override
+  _i12.RepetitionUnit findRepetitionUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findRepetitionUnitById, [id]),
+            returnValue: _FakeRepetitionUnit_12(
+              this,
+              Invocation.method(#findRepetitionUnitById, [id]),
+            ),
+          )
+          as _i12.RepetitionUnit);
+
+  @override
+  List<_i13.Routine> getPlans() =>
+      (super.noSuchMethod(
+            Invocation.method(#getPlans, []),
+            returnValue: <_i13.Routine>[],
+          )
+          as List<_i13.Routine>);
+
+  @override
+  _i13.Routine findById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findById, [id]),
+            returnValue: _FakeRoutine_13(
+              this,
+              Invocation.method(#findById, [id]),
+            ),
+          )
+          as _i13.Routine);
+
+  @override
+  int findIndexById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findIndexById, [id]),
+            returnValue: 0,
+          )
+          as int);
+
+  @override
+  _i20.Future<void> fetchAndSetAllRoutinesFull() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesFull, []),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<void> fetchAndSetAllRoutinesSparse() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesSparse, []),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<void> setExercisesAndUnits(
+    List<_i24.DayData>? entries, {
+    Map<int, _i6.Exercise>? exercises,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #setExercisesAndUnits,
+              [entries],
+              {#exercises: exercises},
+            ),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<_i13.Routine> fetchAndSetRoutineSparse(int? planId) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetRoutineSparse, [planId]),
+            returnValue: _i20.Future<_i13.Routine>.value(
+              _FakeRoutine_13(
+                this,
+                Invocation.method(#fetchAndSetRoutineSparse, [planId]),
+              ),
+            ),
+          )
+          as _i20.Future<_i13.Routine>);
+
+  @override
+  _i20.Future<_i13.Routine> fetchAndSetRoutineFull(int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetRoutineFull, [routineId]),
+            returnValue: _i20.Future<_i13.Routine>.value(
+              _FakeRoutine_13(
+                this,
+                Invocation.method(#fetchAndSetRoutineFull, [routineId]),
+              ),
+            ),
+          )
+          as _i20.Future<_i13.Routine>);
+
+  @override
+  _i20.Future<_i13.Routine> addRoutine(_i13.Routine? routine) =>
+      (super.noSuchMethod(
+            Invocation.method(#addRoutine, [routine]),
+            returnValue: _i20.Future<_i13.Routine>.value(
+              _FakeRoutine_13(this, Invocation.method(#addRoutine, [routine])),
+            ),
+          )
+          as _i20.Future<_i13.Routine>);
+
+  @override
+  _i20.Future<void> editRoutine(_i13.Routine? routine) =>
+      (super.noSuchMethod(
+            Invocation.method(#editRoutine, [routine]),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<void> deleteRoutine(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteRoutine, [id]),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<void> fetchAndSetRepetitionUnits() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetRepetitionUnits, []),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<void> fetchAndSetWeightUnits() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetWeightUnits, []),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<void> fetchAndSetUnits() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetUnits, []),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<_i14.Day> addDay(_i14.Day? day) =>
+      (super.noSuchMethod(
+            Invocation.method(#addDay, [day]),
+            returnValue: _i20.Future<_i14.Day>.value(
+              _FakeDay_14(this, Invocation.method(#addDay, [day])),
+            ),
+          )
+          as _i20.Future<_i14.Day>);
+
+  @override
+  _i20.Future<void> editDay(_i14.Day? day) =>
+      (super.noSuchMethod(
+            Invocation.method(#editDay, [day]),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<void> editDays(List<_i14.Day>? days) =>
+      (super.noSuchMethod(
+            Invocation.method(#editDays, [days]),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<void> deleteDay(int? dayId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteDay, [dayId]),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<_i15.Slot> addSlot(_i15.Slot? slot, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSlot, [slot, routineId]),
+            returnValue: _i20.Future<_i15.Slot>.value(
+              _FakeSlot_15(
+                this,
+                Invocation.method(#addSlot, [slot, routineId]),
+              ),
+            ),
+          )
+          as _i20.Future<_i15.Slot>);
+
+  @override
+  _i20.Future<void> deleteSlot(int? slotId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlot, [slotId, routineId]),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<void> editSlot(_i15.Slot? slot, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlot, [slot, routineId]),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<void> editSlots(List<_i15.Slot>? slots, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlots, [slots, routineId]),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<_i16.SlotEntry> addSlotEntry(
+    _i16.SlotEntry? entry,
+    int? routineId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSlotEntry, [entry, routineId]),
+            returnValue: _i20.Future<_i16.SlotEntry>.value(
+              _FakeSlotEntry_16(
+                this,
+                Invocation.method(#addSlotEntry, [entry, routineId]),
+              ),
+            ),
+          )
+          as _i20.Future<_i16.SlotEntry>);
+
+  @override
+  _i20.Future<void> deleteSlotEntry(int? id, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlotEntry, [id, routineId]),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<void> editSlotEntry(_i16.SlotEntry? entry, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlotEntry, [entry, routineId]),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  String getConfigUrl(_i16.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#getConfigUrl, [type]),
+            returnValue: _i25.dummyValue<String>(
+              this,
+              Invocation.method(#getConfigUrl, [type]),
+            ),
+          )
+          as String);
+
+  @override
+  _i20.Future<_i17.BaseConfig> editConfig(
+    _i17.BaseConfig? config,
+    _i16.ConfigType? type,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#editConfig, [config, type]),
+            returnValue: _i20.Future<_i17.BaseConfig>.value(
+              _FakeBaseConfig_17(
+                this,
+                Invocation.method(#editConfig, [config, type]),
+              ),
+            ),
+          )
+          as _i20.Future<_i17.BaseConfig>);
+
+  @override
+  _i20.Future<_i17.BaseConfig> addConfig(
+    _i17.BaseConfig? config,
+    _i16.ConfigType? type,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addConfig, [config, type]),
+            returnValue: _i20.Future<_i17.BaseConfig>.value(
+              _FakeBaseConfig_17(
+                this,
+                Invocation.method(#addConfig, [config, type]),
+              ),
+            ),
+          )
+          as _i20.Future<_i17.BaseConfig>);
+
+  @override
+  _i20.Future<void> deleteConfig(int? id, _i16.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteConfig, [id, type]),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<void> handleConfig(
+    _i16.SlotEntry? entry,
+    num? value,
+    _i16.ConfigType? type,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#handleConfig, [entry, value, type]),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  _i20.Future<List<_i18.WorkoutSession>> fetchSessionData() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchSessionData, []),
+            returnValue: _i20.Future<List<_i18.WorkoutSession>>.value(
+              <_i18.WorkoutSession>[],
+            ),
+          )
+          as _i20.Future<List<_i18.WorkoutSession>>);
+
+  @override
+  _i20.Future<_i18.WorkoutSession> addSession(
+    _i18.WorkoutSession? session,
+    int? routineId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSession, [session, routineId]),
+            returnValue: _i20.Future<_i18.WorkoutSession>.value(
+              _FakeWorkoutSession_18(
+                this,
+                Invocation.method(#addSession, [session, routineId]),
+              ),
+            ),
+          )
+          as _i20.Future<_i18.WorkoutSession>);
+
+  @override
+  _i20.Future<_i18.WorkoutSession> editSession(_i18.WorkoutSession? session) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSession, [session]),
+            returnValue: _i20.Future<_i18.WorkoutSession>.value(
+              _FakeWorkoutSession_18(
+                this,
+                Invocation.method(#editSession, [session]),
+              ),
+            ),
+          )
+          as _i20.Future<_i18.WorkoutSession>);
+
+  @override
+  _i20.Future<_i19.Log> addLog(_i19.Log? log) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLog, [log]),
+            returnValue: _i20.Future<_i19.Log>.value(
+              _FakeLog_19(this, Invocation.method(#addLog, [log])),
+            ),
+          )
+          as _i20.Future<_i19.Log>);
+
+  @override
+  _i20.Future<void> deleteLog(int? logId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLog, [logId, routineId]),
+            returnValue: _i20.Future<void>.value(),
+            returnValueForMissingStub: _i20.Future<void>.value(),
+          )
+          as _i20.Future<void>);
+
+  @override
+  void addListener(_i22.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void removeListener(_i22.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#removeListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void dispose() => super.noSuchMethod(
+    Invocation.method(#dispose, []),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void notifyListeners() => super.noSuchMethod(
+    Invocation.method(#notifyListeners, []),
+    returnValueForMissingStub: null,
+  );
+}
diff --git a/test/routine/gym_mode_session_screen_test.dart b/test/routine/gym_mode_session_screen_test.dart
new file mode 100644
index 00000000..bb5c77f4
--- /dev/null
+++ b/test/routine/gym_mode_session_screen_test.dart
@@ -0,0 +1,120 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:clock/clock.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+import 'package:provider/provider.dart';
+import 'package:wger/helpers/json.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/workouts/routine.dart';
+import 'package:wger/models/workouts/session.dart';
+import 'package:wger/providers/routines.dart';
+import 'package:wger/widgets/routines/gym_mode/session_page.dart';
+
+import '../../test_data/routines.dart';
+import 'gym_mode_session_screen_test.mocks.dart';
+
+@GenerateMocks([RoutinesProvider])
+void main() {
+  final mockRoutinesProvider = MockRoutinesProvider();
+  late Routine testRoutine;
+
+  setUp(() {
+    testRoutine = getTestRoutine();
+
+    when(mockRoutinesProvider.editSession(any)).thenAnswer(
+      (_) => Future.value(testRoutine.sessions[0].session),
+    );
+  });
+
+  Widget renderSessionPage({locale = 'en'}) {
+    return ChangeNotifierProvider<RoutinesProvider>(
+      create: (context) => mockRoutinesProvider,
+      child: MaterialApp(
+        locale: Locale(locale),
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: Scaffold(
+          body: SessionPage(
+            testRoutine,
+            PageController(),
+            const TimeOfDay(hour: 13, minute: 35),
+            const {},
+          ),
+        ),
+      ),
+    );
+  }
+
+  testWidgets('Test that data from  session is loaded', (WidgetTester tester) async {
+    withClock(Clock.fixed(DateTime(2021, 5, 1)), () async {
+      await tester.pumpWidget(renderSessionPage());
+      expect(find.text('10:00'), findsOneWidget);
+      expect(find.text('12:34'), findsOneWidget);
+      expect(find.text('This is a note'), findsOneWidget);
+      final toggleButtons = tester.widget<ToggleButtons>(find.byType(ToggleButtons));
+      expect(toggleButtons.isSelected[2], isTrue);
+    });
+  });
+
+  testWidgets('Test that data from  session is loaded - null times', (WidgetTester tester) async {
+    testRoutine.sessions[0].session.timeStart = null;
+    testRoutine.sessions[0].session.timeEnd = null;
+
+    withClock(Clock.fixed(DateTime(2021, 5, 1)), () async {
+      await tester.pumpWidget(renderSessionPage());
+
+      final startTimeField = find.byKey(const ValueKey('time-start'));
+      expect(startTimeField, findsOneWidget);
+      expect(tester.widget<TextFormField>(startTimeField).controller!.text, '');
+
+      final endTimeField = find.byKey(const ValueKey('time-end'));
+      expect(endTimeField, findsOneWidget);
+      expect(tester.widget<TextFormField>(endTimeField).controller!.text, '');
+    });
+  });
+
+  testWidgets('Test correct default data (no existing session)', (WidgetTester tester) async {
+    testRoutine.sessions = [];
+    final timeNow = timeToString(TimeOfDay.now())!;
+
+    await tester.pumpWidget(renderSessionPage());
+    expect(find.text('13:35'), findsOneWidget);
+    expect(find.text(timeNow), findsOneWidget);
+    final toggleButtons = tester.widget<ToggleButtons>(find.byType(ToggleButtons));
+    expect(toggleButtons.isSelected[1], isTrue);
+  });
+
+  testWidgets('Test that correct data is send to server', (WidgetTester tester) async {
+    withClock(Clock.fixed(DateTime(2021, 5, 1)), () async {
+      await tester.pumpWidget(renderSessionPage());
+      await tester.tap(find.byKey(const ValueKey('save-button')));
+      final captured =
+          verify(mockRoutinesProvider.editSession(captureAny)).captured.single as WorkoutSession;
+
+      expect(captured.id, 1);
+      expect(captured.impression, 3);
+      expect(captured.notes, equals('This is a note'));
+      expect(captured.timeStart, equals(const TimeOfDay(hour: 10, minute: 0)));
+      expect(captured.timeEnd, equals(const TimeOfDay(hour: 12, minute: 34)));
+    });
+  });
+}
diff --git a/test/routine/gym_mode_session_screen_test.mocks.dart b/test/routine/gym_mode_session_screen_test.mocks.dart
new file mode 100644
index 00000000..0248af2c
--- /dev/null
+++ b/test/routine/gym_mode_session_screen_test.mocks.dart
@@ -0,0 +1,594 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in wger/test/routine/gym_mode_session_screen_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i13;
+import 'dart:ui' as _i17;
+
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:mockito/src/dummies.dart' as _i16;
+import 'package:wger/models/exercises/exercise.dart' as _i15;
+import 'package:wger/models/workouts/base_config.dart' as _i9;
+import 'package:wger/models/workouts/day.dart' as _i6;
+import 'package:wger/models/workouts/day_data.dart' as _i14;
+import 'package:wger/models/workouts/log.dart' as _i11;
+import 'package:wger/models/workouts/repetition_unit.dart' as _i4;
+import 'package:wger/models/workouts/routine.dart' as _i5;
+import 'package:wger/models/workouts/session.dart' as _i10;
+import 'package:wger/models/workouts/slot.dart' as _i7;
+import 'package:wger/models/workouts/slot_entry.dart' as _i8;
+import 'package:wger/models/workouts/weight_unit.dart' as _i3;
+import 'package:wger/providers/base_provider.dart' as _i2;
+import 'package:wger/providers/routines.dart' as _i12;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
+
+class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider {
+  _FakeWgerBaseProvider_0(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeWeightUnit_1 extends _i1.SmartFake implements _i3.WeightUnit {
+  _FakeWeightUnit_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeRepetitionUnit_2 extends _i1.SmartFake implements _i4.RepetitionUnit {
+  _FakeRepetitionUnit_2(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeRoutine_3 extends _i1.SmartFake implements _i5.Routine {
+  _FakeRoutine_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeDay_4 extends _i1.SmartFake implements _i6.Day {
+  _FakeDay_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeSlot_5 extends _i1.SmartFake implements _i7.Slot {
+  _FakeSlot_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeSlotEntry_6 extends _i1.SmartFake implements _i8.SlotEntry {
+  _FakeSlotEntry_6(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeBaseConfig_7 extends _i1.SmartFake implements _i9.BaseConfig {
+  _FakeBaseConfig_7(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeWorkoutSession_8 extends _i1.SmartFake implements _i10.WorkoutSession {
+  _FakeWorkoutSession_8(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeLog_9 extends _i1.SmartFake implements _i11.Log {
+  _FakeLog_9(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+/// A class which mocks [RoutinesProvider].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
+  MockRoutinesProvider() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(
+              this,
+              Invocation.getter(#baseProvider),
+            ),
+          )
+          as _i2.WgerBaseProvider);
+
+  @override
+  List<_i5.Routine> get items =>
+      (super.noSuchMethod(
+            Invocation.getter(#items),
+            returnValue: <_i5.Routine>[],
+          )
+          as List<_i5.Routine>);
+
+  @override
+  List<_i3.WeightUnit> get weightUnits =>
+      (super.noSuchMethod(
+            Invocation.getter(#weightUnits),
+            returnValue: <_i3.WeightUnit>[],
+          )
+          as List<_i3.WeightUnit>);
+
+  @override
+  _i3.WeightUnit get defaultWeightUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultWeightUnit),
+            returnValue: _FakeWeightUnit_1(
+              this,
+              Invocation.getter(#defaultWeightUnit),
+            ),
+          )
+          as _i3.WeightUnit);
+
+  @override
+  List<_i4.RepetitionUnit> get repetitionUnits =>
+      (super.noSuchMethod(
+            Invocation.getter(#repetitionUnits),
+            returnValue: <_i4.RepetitionUnit>[],
+          )
+          as List<_i4.RepetitionUnit>);
+
+  @override
+  _i4.RepetitionUnit get defaultRepetitionUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultRepetitionUnit),
+            returnValue: _FakeRepetitionUnit_2(
+              this,
+              Invocation.getter(#defaultRepetitionUnit),
+            ),
+          )
+          as _i4.RepetitionUnit);
+
+  @override
+  set activeRoutine(_i5.Routine? value) => super.noSuchMethod(
+    Invocation.setter(#activeRoutine, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set weightUnits(List<_i3.WeightUnit>? weightUnits) => super.noSuchMethod(
+    Invocation.setter(#weightUnits, weightUnits),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set repetitionUnits(List<_i4.RepetitionUnit>? repetitionUnits) => super.noSuchMethod(
+    Invocation.setter(#repetitionUnits, repetitionUnits),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  bool get hasListeners =>
+      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
+
+  @override
+  void clear() => super.noSuchMethod(
+    Invocation.method(#clear, []),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  _i3.WeightUnit findWeightUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findWeightUnitById, [id]),
+            returnValue: _FakeWeightUnit_1(
+              this,
+              Invocation.method(#findWeightUnitById, [id]),
+            ),
+          )
+          as _i3.WeightUnit);
+
+  @override
+  _i4.RepetitionUnit findRepetitionUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findRepetitionUnitById, [id]),
+            returnValue: _FakeRepetitionUnit_2(
+              this,
+              Invocation.method(#findRepetitionUnitById, [id]),
+            ),
+          )
+          as _i4.RepetitionUnit);
+
+  @override
+  List<_i5.Routine> getPlans() =>
+      (super.noSuchMethod(
+            Invocation.method(#getPlans, []),
+            returnValue: <_i5.Routine>[],
+          )
+          as List<_i5.Routine>);
+
+  @override
+  _i5.Routine findById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findById, [id]),
+            returnValue: _FakeRoutine_3(
+              this,
+              Invocation.method(#findById, [id]),
+            ),
+          )
+          as _i5.Routine);
+
+  @override
+  int findIndexById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findIndexById, [id]),
+            returnValue: 0,
+          )
+          as int);
+
+  @override
+  _i13.Future<void> fetchAndSetAllRoutinesFull() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesFull, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetAllRoutinesSparse() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesSparse, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> setExercisesAndUnits(
+    List<_i14.DayData>? entries, {
+    Map<int, _i15.Exercise>? exercises,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #setExercisesAndUnits,
+              [entries],
+              {#exercises: exercises},
+            ),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetRoutineSparse, [planId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(
+                this,
+                Invocation.method(#fetchAndSetRoutineSparse, [planId]),
+              ),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
+
+  @override
+  _i13.Future<_i5.Routine> fetchAndSetRoutineFull(int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetRoutineFull, [routineId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(
+                this,
+                Invocation.method(#fetchAndSetRoutineFull, [routineId]),
+              ),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
+
+  @override
+  _i13.Future<_i5.Routine> addRoutine(_i5.Routine? routine) =>
+      (super.noSuchMethod(
+            Invocation.method(#addRoutine, [routine]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#addRoutine, [routine])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
+
+  @override
+  _i13.Future<void> editRoutine(_i5.Routine? routine) =>
+      (super.noSuchMethod(
+            Invocation.method(#editRoutine, [routine]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> deleteRoutine(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteRoutine, [id]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetRepetitionUnits() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetRepetitionUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetWeightUnits() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetWeightUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetUnits() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i6.Day> addDay(_i6.Day? day) =>
+      (super.noSuchMethod(
+            Invocation.method(#addDay, [day]),
+            returnValue: _i13.Future<_i6.Day>.value(
+              _FakeDay_4(this, Invocation.method(#addDay, [day])),
+            ),
+          )
+          as _i13.Future<_i6.Day>);
+
+  @override
+  _i13.Future<void> editDay(_i6.Day? day) =>
+      (super.noSuchMethod(
+            Invocation.method(#editDay, [day]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editDays(List<_i6.Day>? days) =>
+      (super.noSuchMethod(
+            Invocation.method(#editDays, [days]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> deleteDay(int? dayId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteDay, [dayId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i7.Slot> addSlot(_i7.Slot? slot, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSlot, [slot, routineId]),
+            returnValue: _i13.Future<_i7.Slot>.value(
+              _FakeSlot_5(this, Invocation.method(#addSlot, [slot, routineId])),
+            ),
+          )
+          as _i13.Future<_i7.Slot>);
+
+  @override
+  _i13.Future<void> deleteSlot(int? slotId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlot, [slotId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlot(_i7.Slot? slot, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlot, [slot, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlots(List<_i7.Slot>? slots, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlots, [slots, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i8.SlotEntry> addSlotEntry(
+    _i8.SlotEntry? entry,
+    int? routineId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<_i8.SlotEntry>.value(
+              _FakeSlotEntry_6(
+                this,
+                Invocation.method(#addSlotEntry, [entry, routineId]),
+              ),
+            ),
+          )
+          as _i13.Future<_i8.SlotEntry>);
+
+  @override
+  _i13.Future<void> deleteSlotEntry(int? id, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlotEntry, [id, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlotEntry(_i8.SlotEntry? entry, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  String getConfigUrl(_i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#getConfigUrl, [type]),
+            returnValue: _i16.dummyValue<String>(
+              this,
+              Invocation.method(#getConfigUrl, [type]),
+            ),
+          )
+          as String);
+
+  @override
+  _i13.Future<_i9.BaseConfig> editConfig(
+    _i9.BaseConfig? config,
+    _i8.ConfigType? type,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#editConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(
+                this,
+                Invocation.method(#editConfig, [config, type]),
+              ),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<_i9.BaseConfig> addConfig(
+    _i9.BaseConfig? config,
+    _i8.ConfigType? type,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(
+                this,
+                Invocation.method(#addConfig, [config, type]),
+              ),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<void> deleteConfig(int? id, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteConfig, [id, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> handleConfig(
+    _i8.SlotEntry? entry,
+    num? value,
+    _i8.ConfigType? type,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#handleConfig, [entry, value, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<List<_i10.WorkoutSession>> fetchSessionData() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchSessionData, []),
+            returnValue: _i13.Future<List<_i10.WorkoutSession>>.value(
+              <_i10.WorkoutSession>[],
+            ),
+          )
+          as _i13.Future<List<_i10.WorkoutSession>>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> addSession(
+    _i10.WorkoutSession? session,
+    int? routineId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSession, [session, routineId]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(
+                this,
+                Invocation.method(#addSession, [session, routineId]),
+              ),
+            ),
+          )
+          as _i13.Future<_i10.WorkoutSession>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> editSession(_i10.WorkoutSession? session) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSession, [session]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(
+                this,
+                Invocation.method(#editSession, [session]),
+              ),
+            ),
+          )
+          as _i13.Future<_i10.WorkoutSession>);
+
+  @override
+  _i13.Future<_i11.Log> addLog(_i11.Log? log) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLog, [log]),
+            returnValue: _i13.Future<_i11.Log>.value(
+              _FakeLog_9(this, Invocation.method(#addLog, [log])),
+            ),
+          )
+          as _i13.Future<_i11.Log>);
+
+  @override
+  _i13.Future<void> deleteLog(int? logId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLog, [logId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  void addListener(_i17.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void removeListener(_i17.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#removeListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void dispose() => super.noSuchMethod(
+    Invocation.method(#dispose, []),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void notifyListeners() => super.noSuchMethod(
+    Invocation.method(#notifyListeners, []),
+    returnValueForMissingStub: null,
+  );
+}
diff --git a/test/workout/plate_calculator_test.dart b/test/routine/plate_calculator_test.dart
similarity index 100%
rename from test/workout/plate_calculator_test.dart
rename to test/routine/plate_calculator_test.dart
diff --git a/test/workout/repetition_unit_form_widget_test.dart b/test/routine/repetition_unit_form_widget_test.dart
similarity index 71%
rename from test/workout/repetition_unit_form_widget_test.dart
rename to test/routine/repetition_unit_form_widget_test.dart
index 18a172d0..16d16949 100644
--- a/test/workout/repetition_unit_form_widget_test.dart
+++ b/test/routine/repetition_unit_form_widget_test.dart
@@ -23,56 +23,59 @@ import 'package:mockito/mockito.dart';
 import 'package:provider/provider.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/models/workouts/repetition_unit.dart';
-import 'package:wger/models/workouts/setting.dart';
-import 'package:wger/providers/workout_plans.dart';
-import 'package:wger/screens/workout_plan_screen.dart';
-import 'package:wger/widgets/workouts/forms.dart';
+import 'package:wger/models/workouts/slot_entry.dart';
+import 'package:wger/providers/routines.dart';
+import 'package:wger/screens/routine_screen.dart';
+import 'package:wger/widgets/routines/forms/reps_unit.dart';
 
 import 'repetition_unit_form_widget_test.mocks.dart';
 
-@GenerateMocks([WorkoutPlansProvider])
+@GenerateMocks([RoutinesProvider])
 void main() {
-  var mockWorkoutPlans = MockWorkoutPlansProvider();
-
+  var mockWorkoutPlans = MockRoutinesProvider();
   const unit1 = RepetitionUnit(id: 1, name: 'some rep unit');
   const unit2 = RepetitionUnit(id: 2, name: 'another name');
   const unit3 = RepetitionUnit(id: 3, name: 'this is repetition number 3');
 
-  final setting1 = Setting(
-    setId: 1,
-    order: 1,
+  int? result;
+
+  final slotEntry = SlotEntry(
+    slotId: 1,
     exerciseId: 1,
     repetitionUnitId: 1,
-    reps: 2,
+    repetitionRounding: 0.25,
     weightUnitId: 1,
+    weightRounding: 0.25,
     comment: 'comment',
-    rir: '1',
   );
-  setting1.repetitionUnitObj = unit1;
+  slotEntry.repetitionUnitObj = unit1;
 
   setUp(() {
-    mockWorkoutPlans = MockWorkoutPlansProvider();
+    mockWorkoutPlans = MockRoutinesProvider();
+    result = null;
     when(mockWorkoutPlans.repetitionUnits).thenAnswer((_) => [unit1, unit2, unit3]);
+    when(mockWorkoutPlans.findRepetitionUnitById(1)).thenReturn(unit1);
+    when(mockWorkoutPlans.findRepetitionUnitById(2)).thenReturn(unit2);
   });
 
-  Widget createHomeScreen() {
+  Widget renderWidget() {
     final key = GlobalKey<NavigatorState>();
 
-    return ChangeNotifierProvider<WorkoutPlansProvider>(
+    return ChangeNotifierProvider<RoutinesProvider>(
       create: (context) => mockWorkoutPlans,
       child: MaterialApp(
         localizationsDelegates: AppLocalizations.localizationsDelegates,
         supportedLocales: AppLocalizations.supportedLocales,
         navigatorKey: key,
-        home: Scaffold(body: RepetitionUnitInputWidget(setting1)),
-        routes: {WorkoutPlanScreen.routeName: (ctx) => const WorkoutPlanScreen()},
+        home: Scaffold(body: RepetitionUnitInputWidget(1, onChanged: (value) => result = value)),
+        routes: {RoutineScreen.routeName: (ctx) => const RoutineScreen()},
       ),
     );
   }
 
   testWidgets('Test that the entries are shown', (WidgetTester tester) async {
     // arrange
-    await tester.pumpWidget(createHomeScreen());
+    await tester.pumpWidget(renderWidget());
     await tester.tap(find.byKey(const Key('1')));
     await tester.pump();
 
@@ -84,16 +87,15 @@ void main() {
 
   testWidgets('Test that the correct units are set after selection', (WidgetTester tester) async {
     // arrange
-    await tester.pumpWidget(createHomeScreen());
+    await tester.pumpWidget(renderWidget());
     await tester.pump();
 
     // act
-    expect(setting1.repetitionUnitObj, equals(unit1));
     await tester.tap(find.byKey(const Key('1')));
     await tester.pump();
     await tester.tap(find.text('another name').last);
 
     // assert
-    expect(setting1.repetitionUnitObj, equals(unit2));
+    expect(result, equals(2));
   });
 }
diff --git a/test/routine/repetition_unit_form_widget_test.mocks.dart b/test/routine/repetition_unit_form_widget_test.mocks.dart
new file mode 100644
index 00000000..db117697
--- /dev/null
+++ b/test/routine/repetition_unit_form_widget_test.mocks.dart
@@ -0,0 +1,594 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in wger/test/routine/repetition_unit_form_widget_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i13;
+import 'dart:ui' as _i17;
+
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:mockito/src/dummies.dart' as _i16;
+import 'package:wger/models/exercises/exercise.dart' as _i15;
+import 'package:wger/models/workouts/base_config.dart' as _i9;
+import 'package:wger/models/workouts/day.dart' as _i6;
+import 'package:wger/models/workouts/day_data.dart' as _i14;
+import 'package:wger/models/workouts/log.dart' as _i11;
+import 'package:wger/models/workouts/repetition_unit.dart' as _i4;
+import 'package:wger/models/workouts/routine.dart' as _i5;
+import 'package:wger/models/workouts/session.dart' as _i10;
+import 'package:wger/models/workouts/slot.dart' as _i7;
+import 'package:wger/models/workouts/slot_entry.dart' as _i8;
+import 'package:wger/models/workouts/weight_unit.dart' as _i3;
+import 'package:wger/providers/base_provider.dart' as _i2;
+import 'package:wger/providers/routines.dart' as _i12;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
+
+class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider {
+  _FakeWgerBaseProvider_0(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeWeightUnit_1 extends _i1.SmartFake implements _i3.WeightUnit {
+  _FakeWeightUnit_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeRepetitionUnit_2 extends _i1.SmartFake implements _i4.RepetitionUnit {
+  _FakeRepetitionUnit_2(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeRoutine_3 extends _i1.SmartFake implements _i5.Routine {
+  _FakeRoutine_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeDay_4 extends _i1.SmartFake implements _i6.Day {
+  _FakeDay_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeSlot_5 extends _i1.SmartFake implements _i7.Slot {
+  _FakeSlot_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeSlotEntry_6 extends _i1.SmartFake implements _i8.SlotEntry {
+  _FakeSlotEntry_6(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeBaseConfig_7 extends _i1.SmartFake implements _i9.BaseConfig {
+  _FakeBaseConfig_7(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeWorkoutSession_8 extends _i1.SmartFake implements _i10.WorkoutSession {
+  _FakeWorkoutSession_8(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeLog_9 extends _i1.SmartFake implements _i11.Log {
+  _FakeLog_9(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+/// A class which mocks [RoutinesProvider].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
+  MockRoutinesProvider() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(
+              this,
+              Invocation.getter(#baseProvider),
+            ),
+          )
+          as _i2.WgerBaseProvider);
+
+  @override
+  List<_i5.Routine> get items =>
+      (super.noSuchMethod(
+            Invocation.getter(#items),
+            returnValue: <_i5.Routine>[],
+          )
+          as List<_i5.Routine>);
+
+  @override
+  List<_i3.WeightUnit> get weightUnits =>
+      (super.noSuchMethod(
+            Invocation.getter(#weightUnits),
+            returnValue: <_i3.WeightUnit>[],
+          )
+          as List<_i3.WeightUnit>);
+
+  @override
+  _i3.WeightUnit get defaultWeightUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultWeightUnit),
+            returnValue: _FakeWeightUnit_1(
+              this,
+              Invocation.getter(#defaultWeightUnit),
+            ),
+          )
+          as _i3.WeightUnit);
+
+  @override
+  List<_i4.RepetitionUnit> get repetitionUnits =>
+      (super.noSuchMethod(
+            Invocation.getter(#repetitionUnits),
+            returnValue: <_i4.RepetitionUnit>[],
+          )
+          as List<_i4.RepetitionUnit>);
+
+  @override
+  _i4.RepetitionUnit get defaultRepetitionUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultRepetitionUnit),
+            returnValue: _FakeRepetitionUnit_2(
+              this,
+              Invocation.getter(#defaultRepetitionUnit),
+            ),
+          )
+          as _i4.RepetitionUnit);
+
+  @override
+  set activeRoutine(_i5.Routine? value) => super.noSuchMethod(
+    Invocation.setter(#activeRoutine, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set weightUnits(List<_i3.WeightUnit>? weightUnits) => super.noSuchMethod(
+    Invocation.setter(#weightUnits, weightUnits),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set repetitionUnits(List<_i4.RepetitionUnit>? repetitionUnits) => super.noSuchMethod(
+    Invocation.setter(#repetitionUnits, repetitionUnits),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  bool get hasListeners =>
+      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
+
+  @override
+  void clear() => super.noSuchMethod(
+    Invocation.method(#clear, []),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  _i3.WeightUnit findWeightUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findWeightUnitById, [id]),
+            returnValue: _FakeWeightUnit_1(
+              this,
+              Invocation.method(#findWeightUnitById, [id]),
+            ),
+          )
+          as _i3.WeightUnit);
+
+  @override
+  _i4.RepetitionUnit findRepetitionUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findRepetitionUnitById, [id]),
+            returnValue: _FakeRepetitionUnit_2(
+              this,
+              Invocation.method(#findRepetitionUnitById, [id]),
+            ),
+          )
+          as _i4.RepetitionUnit);
+
+  @override
+  List<_i5.Routine> getPlans() =>
+      (super.noSuchMethod(
+            Invocation.method(#getPlans, []),
+            returnValue: <_i5.Routine>[],
+          )
+          as List<_i5.Routine>);
+
+  @override
+  _i5.Routine findById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findById, [id]),
+            returnValue: _FakeRoutine_3(
+              this,
+              Invocation.method(#findById, [id]),
+            ),
+          )
+          as _i5.Routine);
+
+  @override
+  int findIndexById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findIndexById, [id]),
+            returnValue: 0,
+          )
+          as int);
+
+  @override
+  _i13.Future<void> fetchAndSetAllRoutinesFull() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesFull, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetAllRoutinesSparse() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesSparse, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> setExercisesAndUnits(
+    List<_i14.DayData>? entries, {
+    Map<int, _i15.Exercise>? exercises,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #setExercisesAndUnits,
+              [entries],
+              {#exercises: exercises},
+            ),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetRoutineSparse, [planId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(
+                this,
+                Invocation.method(#fetchAndSetRoutineSparse, [planId]),
+              ),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
+
+  @override
+  _i13.Future<_i5.Routine> fetchAndSetRoutineFull(int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetRoutineFull, [routineId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(
+                this,
+                Invocation.method(#fetchAndSetRoutineFull, [routineId]),
+              ),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
+
+  @override
+  _i13.Future<_i5.Routine> addRoutine(_i5.Routine? routine) =>
+      (super.noSuchMethod(
+            Invocation.method(#addRoutine, [routine]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#addRoutine, [routine])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
+
+  @override
+  _i13.Future<void> editRoutine(_i5.Routine? routine) =>
+      (super.noSuchMethod(
+            Invocation.method(#editRoutine, [routine]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> deleteRoutine(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteRoutine, [id]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetRepetitionUnits() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetRepetitionUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetWeightUnits() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetWeightUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetUnits() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i6.Day> addDay(_i6.Day? day) =>
+      (super.noSuchMethod(
+            Invocation.method(#addDay, [day]),
+            returnValue: _i13.Future<_i6.Day>.value(
+              _FakeDay_4(this, Invocation.method(#addDay, [day])),
+            ),
+          )
+          as _i13.Future<_i6.Day>);
+
+  @override
+  _i13.Future<void> editDay(_i6.Day? day) =>
+      (super.noSuchMethod(
+            Invocation.method(#editDay, [day]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editDays(List<_i6.Day>? days) =>
+      (super.noSuchMethod(
+            Invocation.method(#editDays, [days]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> deleteDay(int? dayId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteDay, [dayId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i7.Slot> addSlot(_i7.Slot? slot, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSlot, [slot, routineId]),
+            returnValue: _i13.Future<_i7.Slot>.value(
+              _FakeSlot_5(this, Invocation.method(#addSlot, [slot, routineId])),
+            ),
+          )
+          as _i13.Future<_i7.Slot>);
+
+  @override
+  _i13.Future<void> deleteSlot(int? slotId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlot, [slotId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlot(_i7.Slot? slot, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlot, [slot, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlots(List<_i7.Slot>? slots, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlots, [slots, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i8.SlotEntry> addSlotEntry(
+    _i8.SlotEntry? entry,
+    int? routineId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<_i8.SlotEntry>.value(
+              _FakeSlotEntry_6(
+                this,
+                Invocation.method(#addSlotEntry, [entry, routineId]),
+              ),
+            ),
+          )
+          as _i13.Future<_i8.SlotEntry>);
+
+  @override
+  _i13.Future<void> deleteSlotEntry(int? id, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlotEntry, [id, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlotEntry(_i8.SlotEntry? entry, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  String getConfigUrl(_i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#getConfigUrl, [type]),
+            returnValue: _i16.dummyValue<String>(
+              this,
+              Invocation.method(#getConfigUrl, [type]),
+            ),
+          )
+          as String);
+
+  @override
+  _i13.Future<_i9.BaseConfig> editConfig(
+    _i9.BaseConfig? config,
+    _i8.ConfigType? type,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#editConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(
+                this,
+                Invocation.method(#editConfig, [config, type]),
+              ),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<_i9.BaseConfig> addConfig(
+    _i9.BaseConfig? config,
+    _i8.ConfigType? type,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(
+                this,
+                Invocation.method(#addConfig, [config, type]),
+              ),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<void> deleteConfig(int? id, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteConfig, [id, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> handleConfig(
+    _i8.SlotEntry? entry,
+    num? value,
+    _i8.ConfigType? type,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#handleConfig, [entry, value, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<List<_i10.WorkoutSession>> fetchSessionData() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchSessionData, []),
+            returnValue: _i13.Future<List<_i10.WorkoutSession>>.value(
+              <_i10.WorkoutSession>[],
+            ),
+          )
+          as _i13.Future<List<_i10.WorkoutSession>>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> addSession(
+    _i10.WorkoutSession? session,
+    int? routineId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSession, [session, routineId]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(
+                this,
+                Invocation.method(#addSession, [session, routineId]),
+              ),
+            ),
+          )
+          as _i13.Future<_i10.WorkoutSession>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> editSession(_i10.WorkoutSession? session) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSession, [session]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(
+                this,
+                Invocation.method(#editSession, [session]),
+              ),
+            ),
+          )
+          as _i13.Future<_i10.WorkoutSession>);
+
+  @override
+  _i13.Future<_i11.Log> addLog(_i11.Log? log) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLog, [log]),
+            returnValue: _i13.Future<_i11.Log>.value(
+              _FakeLog_9(this, Invocation.method(#addLog, [log])),
+            ),
+          )
+          as _i13.Future<_i11.Log>);
+
+  @override
+  _i13.Future<void> deleteLog(int? logId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLog, [logId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  void addListener(_i17.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void removeListener(_i17.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#removeListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void dispose() => super.noSuchMethod(
+    Invocation.method(#dispose, []),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void notifyListeners() => super.noSuchMethod(
+    Invocation.method(#notifyListeners, []),
+    returnValueForMissingStub: null,
+  );
+}
diff --git a/test/routine/routine_edit_screen_test.dart b/test/routine/routine_edit_screen_test.dart
new file mode 100644
index 00000000..2341a61b
--- /dev/null
+++ b/test/routine/routine_edit_screen_test.dart
@@ -0,0 +1,72 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+import 'package:provider/provider.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/providers/routines.dart';
+import 'package:wger/screens/routine_edit_screen.dart';
+
+import '../../test_data/routines.dart';
+import 'routine_edit_screen_test.mocks.dart';
+
+@GenerateMocks([RoutinesProvider])
+void main() {
+  final key = GlobalKey<NavigatorState>();
+
+  testWidgets('RoutineEditScreen smoke test', (WidgetTester tester) async {
+    // Create a mock RoutinesProvider
+    final mockRoutinesProvider = MockRoutinesProvider();
+    when(mockRoutinesProvider.fetchAndSetRoutineFull(1)).thenAnswer((_) async => getTestRoutine());
+    when(mockRoutinesProvider.findById(1)).thenReturn(getTestRoutine());
+
+    // Build the RoutineEditScreen widget with the correct arguments
+    await tester.pumpWidget(
+      ChangeNotifierProvider<RoutinesProvider>.value(
+        value: mockRoutinesProvider,
+        child: MaterialApp(
+          locale: const Locale('en'),
+          localizationsDelegates: AppLocalizations.localizationsDelegates,
+          supportedLocales: AppLocalizations.supportedLocales,
+          navigatorKey: key,
+          home: TextButton(
+            onPressed: () => key.currentState!.push(
+              MaterialPageRoute<void>(
+                settings: const RouteSettings(arguments: 1),
+                builder: (_) => const RoutineEditScreen(),
+              ),
+            ),
+            child: const SizedBox(),
+          ),
+        ),
+      ),
+    );
+
+    // Navigate to RoutineEditScreen with the correct arguments
+    await tester.pumpAndSettle();
+    await tester.tap(find.byType(TextButton));
+    await tester.pumpAndSettle();
+
+    // Verify the title is correct
+    verify(mockRoutinesProvider.findById(1));
+    expect(find.text('3 day workout'), findsNWidgets(2));
+  });
+}
diff --git a/test/routine/routine_edit_screen_test.mocks.dart b/test/routine/routine_edit_screen_test.mocks.dart
new file mode 100644
index 00000000..4c31c99c
--- /dev/null
+++ b/test/routine/routine_edit_screen_test.mocks.dart
@@ -0,0 +1,594 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in wger/test/routine/routine_edit_screen_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i13;
+import 'dart:ui' as _i17;
+
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:mockito/src/dummies.dart' as _i16;
+import 'package:wger/models/exercises/exercise.dart' as _i15;
+import 'package:wger/models/workouts/base_config.dart' as _i9;
+import 'package:wger/models/workouts/day.dart' as _i6;
+import 'package:wger/models/workouts/day_data.dart' as _i14;
+import 'package:wger/models/workouts/log.dart' as _i11;
+import 'package:wger/models/workouts/repetition_unit.dart' as _i4;
+import 'package:wger/models/workouts/routine.dart' as _i5;
+import 'package:wger/models/workouts/session.dart' as _i10;
+import 'package:wger/models/workouts/slot.dart' as _i7;
+import 'package:wger/models/workouts/slot_entry.dart' as _i8;
+import 'package:wger/models/workouts/weight_unit.dart' as _i3;
+import 'package:wger/providers/base_provider.dart' as _i2;
+import 'package:wger/providers/routines.dart' as _i12;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
+
+class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider {
+  _FakeWgerBaseProvider_0(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeWeightUnit_1 extends _i1.SmartFake implements _i3.WeightUnit {
+  _FakeWeightUnit_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeRepetitionUnit_2 extends _i1.SmartFake implements _i4.RepetitionUnit {
+  _FakeRepetitionUnit_2(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeRoutine_3 extends _i1.SmartFake implements _i5.Routine {
+  _FakeRoutine_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeDay_4 extends _i1.SmartFake implements _i6.Day {
+  _FakeDay_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeSlot_5 extends _i1.SmartFake implements _i7.Slot {
+  _FakeSlot_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeSlotEntry_6 extends _i1.SmartFake implements _i8.SlotEntry {
+  _FakeSlotEntry_6(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeBaseConfig_7 extends _i1.SmartFake implements _i9.BaseConfig {
+  _FakeBaseConfig_7(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeWorkoutSession_8 extends _i1.SmartFake implements _i10.WorkoutSession {
+  _FakeWorkoutSession_8(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeLog_9 extends _i1.SmartFake implements _i11.Log {
+  _FakeLog_9(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+/// A class which mocks [RoutinesProvider].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
+  MockRoutinesProvider() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(
+              this,
+              Invocation.getter(#baseProvider),
+            ),
+          )
+          as _i2.WgerBaseProvider);
+
+  @override
+  List<_i5.Routine> get items =>
+      (super.noSuchMethod(
+            Invocation.getter(#items),
+            returnValue: <_i5.Routine>[],
+          )
+          as List<_i5.Routine>);
+
+  @override
+  List<_i3.WeightUnit> get weightUnits =>
+      (super.noSuchMethod(
+            Invocation.getter(#weightUnits),
+            returnValue: <_i3.WeightUnit>[],
+          )
+          as List<_i3.WeightUnit>);
+
+  @override
+  _i3.WeightUnit get defaultWeightUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultWeightUnit),
+            returnValue: _FakeWeightUnit_1(
+              this,
+              Invocation.getter(#defaultWeightUnit),
+            ),
+          )
+          as _i3.WeightUnit);
+
+  @override
+  List<_i4.RepetitionUnit> get repetitionUnits =>
+      (super.noSuchMethod(
+            Invocation.getter(#repetitionUnits),
+            returnValue: <_i4.RepetitionUnit>[],
+          )
+          as List<_i4.RepetitionUnit>);
+
+  @override
+  _i4.RepetitionUnit get defaultRepetitionUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultRepetitionUnit),
+            returnValue: _FakeRepetitionUnit_2(
+              this,
+              Invocation.getter(#defaultRepetitionUnit),
+            ),
+          )
+          as _i4.RepetitionUnit);
+
+  @override
+  set activeRoutine(_i5.Routine? value) => super.noSuchMethod(
+    Invocation.setter(#activeRoutine, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set weightUnits(List<_i3.WeightUnit>? weightUnits) => super.noSuchMethod(
+    Invocation.setter(#weightUnits, weightUnits),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set repetitionUnits(List<_i4.RepetitionUnit>? repetitionUnits) => super.noSuchMethod(
+    Invocation.setter(#repetitionUnits, repetitionUnits),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  bool get hasListeners =>
+      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
+
+  @override
+  void clear() => super.noSuchMethod(
+    Invocation.method(#clear, []),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  _i3.WeightUnit findWeightUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findWeightUnitById, [id]),
+            returnValue: _FakeWeightUnit_1(
+              this,
+              Invocation.method(#findWeightUnitById, [id]),
+            ),
+          )
+          as _i3.WeightUnit);
+
+  @override
+  _i4.RepetitionUnit findRepetitionUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findRepetitionUnitById, [id]),
+            returnValue: _FakeRepetitionUnit_2(
+              this,
+              Invocation.method(#findRepetitionUnitById, [id]),
+            ),
+          )
+          as _i4.RepetitionUnit);
+
+  @override
+  List<_i5.Routine> getPlans() =>
+      (super.noSuchMethod(
+            Invocation.method(#getPlans, []),
+            returnValue: <_i5.Routine>[],
+          )
+          as List<_i5.Routine>);
+
+  @override
+  _i5.Routine findById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findById, [id]),
+            returnValue: _FakeRoutine_3(
+              this,
+              Invocation.method(#findById, [id]),
+            ),
+          )
+          as _i5.Routine);
+
+  @override
+  int findIndexById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findIndexById, [id]),
+            returnValue: 0,
+          )
+          as int);
+
+  @override
+  _i13.Future<void> fetchAndSetAllRoutinesFull() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesFull, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetAllRoutinesSparse() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesSparse, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> setExercisesAndUnits(
+    List<_i14.DayData>? entries, {
+    Map<int, _i15.Exercise>? exercises,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #setExercisesAndUnits,
+              [entries],
+              {#exercises: exercises},
+            ),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetRoutineSparse, [planId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(
+                this,
+                Invocation.method(#fetchAndSetRoutineSparse, [planId]),
+              ),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
+
+  @override
+  _i13.Future<_i5.Routine> fetchAndSetRoutineFull(int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetRoutineFull, [routineId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(
+                this,
+                Invocation.method(#fetchAndSetRoutineFull, [routineId]),
+              ),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
+
+  @override
+  _i13.Future<_i5.Routine> addRoutine(_i5.Routine? routine) =>
+      (super.noSuchMethod(
+            Invocation.method(#addRoutine, [routine]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#addRoutine, [routine])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
+
+  @override
+  _i13.Future<void> editRoutine(_i5.Routine? routine) =>
+      (super.noSuchMethod(
+            Invocation.method(#editRoutine, [routine]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> deleteRoutine(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteRoutine, [id]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetRepetitionUnits() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetRepetitionUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetWeightUnits() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetWeightUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetUnits() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i6.Day> addDay(_i6.Day? day) =>
+      (super.noSuchMethod(
+            Invocation.method(#addDay, [day]),
+            returnValue: _i13.Future<_i6.Day>.value(
+              _FakeDay_4(this, Invocation.method(#addDay, [day])),
+            ),
+          )
+          as _i13.Future<_i6.Day>);
+
+  @override
+  _i13.Future<void> editDay(_i6.Day? day) =>
+      (super.noSuchMethod(
+            Invocation.method(#editDay, [day]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editDays(List<_i6.Day>? days) =>
+      (super.noSuchMethod(
+            Invocation.method(#editDays, [days]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> deleteDay(int? dayId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteDay, [dayId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i7.Slot> addSlot(_i7.Slot? slot, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSlot, [slot, routineId]),
+            returnValue: _i13.Future<_i7.Slot>.value(
+              _FakeSlot_5(this, Invocation.method(#addSlot, [slot, routineId])),
+            ),
+          )
+          as _i13.Future<_i7.Slot>);
+
+  @override
+  _i13.Future<void> deleteSlot(int? slotId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlot, [slotId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlot(_i7.Slot? slot, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlot, [slot, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlots(List<_i7.Slot>? slots, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlots, [slots, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i8.SlotEntry> addSlotEntry(
+    _i8.SlotEntry? entry,
+    int? routineId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<_i8.SlotEntry>.value(
+              _FakeSlotEntry_6(
+                this,
+                Invocation.method(#addSlotEntry, [entry, routineId]),
+              ),
+            ),
+          )
+          as _i13.Future<_i8.SlotEntry>);
+
+  @override
+  _i13.Future<void> deleteSlotEntry(int? id, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlotEntry, [id, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlotEntry(_i8.SlotEntry? entry, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  String getConfigUrl(_i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#getConfigUrl, [type]),
+            returnValue: _i16.dummyValue<String>(
+              this,
+              Invocation.method(#getConfigUrl, [type]),
+            ),
+          )
+          as String);
+
+  @override
+  _i13.Future<_i9.BaseConfig> editConfig(
+    _i9.BaseConfig? config,
+    _i8.ConfigType? type,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#editConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(
+                this,
+                Invocation.method(#editConfig, [config, type]),
+              ),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<_i9.BaseConfig> addConfig(
+    _i9.BaseConfig? config,
+    _i8.ConfigType? type,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(
+                this,
+                Invocation.method(#addConfig, [config, type]),
+              ),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<void> deleteConfig(int? id, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteConfig, [id, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> handleConfig(
+    _i8.SlotEntry? entry,
+    num? value,
+    _i8.ConfigType? type,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#handleConfig, [entry, value, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<List<_i10.WorkoutSession>> fetchSessionData() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchSessionData, []),
+            returnValue: _i13.Future<List<_i10.WorkoutSession>>.value(
+              <_i10.WorkoutSession>[],
+            ),
+          )
+          as _i13.Future<List<_i10.WorkoutSession>>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> addSession(
+    _i10.WorkoutSession? session,
+    int? routineId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSession, [session, routineId]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(
+                this,
+                Invocation.method(#addSession, [session, routineId]),
+              ),
+            ),
+          )
+          as _i13.Future<_i10.WorkoutSession>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> editSession(_i10.WorkoutSession? session) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSession, [session]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(
+                this,
+                Invocation.method(#editSession, [session]),
+              ),
+            ),
+          )
+          as _i13.Future<_i10.WorkoutSession>);
+
+  @override
+  _i13.Future<_i11.Log> addLog(_i11.Log? log) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLog, [log]),
+            returnValue: _i13.Future<_i11.Log>.value(
+              _FakeLog_9(this, Invocation.method(#addLog, [log])),
+            ),
+          )
+          as _i13.Future<_i11.Log>);
+
+  @override
+  _i13.Future<void> deleteLog(int? logId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLog, [logId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  void addListener(_i17.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void removeListener(_i17.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#removeListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void dispose() => super.noSuchMethod(
+    Invocation.method(#dispose, []),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void notifyListeners() => super.noSuchMethod(
+    Invocation.method(#notifyListeners, []),
+    returnValueForMissingStub: null,
+  );
+}
diff --git a/test/routine/routine_edit_test.dart b/test/routine/routine_edit_test.dart
new file mode 100644
index 00000000..abe0b66d
--- /dev/null
+++ b/test/routine/routine_edit_test.dart
@@ -0,0 +1,105 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+import 'package:provider/provider.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/providers/routines.dart';
+import 'package:wger/widgets/routines/forms/day.dart';
+import 'package:wger/widgets/routines/routine_edit.dart';
+
+import '../../test_data/routines.dart';
+import 'routine_edit_test.mocks.dart';
+
+@GenerateMocks([RoutinesProvider])
+void main() {
+  late MockRoutinesProvider mockRoutinesProvider;
+
+  setUp(() {
+    mockRoutinesProvider = MockRoutinesProvider();
+    when(mockRoutinesProvider.fetchAndSetRoutineFull(1)).thenAnswer((_) async => getTestRoutine());
+  });
+
+  testWidgets('RoutineEditScreen smoke test', (WidgetTester tester) async {
+    // Build the RoutineEditScreen widget with the correct arguments
+    await tester.pumpWidget(
+      ChangeNotifierProvider<RoutinesProvider>.value(
+        value: mockRoutinesProvider,
+        child: MaterialApp(
+          locale: const Locale('en'),
+          localizationsDelegates: AppLocalizations.localizationsDelegates,
+          supportedLocales: AppLocalizations.supportedLocales,
+          home: Scaffold(
+            body: RoutineEdit(getTestRoutine()),
+          ),
+        ),
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    // Always two widgets, one in the edit list, one in the generated routine
+    expect(find.text('3 day workout'), findsOne, reason: 'title');
+    expect(
+      find.text('This is a 3 day workout and this text is important'),
+      findsNWidgets(2),
+      reason: 'description',
+    );
+
+    expect(find.text('first day'), findsNWidgets(2));
+    expect(find.text('chest, shoulders'), findsNWidgets(2), reason: 'description');
+
+    expect(find.text('second day'), findsNWidgets(2));
+    expect(find.text('legs'), findsNWidgets(2), reason: 'description');
+
+    // Edit the first day
+    expect(find.byElementType(DayFormWidget), findsNothing);
+    expect(find.byIcon(Icons.edit), findsNWidgets(2));
+    expect(find.byIcon(Icons.edit_off), findsNothing);
+    expect(find.byKey(const ValueKey('edit-day-1')), findsOne);
+    expect(find.byKey(const ValueKey('edit-day-2')), findsOne);
+    expect(find.text('is rest day'), findsNothing);
+
+    await tester.tap(find.byKey(const ValueKey('edit-day-1')));
+    await tester.pumpAndSettle();
+
+    expect(
+      find.byIcon(Icons.edit),
+      findsNWidgets(3),
+      reason: 'also for the days',
+    );
+    expect(find.byIcon(Icons.edit_off), findsOne);
+    expect(find.text('Is rest day'), findsOne);
+
+    expect(find.text('Exercise 1'), findsOne);
+    expect(
+      find.text('Bench press'),
+      findsNWidgets(3),
+      reason: 'resulting routine plus edit',
+    );
+
+    expect(find.text('Exercise 2'), findsOne);
+    expect(
+      find.text('Side raises'),
+      findsNWidgets(2),
+      reason: 'resulting routine plus edit',
+    );
+  });
+}
diff --git a/test/routine/routine_edit_test.mocks.dart b/test/routine/routine_edit_test.mocks.dart
new file mode 100644
index 00000000..17bc27bd
--- /dev/null
+++ b/test/routine/routine_edit_test.mocks.dart
@@ -0,0 +1,594 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in wger/test/routine/routine_edit_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i13;
+import 'dart:ui' as _i17;
+
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:mockito/src/dummies.dart' as _i16;
+import 'package:wger/models/exercises/exercise.dart' as _i15;
+import 'package:wger/models/workouts/base_config.dart' as _i9;
+import 'package:wger/models/workouts/day.dart' as _i6;
+import 'package:wger/models/workouts/day_data.dart' as _i14;
+import 'package:wger/models/workouts/log.dart' as _i11;
+import 'package:wger/models/workouts/repetition_unit.dart' as _i4;
+import 'package:wger/models/workouts/routine.dart' as _i5;
+import 'package:wger/models/workouts/session.dart' as _i10;
+import 'package:wger/models/workouts/slot.dart' as _i7;
+import 'package:wger/models/workouts/slot_entry.dart' as _i8;
+import 'package:wger/models/workouts/weight_unit.dart' as _i3;
+import 'package:wger/providers/base_provider.dart' as _i2;
+import 'package:wger/providers/routines.dart' as _i12;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
+
+class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider {
+  _FakeWgerBaseProvider_0(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeWeightUnit_1 extends _i1.SmartFake implements _i3.WeightUnit {
+  _FakeWeightUnit_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeRepetitionUnit_2 extends _i1.SmartFake implements _i4.RepetitionUnit {
+  _FakeRepetitionUnit_2(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeRoutine_3 extends _i1.SmartFake implements _i5.Routine {
+  _FakeRoutine_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeDay_4 extends _i1.SmartFake implements _i6.Day {
+  _FakeDay_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeSlot_5 extends _i1.SmartFake implements _i7.Slot {
+  _FakeSlot_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeSlotEntry_6 extends _i1.SmartFake implements _i8.SlotEntry {
+  _FakeSlotEntry_6(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeBaseConfig_7 extends _i1.SmartFake implements _i9.BaseConfig {
+  _FakeBaseConfig_7(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeWorkoutSession_8 extends _i1.SmartFake implements _i10.WorkoutSession {
+  _FakeWorkoutSession_8(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeLog_9 extends _i1.SmartFake implements _i11.Log {
+  _FakeLog_9(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+/// A class which mocks [RoutinesProvider].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
+  MockRoutinesProvider() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(
+              this,
+              Invocation.getter(#baseProvider),
+            ),
+          )
+          as _i2.WgerBaseProvider);
+
+  @override
+  List<_i5.Routine> get items =>
+      (super.noSuchMethod(
+            Invocation.getter(#items),
+            returnValue: <_i5.Routine>[],
+          )
+          as List<_i5.Routine>);
+
+  @override
+  List<_i3.WeightUnit> get weightUnits =>
+      (super.noSuchMethod(
+            Invocation.getter(#weightUnits),
+            returnValue: <_i3.WeightUnit>[],
+          )
+          as List<_i3.WeightUnit>);
+
+  @override
+  _i3.WeightUnit get defaultWeightUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultWeightUnit),
+            returnValue: _FakeWeightUnit_1(
+              this,
+              Invocation.getter(#defaultWeightUnit),
+            ),
+          )
+          as _i3.WeightUnit);
+
+  @override
+  List<_i4.RepetitionUnit> get repetitionUnits =>
+      (super.noSuchMethod(
+            Invocation.getter(#repetitionUnits),
+            returnValue: <_i4.RepetitionUnit>[],
+          )
+          as List<_i4.RepetitionUnit>);
+
+  @override
+  _i4.RepetitionUnit get defaultRepetitionUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultRepetitionUnit),
+            returnValue: _FakeRepetitionUnit_2(
+              this,
+              Invocation.getter(#defaultRepetitionUnit),
+            ),
+          )
+          as _i4.RepetitionUnit);
+
+  @override
+  set activeRoutine(_i5.Routine? value) => super.noSuchMethod(
+    Invocation.setter(#activeRoutine, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set weightUnits(List<_i3.WeightUnit>? weightUnits) => super.noSuchMethod(
+    Invocation.setter(#weightUnits, weightUnits),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set repetitionUnits(List<_i4.RepetitionUnit>? repetitionUnits) => super.noSuchMethod(
+    Invocation.setter(#repetitionUnits, repetitionUnits),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  bool get hasListeners =>
+      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
+
+  @override
+  void clear() => super.noSuchMethod(
+    Invocation.method(#clear, []),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  _i3.WeightUnit findWeightUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findWeightUnitById, [id]),
+            returnValue: _FakeWeightUnit_1(
+              this,
+              Invocation.method(#findWeightUnitById, [id]),
+            ),
+          )
+          as _i3.WeightUnit);
+
+  @override
+  _i4.RepetitionUnit findRepetitionUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findRepetitionUnitById, [id]),
+            returnValue: _FakeRepetitionUnit_2(
+              this,
+              Invocation.method(#findRepetitionUnitById, [id]),
+            ),
+          )
+          as _i4.RepetitionUnit);
+
+  @override
+  List<_i5.Routine> getPlans() =>
+      (super.noSuchMethod(
+            Invocation.method(#getPlans, []),
+            returnValue: <_i5.Routine>[],
+          )
+          as List<_i5.Routine>);
+
+  @override
+  _i5.Routine findById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findById, [id]),
+            returnValue: _FakeRoutine_3(
+              this,
+              Invocation.method(#findById, [id]),
+            ),
+          )
+          as _i5.Routine);
+
+  @override
+  int findIndexById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findIndexById, [id]),
+            returnValue: 0,
+          )
+          as int);
+
+  @override
+  _i13.Future<void> fetchAndSetAllRoutinesFull() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesFull, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetAllRoutinesSparse() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesSparse, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> setExercisesAndUnits(
+    List<_i14.DayData>? entries, {
+    Map<int, _i15.Exercise>? exercises,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #setExercisesAndUnits,
+              [entries],
+              {#exercises: exercises},
+            ),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetRoutineSparse, [planId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(
+                this,
+                Invocation.method(#fetchAndSetRoutineSparse, [planId]),
+              ),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
+
+  @override
+  _i13.Future<_i5.Routine> fetchAndSetRoutineFull(int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetRoutineFull, [routineId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(
+                this,
+                Invocation.method(#fetchAndSetRoutineFull, [routineId]),
+              ),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
+
+  @override
+  _i13.Future<_i5.Routine> addRoutine(_i5.Routine? routine) =>
+      (super.noSuchMethod(
+            Invocation.method(#addRoutine, [routine]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#addRoutine, [routine])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
+
+  @override
+  _i13.Future<void> editRoutine(_i5.Routine? routine) =>
+      (super.noSuchMethod(
+            Invocation.method(#editRoutine, [routine]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> deleteRoutine(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteRoutine, [id]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetRepetitionUnits() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetRepetitionUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetWeightUnits() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetWeightUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetUnits() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i6.Day> addDay(_i6.Day? day) =>
+      (super.noSuchMethod(
+            Invocation.method(#addDay, [day]),
+            returnValue: _i13.Future<_i6.Day>.value(
+              _FakeDay_4(this, Invocation.method(#addDay, [day])),
+            ),
+          )
+          as _i13.Future<_i6.Day>);
+
+  @override
+  _i13.Future<void> editDay(_i6.Day? day) =>
+      (super.noSuchMethod(
+            Invocation.method(#editDay, [day]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editDays(List<_i6.Day>? days) =>
+      (super.noSuchMethod(
+            Invocation.method(#editDays, [days]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> deleteDay(int? dayId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteDay, [dayId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i7.Slot> addSlot(_i7.Slot? slot, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSlot, [slot, routineId]),
+            returnValue: _i13.Future<_i7.Slot>.value(
+              _FakeSlot_5(this, Invocation.method(#addSlot, [slot, routineId])),
+            ),
+          )
+          as _i13.Future<_i7.Slot>);
+
+  @override
+  _i13.Future<void> deleteSlot(int? slotId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlot, [slotId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlot(_i7.Slot? slot, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlot, [slot, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlots(List<_i7.Slot>? slots, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlots, [slots, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i8.SlotEntry> addSlotEntry(
+    _i8.SlotEntry? entry,
+    int? routineId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<_i8.SlotEntry>.value(
+              _FakeSlotEntry_6(
+                this,
+                Invocation.method(#addSlotEntry, [entry, routineId]),
+              ),
+            ),
+          )
+          as _i13.Future<_i8.SlotEntry>);
+
+  @override
+  _i13.Future<void> deleteSlotEntry(int? id, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlotEntry, [id, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlotEntry(_i8.SlotEntry? entry, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  String getConfigUrl(_i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#getConfigUrl, [type]),
+            returnValue: _i16.dummyValue<String>(
+              this,
+              Invocation.method(#getConfigUrl, [type]),
+            ),
+          )
+          as String);
+
+  @override
+  _i13.Future<_i9.BaseConfig> editConfig(
+    _i9.BaseConfig? config,
+    _i8.ConfigType? type,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#editConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(
+                this,
+                Invocation.method(#editConfig, [config, type]),
+              ),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<_i9.BaseConfig> addConfig(
+    _i9.BaseConfig? config,
+    _i8.ConfigType? type,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(
+                this,
+                Invocation.method(#addConfig, [config, type]),
+              ),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<void> deleteConfig(int? id, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteConfig, [id, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> handleConfig(
+    _i8.SlotEntry? entry,
+    num? value,
+    _i8.ConfigType? type,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#handleConfig, [entry, value, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<List<_i10.WorkoutSession>> fetchSessionData() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchSessionData, []),
+            returnValue: _i13.Future<List<_i10.WorkoutSession>>.value(
+              <_i10.WorkoutSession>[],
+            ),
+          )
+          as _i13.Future<List<_i10.WorkoutSession>>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> addSession(
+    _i10.WorkoutSession? session,
+    int? routineId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSession, [session, routineId]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(
+                this,
+                Invocation.method(#addSession, [session, routineId]),
+              ),
+            ),
+          )
+          as _i13.Future<_i10.WorkoutSession>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> editSession(_i10.WorkoutSession? session) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSession, [session]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(
+                this,
+                Invocation.method(#editSession, [session]),
+              ),
+            ),
+          )
+          as _i13.Future<_i10.WorkoutSession>);
+
+  @override
+  _i13.Future<_i11.Log> addLog(_i11.Log? log) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLog, [log]),
+            returnValue: _i13.Future<_i11.Log>.value(
+              _FakeLog_9(this, Invocation.method(#addLog, [log])),
+            ),
+          )
+          as _i13.Future<_i11.Log>);
+
+  @override
+  _i13.Future<void> deleteLog(int? logId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLog, [logId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  void addListener(_i17.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void removeListener(_i17.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#removeListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void dispose() => super.noSuchMethod(
+    Invocation.method(#dispose, []),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void notifyListeners() => super.noSuchMethod(
+    Invocation.method(#notifyListeners, []),
+    returnValueForMissingStub: null,
+  );
+}
diff --git a/test/routine/routine_form_test.dart b/test/routine/routine_form_test.dart
new file mode 100644
index 00000000..8f287f09
--- /dev/null
+++ b/test/routine/routine_form_test.dart
@@ -0,0 +1,206 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+import 'package:provider/provider.dart';
+import 'package:wger/exceptions/http_exception.dart';
+import 'package:wger/helpers/consts.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/workouts/routine.dart';
+import 'package:wger/providers/routines.dart';
+import 'package:wger/screens/routine_edit_screen.dart';
+import 'package:wger/screens/routine_screen.dart';
+import 'package:wger/widgets/routines/forms/routine.dart';
+
+import './routine_form_test.mocks.dart';
+
+@GenerateMocks([RoutinesProvider])
+void main() {
+  var mockRoutinesProvider = MockRoutinesProvider();
+
+  final existingRoutine = Routine(
+    id: 1,
+    created: DateTime(2021, 1, 1),
+    start: DateTime(2024, 11, 1),
+    end: DateTime(2024, 12, 1),
+    name: 'test 1',
+    description: 'description 1',
+    fitInWeek: false,
+  );
+  var newRoutine = Routine.empty();
+
+  setUp(() {
+    newRoutine = Routine.empty();
+    mockRoutinesProvider = MockRoutinesProvider();
+    when(mockRoutinesProvider.findById(any)).thenAnswer((_) => existingRoutine);
+    when(mockRoutinesProvider.editRoutine(any)).thenAnswer((_) => Future.value(existingRoutine));
+    when(
+      mockRoutinesProvider.fetchAndSetRoutineFull(any),
+    ).thenAnswer((_) => Future.value(existingRoutine));
+  });
+
+  Widget renderWidget(Routine routine, {locale = 'en'}) {
+    final key = GlobalKey<NavigatorState>();
+
+    return ChangeNotifierProvider<RoutinesProvider>(
+      create: (context) => mockRoutinesProvider,
+      child: MaterialApp(
+        locale: Locale(locale),
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        navigatorKey: key,
+        home: Scaffold(body: RoutineForm(routine)),
+        routes: {
+          RoutineScreen.routeName: (ctx) => const RoutineScreen(),
+          RoutineEditScreen.routeName: (ctx) => const RoutineEditScreen(),
+        },
+      ),
+    );
+  }
+
+  testWidgets('Test the widgets on the routine form', (WidgetTester tester) async {
+    await tester.pumpWidget(renderWidget(existingRoutine));
+    await tester.pumpAndSettle();
+
+    expect(find.byType(TextFormField), findsNWidgets(4));
+    expect(find.byType(ElevatedButton), findsOneWidget);
+  });
+
+  testWidgets('Test editing an existing routine', (WidgetTester tester) async {
+    await tester.pumpWidget(renderWidget(existingRoutine));
+    await tester.pumpAndSettle();
+
+    expect(
+      find.text('test 1'),
+      findsOneWidget,
+      reason: 'Name of existing routine',
+    );
+    expect(
+      find.text('description 1'),
+      findsOneWidget,
+      reason: 'Description of existing routine',
+    );
+    await tester.enterText(find.byKey(const Key('field-name')), 'New description');
+    await tester.tap(find.byKey(const Key(SUBMIT_BUTTON_KEY_NAME)));
+
+    // Correct method was called
+    verify(mockRoutinesProvider.editRoutine(any));
+    verifyNever(mockRoutinesProvider.addRoutine(any));
+
+    // TODO(x): edit calls Navigator.pop(), since the form can only be reached from the
+    //       detail page. The test needs to add the detail page to the stack so that
+    //       this can be checked.
+    // https://stackoverflow.com/questions/50704647/how-to-test-navigation-via-navigator-in-flutter
+    // Detail page
+    //await tester.pumpAndSettle();
+    //expect(find.text(('New description')), findsOneWidget, reason: 'Workout plan detail page');
+  });
+
+  testWidgets('Test editing an existing routine - server error', (WidgetTester tester) async {
+    // Arrange
+    when(mockRoutinesProvider.editRoutine(any)).thenThrow(
+      WgerHttpException.fromMap({
+        'name': ['The name is not valid'],
+      }),
+    );
+
+    // Act
+    await tester.pumpWidget(renderWidget(existingRoutine));
+    await tester.tap(find.byKey(const Key(SUBMIT_BUTTON_KEY_NAME)));
+    await tester.pump();
+
+    // Assert
+    expect(find.text('The name is not valid'), findsOneWidget, reason: 'Error message is shown');
+  });
+
+  testWidgets('Test creating a new routine - only name', (WidgetTester tester) async {
+    final editRoutine = Routine(
+      id: 2,
+      created: newRoutine.created,
+      start: DateTime(2024, 11, 1),
+      end: DateTime(2024, 12, 1),
+      name: 'New cool routine',
+    );
+
+    when(mockRoutinesProvider.addRoutine(any)).thenAnswer((_) => Future.value(editRoutine));
+    when(mockRoutinesProvider.findById(any)).thenAnswer((_) => editRoutine);
+
+    await tester.pumpWidget(renderWidget(newRoutine));
+    await tester.pumpAndSettle();
+
+    expect(find.text(''), findsNWidgets(2), reason: 'New routine has no name or description');
+    await tester.enterText(find.byKey(const Key('field-name')), editRoutine.name);
+    await tester.tap(find.byKey(const Key(SUBMIT_BUTTON_KEY_NAME)));
+
+    verifyNever(mockRoutinesProvider.editRoutine(any));
+    verify(mockRoutinesProvider.addRoutine(any));
+
+    // Detail page
+    await tester.pumpAndSettle();
+    expect(find.text('New cool routine'), findsWidgets, reason: 'routine detail page');
+  });
+
+  testWidgets('Test creating a new routine - name and description', (WidgetTester tester) async {
+    final editRoutine = Routine(
+      id: 2,
+      created: newRoutine.created,
+      start: DateTime(2024, 11, 1),
+      end: DateTime(2024, 12, 1),
+      name: 'My routine',
+      description: 'Get yuuuge',
+    );
+    when(mockRoutinesProvider.addRoutine(any)).thenAnswer((_) => Future.value(editRoutine));
+    when(mockRoutinesProvider.findById(any)).thenAnswer((_) => editRoutine);
+
+    await tester.pumpWidget(renderWidget(newRoutine));
+    await tester.pumpAndSettle();
+
+    expect(find.text(''), findsNWidgets(2), reason: 'New routine has no name or description');
+    await tester.enterText(find.byKey(const Key('field-name')), editRoutine.name);
+    await tester.enterText(find.byKey(const Key('field-description')), editRoutine.description);
+    await tester.tap(find.byKey(const Key(SUBMIT_BUTTON_KEY_NAME)));
+
+    verifyNever(mockRoutinesProvider.editRoutine(any));
+    verify(mockRoutinesProvider.addRoutine(any));
+
+    // Detail page
+    await tester.pumpAndSettle();
+    expect(find.text('My routine'), findsWidgets, reason: 'routine detail page');
+  });
+
+  testWidgets('Test creating a new routine - server error', (WidgetTester tester) async {
+    // Arrange
+    when(mockRoutinesProvider.addRoutine(any)).thenThrow(
+      WgerHttpException.fromMap({
+        'name': ['The name is not valid'],
+      }),
+    );
+
+    // Act
+    await tester.pumpWidget(renderWidget(newRoutine));
+    await tester.enterText(find.byKey(const Key('field-name')), 'test 1234');
+    await tester.tap(find.byKey(const Key(SUBMIT_BUTTON_KEY_NAME)));
+    await tester.pump();
+
+    // Assert
+    expect(find.text('The name is not valid'), findsOneWidget, reason: 'Error message is shown');
+  });
+}
diff --git a/test/routine/routine_form_test.mocks.dart b/test/routine/routine_form_test.mocks.dart
new file mode 100644
index 00000000..6ecdd2f3
--- /dev/null
+++ b/test/routine/routine_form_test.mocks.dart
@@ -0,0 +1,594 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in wger/test/routine/routine_form_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i13;
+import 'dart:ui' as _i17;
+
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:mockito/src/dummies.dart' as _i16;
+import 'package:wger/models/exercises/exercise.dart' as _i15;
+import 'package:wger/models/workouts/base_config.dart' as _i9;
+import 'package:wger/models/workouts/day.dart' as _i6;
+import 'package:wger/models/workouts/day_data.dart' as _i14;
+import 'package:wger/models/workouts/log.dart' as _i11;
+import 'package:wger/models/workouts/repetition_unit.dart' as _i4;
+import 'package:wger/models/workouts/routine.dart' as _i5;
+import 'package:wger/models/workouts/session.dart' as _i10;
+import 'package:wger/models/workouts/slot.dart' as _i7;
+import 'package:wger/models/workouts/slot_entry.dart' as _i8;
+import 'package:wger/models/workouts/weight_unit.dart' as _i3;
+import 'package:wger/providers/base_provider.dart' as _i2;
+import 'package:wger/providers/routines.dart' as _i12;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
+
+class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider {
+  _FakeWgerBaseProvider_0(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeWeightUnit_1 extends _i1.SmartFake implements _i3.WeightUnit {
+  _FakeWeightUnit_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeRepetitionUnit_2 extends _i1.SmartFake implements _i4.RepetitionUnit {
+  _FakeRepetitionUnit_2(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeRoutine_3 extends _i1.SmartFake implements _i5.Routine {
+  _FakeRoutine_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeDay_4 extends _i1.SmartFake implements _i6.Day {
+  _FakeDay_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeSlot_5 extends _i1.SmartFake implements _i7.Slot {
+  _FakeSlot_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeSlotEntry_6 extends _i1.SmartFake implements _i8.SlotEntry {
+  _FakeSlotEntry_6(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeBaseConfig_7 extends _i1.SmartFake implements _i9.BaseConfig {
+  _FakeBaseConfig_7(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeWorkoutSession_8 extends _i1.SmartFake implements _i10.WorkoutSession {
+  _FakeWorkoutSession_8(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeLog_9 extends _i1.SmartFake implements _i11.Log {
+  _FakeLog_9(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+/// A class which mocks [RoutinesProvider].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
+  MockRoutinesProvider() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(
+              this,
+              Invocation.getter(#baseProvider),
+            ),
+          )
+          as _i2.WgerBaseProvider);
+
+  @override
+  List<_i5.Routine> get items =>
+      (super.noSuchMethod(
+            Invocation.getter(#items),
+            returnValue: <_i5.Routine>[],
+          )
+          as List<_i5.Routine>);
+
+  @override
+  List<_i3.WeightUnit> get weightUnits =>
+      (super.noSuchMethod(
+            Invocation.getter(#weightUnits),
+            returnValue: <_i3.WeightUnit>[],
+          )
+          as List<_i3.WeightUnit>);
+
+  @override
+  _i3.WeightUnit get defaultWeightUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultWeightUnit),
+            returnValue: _FakeWeightUnit_1(
+              this,
+              Invocation.getter(#defaultWeightUnit),
+            ),
+          )
+          as _i3.WeightUnit);
+
+  @override
+  List<_i4.RepetitionUnit> get repetitionUnits =>
+      (super.noSuchMethod(
+            Invocation.getter(#repetitionUnits),
+            returnValue: <_i4.RepetitionUnit>[],
+          )
+          as List<_i4.RepetitionUnit>);
+
+  @override
+  _i4.RepetitionUnit get defaultRepetitionUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultRepetitionUnit),
+            returnValue: _FakeRepetitionUnit_2(
+              this,
+              Invocation.getter(#defaultRepetitionUnit),
+            ),
+          )
+          as _i4.RepetitionUnit);
+
+  @override
+  set activeRoutine(_i5.Routine? value) => super.noSuchMethod(
+    Invocation.setter(#activeRoutine, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set weightUnits(List<_i3.WeightUnit>? weightUnits) => super.noSuchMethod(
+    Invocation.setter(#weightUnits, weightUnits),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set repetitionUnits(List<_i4.RepetitionUnit>? repetitionUnits) => super.noSuchMethod(
+    Invocation.setter(#repetitionUnits, repetitionUnits),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  bool get hasListeners =>
+      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
+
+  @override
+  void clear() => super.noSuchMethod(
+    Invocation.method(#clear, []),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  _i3.WeightUnit findWeightUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findWeightUnitById, [id]),
+            returnValue: _FakeWeightUnit_1(
+              this,
+              Invocation.method(#findWeightUnitById, [id]),
+            ),
+          )
+          as _i3.WeightUnit);
+
+  @override
+  _i4.RepetitionUnit findRepetitionUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findRepetitionUnitById, [id]),
+            returnValue: _FakeRepetitionUnit_2(
+              this,
+              Invocation.method(#findRepetitionUnitById, [id]),
+            ),
+          )
+          as _i4.RepetitionUnit);
+
+  @override
+  List<_i5.Routine> getPlans() =>
+      (super.noSuchMethod(
+            Invocation.method(#getPlans, []),
+            returnValue: <_i5.Routine>[],
+          )
+          as List<_i5.Routine>);
+
+  @override
+  _i5.Routine findById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findById, [id]),
+            returnValue: _FakeRoutine_3(
+              this,
+              Invocation.method(#findById, [id]),
+            ),
+          )
+          as _i5.Routine);
+
+  @override
+  int findIndexById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findIndexById, [id]),
+            returnValue: 0,
+          )
+          as int);
+
+  @override
+  _i13.Future<void> fetchAndSetAllRoutinesFull() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesFull, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetAllRoutinesSparse() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesSparse, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> setExercisesAndUnits(
+    List<_i14.DayData>? entries, {
+    Map<int, _i15.Exercise>? exercises,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #setExercisesAndUnits,
+              [entries],
+              {#exercises: exercises},
+            ),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetRoutineSparse, [planId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(
+                this,
+                Invocation.method(#fetchAndSetRoutineSparse, [planId]),
+              ),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
+
+  @override
+  _i13.Future<_i5.Routine> fetchAndSetRoutineFull(int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetRoutineFull, [routineId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(
+                this,
+                Invocation.method(#fetchAndSetRoutineFull, [routineId]),
+              ),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
+
+  @override
+  _i13.Future<_i5.Routine> addRoutine(_i5.Routine? routine) =>
+      (super.noSuchMethod(
+            Invocation.method(#addRoutine, [routine]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#addRoutine, [routine])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
+
+  @override
+  _i13.Future<void> editRoutine(_i5.Routine? routine) =>
+      (super.noSuchMethod(
+            Invocation.method(#editRoutine, [routine]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> deleteRoutine(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteRoutine, [id]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetRepetitionUnits() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetRepetitionUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetWeightUnits() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetWeightUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetUnits() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i6.Day> addDay(_i6.Day? day) =>
+      (super.noSuchMethod(
+            Invocation.method(#addDay, [day]),
+            returnValue: _i13.Future<_i6.Day>.value(
+              _FakeDay_4(this, Invocation.method(#addDay, [day])),
+            ),
+          )
+          as _i13.Future<_i6.Day>);
+
+  @override
+  _i13.Future<void> editDay(_i6.Day? day) =>
+      (super.noSuchMethod(
+            Invocation.method(#editDay, [day]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editDays(List<_i6.Day>? days) =>
+      (super.noSuchMethod(
+            Invocation.method(#editDays, [days]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> deleteDay(int? dayId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteDay, [dayId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i7.Slot> addSlot(_i7.Slot? slot, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSlot, [slot, routineId]),
+            returnValue: _i13.Future<_i7.Slot>.value(
+              _FakeSlot_5(this, Invocation.method(#addSlot, [slot, routineId])),
+            ),
+          )
+          as _i13.Future<_i7.Slot>);
+
+  @override
+  _i13.Future<void> deleteSlot(int? slotId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlot, [slotId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlot(_i7.Slot? slot, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlot, [slot, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlots(List<_i7.Slot>? slots, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlots, [slots, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i8.SlotEntry> addSlotEntry(
+    _i8.SlotEntry? entry,
+    int? routineId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<_i8.SlotEntry>.value(
+              _FakeSlotEntry_6(
+                this,
+                Invocation.method(#addSlotEntry, [entry, routineId]),
+              ),
+            ),
+          )
+          as _i13.Future<_i8.SlotEntry>);
+
+  @override
+  _i13.Future<void> deleteSlotEntry(int? id, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlotEntry, [id, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlotEntry(_i8.SlotEntry? entry, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  String getConfigUrl(_i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#getConfigUrl, [type]),
+            returnValue: _i16.dummyValue<String>(
+              this,
+              Invocation.method(#getConfigUrl, [type]),
+            ),
+          )
+          as String);
+
+  @override
+  _i13.Future<_i9.BaseConfig> editConfig(
+    _i9.BaseConfig? config,
+    _i8.ConfigType? type,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#editConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(
+                this,
+                Invocation.method(#editConfig, [config, type]),
+              ),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<_i9.BaseConfig> addConfig(
+    _i9.BaseConfig? config,
+    _i8.ConfigType? type,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(
+                this,
+                Invocation.method(#addConfig, [config, type]),
+              ),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<void> deleteConfig(int? id, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteConfig, [id, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> handleConfig(
+    _i8.SlotEntry? entry,
+    num? value,
+    _i8.ConfigType? type,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#handleConfig, [entry, value, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<List<_i10.WorkoutSession>> fetchSessionData() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchSessionData, []),
+            returnValue: _i13.Future<List<_i10.WorkoutSession>>.value(
+              <_i10.WorkoutSession>[],
+            ),
+          )
+          as _i13.Future<List<_i10.WorkoutSession>>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> addSession(
+    _i10.WorkoutSession? session,
+    int? routineId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSession, [session, routineId]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(
+                this,
+                Invocation.method(#addSession, [session, routineId]),
+              ),
+            ),
+          )
+          as _i13.Future<_i10.WorkoutSession>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> editSession(_i10.WorkoutSession? session) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSession, [session]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(
+                this,
+                Invocation.method(#editSession, [session]),
+              ),
+            ),
+          )
+          as _i13.Future<_i10.WorkoutSession>);
+
+  @override
+  _i13.Future<_i11.Log> addLog(_i11.Log? log) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLog, [log]),
+            returnValue: _i13.Future<_i11.Log>.value(
+              _FakeLog_9(this, Invocation.method(#addLog, [log])),
+            ),
+          )
+          as _i13.Future<_i11.Log>);
+
+  @override
+  _i13.Future<void> deleteLog(int? logId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLog, [logId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  void addListener(_i17.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void removeListener(_i17.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#removeListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void dispose() => super.noSuchMethod(
+    Invocation.method(#dispose, []),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void notifyListeners() => super.noSuchMethod(
+    Invocation.method(#notifyListeners, []),
+    returnValueForMissingStub: null,
+  );
+}
diff --git a/test/routine/routine_logs_screen_test.dart b/test/routine/routine_logs_screen_test.dart
new file mode 100644
index 00000000..8d57b942
--- /dev/null
+++ b/test/routine/routine_logs_screen_test.dart
@@ -0,0 +1,120 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'dart:io';
+
+import 'package:clock/clock.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+import 'package:provider/provider.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/workouts/routine.dart';
+import 'package:wger/providers/routines.dart';
+import 'package:wger/screens/routine_logs_screen.dart';
+import 'package:wger/screens/routine_screen.dart';
+import 'package:wger/widgets/routines/workout_logs.dart';
+
+import '../../test_data/routines.dart';
+import 'routine_logs_screen_test.mocks.dart';
+
+@GenerateMocks([RoutinesProvider])
+void main() {
+  late Routine routine;
+  final mockRoutinesProvider = MockRoutinesProvider();
+
+  setUp(() {
+    routine = getTestRoutine();
+    routine.sessions[0].session.date = DateTime(2025, 3, 29);
+
+    when(mockRoutinesProvider.findById(any)).thenAnswer((_) => routine);
+  });
+
+  Widget renderWidget({locale = 'en'}) {
+    final key = GlobalKey<NavigatorState>();
+
+    return ChangeNotifierProvider<RoutinesProvider>(
+      create: (context) => mockRoutinesProvider,
+      child: MaterialApp(
+        locale: Locale(locale),
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        navigatorKey: key,
+        home: TextButton(
+          onPressed: () => key.currentState!.push(
+            MaterialPageRoute<void>(
+              settings: RouteSettings(arguments: routine.id),
+              builder: (_) => const WorkoutLogsScreen(),
+            ),
+          ),
+          child: const SizedBox(),
+        ),
+        routes: {
+          RoutineScreen.routeName: (ctx) => const WorkoutLogsScreen(),
+        },
+      ),
+    );
+  }
+
+  testWidgets(
+    'Smoke test the widgets on the routine logs screen',
+    (WidgetTester tester) async {
+      tester.view.physicalSize = const Size(500, 1000);
+      tester.view.devicePixelRatio = 1.0; // Ensure correct pixel ratio
+
+      await withClock(Clock.fixed(DateTime(2025, 3, 29)), () async {
+        await tester.pumpWidget(renderWidget());
+        await tester.tap(find.byType(TextButton));
+        await tester.pumpAndSettle();
+
+        if (Platform.isLinux) {
+          await expectLater(
+            find.byType(WorkoutLogsScreen),
+            matchesGoldenFile('goldens/routine_logs_screen_detail.png'),
+          );
+        }
+
+        expect(find.text('Training logs'), findsOneWidget);
+        expect(find.byType(WorkoutLogCalendar), findsOneWidget);
+        expect(find.text('Bench press'), findsOneWidget);
+        expect(find.byKey(const ValueKey('delete-log-1')), findsOneWidget);
+        expect(find.byKey(const ValueKey('delete-log-2')), findsOneWidget);
+        expect(find.byKey(const ValueKey('delete-log-3')), findsNothing);
+      });
+    },
+    tags: ['golden'],
+  );
+
+  testWidgets('Test deleting log entries', (WidgetTester tester) async {
+    await withClock(Clock.fixed(DateTime(2025, 3, 29)), () async {
+      await tester.pumpWidget(renderWidget());
+      await tester.tap(find.byType(TextButton));
+      await tester.pumpAndSettle();
+      await tester.drag(find.byType(ListView), const Offset(0, -500));
+      await tester.pumpAndSettle();
+      await tester.tap(find.byKey(const ValueKey('delete-log-1')));
+      await tester.pumpAndSettle();
+
+      expect(find.byKey(const ValueKey('delete-button')), findsOneWidget);
+      expect(find.byKey(const ValueKey('cancel-button')), findsOneWidget);
+      await tester.tap(find.byKey(const ValueKey('delete-button')));
+      verify(mockRoutinesProvider.deleteLog(1, 1)).called(1);
+    });
+  });
+}
diff --git a/test/routine/routine_logs_screen_test.mocks.dart b/test/routine/routine_logs_screen_test.mocks.dart
new file mode 100644
index 00000000..dca48e93
--- /dev/null
+++ b/test/routine/routine_logs_screen_test.mocks.dart
@@ -0,0 +1,594 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in wger/test/routine/routine_logs_screen_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i13;
+import 'dart:ui' as _i17;
+
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:mockito/src/dummies.dart' as _i16;
+import 'package:wger/models/exercises/exercise.dart' as _i15;
+import 'package:wger/models/workouts/base_config.dart' as _i9;
+import 'package:wger/models/workouts/day.dart' as _i6;
+import 'package:wger/models/workouts/day_data.dart' as _i14;
+import 'package:wger/models/workouts/log.dart' as _i11;
+import 'package:wger/models/workouts/repetition_unit.dart' as _i4;
+import 'package:wger/models/workouts/routine.dart' as _i5;
+import 'package:wger/models/workouts/session.dart' as _i10;
+import 'package:wger/models/workouts/slot.dart' as _i7;
+import 'package:wger/models/workouts/slot_entry.dart' as _i8;
+import 'package:wger/models/workouts/weight_unit.dart' as _i3;
+import 'package:wger/providers/base_provider.dart' as _i2;
+import 'package:wger/providers/routines.dart' as _i12;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
+
+class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider {
+  _FakeWgerBaseProvider_0(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeWeightUnit_1 extends _i1.SmartFake implements _i3.WeightUnit {
+  _FakeWeightUnit_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeRepetitionUnit_2 extends _i1.SmartFake implements _i4.RepetitionUnit {
+  _FakeRepetitionUnit_2(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeRoutine_3 extends _i1.SmartFake implements _i5.Routine {
+  _FakeRoutine_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeDay_4 extends _i1.SmartFake implements _i6.Day {
+  _FakeDay_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeSlot_5 extends _i1.SmartFake implements _i7.Slot {
+  _FakeSlot_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeSlotEntry_6 extends _i1.SmartFake implements _i8.SlotEntry {
+  _FakeSlotEntry_6(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeBaseConfig_7 extends _i1.SmartFake implements _i9.BaseConfig {
+  _FakeBaseConfig_7(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeWorkoutSession_8 extends _i1.SmartFake implements _i10.WorkoutSession {
+  _FakeWorkoutSession_8(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeLog_9 extends _i1.SmartFake implements _i11.Log {
+  _FakeLog_9(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+/// A class which mocks [RoutinesProvider].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
+  MockRoutinesProvider() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(
+              this,
+              Invocation.getter(#baseProvider),
+            ),
+          )
+          as _i2.WgerBaseProvider);
+
+  @override
+  List<_i5.Routine> get items =>
+      (super.noSuchMethod(
+            Invocation.getter(#items),
+            returnValue: <_i5.Routine>[],
+          )
+          as List<_i5.Routine>);
+
+  @override
+  List<_i3.WeightUnit> get weightUnits =>
+      (super.noSuchMethod(
+            Invocation.getter(#weightUnits),
+            returnValue: <_i3.WeightUnit>[],
+          )
+          as List<_i3.WeightUnit>);
+
+  @override
+  _i3.WeightUnit get defaultWeightUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultWeightUnit),
+            returnValue: _FakeWeightUnit_1(
+              this,
+              Invocation.getter(#defaultWeightUnit),
+            ),
+          )
+          as _i3.WeightUnit);
+
+  @override
+  List<_i4.RepetitionUnit> get repetitionUnits =>
+      (super.noSuchMethod(
+            Invocation.getter(#repetitionUnits),
+            returnValue: <_i4.RepetitionUnit>[],
+          )
+          as List<_i4.RepetitionUnit>);
+
+  @override
+  _i4.RepetitionUnit get defaultRepetitionUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultRepetitionUnit),
+            returnValue: _FakeRepetitionUnit_2(
+              this,
+              Invocation.getter(#defaultRepetitionUnit),
+            ),
+          )
+          as _i4.RepetitionUnit);
+
+  @override
+  set activeRoutine(_i5.Routine? value) => super.noSuchMethod(
+    Invocation.setter(#activeRoutine, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set weightUnits(List<_i3.WeightUnit>? weightUnits) => super.noSuchMethod(
+    Invocation.setter(#weightUnits, weightUnits),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set repetitionUnits(List<_i4.RepetitionUnit>? repetitionUnits) => super.noSuchMethod(
+    Invocation.setter(#repetitionUnits, repetitionUnits),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  bool get hasListeners =>
+      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
+
+  @override
+  void clear() => super.noSuchMethod(
+    Invocation.method(#clear, []),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  _i3.WeightUnit findWeightUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findWeightUnitById, [id]),
+            returnValue: _FakeWeightUnit_1(
+              this,
+              Invocation.method(#findWeightUnitById, [id]),
+            ),
+          )
+          as _i3.WeightUnit);
+
+  @override
+  _i4.RepetitionUnit findRepetitionUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findRepetitionUnitById, [id]),
+            returnValue: _FakeRepetitionUnit_2(
+              this,
+              Invocation.method(#findRepetitionUnitById, [id]),
+            ),
+          )
+          as _i4.RepetitionUnit);
+
+  @override
+  List<_i5.Routine> getPlans() =>
+      (super.noSuchMethod(
+            Invocation.method(#getPlans, []),
+            returnValue: <_i5.Routine>[],
+          )
+          as List<_i5.Routine>);
+
+  @override
+  _i5.Routine findById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findById, [id]),
+            returnValue: _FakeRoutine_3(
+              this,
+              Invocation.method(#findById, [id]),
+            ),
+          )
+          as _i5.Routine);
+
+  @override
+  int findIndexById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findIndexById, [id]),
+            returnValue: 0,
+          )
+          as int);
+
+  @override
+  _i13.Future<void> fetchAndSetAllRoutinesFull() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesFull, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetAllRoutinesSparse() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesSparse, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> setExercisesAndUnits(
+    List<_i14.DayData>? entries, {
+    Map<int, _i15.Exercise>? exercises,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #setExercisesAndUnits,
+              [entries],
+              {#exercises: exercises},
+            ),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetRoutineSparse, [planId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(
+                this,
+                Invocation.method(#fetchAndSetRoutineSparse, [planId]),
+              ),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
+
+  @override
+  _i13.Future<_i5.Routine> fetchAndSetRoutineFull(int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetRoutineFull, [routineId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(
+                this,
+                Invocation.method(#fetchAndSetRoutineFull, [routineId]),
+              ),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
+
+  @override
+  _i13.Future<_i5.Routine> addRoutine(_i5.Routine? routine) =>
+      (super.noSuchMethod(
+            Invocation.method(#addRoutine, [routine]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#addRoutine, [routine])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
+
+  @override
+  _i13.Future<void> editRoutine(_i5.Routine? routine) =>
+      (super.noSuchMethod(
+            Invocation.method(#editRoutine, [routine]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> deleteRoutine(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteRoutine, [id]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetRepetitionUnits() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetRepetitionUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetWeightUnits() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetWeightUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetUnits() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i6.Day> addDay(_i6.Day? day) =>
+      (super.noSuchMethod(
+            Invocation.method(#addDay, [day]),
+            returnValue: _i13.Future<_i6.Day>.value(
+              _FakeDay_4(this, Invocation.method(#addDay, [day])),
+            ),
+          )
+          as _i13.Future<_i6.Day>);
+
+  @override
+  _i13.Future<void> editDay(_i6.Day? day) =>
+      (super.noSuchMethod(
+            Invocation.method(#editDay, [day]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editDays(List<_i6.Day>? days) =>
+      (super.noSuchMethod(
+            Invocation.method(#editDays, [days]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> deleteDay(int? dayId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteDay, [dayId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i7.Slot> addSlot(_i7.Slot? slot, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSlot, [slot, routineId]),
+            returnValue: _i13.Future<_i7.Slot>.value(
+              _FakeSlot_5(this, Invocation.method(#addSlot, [slot, routineId])),
+            ),
+          )
+          as _i13.Future<_i7.Slot>);
+
+  @override
+  _i13.Future<void> deleteSlot(int? slotId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlot, [slotId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlot(_i7.Slot? slot, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlot, [slot, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlots(List<_i7.Slot>? slots, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlots, [slots, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i8.SlotEntry> addSlotEntry(
+    _i8.SlotEntry? entry,
+    int? routineId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<_i8.SlotEntry>.value(
+              _FakeSlotEntry_6(
+                this,
+                Invocation.method(#addSlotEntry, [entry, routineId]),
+              ),
+            ),
+          )
+          as _i13.Future<_i8.SlotEntry>);
+
+  @override
+  _i13.Future<void> deleteSlotEntry(int? id, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlotEntry, [id, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlotEntry(_i8.SlotEntry? entry, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  String getConfigUrl(_i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#getConfigUrl, [type]),
+            returnValue: _i16.dummyValue<String>(
+              this,
+              Invocation.method(#getConfigUrl, [type]),
+            ),
+          )
+          as String);
+
+  @override
+  _i13.Future<_i9.BaseConfig> editConfig(
+    _i9.BaseConfig? config,
+    _i8.ConfigType? type,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#editConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(
+                this,
+                Invocation.method(#editConfig, [config, type]),
+              ),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<_i9.BaseConfig> addConfig(
+    _i9.BaseConfig? config,
+    _i8.ConfigType? type,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(
+                this,
+                Invocation.method(#addConfig, [config, type]),
+              ),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<void> deleteConfig(int? id, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteConfig, [id, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> handleConfig(
+    _i8.SlotEntry? entry,
+    num? value,
+    _i8.ConfigType? type,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#handleConfig, [entry, value, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<List<_i10.WorkoutSession>> fetchSessionData() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchSessionData, []),
+            returnValue: _i13.Future<List<_i10.WorkoutSession>>.value(
+              <_i10.WorkoutSession>[],
+            ),
+          )
+          as _i13.Future<List<_i10.WorkoutSession>>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> addSession(
+    _i10.WorkoutSession? session,
+    int? routineId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSession, [session, routineId]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(
+                this,
+                Invocation.method(#addSession, [session, routineId]),
+              ),
+            ),
+          )
+          as _i13.Future<_i10.WorkoutSession>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> editSession(_i10.WorkoutSession? session) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSession, [session]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(
+                this,
+                Invocation.method(#editSession, [session]),
+              ),
+            ),
+          )
+          as _i13.Future<_i10.WorkoutSession>);
+
+  @override
+  _i13.Future<_i11.Log> addLog(_i11.Log? log) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLog, [log]),
+            returnValue: _i13.Future<_i11.Log>.value(
+              _FakeLog_9(this, Invocation.method(#addLog, [log])),
+            ),
+          )
+          as _i13.Future<_i11.Log>);
+
+  @override
+  _i13.Future<void> deleteLog(int? logId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLog, [logId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  void addListener(_i17.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void removeListener(_i17.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#removeListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void dispose() => super.noSuchMethod(
+    Invocation.method(#dispose, []),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void notifyListeners() => super.noSuchMethod(
+    Invocation.method(#notifyListeners, []),
+    returnValueForMissingStub: null,
+  );
+}
diff --git a/test/workout/workout_plan_model_test.dart b/test/routine/routine_model_test.dart
similarity index 63%
rename from test/workout/workout_plan_model_test.dart
rename to test/routine/routine_model_test.dart
index 57be4bb3..2ec646a0 100644
--- a/test/workout/workout_plan_model_test.dart
+++ b/test/routine/routine_model_test.dart
@@ -18,25 +18,35 @@
 
 import 'package:flutter_test/flutter_test.dart';
 
-import '../../test_data/exercises.dart';
-import '../../test_data/workouts.dart';
+import '../../test_data/routines.dart';
 
 void main() {
   group('model tests', () {
     test('Test the filterLogsByExercise method', () {
-      final workout = getWorkout();
+      final routine = getTestRoutine();
 
-      expect(workout.logs.length, 3);
-      final logExercise1 = workout.filterLogsByExerciseBase(getTestExercises()[0]);
+      expect(routine.logs.length, 3);
+      final logExercise1 = routine.filterLogsByExercise(1);
       expect(logExercise1.length, 2);
       expect(logExercise1[0].id, 1);
       expect(logExercise1[1].id, 2);
 
-      final logExercise2 = workout.filterLogsByExerciseBase(getTestExercises()[1]);
+      final logExercise2 = routine.filterLogsByExercise(2);
       expect(logExercise2.length, 1);
       expect(logExercise2[0].id, 3);
 
-      expect(workout.filterLogsByExerciseBase(getTestExercises()[2]).length, 0);
+      expect(routine.filterLogsByExercise(3).length, 0);
+    });
+
+    test('Test the groupLogsByRepetition method', () {
+      final routine = getTestRoutine();
+
+      expect(routine.logs.length, 3);
+      final result = routine.groupLogsByRepetition();
+      expect(result.keys, [10, 12, 8]);
+      expect(result[8], [routine.logs[2]]);
+      expect(result[10], [routine.logs[0]]);
+      expect(result[12], [routine.logs[1]]);
     });
   });
 }
diff --git a/test/workout/workout_plan_screen_test.dart b/test/routine/routine_screen_test.dart
similarity index 53%
rename from test/workout/workout_plan_screen_test.dart
rename to test/routine/routine_screen_test.dart
index 84658f08..9d46b1d2 100644
--- a/test/workout/workout_plan_screen_test.dart
+++ b/test/routine/routine_screen_test.dart
@@ -16,6 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import 'dart:io';
+
 import 'package:drift/native.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
@@ -25,11 +27,11 @@ import 'package:wger/database/exercises/exercise_database.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/providers/base_provider.dart';
 import 'package:wger/providers/exercises.dart';
-import 'package:wger/providers/workout_plans.dart';
-import 'package:wger/screens/workout_plan_screen.dart';
+import 'package:wger/providers/routines.dart';
+import 'package:wger/screens/routine_screen.dart';
 
-import '../../test_data/workouts.dart';
-import 'workout_plan_screen_test.mocks.dart';
+import '../../test_data/routines.dart';
+import 'routine_screen_test.mocks.dart';
 
 @GenerateMocks([WgerBaseProvider])
 void main() {
@@ -38,11 +40,16 @@ void main() {
     mockBaseProvider,
     database: ExerciseDatabase.inMemory(NativeDatabase.memory()),
   );
-  Widget createHomeScreen({locale = 'en'}) {
+
+  Widget renderWidget({locale = 'en'}) {
     final key = GlobalKey<NavigatorState>();
 
-    return ChangeNotifierProvider<WorkoutPlansProvider>(
-      create: (context) => WorkoutPlansProvider(mockBaseProvider, exercisesProvider, []),
+    return ChangeNotifierProvider<RoutinesProvider>(
+      create: (context) => RoutinesProvider(
+        mockBaseProvider,
+        exercisesProvider,
+        [getTestRoutine()],
+      ),
       child: MaterialApp(
         locale: Locale(locale),
         localizationsDelegates: AppLocalizations.localizationsDelegates,
@@ -51,43 +58,45 @@ void main() {
         home: TextButton(
           onPressed: () => key.currentState!.push(
             MaterialPageRoute<void>(
-              settings: RouteSettings(arguments: getWorkout()),
-              builder: (_) => const WorkoutPlanScreen(),
+              settings: const RouteSettings(arguments: 1),
+              builder: (_) => const RoutineScreen(),
             ),
           ),
           child: const SizedBox(),
         ),
-        routes: {WorkoutPlanScreen.routeName: (ctx) => const WorkoutPlanScreen()},
+        routes: {RoutineScreen.routeName: (ctx) => const RoutineScreen()},
       ),
     );
   }
 
-  testWidgets('Test the widgets on the nutritional plan screen', (WidgetTester tester) async {
-    await tester.pumpWidget(createHomeScreen());
-    await tester.tap(find.byType(TextButton));
-    await tester.pumpAndSettle();
+  testWidgets(
+    'Test the widgets on the routine screen',
+    (WidgetTester tester) async {
+      tester.view.physicalSize = const Size(500, 1000);
+      tester.view.devicePixelRatio = 1.0; // Ensure correct pixel ratio
 
-    expect(find.text('3 day workout'), findsOneWidget);
-    expect(find.text('chest, shoulders'), findsOneWidget);
-    expect(find.text('legs'), findsOneWidget);
-    expect(find.byType(Card), findsNWidgets(2));
-  });
+      await tester.pumpWidget(renderWidget());
+      await tester.tap(find.byType(TextButton));
+      await tester.pumpAndSettle();
 
-  testWidgets('Tests the localization of times - EN', (WidgetTester tester) async {
-    await tester.pumpWidget(createHomeScreen());
-    await tester.tap(find.byType(TextButton));
-    await tester.pumpAndSettle();
+      if (Platform.isLinux) {
+        await expectLater(
+          find.byType(MaterialApp),
+          matchesGoldenFile('goldens/routine_screen_detail.png'),
+        );
+      }
 
-    expect(find.text('Monday, Tuesday'), findsOneWidget);
-    expect(find.text('Thursday'), findsOneWidget);
-  });
+      expect(find.text('3 day workout'), findsOneWidget);
 
-  testWidgets('Tests the localization of times - DE', (WidgetTester tester) async {
-    await tester.pumpWidget(createHomeScreen(locale: 'de'));
-    await tester.tap(find.byType(TextButton));
-    await tester.pumpAndSettle();
+      expect(find.text('first day'), findsOneWidget);
+      expect(find.text('chest, shoulders'), findsOneWidget);
 
-    expect(find.text('Montag, Dienstag'), findsOneWidget);
-    expect(find.text('Donnerstag'), findsOneWidget);
-  });
+      expect(find.text('second day'), findsOneWidget);
+      expect(find.text('legs'), findsOneWidget);
+
+      expect(find.byType(Card), findsWidgets);
+      // expect(find.byType(Card), findsNWidgets(4));
+    },
+    tags: ['golden'],
+  );
 }
diff --git a/test/routine/routine_screen_test.mocks.dart b/test/routine/routine_screen_test.mocks.dart
new file mode 100644
index 00000000..99fe1643
--- /dev/null
+++ b/test/routine/routine_screen_test.mocks.dart
@@ -0,0 +1,165 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in wger/test/routine/routine_screen_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i5;
+
+import 'package:http/http.dart' as _i3;
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:wger/providers/auth.dart' as _i2;
+import 'package:wger/providers/base_provider.dart' as _i4;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
+
+class _FakeAuthProvider_0 extends _i1.SmartFake implements _i2.AuthProvider {
+  _FakeAuthProvider_0(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
+  _FakeClient_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeUri_2 extends _i1.SmartFake implements Uri {
+  _FakeUri_2(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeResponse_3 extends _i1.SmartFake implements _i3.Response {
+  _FakeResponse_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+/// A class which mocks [WgerBaseProvider].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
+  MockWgerBaseProvider() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i2.AuthProvider get auth =>
+      (super.noSuchMethod(
+            Invocation.getter(#auth),
+            returnValue: _FakeAuthProvider_0(this, Invocation.getter(#auth)),
+          )
+          as _i2.AuthProvider);
+
+  @override
+  _i3.Client get client =>
+      (super.noSuchMethod(
+            Invocation.getter(#client),
+            returnValue: _FakeClient_1(this, Invocation.getter(#client)),
+          )
+          as _i3.Client);
+
+  @override
+  set auth(_i2.AuthProvider? value) => super.noSuchMethod(
+    Invocation.setter(#auth, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set client(_i3.Client? value) => super.noSuchMethod(
+    Invocation.setter(#client, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  Map<String, String> getDefaultHeaders({bool? includeAuth = false}) =>
+      (super.noSuchMethod(
+            Invocation.method(#getDefaultHeaders, [], {
+              #includeAuth: includeAuth,
+            }),
+            returnValue: <String, String>{},
+          )
+          as Map<String, String>);
+
+  @override
+  Uri makeUrl(
+    String? path, {
+    int? id,
+    String? objectMethod,
+    Map<String, dynamic>? query,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #makeUrl,
+              [path],
+              {#id: id, #objectMethod: objectMethod, #query: query},
+            ),
+            returnValue: _FakeUri_2(
+              this,
+              Invocation.method(
+                #makeUrl,
+                [path],
+                {#id: id, #objectMethod: objectMethod, #query: query},
+              ),
+            ),
+          )
+          as Uri);
+
+  @override
+  _i5.Future<dynamic> fetch(Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetch, [uri]),
+            returnValue: _i5.Future<dynamic>.value(),
+          )
+          as _i5.Future<dynamic>);
+
+  @override
+  _i5.Future<List<dynamic>> fetchPaginated(Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchPaginated, [uri]),
+            returnValue: _i5.Future<List<dynamic>>.value(<dynamic>[]),
+          )
+          as _i5.Future<List<dynamic>>);
+
+  @override
+  _i5.Future<Map<String, dynamic>> post(Map<String, dynamic>? data, Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#post, [data, uri]),
+            returnValue: _i5.Future<Map<String, dynamic>>.value(
+              <String, dynamic>{},
+            ),
+          )
+          as _i5.Future<Map<String, dynamic>>);
+
+  @override
+  _i5.Future<Map<String, dynamic>> patch(
+    Map<String, dynamic>? data,
+    Uri? uri,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#patch, [data, uri]),
+            returnValue: _i5.Future<Map<String, dynamic>>.value(
+              <String, dynamic>{},
+            ),
+          )
+          as _i5.Future<Map<String, dynamic>>);
+
+  @override
+  _i5.Future<_i3.Response> deleteRequest(String? url, int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteRequest, [url, id]),
+            returnValue: _i5.Future<_i3.Response>.value(
+              _FakeResponse_3(
+                this,
+                Invocation.method(#deleteRequest, [url, id]),
+              ),
+            ),
+          )
+          as _i5.Future<_i3.Response>);
+}
diff --git a/test/workout/workout_provider_test.dart b/test/routine/routines_provider_test.dart
similarity index 51%
rename from test/workout/workout_provider_test.dart
rename to test/routine/routines_provider_test.dart
index d6a17e4e..4679985c 100644
--- a/test/workout/workout_provider_test.dart
+++ b/test/routine/routines_provider_test.dart
@@ -24,49 +24,62 @@ import 'package:http/http.dart';
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
 import 'package:shared_preferences/shared_preferences.dart';
+import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
+import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
 import 'package:wger/core/locator.dart';
 import 'package:wger/helpers/consts.dart';
+import 'package:wger/helpers/shared_preferences.dart';
 import 'package:wger/models/workouts/repetition_unit.dart';
+import 'package:wger/models/workouts/routine.dart';
 import 'package:wger/models/workouts/weight_unit.dart';
-import 'package:wger/models/workouts/workout_plan.dart';
 import 'package:wger/providers/base_provider.dart';
 import 'package:wger/providers/exercises.dart';
-import 'package:wger/providers/workout_plans.dart';
+import 'package:wger/providers/routines.dart';
 
+import '../../test_data/exercises.dart';
+import '../../test_data/routines.dart';
 import '../fixtures/fixture_reader.dart';
-import 'workout_provider_test.mocks.dart';
+import 'routines_provider_test.mocks.dart';
 
-@GenerateMocks([WgerBaseProvider])
+@GenerateMocks([WgerBaseProvider, ExercisesProvider])
 void main() {
   final mockBaseProvider = MockWgerBaseProvider();
 
+  /// Replacement for SharedPreferences.setMockInitialValues()
+  SharedPreferencesAsyncPlatform.instance = InMemorySharedPreferencesAsync.empty();
+
   setUpAll(() async {
     // Needs to be configured here, setUp runs on every test, setUpAll only once
     await ServiceLocator().configure();
   });
 
   group('test the workout routine provider', () {
-    test('Test fetching and setting a plan', () async {
+    test('Test fetching and setting a routine', () async {
       final exercisesProvider = ExercisesProvider(mockBaseProvider);
 
-      final uri = Uri.https('localhost', 'api/v2/workout/325397/');
-      when(mockBaseProvider.makeUrl('workout', id: 325397)).thenReturn(uri);
+      final uri = Uri.https('localhost', 'api/v2/routine/325397/');
+      when(
+        mockBaseProvider.makeUrl('routine', id: 325397, query: {'limit': API_MAX_PAGE_SIZE}),
+      ).thenReturn(uri);
       when(mockBaseProvider.fetch(uri)).thenAnswer(
         (_) async => Future.value({
           'id': 325397,
+          'created': '2022-10-10',
           'name': 'Test workout',
-          'creation_date': '2022-10-10',
           'description': 'Test workout abcd',
+          'start': '2021-12-20',
+          'end': '2022-06-06',
+          'fit_in_week': false,
         }),
       );
 
       // Load the entries
-      final provider = WorkoutPlansProvider(mockBaseProvider, exercisesProvider, []);
-      final plan = await provider.fetchAndSetPlanSparse(325397);
+      final provider = RoutinesProvider(mockBaseProvider, exercisesProvider, []);
+      final plan = await provider.fetchAndSetRoutineSparse(325397);
       final plans = provider.getPlans();
 
       // Check that everything is ok
-      expect(plan, isA<WorkoutPlan>());
+      expect(plan, isA<Routine>());
       expect(plan.id, 325397);
       expect(plan.description, 'Test workout abcd');
       expect(plans.length, 1);
@@ -84,15 +97,15 @@ void main() {
           'description': 'Test workout abcd',
         }),
       );
-      when(mockBaseProvider.deleteRequest('workout', 325397)).thenAnswer(
+      when(mockBaseProvider.deleteRequest('routine', 325397)).thenAnswer(
         (_) => Future.value(Response('', 204)),
       );
 
       // Load the entries
-      final provider = WorkoutPlansProvider(mockBaseProvider, exercisesProvider, []);
+      final provider = RoutinesProvider(mockBaseProvider, exercisesProvider, []);
 
-      await provider.fetchAndSetPlanSparse(325397);
-      await provider.deleteWorkout(325397);
+      await provider.fetchAndSetRoutineSparse(325397);
+      await provider.deleteRoutine(325397);
       final plans = provider.getPlans();
       expect(plans.length, 0);
     });
@@ -103,11 +116,12 @@ void main() {
       final uri = Uri.https('localhost', 'api/v2/setting-repetitionunit/');
       final tRepetitionUnits = jsonDecode(fixture('routines/repetition_units.json'));
       when(mockBaseProvider.makeUrl('setting-repetitionunit')).thenReturn(uri);
-      when(mockBaseProvider.fetchPaginated(uri))
-          .thenAnswer((_) => Future.value(tRepetitionUnits['results']));
+      when(
+        mockBaseProvider.fetchPaginated(uri),
+      ).thenAnswer((_) => Future.value(tRepetitionUnits['results']));
 
       // Load the entries
-      final provider = WorkoutPlansProvider(mockBaseProvider, exercisesProvider, []);
+      final provider = RoutinesProvider(mockBaseProvider, exercisesProvider, []);
       await provider.fetchAndSetRepetitionUnits();
       final repetitionUnits = provider.repetitionUnits;
 
@@ -118,13 +132,14 @@ void main() {
       final uri = Uri.https('localhost', 'api/v2/setting-weightunit/');
       when(mockBaseProvider.makeUrl('setting-weightunit')).thenReturn(uri);
       final tWeightUnits = jsonDecode(fixture('routines/weight_units.json'));
-      when(mockBaseProvider.fetchPaginated(uri))
-          .thenAnswer((_) => Future.value(tWeightUnits['results']));
+      when(
+        mockBaseProvider.fetchPaginated(uri),
+      ).thenAnswer((_) => Future.value(tWeightUnits['results']));
 
       final ExercisesProvider testExercisesProvider = ExercisesProvider(mockBaseProvider);
 
       // Load the entries
-      final provider = WorkoutPlansProvider(mockBaseProvider, testExercisesProvider, []);
+      final provider = RoutinesProvider(mockBaseProvider, testExercisesProvider, []);
       await provider.fetchAndSetWeightUnits();
       final weightUnits = provider.weightUnits;
 
@@ -136,29 +151,101 @@ void main() {
       final weightUri = Uri.https('localhost', 'api/v2/setting-weightunit/');
       when(mockBaseProvider.makeUrl('setting-weightunit')).thenReturn(weightUri);
       final tWeightUnits = jsonDecode(fixture('routines/weight_units.json'));
-      when(mockBaseProvider.fetchPaginated(weightUri))
-          .thenAnswer((_) => Future.value(tWeightUnits['results']));
+      when(
+        mockBaseProvider.fetchPaginated(weightUri),
+      ).thenAnswer((_) => Future.value(tWeightUnits['results']));
 
       final repUnit = Uri.https('localhost', 'api/v2/setting-repetitionunit/');
       final tRepetitionUnits = jsonDecode(fixture('routines/repetition_units.json'));
       when(mockBaseProvider.makeUrl('setting-repetitionunit')).thenReturn(repUnit);
-      when(mockBaseProvider.fetchPaginated(repUnit))
-          .thenAnswer((_) => Future.value(tRepetitionUnits['results']));
+      when(
+        mockBaseProvider.fetchPaginated(repUnit),
+      ).thenAnswer((_) => Future.value(tRepetitionUnits['results']));
 
       final exercisesProvider = ExercisesProvider(mockBaseProvider);
       WidgetsFlutterBinding.ensureInitialized();
       SharedPreferences.setMockInitialValues({});
-      final prefs = await SharedPreferences.getInstance();
+      final prefs = PreferenceHelper.asyncPref;
 
       // Load the entries
-      final provider = WorkoutPlansProvider(mockBaseProvider, exercisesProvider, []);
+      final provider = RoutinesProvider(mockBaseProvider, exercisesProvider, []);
       await provider.fetchAndSetUnits();
-      final prefsJson = jsonDecode(prefs.getString(PREFS_WORKOUT_UNITS)!);
+      final prefsJson = jsonDecode((await prefs.getString(PREFS_WORKOUT_UNITS))!);
 
       expect(prefsJson['repetitionUnits'].length, 7);
       expect(prefsJson['weightUnit'].length, 6);
       expect(true, DateTime.parse(prefsJson['date']).isBefore(DateTime.now()));
       expect(true, DateTime.parse(prefsJson['expiresIn']).isAfter(DateTime.now()));
     });
+
+    test('Smoke test fetchAndSetRoutineFull', () async {
+      //Arrange
+      final structureUri = Uri.https('localhost', 'api/v2/routine/101/structure/');
+      when(
+        mockBaseProvider.makeUrl('routine', objectMethod: 'structure', id: 101),
+      ).thenReturn(structureUri);
+      when(mockBaseProvider.fetch(structureUri)).thenAnswer(
+        (_) async => Future.value(
+          jsonDecode(fixture('routines/routine_structure.json')),
+        ),
+      );
+
+      final dateSequenceDisplayUri = Uri.https(
+        'localhost',
+        'api/v2/routine/101/date-sequence-display/',
+      );
+      when(
+        mockBaseProvider.makeUrl('routine', objectMethod: 'date-sequence-display', id: 101),
+      ).thenReturn(dateSequenceDisplayUri);
+      when(mockBaseProvider.fetch(dateSequenceDisplayUri)).thenAnswer(
+        (_) async => Future.value(
+          jsonDecode(fixture('routines/routine_date_sequence_display.json')),
+        ),
+      );
+
+      final dateSequenceGymUri = Uri.https('localhost', 'api/v2/routine/101/date-sequence-gym/');
+      when(
+        mockBaseProvider.makeUrl('routine', objectMethod: 'date-sequence-gym', id: 101),
+      ).thenReturn(dateSequenceGymUri);
+      when(mockBaseProvider.fetch(dateSequenceGymUri)).thenAnswer(
+        (_) async => Future.value(
+          jsonDecode(fixture('routines/routine_date_sequence_gym.json')),
+        ),
+      );
+
+      final logsUri = Uri.https('localhost', 'api/v2/routine/101/logs/');
+      when(mockBaseProvider.makeUrl('routine', objectMethod: 'logs', id: 101)).thenReturn(logsUri);
+      when(mockBaseProvider.fetch(logsUri)).thenAnswer(
+        (_) async => Future.value(
+          jsonDecode(fixture('routines/routine_logs.json')),
+        ),
+      );
+
+      final mockExercisesProvider = MockExercisesProvider();
+      when(mockExercisesProvider.fetchAndSetExercise(76)).thenAnswer(
+        (_) async => Future.value(testBenchPress),
+      );
+      when(mockExercisesProvider.fetchAndSetExercise(92)).thenAnswer(
+        (_) async => Future.value(testCrunches),
+      );
+
+      final provider = RoutinesProvider(mockBaseProvider, mockExercisesProvider, []);
+      provider.repetitionUnits = testRepetitionUnits;
+      provider.weightUnits = testWeightUnits;
+
+      // Act
+      final result = await provider.fetchAndSetRoutineFull(101);
+
+      // Assert
+      expect(result, isA<Routine>());
+      expect(result.id, 101);
+      expect(result.sessions.length, 3);
+      expect(result.days.length, 3);
+      expect(result.logs.length, 12);
+      expect(result.dayDataCurrentIteration.length, 8);
+      expect(result.dayDataCurrentIterationGym.length, 8);
+      expect(result.dayData.length, 32);
+      expect(result.dayDataGym.length, 32);
+    });
   });
 }
diff --git a/test/routine/routines_provider_test.mocks.dart b/test/routine/routines_provider_test.mocks.dart
new file mode 100644
index 00000000..06326506
--- /dev/null
+++ b/test/routine/routines_provider_test.mocks.dart
@@ -0,0 +1,629 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in wger/test/routine/routines_provider_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i11;
+import 'dart:ui' as _i13;
+
+import 'package:http/http.dart' as _i3;
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:wger/database/exercises/exercise_database.dart' as _i5;
+import 'package:wger/models/exercises/category.dart' as _i7;
+import 'package:wger/models/exercises/equipment.dart' as _i8;
+import 'package:wger/models/exercises/exercise.dart' as _i6;
+import 'package:wger/models/exercises/language.dart' as _i10;
+import 'package:wger/models/exercises/muscle.dart' as _i9;
+import 'package:wger/providers/auth.dart' as _i2;
+import 'package:wger/providers/base_provider.dart' as _i4;
+import 'package:wger/providers/exercises.dart' as _i12;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
+
+class _FakeAuthProvider_0 extends _i1.SmartFake implements _i2.AuthProvider {
+  _FakeAuthProvider_0(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
+  _FakeClient_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeUri_2 extends _i1.SmartFake implements Uri {
+  _FakeUri_2(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeResponse_3 extends _i1.SmartFake implements _i3.Response {
+  _FakeResponse_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeWgerBaseProvider_4 extends _i1.SmartFake implements _i4.WgerBaseProvider {
+  _FakeWgerBaseProvider_4(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeExerciseDatabase_5 extends _i1.SmartFake implements _i5.ExerciseDatabase {
+  _FakeExerciseDatabase_5(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeExercise_6 extends _i1.SmartFake implements _i6.Exercise {
+  _FakeExercise_6(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeExerciseCategory_7 extends _i1.SmartFake implements _i7.ExerciseCategory {
+  _FakeExerciseCategory_7(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeEquipment_8 extends _i1.SmartFake implements _i8.Equipment {
+  _FakeEquipment_8(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeMuscle_9 extends _i1.SmartFake implements _i9.Muscle {
+  _FakeMuscle_9(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeLanguage_10 extends _i1.SmartFake implements _i10.Language {
+  _FakeLanguage_10(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+/// A class which mocks [WgerBaseProvider].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
+  MockWgerBaseProvider() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i2.AuthProvider get auth =>
+      (super.noSuchMethod(
+            Invocation.getter(#auth),
+            returnValue: _FakeAuthProvider_0(this, Invocation.getter(#auth)),
+          )
+          as _i2.AuthProvider);
+
+  @override
+  _i3.Client get client =>
+      (super.noSuchMethod(
+            Invocation.getter(#client),
+            returnValue: _FakeClient_1(this, Invocation.getter(#client)),
+          )
+          as _i3.Client);
+
+  @override
+  set auth(_i2.AuthProvider? value) => super.noSuchMethod(
+    Invocation.setter(#auth, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set client(_i3.Client? value) => super.noSuchMethod(
+    Invocation.setter(#client, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  Map<String, String> getDefaultHeaders({bool? includeAuth = false}) =>
+      (super.noSuchMethod(
+            Invocation.method(#getDefaultHeaders, [], {
+              #includeAuth: includeAuth,
+            }),
+            returnValue: <String, String>{},
+          )
+          as Map<String, String>);
+
+  @override
+  Uri makeUrl(
+    String? path, {
+    int? id,
+    String? objectMethod,
+    Map<String, dynamic>? query,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #makeUrl,
+              [path],
+              {#id: id, #objectMethod: objectMethod, #query: query},
+            ),
+            returnValue: _FakeUri_2(
+              this,
+              Invocation.method(
+                #makeUrl,
+                [path],
+                {#id: id, #objectMethod: objectMethod, #query: query},
+              ),
+            ),
+          )
+          as Uri);
+
+  @override
+  _i11.Future<dynamic> fetch(Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetch, [uri]),
+            returnValue: _i11.Future<dynamic>.value(),
+          )
+          as _i11.Future<dynamic>);
+
+  @override
+  _i11.Future<List<dynamic>> fetchPaginated(Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchPaginated, [uri]),
+            returnValue: _i11.Future<List<dynamic>>.value(<dynamic>[]),
+          )
+          as _i11.Future<List<dynamic>>);
+
+  @override
+  _i11.Future<Map<String, dynamic>> post(
+    Map<String, dynamic>? data,
+    Uri? uri,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#post, [data, uri]),
+            returnValue: _i11.Future<Map<String, dynamic>>.value(
+              <String, dynamic>{},
+            ),
+          )
+          as _i11.Future<Map<String, dynamic>>);
+
+  @override
+  _i11.Future<Map<String, dynamic>> patch(
+    Map<String, dynamic>? data,
+    Uri? uri,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#patch, [data, uri]),
+            returnValue: _i11.Future<Map<String, dynamic>>.value(
+              <String, dynamic>{},
+            ),
+          )
+          as _i11.Future<Map<String, dynamic>>);
+
+  @override
+  _i11.Future<_i3.Response> deleteRequest(String? url, int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteRequest, [url, id]),
+            returnValue: _i11.Future<_i3.Response>.value(
+              _FakeResponse_3(
+                this,
+                Invocation.method(#deleteRequest, [url, id]),
+              ),
+            ),
+          )
+          as _i11.Future<_i3.Response>);
+}
+
+/// A class which mocks [ExercisesProvider].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockExercisesProvider extends _i1.Mock implements _i12.ExercisesProvider {
+  MockExercisesProvider() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i4.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_4(
+              this,
+              Invocation.getter(#baseProvider),
+            ),
+          )
+          as _i4.WgerBaseProvider);
+
+  @override
+  _i5.ExerciseDatabase get database =>
+      (super.noSuchMethod(
+            Invocation.getter(#database),
+            returnValue: _FakeExerciseDatabase_5(
+              this,
+              Invocation.getter(#database),
+            ),
+          )
+          as _i5.ExerciseDatabase);
+
+  @override
+  List<_i6.Exercise> get exercises =>
+      (super.noSuchMethod(
+            Invocation.getter(#exercises),
+            returnValue: <_i6.Exercise>[],
+          )
+          as List<_i6.Exercise>);
+
+  @override
+  List<_i6.Exercise> get filteredExercises =>
+      (super.noSuchMethod(
+            Invocation.getter(#filteredExercises),
+            returnValue: <_i6.Exercise>[],
+          )
+          as List<_i6.Exercise>);
+
+  @override
+  Map<int, List<_i6.Exercise>> get exerciseByVariation =>
+      (super.noSuchMethod(
+            Invocation.getter(#exerciseByVariation),
+            returnValue: <int, List<_i6.Exercise>>{},
+          )
+          as Map<int, List<_i6.Exercise>>);
+
+  @override
+  List<_i7.ExerciseCategory> get categories =>
+      (super.noSuchMethod(
+            Invocation.getter(#categories),
+            returnValue: <_i7.ExerciseCategory>[],
+          )
+          as List<_i7.ExerciseCategory>);
+
+  @override
+  List<_i9.Muscle> get muscles =>
+      (super.noSuchMethod(
+            Invocation.getter(#muscles),
+            returnValue: <_i9.Muscle>[],
+          )
+          as List<_i9.Muscle>);
+
+  @override
+  List<_i8.Equipment> get equipment =>
+      (super.noSuchMethod(
+            Invocation.getter(#equipment),
+            returnValue: <_i8.Equipment>[],
+          )
+          as List<_i8.Equipment>);
+
+  @override
+  List<_i10.Language> get languages =>
+      (super.noSuchMethod(
+            Invocation.getter(#languages),
+            returnValue: <_i10.Language>[],
+          )
+          as List<_i10.Language>);
+
+  @override
+  set database(_i5.ExerciseDatabase? value) => super.noSuchMethod(
+    Invocation.setter(#database, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set exercises(List<_i6.Exercise>? value) => super.noSuchMethod(
+    Invocation.setter(#exercises, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set filteredExercises(List<_i6.Exercise>? newFilteredExercises) => super.noSuchMethod(
+    Invocation.setter(#filteredExercises, newFilteredExercises),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set languages(List<_i10.Language>? languages) => super.noSuchMethod(
+    Invocation.setter(#languages, languages),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  bool get hasListeners =>
+      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
+
+  @override
+  _i11.Future<void> setFilters(_i12.Filters? newFilters) =>
+      (super.noSuchMethod(
+            Invocation.method(#setFilters, [newFilters]),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  void initFilters() => super.noSuchMethod(
+    Invocation.method(#initFilters, []),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  _i11.Future<void> findByFilters() =>
+      (super.noSuchMethod(
+            Invocation.method(#findByFilters, []),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  void clear() => super.noSuchMethod(
+    Invocation.method(#clear, []),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  _i6.Exercise findExerciseById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findExerciseById, [id]),
+            returnValue: _FakeExercise_6(
+              this,
+              Invocation.method(#findExerciseById, [id]),
+            ),
+          )
+          as _i6.Exercise);
+
+  @override
+  List<_i6.Exercise> findExercisesByVariationId(
+    int? variationId, {
+    int? exerciseIdToExclude,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #findExercisesByVariationId,
+              [variationId],
+              {#exerciseIdToExclude: exerciseIdToExclude},
+            ),
+            returnValue: <_i6.Exercise>[],
+          )
+          as List<_i6.Exercise>);
+
+  @override
+  _i7.ExerciseCategory findCategoryById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findCategoryById, [id]),
+            returnValue: _FakeExerciseCategory_7(
+              this,
+              Invocation.method(#findCategoryById, [id]),
+            ),
+          )
+          as _i7.ExerciseCategory);
+
+  @override
+  _i8.Equipment findEquipmentById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findEquipmentById, [id]),
+            returnValue: _FakeEquipment_8(
+              this,
+              Invocation.method(#findEquipmentById, [id]),
+            ),
+          )
+          as _i8.Equipment);
+
+  @override
+  _i9.Muscle findMuscleById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findMuscleById, [id]),
+            returnValue: _FakeMuscle_9(
+              this,
+              Invocation.method(#findMuscleById, [id]),
+            ),
+          )
+          as _i9.Muscle);
+
+  @override
+  _i10.Language findLanguageById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findLanguageById, [id]),
+            returnValue: _FakeLanguage_10(
+              this,
+              Invocation.method(#findLanguageById, [id]),
+            ),
+          )
+          as _i10.Language);
+
+  @override
+  _i11.Future<void> fetchAndSetCategoriesFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetCategoriesFromApi, []),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  _i11.Future<void> fetchAndSetMusclesFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetMusclesFromApi, []),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  _i11.Future<void> fetchAndSetEquipmentsFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetEquipmentsFromApi, []),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  _i11.Future<void> fetchAndSetLanguagesFromApi() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetLanguagesFromApi, []),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  _i11.Future<void> fetchAndSetAllExercises() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllExercises, []),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  _i11.Future<_i6.Exercise?> fetchAndSetExercise(int? exerciseId) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetExercise, [exerciseId]),
+            returnValue: _i11.Future<_i6.Exercise?>.value(),
+          )
+          as _i11.Future<_i6.Exercise?>);
+
+  @override
+  _i11.Future<_i6.Exercise> handleUpdateExerciseFromApi(
+    _i5.ExerciseDatabase? database,
+    int? exerciseId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#handleUpdateExerciseFromApi, [
+              database,
+              exerciseId,
+            ]),
+            returnValue: _i11.Future<_i6.Exercise>.value(
+              _FakeExercise_6(
+                this,
+                Invocation.method(#handleUpdateExerciseFromApi, [
+                  database,
+                  exerciseId,
+                ]),
+              ),
+            ),
+          )
+          as _i11.Future<_i6.Exercise>);
+
+  @override
+  _i11.Future<void> initCacheTimesLocalPrefs({dynamic forceInit = false}) =>
+      (super.noSuchMethod(
+            Invocation.method(#initCacheTimesLocalPrefs, [], {
+              #forceInit: forceInit,
+            }),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  _i11.Future<void> clearAllCachesAndPrefs() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearAllCachesAndPrefs, []),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  _i11.Future<void> fetchAndSetInitialData() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetInitialData, []),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  _i11.Future<void> setExercisesFromDatabase(
+    _i5.ExerciseDatabase? database, {
+    bool? forceDeleteCache = false,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #setExercisesFromDatabase,
+              [database],
+              {#forceDeleteCache: forceDeleteCache},
+            ),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  _i11.Future<void> updateExerciseCache(_i5.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateExerciseCache, [database]),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  _i11.Future<void> fetchAndSetMuscles(_i5.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetMuscles, [database]),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  _i11.Future<void> fetchAndSetCategories(_i5.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetCategories, [database]),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  _i11.Future<void> fetchAndSetLanguages(_i5.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetLanguages, [database]),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  _i11.Future<void> fetchAndSetEquipments(_i5.ExerciseDatabase? database) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetEquipments, [database]),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  _i11.Future<List<_i6.Exercise>> searchExercise(
+    String? name, {
+    String? languageCode = 'en',
+    bool? searchEnglish = false,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #searchExercise,
+              [name],
+              {#languageCode: languageCode, #searchEnglish: searchEnglish},
+            ),
+            returnValue: _i11.Future<List<_i6.Exercise>>.value(
+              <_i6.Exercise>[],
+            ),
+          )
+          as _i11.Future<List<_i6.Exercise>>);
+
+  @override
+  void addListener(_i13.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void removeListener(_i13.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#removeListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void dispose() => super.noSuchMethod(
+    Invocation.method(#dispose, []),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void notifyListeners() => super.noSuchMethod(
+    Invocation.method(#notifyListeners, []),
+    returnValueForMissingStub: null,
+  );
+}
diff --git a/test/workout/workout_plans_screen_test.dart b/test/routine/routines_screen_test.dart
similarity index 66%
rename from test/workout/workout_plans_screen_test.dart
rename to test/routine/routines_screen_test.dart
index 31596292..6c774058 100644
--- a/test/workout/workout_plans_screen_test.dart
+++ b/test/routine/routines_screen_test.dart
@@ -25,16 +25,16 @@ import 'package:mockito/mockito.dart';
 import 'package:provider/provider.dart';
 import 'package:wger/database/exercises/exercise_database.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
-import 'package:wger/models/workouts/workout_plan.dart';
+import 'package:wger/models/workouts/routine.dart';
 import 'package:wger/providers/base_provider.dart';
 import 'package:wger/providers/exercises.dart';
-import 'package:wger/providers/workout_plans.dart';
+import 'package:wger/providers/routines.dart';
 import 'package:wger/screens/form_screen.dart';
-import 'package:wger/screens/workout_plans_screen.dart';
+import 'package:wger/screens/routine_list_screen.dart';
 import 'package:wger/widgets/nutrition/forms.dart';
-import 'package:wger/widgets/workouts/forms.dart';
+import 'package:wger/widgets/routines/forms/routine.dart';
 
-import 'workout_plans_screen_test.mocks.dart';
+import 'routines_screen_test.mocks.dart';
 
 @GenerateMocks([WgerBaseProvider])
 void main() {
@@ -48,37 +48,61 @@ void main() {
     mockBaseProvider = MockWgerBaseProvider();
   });
 
-  Widget createHomeScreen({locale = 'en'}) {
-    final uri = Uri(scheme: 'https', host: 'localhost', path: 'api/v2/workout/');
+  Widget renderWidget({locale = 'en'}) {
+    final uri = Uri(
+      scheme: 'https',
+      host: 'localhost',
+      path: 'api/v2/workout/',
+    );
     when(mockBaseProvider.makeUrl('workout', query: anyNamed('query'))).thenReturn(uri);
     when(mockBaseProvider.deleteRequest(any, any)).thenAnswer((_) async => http.Response('', 204));
 
-    return ChangeNotifierProvider<WorkoutPlansProvider>(
-      create: (context) => WorkoutPlansProvider(mockBaseProvider, testExercisesProvider, [
-        WorkoutPlan(id: 1, creationDate: DateTime(2021, 01, 01), name: 'test 1'),
-        WorkoutPlan(id: 2, creationDate: DateTime(2021, 02, 12), name: 'test 2'),
-      ]),
+    return ChangeNotifierProvider<RoutinesProvider>(
+      create: (context) => RoutinesProvider(
+        mockBaseProvider,
+        testExercisesProvider,
+        [
+          Routine(
+            id: 1,
+            created: DateTime(2021, 01, 01),
+            start: DateTime(2024, 11, 1),
+            end: DateTime(2024, 12, 1),
+            name: 'test 1',
+            fitInWeek: false,
+          ),
+          Routine(
+            id: 2,
+            created: DateTime(2021, 02, 12),
+            start: DateTime(2024, 5, 5),
+            end: DateTime(2024, 6, 6),
+            name: 'test 2',
+            fitInWeek: false,
+          ),
+        ],
+      ),
       child: MaterialApp(
         locale: Locale(locale),
         localizationsDelegates: AppLocalizations.localizationsDelegates,
         supportedLocales: AppLocalizations.supportedLocales,
-        home: const WorkoutPlansScreen(),
+        home: const RoutineListScreen(),
         routes: {FormScreen.routeName: (ctx) => const FormScreen()},
       ),
     );
   }
 
   testWidgets('Test the widgets on the workout plans screen', (WidgetTester tester) async {
-    await tester.pumpWidget(createHomeScreen());
+    await tester.pumpWidget(renderWidget());
 
     //debugDumpApp();
-    expect(find.text('Workout plans'), findsOneWidget);
+    expect(find.text('Routines'), findsOneWidget);
+    expect(find.text('test 1'), findsOneWidget);
+    expect(find.text('test 2'), findsOneWidget);
     expect(find.byType(Card), findsNWidgets(2));
     expect(find.byType(ListTile), findsNWidgets(2));
   });
 
   testWidgets('Test deleting an item using the Delete button', (WidgetTester tester) async {
-    await tester.pumpWidget(createHomeScreen());
+    await tester.pumpWidget(renderWidget());
 
     await tester.tap(find.byIcon(Icons.delete).first);
 
@@ -105,25 +129,25 @@ void main() {
    */
 
   testWidgets('Test the form on the workout plan screen', (WidgetTester tester) async {
-    await tester.pumpWidget(createHomeScreen());
+    await tester.pumpWidget(renderWidget());
 
     expect(find.byType(PlanForm), findsNothing);
     await tester.tap(find.byType(FloatingActionButton));
     await tester.pumpAndSettle();
-    expect(find.byType(WorkoutForm), findsOneWidget);
+    expect(find.byType(RoutineForm), findsOneWidget);
   });
 
   testWidgets('Tests the localization of dates - EN', (WidgetTester tester) async {
-    await tester.pumpWidget(createHomeScreen());
+    await tester.pumpWidget(renderWidget());
 
-    expect(find.text('1/1/2021'), findsOneWidget);
-    expect(find.text('2/12/2021'), findsOneWidget);
+    expect(find.text('11/1/2024 - 12/1/2024'), findsOneWidget);
+    expect(find.text('5/5/2024 - 6/6/2024'), findsOneWidget);
   });
 
   testWidgets('Tests the localization of dates - DE', (WidgetTester tester) async {
-    await tester.pumpWidget(createHomeScreen(locale: 'de'));
+    await tester.pumpWidget(renderWidget(locale: 'de'));
 
-    expect(find.text('1.1.2021'), findsOneWidget);
-    expect(find.text('12.2.2021'), findsOneWidget);
+    expect(find.text('1.11.2024 - 1.12.2024'), findsOneWidget);
+    expect(find.text('5.5.2024 - 6.6.2024'), findsOneWidget);
   });
 }
diff --git a/test/routine/routines_screen_test.mocks.dart b/test/routine/routines_screen_test.mocks.dart
new file mode 100644
index 00000000..2607f048
--- /dev/null
+++ b/test/routine/routines_screen_test.mocks.dart
@@ -0,0 +1,165 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in wger/test/routine/routines_screen_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i5;
+
+import 'package:http/http.dart' as _i3;
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:wger/providers/auth.dart' as _i2;
+import 'package:wger/providers/base_provider.dart' as _i4;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
+
+class _FakeAuthProvider_0 extends _i1.SmartFake implements _i2.AuthProvider {
+  _FakeAuthProvider_0(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
+  _FakeClient_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeUri_2 extends _i1.SmartFake implements Uri {
+  _FakeUri_2(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeResponse_3 extends _i1.SmartFake implements _i3.Response {
+  _FakeResponse_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+/// A class which mocks [WgerBaseProvider].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
+  MockWgerBaseProvider() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i2.AuthProvider get auth =>
+      (super.noSuchMethod(
+            Invocation.getter(#auth),
+            returnValue: _FakeAuthProvider_0(this, Invocation.getter(#auth)),
+          )
+          as _i2.AuthProvider);
+
+  @override
+  _i3.Client get client =>
+      (super.noSuchMethod(
+            Invocation.getter(#client),
+            returnValue: _FakeClient_1(this, Invocation.getter(#client)),
+          )
+          as _i3.Client);
+
+  @override
+  set auth(_i2.AuthProvider? value) => super.noSuchMethod(
+    Invocation.setter(#auth, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set client(_i3.Client? value) => super.noSuchMethod(
+    Invocation.setter(#client, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  Map<String, String> getDefaultHeaders({bool? includeAuth = false}) =>
+      (super.noSuchMethod(
+            Invocation.method(#getDefaultHeaders, [], {
+              #includeAuth: includeAuth,
+            }),
+            returnValue: <String, String>{},
+          )
+          as Map<String, String>);
+
+  @override
+  Uri makeUrl(
+    String? path, {
+    int? id,
+    String? objectMethod,
+    Map<String, dynamic>? query,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #makeUrl,
+              [path],
+              {#id: id, #objectMethod: objectMethod, #query: query},
+            ),
+            returnValue: _FakeUri_2(
+              this,
+              Invocation.method(
+                #makeUrl,
+                [path],
+                {#id: id, #objectMethod: objectMethod, #query: query},
+              ),
+            ),
+          )
+          as Uri);
+
+  @override
+  _i5.Future<dynamic> fetch(Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetch, [uri]),
+            returnValue: _i5.Future<dynamic>.value(),
+          )
+          as _i5.Future<dynamic>);
+
+  @override
+  _i5.Future<List<dynamic>> fetchPaginated(Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchPaginated, [uri]),
+            returnValue: _i5.Future<List<dynamic>>.value(<dynamic>[]),
+          )
+          as _i5.Future<List<dynamic>>);
+
+  @override
+  _i5.Future<Map<String, dynamic>> post(Map<String, dynamic>? data, Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#post, [data, uri]),
+            returnValue: _i5.Future<Map<String, dynamic>>.value(
+              <String, dynamic>{},
+            ),
+          )
+          as _i5.Future<Map<String, dynamic>>);
+
+  @override
+  _i5.Future<Map<String, dynamic>> patch(
+    Map<String, dynamic>? data,
+    Uri? uri,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#patch, [data, uri]),
+            returnValue: _i5.Future<Map<String, dynamic>>.value(
+              <String, dynamic>{},
+            ),
+          )
+          as _i5.Future<Map<String, dynamic>>);
+
+  @override
+  _i5.Future<_i3.Response> deleteRequest(String? url, int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteRequest, [url, id]),
+            returnValue: _i5.Future<_i3.Response>.value(
+              _FakeResponse_3(
+                this,
+                Invocation.method(#deleteRequest, [url, id]),
+              ),
+            ),
+          )
+          as _i5.Future<_i3.Response>);
+}
diff --git a/test/routine/slot_entry_form_test.dart b/test/routine/slot_entry_form_test.dart
new file mode 100644
index 00000000..81ec22a2
--- /dev/null
+++ b/test/routine/slot_entry_form_test.dart
@@ -0,0 +1,159 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+import 'package:provider/provider.dart';
+import 'package:wger/helpers/consts.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/workouts/slot_entry.dart';
+import 'package:wger/providers/routines.dart';
+import 'package:wger/widgets/routines/forms/reps_unit.dart';
+import 'package:wger/widgets/routines/forms/rir.dart';
+import 'package:wger/widgets/routines/forms/slot_entry.dart';
+import 'package:wger/widgets/routines/forms/weight_unit.dart';
+
+import '../../test_data/routines.dart';
+import './slot_entry_form_test.mocks.dart';
+
+@GenerateMocks([RoutinesProvider])
+void main() {
+  var mockRoutinesProvider = MockRoutinesProvider();
+
+  final slotEntry = getTestRoutine().days[0].slots[0].entries[0];
+
+  setUp(() {
+    mockRoutinesProvider = MockRoutinesProvider();
+    when(mockRoutinesProvider.weightUnits).thenReturn(testWeightUnits);
+    when(mockRoutinesProvider.findWeightUnitById(any)).thenReturn(testWeightUnit1);
+    when(mockRoutinesProvider.repetitionUnits).thenReturn(testRepetitionUnits);
+    when(mockRoutinesProvider.findRepetitionUnitById(any)).thenReturn(testRepetitionUnit1);
+  });
+
+  Widget renderWidget({simpleMode = true, locale = 'en'}) {
+    final key = GlobalKey<NavigatorState>();
+
+    return ChangeNotifierProvider<RoutinesProvider>(
+      create: (context) => mockRoutinesProvider,
+      child: MaterialApp(
+        locale: Locale(locale),
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        navigatorKey: key,
+        home: Scaffold(body: SlotEntryForm(slotEntry, 1, simpleMode: simpleMode)),
+      ),
+    );
+  }
+
+  testWidgets('Checks correct widgets are rendered in simple mode', (WidgetTester tester) async {
+    await tester.pumpWidget(renderWidget());
+    await tester.pumpAndSettle();
+
+    expect(find.byType(TextFormField), findsNWidgets(2));
+    expect(find.byType(Slider), findsOne);
+    expect(find.byType(DropdownButtonFormField), findsNothing);
+    expect(find.byType(WeightUnitInputWidget), findsNothing);
+    expect(find.byType(RepetitionUnitInputWidget), findsNothing);
+    expect(find.byType(RiRInputWidget), findsNothing);
+  });
+
+  testWidgets('Checks correct widgets are rendered in expanded mode', (WidgetTester tester) async {
+    await tester.pumpWidget(renderWidget(simpleMode: false));
+    await tester.pumpAndSettle();
+
+    expect(find.byType(TextFormField), findsNWidgets(6));
+    expect(find.byType(Slider), findsNWidgets(2));
+    expect(find.byType(DropdownButtonFormField), findsNothing);
+    expect(find.byType(WeightUnitInputWidget), findsOne);
+    expect(find.byType(RepetitionUnitInputWidget), findsOne);
+    expect(find.byType(RiRInputWidget), findsOne);
+  });
+
+  testWidgets('Correctly updates the values on the server', (WidgetTester tester) async {
+    await tester.pumpWidget(renderWidget(simpleMode: false));
+    await tester.pumpAndSettle();
+
+    // Set weight
+    final weightField = find.byKey(const ValueKey('field-weight'));
+    await tester.enterText(weightField, '100');
+
+    final maxWeightField = find.byKey(const ValueKey('field-max-weight'));
+    await tester.enterText(maxWeightField, '110');
+
+    // Set repetitions
+    final repetitionsField = find.byKey(const ValueKey('field-repetitions'));
+    await tester.enterText(repetitionsField, '10');
+    final maxRepetitionsField = find.byKey(const ValueKey('field-max-repetitions'));
+    await tester.enterText(maxRepetitionsField, '12');
+
+    // Set rest time
+    final restField = find.byKey(const ValueKey('field-rest'));
+    await tester.enterText(restField, '90');
+    final maxRestField = find.byKey(const ValueKey('field-max-rest'));
+    await tester.enterText(maxRestField, '100');
+
+    // Set type
+    await tester.tap(find.byKey(const ValueKey('field-slot-entry-type')));
+    await tester.pumpAndSettle();
+    await tester.ensureVisible(find.byKey(const ValueKey('slot-entry-type-option-myo')));
+    await tester.pumpAndSettle();
+    await tester.tap(find.byKey(const ValueKey('slot-entry-type-option-myo')), warnIfMissed: false);
+    await tester.pumpAndSettle();
+
+    await tester.tap(find.byKey(const ValueKey(SUBMIT_BUTTON_KEY_NAME)));
+    await tester.pumpAndSettle();
+
+    verify(
+      mockRoutinesProvider.editSlotEntry(
+        argThat(
+          isA<SlotEntry>()
+              .having((d) => d.id, 'id', null)
+              .having((d) => d.slotId, 'slotId', 1)
+              .having((d) => d.order, 'order', 1)
+              .having((d) => d.type, 'type', SlotEntryType.myo),
+        ),
+        1,
+      ),
+    );
+
+    final verification = verify(
+      mockRoutinesProvider.handleConfig(captureAny, captureAny, captureAny),
+    );
+    final capturedArgs = verification.captured; // List with 8*3 arguments (3 per call)
+
+    expect(capturedArgs[(0 * 3) + 1], 4);
+    expect(capturedArgs[(0 * 3) + 2], ConfigType.sets);
+
+    expect(capturedArgs[(1 * 3) + 1], 100);
+    expect(capturedArgs[(1 * 3) + 2], ConfigType.weight);
+    expect(capturedArgs[(2 * 3) + 1], 110);
+    expect(capturedArgs[(2 * 3) + 2], ConfigType.maxWeight);
+
+    expect(capturedArgs[(3 * 3) + 1], 10);
+    expect(capturedArgs[(3 * 3) + 2], ConfigType.repetitions);
+    expect(capturedArgs[(4 * 3) + 1], 12);
+    expect(capturedArgs[(4 * 3) + 2], ConfigType.maxRepetitions);
+
+    expect(capturedArgs[(5 * 3) + 1], 90);
+    expect(capturedArgs[(5 * 3) + 2], ConfigType.rest);
+    expect(capturedArgs[(6 * 3) + 1], 100);
+    expect(capturedArgs[(6 * 3) + 2], ConfigType.maxRest);
+  });
+}
diff --git a/test/routine/slot_entry_form_test.mocks.dart b/test/routine/slot_entry_form_test.mocks.dart
new file mode 100644
index 00000000..6b9d61ac
--- /dev/null
+++ b/test/routine/slot_entry_form_test.mocks.dart
@@ -0,0 +1,594 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in wger/test/routine/slot_entry_form_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i13;
+import 'dart:ui' as _i17;
+
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:mockito/src/dummies.dart' as _i16;
+import 'package:wger/models/exercises/exercise.dart' as _i15;
+import 'package:wger/models/workouts/base_config.dart' as _i9;
+import 'package:wger/models/workouts/day.dart' as _i6;
+import 'package:wger/models/workouts/day_data.dart' as _i14;
+import 'package:wger/models/workouts/log.dart' as _i11;
+import 'package:wger/models/workouts/repetition_unit.dart' as _i4;
+import 'package:wger/models/workouts/routine.dart' as _i5;
+import 'package:wger/models/workouts/session.dart' as _i10;
+import 'package:wger/models/workouts/slot.dart' as _i7;
+import 'package:wger/models/workouts/slot_entry.dart' as _i8;
+import 'package:wger/models/workouts/weight_unit.dart' as _i3;
+import 'package:wger/providers/base_provider.dart' as _i2;
+import 'package:wger/providers/routines.dart' as _i12;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
+
+class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider {
+  _FakeWgerBaseProvider_0(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeWeightUnit_1 extends _i1.SmartFake implements _i3.WeightUnit {
+  _FakeWeightUnit_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeRepetitionUnit_2 extends _i1.SmartFake implements _i4.RepetitionUnit {
+  _FakeRepetitionUnit_2(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeRoutine_3 extends _i1.SmartFake implements _i5.Routine {
+  _FakeRoutine_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeDay_4 extends _i1.SmartFake implements _i6.Day {
+  _FakeDay_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeSlot_5 extends _i1.SmartFake implements _i7.Slot {
+  _FakeSlot_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeSlotEntry_6 extends _i1.SmartFake implements _i8.SlotEntry {
+  _FakeSlotEntry_6(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeBaseConfig_7 extends _i1.SmartFake implements _i9.BaseConfig {
+  _FakeBaseConfig_7(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeWorkoutSession_8 extends _i1.SmartFake implements _i10.WorkoutSession {
+  _FakeWorkoutSession_8(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeLog_9 extends _i1.SmartFake implements _i11.Log {
+  _FakeLog_9(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+/// A class which mocks [RoutinesProvider].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
+  MockRoutinesProvider() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(
+              this,
+              Invocation.getter(#baseProvider),
+            ),
+          )
+          as _i2.WgerBaseProvider);
+
+  @override
+  List<_i5.Routine> get items =>
+      (super.noSuchMethod(
+            Invocation.getter(#items),
+            returnValue: <_i5.Routine>[],
+          )
+          as List<_i5.Routine>);
+
+  @override
+  List<_i3.WeightUnit> get weightUnits =>
+      (super.noSuchMethod(
+            Invocation.getter(#weightUnits),
+            returnValue: <_i3.WeightUnit>[],
+          )
+          as List<_i3.WeightUnit>);
+
+  @override
+  _i3.WeightUnit get defaultWeightUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultWeightUnit),
+            returnValue: _FakeWeightUnit_1(
+              this,
+              Invocation.getter(#defaultWeightUnit),
+            ),
+          )
+          as _i3.WeightUnit);
+
+  @override
+  List<_i4.RepetitionUnit> get repetitionUnits =>
+      (super.noSuchMethod(
+            Invocation.getter(#repetitionUnits),
+            returnValue: <_i4.RepetitionUnit>[],
+          )
+          as List<_i4.RepetitionUnit>);
+
+  @override
+  _i4.RepetitionUnit get defaultRepetitionUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultRepetitionUnit),
+            returnValue: _FakeRepetitionUnit_2(
+              this,
+              Invocation.getter(#defaultRepetitionUnit),
+            ),
+          )
+          as _i4.RepetitionUnit);
+
+  @override
+  set activeRoutine(_i5.Routine? value) => super.noSuchMethod(
+    Invocation.setter(#activeRoutine, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set weightUnits(List<_i3.WeightUnit>? weightUnits) => super.noSuchMethod(
+    Invocation.setter(#weightUnits, weightUnits),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set repetitionUnits(List<_i4.RepetitionUnit>? repetitionUnits) => super.noSuchMethod(
+    Invocation.setter(#repetitionUnits, repetitionUnits),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  bool get hasListeners =>
+      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
+
+  @override
+  void clear() => super.noSuchMethod(
+    Invocation.method(#clear, []),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  _i3.WeightUnit findWeightUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findWeightUnitById, [id]),
+            returnValue: _FakeWeightUnit_1(
+              this,
+              Invocation.method(#findWeightUnitById, [id]),
+            ),
+          )
+          as _i3.WeightUnit);
+
+  @override
+  _i4.RepetitionUnit findRepetitionUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findRepetitionUnitById, [id]),
+            returnValue: _FakeRepetitionUnit_2(
+              this,
+              Invocation.method(#findRepetitionUnitById, [id]),
+            ),
+          )
+          as _i4.RepetitionUnit);
+
+  @override
+  List<_i5.Routine> getPlans() =>
+      (super.noSuchMethod(
+            Invocation.method(#getPlans, []),
+            returnValue: <_i5.Routine>[],
+          )
+          as List<_i5.Routine>);
+
+  @override
+  _i5.Routine findById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findById, [id]),
+            returnValue: _FakeRoutine_3(
+              this,
+              Invocation.method(#findById, [id]),
+            ),
+          )
+          as _i5.Routine);
+
+  @override
+  int findIndexById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findIndexById, [id]),
+            returnValue: 0,
+          )
+          as int);
+
+  @override
+  _i13.Future<void> fetchAndSetAllRoutinesFull() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesFull, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetAllRoutinesSparse() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesSparse, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> setExercisesAndUnits(
+    List<_i14.DayData>? entries, {
+    Map<int, _i15.Exercise>? exercises,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #setExercisesAndUnits,
+              [entries],
+              {#exercises: exercises},
+            ),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetRoutineSparse, [planId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(
+                this,
+                Invocation.method(#fetchAndSetRoutineSparse, [planId]),
+              ),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
+
+  @override
+  _i13.Future<_i5.Routine> fetchAndSetRoutineFull(int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetRoutineFull, [routineId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(
+                this,
+                Invocation.method(#fetchAndSetRoutineFull, [routineId]),
+              ),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
+
+  @override
+  _i13.Future<_i5.Routine> addRoutine(_i5.Routine? routine) =>
+      (super.noSuchMethod(
+            Invocation.method(#addRoutine, [routine]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#addRoutine, [routine])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
+
+  @override
+  _i13.Future<void> editRoutine(_i5.Routine? routine) =>
+      (super.noSuchMethod(
+            Invocation.method(#editRoutine, [routine]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> deleteRoutine(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteRoutine, [id]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetRepetitionUnits() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetRepetitionUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetWeightUnits() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetWeightUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetUnits() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i6.Day> addDay(_i6.Day? day) =>
+      (super.noSuchMethod(
+            Invocation.method(#addDay, [day]),
+            returnValue: _i13.Future<_i6.Day>.value(
+              _FakeDay_4(this, Invocation.method(#addDay, [day])),
+            ),
+          )
+          as _i13.Future<_i6.Day>);
+
+  @override
+  _i13.Future<void> editDay(_i6.Day? day) =>
+      (super.noSuchMethod(
+            Invocation.method(#editDay, [day]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editDays(List<_i6.Day>? days) =>
+      (super.noSuchMethod(
+            Invocation.method(#editDays, [days]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> deleteDay(int? dayId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteDay, [dayId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i7.Slot> addSlot(_i7.Slot? slot, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSlot, [slot, routineId]),
+            returnValue: _i13.Future<_i7.Slot>.value(
+              _FakeSlot_5(this, Invocation.method(#addSlot, [slot, routineId])),
+            ),
+          )
+          as _i13.Future<_i7.Slot>);
+
+  @override
+  _i13.Future<void> deleteSlot(int? slotId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlot, [slotId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlot(_i7.Slot? slot, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlot, [slot, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlots(List<_i7.Slot>? slots, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlots, [slots, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i8.SlotEntry> addSlotEntry(
+    _i8.SlotEntry? entry,
+    int? routineId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<_i8.SlotEntry>.value(
+              _FakeSlotEntry_6(
+                this,
+                Invocation.method(#addSlotEntry, [entry, routineId]),
+              ),
+            ),
+          )
+          as _i13.Future<_i8.SlotEntry>);
+
+  @override
+  _i13.Future<void> deleteSlotEntry(int? id, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlotEntry, [id, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlotEntry(_i8.SlotEntry? entry, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  String getConfigUrl(_i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#getConfigUrl, [type]),
+            returnValue: _i16.dummyValue<String>(
+              this,
+              Invocation.method(#getConfigUrl, [type]),
+            ),
+          )
+          as String);
+
+  @override
+  _i13.Future<_i9.BaseConfig> editConfig(
+    _i9.BaseConfig? config,
+    _i8.ConfigType? type,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#editConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(
+                this,
+                Invocation.method(#editConfig, [config, type]),
+              ),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<_i9.BaseConfig> addConfig(
+    _i9.BaseConfig? config,
+    _i8.ConfigType? type,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(
+                this,
+                Invocation.method(#addConfig, [config, type]),
+              ),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<void> deleteConfig(int? id, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteConfig, [id, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> handleConfig(
+    _i8.SlotEntry? entry,
+    num? value,
+    _i8.ConfigType? type,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#handleConfig, [entry, value, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<List<_i10.WorkoutSession>> fetchSessionData() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchSessionData, []),
+            returnValue: _i13.Future<List<_i10.WorkoutSession>>.value(
+              <_i10.WorkoutSession>[],
+            ),
+          )
+          as _i13.Future<List<_i10.WorkoutSession>>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> addSession(
+    _i10.WorkoutSession? session,
+    int? routineId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSession, [session, routineId]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(
+                this,
+                Invocation.method(#addSession, [session, routineId]),
+              ),
+            ),
+          )
+          as _i13.Future<_i10.WorkoutSession>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> editSession(_i10.WorkoutSession? session) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSession, [session]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(
+                this,
+                Invocation.method(#editSession, [session]),
+              ),
+            ),
+          )
+          as _i13.Future<_i10.WorkoutSession>);
+
+  @override
+  _i13.Future<_i11.Log> addLog(_i11.Log? log) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLog, [log]),
+            returnValue: _i13.Future<_i11.Log>.value(
+              _FakeLog_9(this, Invocation.method(#addLog, [log])),
+            ),
+          )
+          as _i13.Future<_i11.Log>);
+
+  @override
+  _i13.Future<void> deleteLog(int? logId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLog, [logId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  void addListener(_i17.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void removeListener(_i17.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#removeListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void dispose() => super.noSuchMethod(
+    Invocation.method(#dispose, []),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void notifyListeners() => super.noSuchMethod(
+    Invocation.method(#notifyListeners, []),
+    returnValueForMissingStub: null,
+  );
+}
diff --git a/test/routine/slot_entry_model_test.dart b/test/routine/slot_entry_model_test.dart
new file mode 100644
index 00000000..96fde3b0
--- /dev/null
+++ b/test/routine/slot_entry_model_test.dart
@@ -0,0 +1,64 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'dart:convert';
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:wger/models/workouts/base_config.dart';
+import 'package:wger/models/workouts/slot_entry.dart';
+
+import '../fixtures/fixture_reader.dart';
+
+void main() {
+  test('Checks that the data is correctly read from the server', () {
+    final apiResponse = fixture('routines/slot_entry.json');
+
+    final slotEntry = SlotEntry.fromJson(json.decode(apiResponse));
+    expect(slotEntry.id, 143);
+    expect(slotEntry.slotId, 140);
+    expect(slotEntry.order, 2);
+    expect(slotEntry.config, null);
+    expect(slotEntry.repetitionUnitId, 1);
+    expect(slotEntry.repetitionRounding, 1.25);
+    expect(slotEntry.weightUnitId, 1);
+    expect(slotEntry.weightRounding, 2.5);
+    expect(slotEntry.repetitionsConfigs.length, 1);
+    expect(slotEntry.repetitionsConfigs[0].id, 139);
+    expect(slotEntry.maxRepetitionsConfigs.length, 1);
+    expect(slotEntry.weightConfigs.length, 1);
+    expect(slotEntry.maxWeightConfigs.length, 1);
+    expect(slotEntry.nrOfSetsConfigs.length, 1);
+    expect(slotEntry.maxNrOfSetsConfigs.length, 1);
+    expect(slotEntry.rirConfigs.length, 1);
+    expect(slotEntry.maxRirConfigs.length, 0);
+    expect(slotEntry.restTimeConfigs.length, 1);
+    expect(slotEntry.maxRestTimeConfigs.length, 1);
+  });
+
+  test('Checks that an empty model correctly calculates hasProgressionRules', () {
+    final slotEntry = SlotEntry.empty();
+    expect(slotEntry.hasProgressionRules, false);
+  });
+
+  test('Checks that an model with data correctly calculates hasProgressionRules', () {
+    final slotEntry = SlotEntry.empty();
+    slotEntry.weightConfigs.add(BaseConfig.firstIteration(3, 1));
+    slotEntry.weightConfigs.add(BaseConfig.firstIteration(4, 1));
+    expect(slotEntry.hasProgressionRules, true);
+  });
+}
diff --git a/test/workout/weight_unit_form_widget_test.dart b/test/routine/weight_unit_form_widget_test.dart
similarity index 68%
rename from test/workout/weight_unit_form_widget_test.dart
rename to test/routine/weight_unit_form_widget_test.dart
index ef333d10..231e32ea 100644
--- a/test/workout/weight_unit_form_widget_test.dart
+++ b/test/routine/weight_unit_form_widget_test.dart
@@ -22,58 +22,60 @@ import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
 import 'package:provider/provider.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
-import 'package:wger/models/workouts/setting.dart';
+import 'package:wger/models/workouts/slot_entry.dart';
 import 'package:wger/models/workouts/weight_unit.dart';
-import 'package:wger/providers/body_weight.dart';
-import 'package:wger/providers/workout_plans.dart';
-import 'package:wger/screens/workout_plan_screen.dart';
-import 'package:wger/widgets/workouts/forms.dart';
+import 'package:wger/providers/routines.dart';
+import 'package:wger/screens/routine_screen.dart';
+import 'package:wger/widgets/routines/forms/weight_unit.dart';
 
-import './workout_form_test.mocks.dart';
+import 'weight_unit_form_widget_test.mocks.dart';
 
-@GenerateMocks([BodyWeightProvider])
+@GenerateMocks([RoutinesProvider])
 void main() {
-  var mockWorkoutPlans = MockWorkoutPlansProvider();
+  var mockWorkoutPlans = MockRoutinesProvider();
+  int? result;
 
   const unit1 = WeightUnit(id: 1, name: 'kg');
   const unit2 = WeightUnit(id: 2, name: 'donkeys');
   const unit3 = WeightUnit(id: 3, name: 'plates');
 
-  final setting1 = Setting(
-    setId: 1,
-    order: 1,
+  final slotEntry = SlotEntry(
+    slotId: 1,
     exerciseId: 1,
     repetitionUnitId: 1,
-    reps: 2,
+    repetitionRounding: 0.25,
     weightUnitId: 1,
+    weightRounding: 0.25,
     comment: 'comment',
-    rir: '1',
   );
-  setting1.weightUnitObj = unit1;
+  slotEntry.weightUnitObj = unit1;
 
   setUp(() {
-    mockWorkoutPlans = MockWorkoutPlansProvider();
+    result = null;
+    mockWorkoutPlans = MockRoutinesProvider();
     when(mockWorkoutPlans.weightUnits).thenAnswer((_) => [unit1, unit2, unit3]);
+    when(mockWorkoutPlans.findWeightUnitById(1)).thenReturn(unit1);
+    when(mockWorkoutPlans.findWeightUnitById(2)).thenReturn(unit2);
   });
 
-  Widget createHomeScreen() {
+  Widget renderWidget() {
     final key = GlobalKey<NavigatorState>();
 
-    return ChangeNotifierProvider<WorkoutPlansProvider>(
+    return ChangeNotifierProvider<RoutinesProvider>(
       create: (context) => mockWorkoutPlans,
       child: MaterialApp(
         localizationsDelegates: AppLocalizations.localizationsDelegates,
         supportedLocales: AppLocalizations.supportedLocales,
         navigatorKey: key,
-        home: Scaffold(body: WeightUnitInputWidget(setting1)),
-        routes: {WorkoutPlanScreen.routeName: (ctx) => const WorkoutPlanScreen()},
+        home: Scaffold(body: WeightUnitInputWidget(1, onChanged: (value) => result = value)),
+        routes: {RoutineScreen.routeName: (ctx) => const RoutineScreen()},
       ),
     );
   }
 
   testWidgets('Test that the entries are shown', (WidgetTester tester) async {
     // arrange
-    await tester.pumpWidget(createHomeScreen());
+    await tester.pumpWidget(renderWidget());
     await tester.tap(find.byKey(const Key('1')));
     await tester.pump();
 
@@ -85,16 +87,16 @@ void main() {
 
   testWidgets('Test that the correct units are set after selection', (WidgetTester tester) async {
     // arrange
-    await tester.pumpWidget(createHomeScreen());
+    await tester.pumpWidget(renderWidget());
     await tester.pump();
 
     // act
-    expect(setting1.weightUnitObj, equals(unit1));
+    expect(slotEntry.weightUnitObj, equals(unit1));
     await tester.tap(find.byKey(const Key('1')));
     await tester.pump();
     await tester.tap(find.text('donkeys').last);
 
     // assert
-    expect(setting1.weightUnitObj, equals(unit2));
+    expect(result, equals(2));
   });
 }
diff --git a/test/routine/weight_unit_form_widget_test.mocks.dart b/test/routine/weight_unit_form_widget_test.mocks.dart
new file mode 100644
index 00000000..bfb4febb
--- /dev/null
+++ b/test/routine/weight_unit_form_widget_test.mocks.dart
@@ -0,0 +1,594 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in wger/test/routine/weight_unit_form_widget_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i13;
+import 'dart:ui' as _i17;
+
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:mockito/src/dummies.dart' as _i16;
+import 'package:wger/models/exercises/exercise.dart' as _i15;
+import 'package:wger/models/workouts/base_config.dart' as _i9;
+import 'package:wger/models/workouts/day.dart' as _i6;
+import 'package:wger/models/workouts/day_data.dart' as _i14;
+import 'package:wger/models/workouts/log.dart' as _i11;
+import 'package:wger/models/workouts/repetition_unit.dart' as _i4;
+import 'package:wger/models/workouts/routine.dart' as _i5;
+import 'package:wger/models/workouts/session.dart' as _i10;
+import 'package:wger/models/workouts/slot.dart' as _i7;
+import 'package:wger/models/workouts/slot_entry.dart' as _i8;
+import 'package:wger/models/workouts/weight_unit.dart' as _i3;
+import 'package:wger/providers/base_provider.dart' as _i2;
+import 'package:wger/providers/routines.dart' as _i12;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
+
+class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider {
+  _FakeWgerBaseProvider_0(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeWeightUnit_1 extends _i1.SmartFake implements _i3.WeightUnit {
+  _FakeWeightUnit_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeRepetitionUnit_2 extends _i1.SmartFake implements _i4.RepetitionUnit {
+  _FakeRepetitionUnit_2(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeRoutine_3 extends _i1.SmartFake implements _i5.Routine {
+  _FakeRoutine_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeDay_4 extends _i1.SmartFake implements _i6.Day {
+  _FakeDay_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeSlot_5 extends _i1.SmartFake implements _i7.Slot {
+  _FakeSlot_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeSlotEntry_6 extends _i1.SmartFake implements _i8.SlotEntry {
+  _FakeSlotEntry_6(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeBaseConfig_7 extends _i1.SmartFake implements _i9.BaseConfig {
+  _FakeBaseConfig_7(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeWorkoutSession_8 extends _i1.SmartFake implements _i10.WorkoutSession {
+  _FakeWorkoutSession_8(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeLog_9 extends _i1.SmartFake implements _i11.Log {
+  _FakeLog_9(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+/// A class which mocks [RoutinesProvider].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
+  MockRoutinesProvider() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(
+              this,
+              Invocation.getter(#baseProvider),
+            ),
+          )
+          as _i2.WgerBaseProvider);
+
+  @override
+  List<_i5.Routine> get items =>
+      (super.noSuchMethod(
+            Invocation.getter(#items),
+            returnValue: <_i5.Routine>[],
+          )
+          as List<_i5.Routine>);
+
+  @override
+  List<_i3.WeightUnit> get weightUnits =>
+      (super.noSuchMethod(
+            Invocation.getter(#weightUnits),
+            returnValue: <_i3.WeightUnit>[],
+          )
+          as List<_i3.WeightUnit>);
+
+  @override
+  _i3.WeightUnit get defaultWeightUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultWeightUnit),
+            returnValue: _FakeWeightUnit_1(
+              this,
+              Invocation.getter(#defaultWeightUnit),
+            ),
+          )
+          as _i3.WeightUnit);
+
+  @override
+  List<_i4.RepetitionUnit> get repetitionUnits =>
+      (super.noSuchMethod(
+            Invocation.getter(#repetitionUnits),
+            returnValue: <_i4.RepetitionUnit>[],
+          )
+          as List<_i4.RepetitionUnit>);
+
+  @override
+  _i4.RepetitionUnit get defaultRepetitionUnit =>
+      (super.noSuchMethod(
+            Invocation.getter(#defaultRepetitionUnit),
+            returnValue: _FakeRepetitionUnit_2(
+              this,
+              Invocation.getter(#defaultRepetitionUnit),
+            ),
+          )
+          as _i4.RepetitionUnit);
+
+  @override
+  set activeRoutine(_i5.Routine? value) => super.noSuchMethod(
+    Invocation.setter(#activeRoutine, value),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set weightUnits(List<_i3.WeightUnit>? weightUnits) => super.noSuchMethod(
+    Invocation.setter(#weightUnits, weightUnits),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  set repetitionUnits(List<_i4.RepetitionUnit>? repetitionUnits) => super.noSuchMethod(
+    Invocation.setter(#repetitionUnits, repetitionUnits),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  bool get hasListeners =>
+      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
+
+  @override
+  void clear() => super.noSuchMethod(
+    Invocation.method(#clear, []),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  _i3.WeightUnit findWeightUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findWeightUnitById, [id]),
+            returnValue: _FakeWeightUnit_1(
+              this,
+              Invocation.method(#findWeightUnitById, [id]),
+            ),
+          )
+          as _i3.WeightUnit);
+
+  @override
+  _i4.RepetitionUnit findRepetitionUnitById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findRepetitionUnitById, [id]),
+            returnValue: _FakeRepetitionUnit_2(
+              this,
+              Invocation.method(#findRepetitionUnitById, [id]),
+            ),
+          )
+          as _i4.RepetitionUnit);
+
+  @override
+  List<_i5.Routine> getPlans() =>
+      (super.noSuchMethod(
+            Invocation.method(#getPlans, []),
+            returnValue: <_i5.Routine>[],
+          )
+          as List<_i5.Routine>);
+
+  @override
+  _i5.Routine findById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findById, [id]),
+            returnValue: _FakeRoutine_3(
+              this,
+              Invocation.method(#findById, [id]),
+            ),
+          )
+          as _i5.Routine);
+
+  @override
+  int findIndexById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findIndexById, [id]),
+            returnValue: 0,
+          )
+          as int);
+
+  @override
+  _i13.Future<void> fetchAndSetAllRoutinesFull() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesFull, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetAllRoutinesSparse() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllRoutinesSparse, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> setExercisesAndUnits(
+    List<_i14.DayData>? entries, {
+    Map<int, _i15.Exercise>? exercises,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #setExercisesAndUnits,
+              [entries],
+              {#exercises: exercises},
+            ),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetRoutineSparse, [planId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(
+                this,
+                Invocation.method(#fetchAndSetRoutineSparse, [planId]),
+              ),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
+
+  @override
+  _i13.Future<_i5.Routine> fetchAndSetRoutineFull(int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetRoutineFull, [routineId]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(
+                this,
+                Invocation.method(#fetchAndSetRoutineFull, [routineId]),
+              ),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
+
+  @override
+  _i13.Future<_i5.Routine> addRoutine(_i5.Routine? routine) =>
+      (super.noSuchMethod(
+            Invocation.method(#addRoutine, [routine]),
+            returnValue: _i13.Future<_i5.Routine>.value(
+              _FakeRoutine_3(this, Invocation.method(#addRoutine, [routine])),
+            ),
+          )
+          as _i13.Future<_i5.Routine>);
+
+  @override
+  _i13.Future<void> editRoutine(_i5.Routine? routine) =>
+      (super.noSuchMethod(
+            Invocation.method(#editRoutine, [routine]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> deleteRoutine(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteRoutine, [id]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetRepetitionUnits() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetRepetitionUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetWeightUnits() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetWeightUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> fetchAndSetUnits() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetUnits, []),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i6.Day> addDay(_i6.Day? day) =>
+      (super.noSuchMethod(
+            Invocation.method(#addDay, [day]),
+            returnValue: _i13.Future<_i6.Day>.value(
+              _FakeDay_4(this, Invocation.method(#addDay, [day])),
+            ),
+          )
+          as _i13.Future<_i6.Day>);
+
+  @override
+  _i13.Future<void> editDay(_i6.Day? day) =>
+      (super.noSuchMethod(
+            Invocation.method(#editDay, [day]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editDays(List<_i6.Day>? days) =>
+      (super.noSuchMethod(
+            Invocation.method(#editDays, [days]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> deleteDay(int? dayId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteDay, [dayId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i7.Slot> addSlot(_i7.Slot? slot, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSlot, [slot, routineId]),
+            returnValue: _i13.Future<_i7.Slot>.value(
+              _FakeSlot_5(this, Invocation.method(#addSlot, [slot, routineId])),
+            ),
+          )
+          as _i13.Future<_i7.Slot>);
+
+  @override
+  _i13.Future<void> deleteSlot(int? slotId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlot, [slotId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlot(_i7.Slot? slot, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlot, [slot, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlots(List<_i7.Slot>? slots, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlots, [slots, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<_i8.SlotEntry> addSlotEntry(
+    _i8.SlotEntry? entry,
+    int? routineId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<_i8.SlotEntry>.value(
+              _FakeSlotEntry_6(
+                this,
+                Invocation.method(#addSlotEntry, [entry, routineId]),
+              ),
+            ),
+          )
+          as _i13.Future<_i8.SlotEntry>);
+
+  @override
+  _i13.Future<void> deleteSlotEntry(int? id, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteSlotEntry, [id, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> editSlotEntry(_i8.SlotEntry? entry, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSlotEntry, [entry, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  String getConfigUrl(_i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#getConfigUrl, [type]),
+            returnValue: _i16.dummyValue<String>(
+              this,
+              Invocation.method(#getConfigUrl, [type]),
+            ),
+          )
+          as String);
+
+  @override
+  _i13.Future<_i9.BaseConfig> editConfig(
+    _i9.BaseConfig? config,
+    _i8.ConfigType? type,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#editConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(
+                this,
+                Invocation.method(#editConfig, [config, type]),
+              ),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<_i9.BaseConfig> addConfig(
+    _i9.BaseConfig? config,
+    _i8.ConfigType? type,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addConfig, [config, type]),
+            returnValue: _i13.Future<_i9.BaseConfig>.value(
+              _FakeBaseConfig_7(
+                this,
+                Invocation.method(#addConfig, [config, type]),
+              ),
+            ),
+          )
+          as _i13.Future<_i9.BaseConfig>);
+
+  @override
+  _i13.Future<void> deleteConfig(int? id, _i8.ConfigType? type) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteConfig, [id, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<void> handleConfig(
+    _i8.SlotEntry? entry,
+    num? value,
+    _i8.ConfigType? type,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#handleConfig, [entry, value, type]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  _i13.Future<List<_i10.WorkoutSession>> fetchSessionData() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchSessionData, []),
+            returnValue: _i13.Future<List<_i10.WorkoutSession>>.value(
+              <_i10.WorkoutSession>[],
+            ),
+          )
+          as _i13.Future<List<_i10.WorkoutSession>>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> addSession(
+    _i10.WorkoutSession? session,
+    int? routineId,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#addSession, [session, routineId]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(
+                this,
+                Invocation.method(#addSession, [session, routineId]),
+              ),
+            ),
+          )
+          as _i13.Future<_i10.WorkoutSession>);
+
+  @override
+  _i13.Future<_i10.WorkoutSession> editSession(_i10.WorkoutSession? session) =>
+      (super.noSuchMethod(
+            Invocation.method(#editSession, [session]),
+            returnValue: _i13.Future<_i10.WorkoutSession>.value(
+              _FakeWorkoutSession_8(
+                this,
+                Invocation.method(#editSession, [session]),
+              ),
+            ),
+          )
+          as _i13.Future<_i10.WorkoutSession>);
+
+  @override
+  _i13.Future<_i11.Log> addLog(_i11.Log? log) =>
+      (super.noSuchMethod(
+            Invocation.method(#addLog, [log]),
+            returnValue: _i13.Future<_i11.Log>.value(
+              _FakeLog_9(this, Invocation.method(#addLog, [log])),
+            ),
+          )
+          as _i13.Future<_i11.Log>);
+
+  @override
+  _i13.Future<void> deleteLog(int? logId, int? routineId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLog, [logId, routineId]),
+            returnValue: _i13.Future<void>.value(),
+            returnValueForMissingStub: _i13.Future<void>.value(),
+          )
+          as _i13.Future<void>);
+
+  @override
+  void addListener(_i17.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void removeListener(_i17.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#removeListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void dispose() => super.noSuchMethod(
+    Invocation.method(#dispose, []),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void notifyListeners() => super.noSuchMethod(
+    Invocation.method(#notifyListeners, []),
+    returnValueForMissingStub: null,
+  );
+}
diff --git a/test/workout/workout_log_model_test.dart b/test/routine/workout_log_model_test.dart
similarity index 82%
rename from test/workout/workout_log_model_test.dart
rename to test/routine/workout_log_model_test.dart
index a53e7ae3..1d993b2d 100644
--- a/test/workout/workout_log_model_test.dart
+++ b/test/routine/workout_log_model_test.dart
@@ -27,22 +27,26 @@ void main() {
     setUp(() {
       log1 = Log(
         id: 123,
-        workoutPlan: 100,
-        exerciseBaseId: 1,
-        reps: 10,
-        rir: '1.5',
-        repetitionUnitId: 1,
+        iteration: 1,
+        slotEntryId: 100,
+        routineId: 100,
+        exerciseId: 1,
+        repetitions: 10,
+        rir: 1.5,
+        repetitionsUnitId: 1,
         weight: 20,
         weightUnitId: 1,
         date: DateTime(2010, 10, 1),
       );
       log2 = Log(
         id: 9,
-        workoutPlan: 42,
-        exerciseBaseId: 1,
-        reps: 10,
-        rir: '1.5',
-        repetitionUnitId: 1,
+        iteration: 2,
+        slotEntryId: 42,
+        routineId: 42,
+        exerciseId: 1,
+        repetitions: 10,
+        rir: 1.5,
+        repetitionsUnitId: 1,
         weight: 20,
         weightUnitId: 1,
         date: DateTime(2063, 4, 5),
@@ -69,12 +73,12 @@ void main() {
     });
 
     test('Test different reps', () {
-      log1.reps = 99;
+      log1.repetitions = 99;
       expect(log1, isNot(log2));
     });
 
     test('Test different rep units', () {
-      log1.repetitionUnitId = 44;
+      log1.repetitionsUnitId = 44;
       expect(log1, isNot(log2));
     });
   });
diff --git a/test/user/provider_test.dart b/test/user/provider_test.dart
index 6d13688c..8297b330 100644
--- a/test/user/provider_test.dart
+++ b/test/user/provider_test.dart
@@ -21,6 +21,8 @@ import 'dart:convert';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
+import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
+import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
 import 'package:wger/providers/base_provider.dart';
 import 'package:wger/providers/user.dart';
 
@@ -29,12 +31,14 @@ import 'provider_test.mocks.dart';
 
 @GenerateMocks([WgerBaseProvider])
 void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
   late UserProvider userProvider;
   late MockWgerBaseProvider mockWgerBaseProvider;
 
   const String profileUrl = 'userprofile';
-  final Map<String, dynamic> tUserProfileMap =
-      jsonDecode(fixture('user/userprofile_response.json'));
+  final Map<String, dynamic> tUserProfileMap = jsonDecode(
+    fixture('user/userprofile_response.json'),
+  );
   final Uri tProfileUri = Uri(
     scheme: 'http',
     host: 'localhost',
@@ -47,14 +51,18 @@ void main() {
   );
 
   setUp(() {
+    /// Replacement for SharedPreferences.setMockInitialValues()
+    SharedPreferencesAsyncPlatform.instance = InMemorySharedPreferencesAsync.empty();
     mockWgerBaseProvider = MockWgerBaseProvider();
     userProvider = UserProvider(mockWgerBaseProvider);
 
     when(mockWgerBaseProvider.makeUrl(any)).thenReturn(tProfileUri);
-    when(mockWgerBaseProvider.makeUrl(any, objectMethod: 'verify-email'))
-        .thenReturn(tEmailVerifyUri);
-    when(mockWgerBaseProvider.fetch(any))
-        .thenAnswer((realInvocation) => Future.value(tUserProfileMap));
+    when(
+      mockWgerBaseProvider.makeUrl(any, objectMethod: 'verify-email'),
+    ).thenReturn(tEmailVerifyUri);
+    when(
+      mockWgerBaseProvider.fetch(any),
+    ).thenAnswer((realInvocation) => Future.value(tUserProfileMap));
   });
 
   group('house keeping', () {
diff --git a/test/user/provider_test.mocks.dart b/test/user/provider_test.mocks.dart
index b0b9aaf6..187bf7e8 100644
--- a/test/user/provider_test.mocks.dart
+++ b/test/user/provider_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.4.4 from annotations
+// Mocks generated by Mockito 5.4.6 from annotations
 // in wger/test/user/provider_test.dart.
 // Do not manually edit this file.
 
@@ -18,49 +18,27 @@ import 'package:wger/providers/base_provider.dart' as _i4;
 // ignore_for_file: deprecated_member_use_from_same_package
 // ignore_for_file: implementation_imports
 // ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
 // ignore_for_file: camel_case_types
 // ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
 
 class _FakeAuthProvider_0 extends _i1.SmartFake implements _i2.AuthProvider {
-  _FakeAuthProvider_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeAuthProvider_0(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
-  _FakeClient_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeClient_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeUri_2 extends _i1.SmartFake implements Uri {
-  _FakeUri_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeUri_2(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeResponse_3 extends _i1.SmartFake implements _i3.Response {
-  _FakeResponse_3(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeResponse_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 /// A class which mocks [WgerBaseProvider].
@@ -72,158 +50,95 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
   }
 
   @override
-  _i2.AuthProvider get auth => (super.noSuchMethod(
-        Invocation.getter(#auth),
-        returnValue: _FakeAuthProvider_0(
-          this,
-          Invocation.getter(#auth),
-        ),
-      ) as _i2.AuthProvider);
+  _i2.AuthProvider get auth =>
+      (super.noSuchMethod(
+            Invocation.getter(#auth),
+            returnValue: _FakeAuthProvider_0(this, Invocation.getter(#auth)),
+          )
+          as _i2.AuthProvider);
 
   @override
-  set auth(_i2.AuthProvider? _auth) => super.noSuchMethod(
-        Invocation.setter(
-          #auth,
-          _auth,
-        ),
-        returnValueForMissingStub: null,
-      );
+  _i3.Client get client =>
+      (super.noSuchMethod(
+            Invocation.getter(#client),
+            returnValue: _FakeClient_1(this, Invocation.getter(#client)),
+          )
+          as _i3.Client);
 
   @override
-  _i3.Client get client => (super.noSuchMethod(
-        Invocation.getter(#client),
-        returnValue: _FakeClient_1(
-          this,
-          Invocation.getter(#client),
-        ),
-      ) as _i3.Client);
+  set auth(_i2.AuthProvider? value) =>
+      super.noSuchMethod(Invocation.setter(#auth, value), returnValueForMissingStub: null);
 
   @override
-  set client(_i3.Client? _client) => super.noSuchMethod(
-        Invocation.setter(
-          #client,
-          _client,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set client(_i3.Client? value) =>
+      super.noSuchMethod(Invocation.setter(#client, value), returnValueForMissingStub: null);
 
   @override
   Map<String, String> getDefaultHeaders({bool? includeAuth = false}) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #getDefaultHeaders,
-          [],
-          {#includeAuth: includeAuth},
-        ),
-        returnValue: <String, String>{},
-      ) as Map<String, String>);
+            Invocation.method(#getDefaultHeaders, [], {#includeAuth: includeAuth}),
+            returnValue: <String, String>{},
+          )
+          as Map<String, String>);
 
   @override
-  Uri makeUrl(
-    String? path, {
-    int? id,
-    String? objectMethod,
-    Map<String, dynamic>? query,
-  }) =>
+  Uri makeUrl(String? path, {int? id, String? objectMethod, Map<String, dynamic>? query}) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #makeUrl,
-          [path],
-          {
-            #id: id,
-            #objectMethod: objectMethod,
-            #query: query,
-          },
-        ),
-        returnValue: _FakeUri_2(
-          this,
-          Invocation.method(
-            #makeUrl,
-            [path],
-            {
-              #id: id,
-              #objectMethod: objectMethod,
-              #query: query,
-            },
-          ),
-        ),
-      ) as Uri);
+            Invocation.method(
+              #makeUrl,
+              [path],
+              {#id: id, #objectMethod: objectMethod, #query: query},
+            ),
+            returnValue: _FakeUri_2(
+              this,
+              Invocation.method(
+                #makeUrl,
+                [path],
+                {#id: id, #objectMethod: objectMethod, #query: query},
+              ),
+            ),
+          )
+          as Uri);
 
   @override
-  _i5.Future<Map<String, dynamic>> fetch(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetch,
-          [uri],
-        ),
-        returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
-
-  @override
-  _i5.Future<List<dynamic>> fetchPaginated(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchPaginated,
-          [uri],
-        ),
-        returnValue: _i5.Future<List<dynamic>>.value(<dynamic>[]),
-      ) as _i5.Future<List<dynamic>>);
-
-  @override
-  _i5.Future<Map<String, dynamic>> post(
-    Map<String, dynamic>? data,
-    Uri? uri,
-  ) =>
+  _i5.Future<dynamic> fetch(Uri? uri) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #post,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            Invocation.method(#fetch, [uri]),
+            returnValue: _i5.Future<dynamic>.value(),
+          )
+          as _i5.Future<dynamic>);
 
   @override
-  _i5.Future<Map<String, dynamic>> patch(
-    Map<String, dynamic>? data,
-    Uri? uri,
-  ) =>
+  _i5.Future<List<dynamic>> fetchPaginated(Uri? uri) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #patch,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            Invocation.method(#fetchPaginated, [uri]),
+            returnValue: _i5.Future<List<dynamic>>.value(<dynamic>[]),
+          )
+          as _i5.Future<List<dynamic>>);
 
   @override
-  _i5.Future<_i3.Response> deleteRequest(
-    String? url,
-    int? id,
-  ) =>
+  _i5.Future<Map<String, dynamic>> post(Map<String, dynamic>? data, Uri? uri) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteRequest,
-          [
-            url,
-            id,
-          ],
-        ),
-        returnValue: _i5.Future<_i3.Response>.value(_FakeResponse_3(
-          this,
-          Invocation.method(
-            #deleteRequest,
-            [
-              url,
-              id,
-            ],
-          ),
-        )),
-      ) as _i5.Future<_i3.Response>);
+            Invocation.method(#post, [data, uri]),
+            returnValue: _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+          )
+          as _i5.Future<Map<String, dynamic>>);
+
+  @override
+  _i5.Future<Map<String, dynamic>> patch(Map<String, dynamic>? data, Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#patch, [data, uri]),
+            returnValue: _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+          )
+          as _i5.Future<Map<String, dynamic>>);
+
+  @override
+  _i5.Future<_i3.Response> deleteRequest(String? url, int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteRequest, [url, id]),
+            returnValue: _i5.Future<_i3.Response>.value(
+              _FakeResponse_3(this, Invocation.method(#deleteRequest, [url, id])),
+            ),
+          )
+          as _i5.Future<_i3.Response>);
 }
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';
 
diff --git a/test/utils/colors.dart b/test/utils/colors.dart
deleted file mode 100644
index d3e48d7d..00000000
--- a/test/utils/colors.dart
+++ /dev/null
@@ -1,49 +0,0 @@
-import 'dart:ui';
-
-import 'package:flutter_test/flutter_test.dart';
-import 'package:wger/helpers/colors.dart';
-
-void main() {
-  group('test the color utility', () {
-    test('3 items or less', () {
-      final result = generateChartColors(2).iterator;
-      expect(result.current, equals(const Color(0xFF2A4C7D)));
-      result.moveNext();
-      expect(result.current, equals(const Color(0xFFD45089)));
-    });
-
-    test('5 items or less', () {
-      final result = generateChartColors(5).iterator;
-      expect(result.current, equals(const Color(0xFF2A4C7D)));
-      result.moveNext();
-      expect(result.current, equals(const Color(0xFF825298)));
-      result.moveNext();
-      expect(result.current, equals(const Color(0xFFD45089)));
-      result.moveNext();
-      expect(result.current, equals(const Color(0xFFFF6A59)));
-      result.moveNext();
-      expect(result.current, equals(const Color(0xFFFFA600)));
-    });
-
-    test('8 items or more - last ones undefined', () {
-      final result = generateChartColors(8).iterator;
-      expect(result.current, equals(const Color(0xFF2A4C7D)));
-      result.moveNext();
-      expect(result.current, equals(const Color(0xFF5B5291)));
-      result.moveNext();
-      expect(result.current, equals(const Color(0xFF8E5298)));
-      result.moveNext();
-      expect(result.current, equals(const Color(0xFFBF5092)));
-      result.moveNext();
-      expect(result.current, equals(const Color(0xFFE7537E)));
-      result.moveNext();
-      expect(result.current, equals(const Color(0xFFFF6461)));
-      result.moveNext();
-      expect(result.current, equals(const Color(0xFFFF813D)));
-      result.moveNext();
-      expect(result.current, equals(const Color(0xFFFFA600)));
-      result.moveNext();
-      expect(result.current, isNull);
-    });
-  });
-}
diff --git a/test/utils/errors_test.dart b/test/utils/errors_test.dart
new file mode 100644
index 00000000..6ec2afb9
--- /dev/null
+++ b/test/utils/errors_test.dart
@@ -0,0 +1,123 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:wger/helpers/errors.dart';
+
+void main() {
+  group('extractErrors', () {
+    testWidgets('Returns empty list when errors is empty', (WidgetTester tester) async {
+      final result = extractErrors({});
+      expect(result, isEmpty);
+    });
+
+    testWidgets('Processes string values correctly', (WidgetTester tester) async {
+      // Arrange
+      final errors = {'error': 'Something went wrong'};
+
+      // Act
+      final result = extractErrors(errors);
+
+      // Assert
+      expect(result.length, 1, reason: 'Expected 1 error');
+      expect(result[0].errorMessages.length, 1, reason: '1 error message');
+
+      expect(result[0].key, 'Error');
+      expect(result[0].errorMessages[0], 'Something went wrong');
+    });
+
+    testWidgets('Processes list values correctly', (WidgetTester tester) async {
+      // Arrange
+      final errors = {
+        'validation_error': ['Error 1', 'Error 2'],
+      };
+
+      // Act
+      final result = extractErrors(errors);
+
+      // Assert
+      expect(result[0].key, 'Validation error');
+      expect(result[0].errorMessages[0], 'Error 1');
+      expect(result[0].errorMessages[1], 'Error 2');
+    });
+
+    testWidgets('Processes nested list values correctly', (WidgetTester tester) async {
+      // Arrange
+      final errors = {
+        'validation_error': {
+          'subkey': ['Error 1', 'Error 2'],
+        },
+      };
+
+      // Act
+      final result = extractErrors(errors);
+
+      // Assert
+      expect(result[0].key, 'Validation error | Subkey');
+      expect(result[0].errorMessages[0], 'Error 1');
+      expect(result[0].errorMessages[1], 'Error 2');
+    });
+
+    testWidgets('Processes nested lists correctly', (WidgetTester tester) async {
+      // Arrange
+      final errors = {
+        'validation_error': [
+          {
+            'subkey': ['Error 1', 'Error 2'],
+          },
+          {'otherKey': 'foo'},
+        ],
+      };
+
+      // Act
+      final result = extractErrors(errors);
+
+      // Assert
+      expect(result[0].key, 'Validation error | Subkey');
+      expect(result[0].errorMessages[0], 'Error 1');
+      expect(result[0].errorMessages[1], 'Error 2');
+      expect(result[1].key, 'Validation error | OtherKey');
+      expect(result[1].errorMessages[0], 'foo');
+    });
+
+    testWidgets('Processes multiple error types correctly', (WidgetTester tester) async {
+      // Arrange
+      final errors = {
+        'username': ['Username is too boring', 'Username is too short'],
+        'password': 'Password does not match',
+      };
+
+      // Act
+      final result = extractErrors(errors);
+
+      // Assert
+      expect(result.length, 2);
+      final error1 = result[0];
+      final error2 = result[1];
+
+      expect(error1.key, 'Username');
+      expect(error1.errorMessages.length, 2);
+      expect(error1.errorMessages[0], 'Username is too boring');
+      expect(error1.errorMessages[1], 'Username is too short');
+
+      expect(error2.key, 'Password');
+      expect(error2.errorMessages.length, 1);
+      expect(error2.errorMessages[0], 'Password does not match');
+    });
+  });
+}
diff --git a/test/weight/weight_form_test.dart b/test/weight/weight_form_test.dart
index 443f07f5..0a821a37 100644
--- a/test/weight/weight_form_test.dart
+++ b/test/weight/weight_form_test.dart
@@ -34,11 +34,21 @@ void main() {
     );
   }
 
-  testWidgets('The form is prefilled with the data from an entry', (WidgetTester tester) async {
+  testWidgets('Correctly prefills and localizes the data - en', (WidgetTester tester) async {
     await tester.pumpWidget(createWeightForm(weightEntry: testWeightEntry1));
     await tester.pumpAndSettle();
 
-    expect(find.text('2021-01-01'), findsOneWidget);
+    expect(find.text('1/1/2021'), findsOneWidget);
+    expect(find.text('3:30 PM'), findsOneWidget);
+    expect(find.text('80'), findsOneWidget);
+  });
+
+  testWidgets('Correctly prefills and localizes the data - de', (WidgetTester tester) async {
+    await tester.pumpWidget(createWeightForm(weightEntry: testWeightEntry1, locale: 'de'));
+    await tester.pumpAndSettle();
+
+    expect(find.text('1.1.2021'), findsOneWidget);
+    expect(find.text('15:30'), findsOneWidget);
     expect(find.text('80'), findsOneWidget);
   });
 
@@ -56,7 +66,7 @@ void main() {
     expect(find.text('79.9'), findsOneWidget);
 
     await tester.tap(find.byKey(const Key('quickPlusSmall')));
-    expect(find.text('80.0'), findsOneWidget);
+    expect(find.text('80'), findsOneWidget);
   });
 
   testWidgets("Entering garbage doesn't break the quick-change", (WidgetTester tester) async {
diff --git a/test/weight/weight_model_test.dart b/test/weight/weight_model_test.dart
index 0866d83e..0bebf456 100644
--- a/test/weight/weight_model_test.dart
+++ b/test/weight/weight_model_test.dart
@@ -22,16 +22,23 @@ import 'package:wger/models/body_weight/weight_entry.dart';
 void main() {
   group('fetchPost', () {
     test('Test that the weight entries are correctly converted to json', () {
-      WeightEntry weightEntry = WeightEntry(id: 1, weight: 80, date: DateTime(2020, 12, 31));
-      expect(weightEntry.toJson(), {'id': 1, 'weight': '80', 'date': '2020-12-31'});
+      expect(
+        WeightEntry(id: 1, weight: 80, date: DateTime(2020, 12, 31, 12, 34)).toJson(),
+        {'id': 1, 'weight': '80', 'date': '2020-12-31T12:34:00.000'},
+      );
 
-      weightEntry = WeightEntry(id: 2, weight: 70.2, date: DateTime(2020, 12, 01));
-      expect(weightEntry.toJson(), {'id': 2, 'weight': '70.2', 'date': '2020-12-01'});
+      expect(
+        WeightEntry(id: 2, weight: 70.2, date: DateTime(2020, 12, 01)).toJson(),
+        {'id': 2, 'weight': '70.2', 'date': '2020-12-01T00:00:00.000'},
+      );
     });
 
     test('Test that the weight entries are correctly converted from json', () {
-      final WeightEntry weightEntryObj =
-          WeightEntry(id: 1, weight: 80, date: DateTime(2020, 12, 31));
+      final WeightEntry weightEntryObj = WeightEntry(
+        id: 1,
+        weight: 80,
+        date: DateTime(2020, 12, 31),
+      );
       final WeightEntry weightEntry = WeightEntry.fromJson({
         'id': 1,
         'weight': '80',
diff --git a/test/weight/weight_provider_test.dart b/test/weight/weight_provider_test.dart
index 08ce8c66..72699209 100644
--- a/test/weight/weight_provider_test.dart
+++ b/test/weight/weight_provider_test.dart
@@ -70,8 +70,12 @@ void main() {
         path: 'api/v2/weightentry/',
       );
       when(mockBaseProvider.makeUrl(any, query: anyNamed('query'))).thenReturn(uri);
-      when(mockBaseProvider.post({'id': null, 'weight': '80', 'date': '2021-01-01'}, uri))
-          .thenAnswer((_) => Future.value({'id': 25, 'date': '2021-01-01', 'weight': '80'}));
+      when(
+        mockBaseProvider.post(
+          {'id': null, 'weight': '80', 'date': '2021-01-01T00:00:00.000'},
+          uri,
+        ),
+      ).thenAnswer((_) => Future.value({'id': 25, 'date': '2021-01-01', 'weight': '80'}));
 
       // Act
       final BodyWeightProvider provider = BodyWeightProvider(mockBaseProvider);
diff --git a/test/weight/weight_provider_test.mocks.dart b/test/weight/weight_provider_test.mocks.dart
index 8c8530b6..985b0d14 100644
--- a/test/weight/weight_provider_test.mocks.dart
+++ b/test/weight/weight_provider_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.4.4 from annotations
+// Mocks generated by Mockito 5.4.6 from annotations
 // in wger/test/weight/weight_provider_test.dart.
 // Do not manually edit this file.
 
@@ -18,49 +18,27 @@ import 'package:wger/providers/base_provider.dart' as _i4;
 // ignore_for_file: deprecated_member_use_from_same_package
 // ignore_for_file: implementation_imports
 // ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
 // ignore_for_file: camel_case_types
 // ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
 
 class _FakeAuthProvider_0 extends _i1.SmartFake implements _i2.AuthProvider {
-  _FakeAuthProvider_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeAuthProvider_0(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
-  _FakeClient_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeClient_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeUri_2 extends _i1.SmartFake implements Uri {
-  _FakeUri_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeUri_2(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 class _FakeResponse_3 extends _i1.SmartFake implements _i3.Response {
-  _FakeResponse_3(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeResponse_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 /// A class which mocks [WgerBaseProvider].
@@ -72,158 +50,95 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
   }
 
   @override
-  _i2.AuthProvider get auth => (super.noSuchMethod(
-        Invocation.getter(#auth),
-        returnValue: _FakeAuthProvider_0(
-          this,
-          Invocation.getter(#auth),
-        ),
-      ) as _i2.AuthProvider);
+  _i2.AuthProvider get auth =>
+      (super.noSuchMethod(
+            Invocation.getter(#auth),
+            returnValue: _FakeAuthProvider_0(this, Invocation.getter(#auth)),
+          )
+          as _i2.AuthProvider);
 
   @override
-  set auth(_i2.AuthProvider? _auth) => super.noSuchMethod(
-        Invocation.setter(
-          #auth,
-          _auth,
-        ),
-        returnValueForMissingStub: null,
-      );
+  _i3.Client get client =>
+      (super.noSuchMethod(
+            Invocation.getter(#client),
+            returnValue: _FakeClient_1(this, Invocation.getter(#client)),
+          )
+          as _i3.Client);
 
   @override
-  _i3.Client get client => (super.noSuchMethod(
-        Invocation.getter(#client),
-        returnValue: _FakeClient_1(
-          this,
-          Invocation.getter(#client),
-        ),
-      ) as _i3.Client);
+  set auth(_i2.AuthProvider? value) =>
+      super.noSuchMethod(Invocation.setter(#auth, value), returnValueForMissingStub: null);
 
   @override
-  set client(_i3.Client? _client) => super.noSuchMethod(
-        Invocation.setter(
-          #client,
-          _client,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set client(_i3.Client? value) =>
+      super.noSuchMethod(Invocation.setter(#client, value), returnValueForMissingStub: null);
 
   @override
   Map<String, String> getDefaultHeaders({bool? includeAuth = false}) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #getDefaultHeaders,
-          [],
-          {#includeAuth: includeAuth},
-        ),
-        returnValue: <String, String>{},
-      ) as Map<String, String>);
+            Invocation.method(#getDefaultHeaders, [], {#includeAuth: includeAuth}),
+            returnValue: <String, String>{},
+          )
+          as Map<String, String>);
 
   @override
-  Uri makeUrl(
-    String? path, {
-    int? id,
-    String? objectMethod,
-    Map<String, dynamic>? query,
-  }) =>
+  Uri makeUrl(String? path, {int? id, String? objectMethod, Map<String, dynamic>? query}) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #makeUrl,
-          [path],
-          {
-            #id: id,
-            #objectMethod: objectMethod,
-            #query: query,
-          },
-        ),
-        returnValue: _FakeUri_2(
-          this,
-          Invocation.method(
-            #makeUrl,
-            [path],
-            {
-              #id: id,
-              #objectMethod: objectMethod,
-              #query: query,
-            },
-          ),
-        ),
-      ) as Uri);
+            Invocation.method(
+              #makeUrl,
+              [path],
+              {#id: id, #objectMethod: objectMethod, #query: query},
+            ),
+            returnValue: _FakeUri_2(
+              this,
+              Invocation.method(
+                #makeUrl,
+                [path],
+                {#id: id, #objectMethod: objectMethod, #query: query},
+              ),
+            ),
+          )
+          as Uri);
 
   @override
-  _i5.Future<Map<String, dynamic>> fetch(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetch,
-          [uri],
-        ),
-        returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
-
-  @override
-  _i5.Future<List<dynamic>> fetchPaginated(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchPaginated,
-          [uri],
-        ),
-        returnValue: _i5.Future<List<dynamic>>.value(<dynamic>[]),
-      ) as _i5.Future<List<dynamic>>);
-
-  @override
-  _i5.Future<Map<String, dynamic>> post(
-    Map<String, dynamic>? data,
-    Uri? uri,
-  ) =>
+  _i5.Future<dynamic> fetch(Uri? uri) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #post,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            Invocation.method(#fetch, [uri]),
+            returnValue: _i5.Future<dynamic>.value(),
+          )
+          as _i5.Future<dynamic>);
 
   @override
-  _i5.Future<Map<String, dynamic>> patch(
-    Map<String, dynamic>? data,
-    Uri? uri,
-  ) =>
+  _i5.Future<List<dynamic>> fetchPaginated(Uri? uri) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #patch,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            Invocation.method(#fetchPaginated, [uri]),
+            returnValue: _i5.Future<List<dynamic>>.value(<dynamic>[]),
+          )
+          as _i5.Future<List<dynamic>>);
 
   @override
-  _i5.Future<_i3.Response> deleteRequest(
-    String? url,
-    int? id,
-  ) =>
+  _i5.Future<Map<String, dynamic>> post(Map<String, dynamic>? data, Uri? uri) =>
       (super.noSuchMethod(
-        Invocation.method(
-          #deleteRequest,
-          [
-            url,
-            id,
-          ],
-        ),
-        returnValue: _i5.Future<_i3.Response>.value(_FakeResponse_3(
-          this,
-          Invocation.method(
-            #deleteRequest,
-            [
-              url,
-              id,
-            ],
-          ),
-        )),
-      ) as _i5.Future<_i3.Response>);
+            Invocation.method(#post, [data, uri]),
+            returnValue: _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+          )
+          as _i5.Future<Map<String, dynamic>>);
+
+  @override
+  _i5.Future<Map<String, dynamic>> patch(Map<String, dynamic>? data, Uri? uri) =>
+      (super.noSuchMethod(
+            Invocation.method(#patch, [data, uri]),
+            returnValue: _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+          )
+          as _i5.Future<Map<String, dynamic>>);
+
+  @override
+  _i5.Future<_i3.Response> deleteRequest(String? url, int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteRequest, [url, id]),
+            returnValue: _i5.Future<_i3.Response>.value(
+              _FakeResponse_3(this, Invocation.method(#deleteRequest, [url, id])),
+            ),
+          )
+          as _i5.Future<_i3.Response>);
 }
diff --git a/test/weight/weight_screen_test.dart b/test/weight/weight_screen_test.dart
index af3d100a..b47f2ba7 100644
--- a/test/weight/weight_screen_test.dart
+++ b/test/weight/weight_screen_test.dart
@@ -32,10 +32,9 @@ import 'package:wger/widgets/weight/forms.dart';
 
 import '../../test_data/body_weight.dart';
 import '../../test_data/profile.dart';
-import '../nutrition/nutritional_plan_form_test.mocks.dart';
 import 'weight_screen_test.mocks.dart';
 
-@GenerateMocks([BodyWeightProvider, UserProvider])
+@GenerateMocks([BodyWeightProvider, UserProvider, NutritionPlansProvider])
 void main() {
   late MockBodyWeightProvider mockWeightProvider;
   late MockUserProvider mockUserProvider;
@@ -44,30 +43,34 @@ void main() {
   setUp(() {
     mockWeightProvider = MockBodyWeightProvider();
     when(mockWeightProvider.items).thenReturn(getWeightEntries());
-    when(mockWeightProvider.getNewestEntry()).thenReturn(null);
 
     mockUserProvider = MockUserProvider();
     when(mockUserProvider.profile).thenReturn(tProfile1);
 
     mockNutritionPlansProvider = MockNutritionPlansProvider();
     when(mockNutritionPlansProvider.currentPlan).thenReturn(null);
+    when(mockNutritionPlansProvider.items).thenReturn([]);
   });
 
   Widget createWeightScreen({locale = 'en'}) {
-    return ChangeNotifierProvider<NutritionPlansProvider>(
-      create: (context) => mockNutritionPlansProvider,
-      child: ChangeNotifierProvider<UserProvider>(
-        create: (context) => mockUserProvider,
-        child: ChangeNotifierProvider<BodyWeightProvider>(
-          create: (context) => mockWeightProvider,
-          child: MaterialApp(
-            locale: Locale(locale),
-            localizationsDelegates: AppLocalizations.localizationsDelegates,
-            supportedLocales: AppLocalizations.supportedLocales,
-            home: const WeightScreen(),
-            routes: {FormScreen.routeName: (_) => const FormScreen()},
-          ),
+    return MultiProvider(
+      providers: [
+        ChangeNotifierProvider<NutritionPlansProvider>(
+          create: (ctx) => mockNutritionPlansProvider,
         ),
+        ChangeNotifierProvider<BodyWeightProvider>(
+          create: (context) => mockWeightProvider,
+        ),
+        ChangeNotifierProvider<UserProvider>(
+          create: (context) => mockUserProvider,
+        ),
+      ],
+      child: MaterialApp(
+        locale: Locale(locale),
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: const WeightScreen(),
+        routes: {FormScreen.routeName: (_) => const FormScreen()},
       ),
     );
   }
diff --git a/test/weight/weight_screen_test.mocks.dart b/test/weight/weight_screen_test.mocks.dart
index 81a98f60..264480d6 100644
--- a/test/weight/weight_screen_test.mocks.dart
+++ b/test/weight/weight_screen_test.mocks.dart
@@ -1,17 +1,25 @@
-// Mocks generated by Mockito 5.4.4 from annotations
+// Mocks generated by Mockito 5.4.6 from annotations
 // in wger/test/weight/weight_screen_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i5;
-import 'dart:ui' as _i6;
+import 'dart:async' as _i11;
+import 'dart:ui' as _i12;
 
+import 'package:flutter/material.dart' as _i14;
 import 'package:mockito/mockito.dart' as _i1;
+import 'package:shared_preferences/shared_preferences.dart' as _i4;
+import 'package:wger/database/ingredients/ingredients_database.dart' as _i5;
 import 'package:wger/models/body_weight/weight_entry.dart' as _i3;
-import 'package:wger/models/user/profile.dart' as _i8;
+import 'package:wger/models/nutrition/ingredient.dart' as _i9;
+import 'package:wger/models/nutrition/meal.dart' as _i7;
+import 'package:wger/models/nutrition/meal_item.dart' as _i8;
+import 'package:wger/models/nutrition/nutritional_plan.dart' as _i6;
+import 'package:wger/models/user/profile.dart' as _i15;
 import 'package:wger/providers/base_provider.dart' as _i2;
-import 'package:wger/providers/body_weight.dart' as _i4;
-import 'package:wger/providers/user.dart' as _i7;
+import 'package:wger/providers/body_weight.dart' as _i10;
+import 'package:wger/providers/nutrition.dart' as _i16;
+import 'package:wger/providers/user.dart' as _i13;
 
 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -21,289 +29,543 @@ import 'package:wger/providers/user.dart' as _i7;
 // ignore_for_file: deprecated_member_use_from_same_package
 // ignore_for_file: implementation_imports
 // ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
 // ignore_for_file: camel_case_types
 // ignore_for_file: subtype_of_sealed_class
+// ignore_for_file: invalid_use_of_internal_member
 
-class _FakeWgerBaseProvider_0 extends _i1.SmartFake
-    implements _i2.WgerBaseProvider {
-  _FakeWgerBaseProvider_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvider {
+  _FakeWgerBaseProvider_0(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
 }
 
 class _FakeWeightEntry_1 extends _i1.SmartFake implements _i3.WeightEntry {
-  _FakeWeightEntry_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
+  _FakeWeightEntry_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeSharedPreferencesAsync_2 extends _i1.SmartFake implements _i4.SharedPreferencesAsync {
+  _FakeSharedPreferencesAsync_2(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeIngredientDatabase_3 extends _i1.SmartFake implements _i5.IngredientDatabase {
+  _FakeIngredientDatabase_3(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeNutritionalPlan_4 extends _i1.SmartFake implements _i6.NutritionalPlan {
+  _FakeNutritionalPlan_4(Object parent, Invocation parentInvocation)
+    : super(parent, parentInvocation);
+}
+
+class _FakeMeal_5 extends _i1.SmartFake implements _i7.Meal {
+  _FakeMeal_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeMealItem_6 extends _i1.SmartFake implements _i8.MealItem {
+  _FakeMealItem_6(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeIngredient_7 extends _i1.SmartFake implements _i9.Ingredient {
+  _FakeIngredient_7(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }
 
 /// A class which mocks [BodyWeightProvider].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockBodyWeightProvider extends _i1.Mock
-    implements _i4.BodyWeightProvider {
+class MockBodyWeightProvider extends _i1.Mock implements _i10.BodyWeightProvider {
   MockBodyWeightProvider() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_0(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i2.WgerBaseProvider);
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(this, Invocation.getter(#baseProvider)),
+          )
+          as _i2.WgerBaseProvider);
 
   @override
-  List<_i3.WeightEntry> get items => (super.noSuchMethod(
-        Invocation.getter(#items),
-        returnValue: <_i3.WeightEntry>[],
-      ) as List<_i3.WeightEntry>);
+  List<_i3.WeightEntry> get items =>
+      (super.noSuchMethod(Invocation.getter(#items), returnValue: <_i3.WeightEntry>[])
+          as List<_i3.WeightEntry>);
 
   @override
-  set items(List<_i3.WeightEntry>? entries) => super.noSuchMethod(
-        Invocation.setter(
-          #items,
-          entries,
-        ),
-        returnValueForMissingStub: null,
-      );
+  set items(List<_i3.WeightEntry>? entries) =>
+      super.noSuchMethod(Invocation.setter(#items, entries), returnValueForMissingStub: null);
 
   @override
-  bool get hasListeners => (super.noSuchMethod(
-        Invocation.getter(#hasListeners),
-        returnValue: false,
-      ) as bool);
+  bool get hasListeners =>
+      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
 
   @override
-  void clear() => super.noSuchMethod(
-        Invocation.method(
-          #clear,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void clear() =>
+      super.noSuchMethod(Invocation.method(#clear, []), returnValueForMissingStub: null);
 
   @override
-  _i3.WeightEntry findById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findById,
-          [id],
-        ),
-        returnValue: _FakeWeightEntry_1(
-          this,
-          Invocation.method(
-            #findById,
-            [id],
-          ),
-        ),
-      ) as _i3.WeightEntry);
+  _i3.WeightEntry findById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findById, [id]),
+            returnValue: _FakeWeightEntry_1(this, Invocation.method(#findById, [id])),
+          )
+          as _i3.WeightEntry);
 
   @override
   _i3.WeightEntry? findByDate(DateTime? date) =>
-      (super.noSuchMethod(Invocation.method(
-        #findByDate,
-        [date],
-      )) as _i3.WeightEntry?);
+      (super.noSuchMethod(Invocation.method(#findByDate, [date])) as _i3.WeightEntry?);
 
   @override
-  _i5.Future<List<_i3.WeightEntry>> fetchAndSetEntries() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetEntries,
-          [],
-        ),
-        returnValue:
-            _i5.Future<List<_i3.WeightEntry>>.value(<_i3.WeightEntry>[]),
-      ) as _i5.Future<List<_i3.WeightEntry>>);
-
-  @override
-  _i5.Future<_i3.WeightEntry> addEntry(_i3.WeightEntry? entry) =>
+  _i11.Future<List<_i3.WeightEntry>> fetchAndSetEntries() =>
       (super.noSuchMethod(
-        Invocation.method(
-          #addEntry,
-          [entry],
-        ),
-        returnValue: _i5.Future<_i3.WeightEntry>.value(_FakeWeightEntry_1(
-          this,
-          Invocation.method(
-            #addEntry,
-            [entry],
-          ),
-        )),
-      ) as _i5.Future<_i3.WeightEntry>);
+            Invocation.method(#fetchAndSetEntries, []),
+            returnValue: _i11.Future<List<_i3.WeightEntry>>.value(<_i3.WeightEntry>[]),
+          )
+          as _i11.Future<List<_i3.WeightEntry>>);
 
   @override
-  _i5.Future<void> editEntry(_i3.WeightEntry? entry) => (super.noSuchMethod(
-        Invocation.method(
-          #editEntry,
-          [entry],
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+  _i11.Future<_i3.WeightEntry> addEntry(_i3.WeightEntry? entry) =>
+      (super.noSuchMethod(
+            Invocation.method(#addEntry, [entry]),
+            returnValue: _i11.Future<_i3.WeightEntry>.value(
+              _FakeWeightEntry_1(this, Invocation.method(#addEntry, [entry])),
+            ),
+          )
+          as _i11.Future<_i3.WeightEntry>);
 
   @override
-  _i5.Future<void> deleteEntry(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteEntry,
-          [id],
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+  _i11.Future<void> editEntry(_i3.WeightEntry? entry) =>
+      (super.noSuchMethod(
+            Invocation.method(#editEntry, [entry]),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
 
   @override
-  void addListener(_i6.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+  _i11.Future<void> deleteEntry(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteEntry, [id]),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
 
   @override
-  void removeListener(_i6.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void addListener(_i12.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void removeListener(_i12.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#removeListener, [listener]),
+    returnValueForMissingStub: null,
+  );
 
   @override
-  void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void dispose() =>
+      super.noSuchMethod(Invocation.method(#dispose, []), returnValueForMissingStub: null);
+
+  @override
+  void notifyListeners() =>
+      super.noSuchMethod(Invocation.method(#notifyListeners, []), returnValueForMissingStub: null);
 }
 
 /// A class which mocks [UserProvider].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockUserProvider extends _i1.Mock implements _i7.UserProvider {
+class MockUserProvider extends _i1.Mock implements _i13.UserProvider {
   MockUserProvider() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_0(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i2.WgerBaseProvider);
+  _i14.ThemeMode get themeMode =>
+      (super.noSuchMethod(Invocation.getter(#themeMode), returnValue: _i14.ThemeMode.system)
+          as _i14.ThemeMode);
 
   @override
-  set profile(_i8.Profile? _profile) => super.noSuchMethod(
-        Invocation.setter(
-          #profile,
-          _profile,
-        ),
-        returnValueForMissingStub: null,
-      );
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(this, Invocation.getter(#baseProvider)),
+          )
+          as _i2.WgerBaseProvider);
 
   @override
-  bool get hasListeners => (super.noSuchMethod(
-        Invocation.getter(#hasListeners),
-        returnValue: false,
-      ) as bool);
+  _i4.SharedPreferencesAsync get prefs =>
+      (super.noSuchMethod(
+            Invocation.getter(#prefs),
+            returnValue: _FakeSharedPreferencesAsync_2(this, Invocation.getter(#prefs)),
+          )
+          as _i4.SharedPreferencesAsync);
 
   @override
-  void clear() => super.noSuchMethod(
-        Invocation.method(
-          #clear,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+  set themeMode(_i14.ThemeMode? value) =>
+      super.noSuchMethod(Invocation.setter(#themeMode, value), returnValueForMissingStub: null);
 
   @override
-  _i5.Future<void> fetchAndSetProfile() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetProfile,
-          [],
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+  set prefs(_i4.SharedPreferencesAsync? value) =>
+      super.noSuchMethod(Invocation.setter(#prefs, value), returnValueForMissingStub: null);
 
   @override
-  _i5.Future<void> saveProfile() => (super.noSuchMethod(
-        Invocation.method(
-          #saveProfile,
-          [],
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+  set profile(_i15.Profile? value) =>
+      super.noSuchMethod(Invocation.setter(#profile, value), returnValueForMissingStub: null);
 
   @override
-  _i5.Future<void> verifyEmail() => (super.noSuchMethod(
-        Invocation.method(
-          #verifyEmail,
-          [],
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+  bool get hasListeners =>
+      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
 
   @override
-  void addListener(_i6.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void clear() =>
+      super.noSuchMethod(Invocation.method(#clear, []), returnValueForMissingStub: null);
 
   @override
-  void removeListener(_i6.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
+  void setThemeMode(_i14.ThemeMode? mode) =>
+      super.noSuchMethod(Invocation.method(#setThemeMode, [mode]), returnValueForMissingStub: null);
 
   @override
-  void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+  _i11.Future<void> fetchAndSetProfile() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetProfile, []),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
 
   @override
-  void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
+  _i11.Future<void> saveProfile() =>
+      (super.noSuchMethod(
+            Invocation.method(#saveProfile, []),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  _i11.Future<void> verifyEmail() =>
+      (super.noSuchMethod(
+            Invocation.method(#verifyEmail, []),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  void addListener(_i12.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void removeListener(_i12.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#removeListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void dispose() =>
+      super.noSuchMethod(Invocation.method(#dispose, []), returnValueForMissingStub: null);
+
+  @override
+  void notifyListeners() =>
+      super.noSuchMethod(Invocation.method(#notifyListeners, []), returnValueForMissingStub: null);
+}
+
+/// A class which mocks [NutritionPlansProvider].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockNutritionPlansProvider extends _i1.Mock implements _i16.NutritionPlansProvider {
+  MockNutritionPlansProvider() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i2.WgerBaseProvider get baseProvider =>
+      (super.noSuchMethod(
+            Invocation.getter(#baseProvider),
+            returnValue: _FakeWgerBaseProvider_0(this, Invocation.getter(#baseProvider)),
+          )
+          as _i2.WgerBaseProvider);
+
+  @override
+  _i5.IngredientDatabase get database =>
+      (super.noSuchMethod(
+            Invocation.getter(#database),
+            returnValue: _FakeIngredientDatabase_3(this, Invocation.getter(#database)),
+          )
+          as _i5.IngredientDatabase);
+
+  @override
+  List<_i9.Ingredient> get ingredients =>
+      (super.noSuchMethod(Invocation.getter(#ingredients), returnValue: <_i9.Ingredient>[])
+          as List<_i9.Ingredient>);
+
+  @override
+  List<_i6.NutritionalPlan> get items =>
+      (super.noSuchMethod(Invocation.getter(#items), returnValue: <_i6.NutritionalPlan>[])
+          as List<_i6.NutritionalPlan>);
+
+  @override
+  set database(_i5.IngredientDatabase? value) =>
+      super.noSuchMethod(Invocation.setter(#database, value), returnValueForMissingStub: null);
+
+  @override
+  set ingredients(List<_i9.Ingredient>? value) =>
+      super.noSuchMethod(Invocation.setter(#ingredients, value), returnValueForMissingStub: null);
+
+  @override
+  bool get hasListeners =>
+      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
+
+  @override
+  void clear() =>
+      super.noSuchMethod(Invocation.method(#clear, []), returnValueForMissingStub: null);
+
+  @override
+  _i6.NutritionalPlan findById(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#findById, [id]),
+            returnValue: _FakeNutritionalPlan_4(this, Invocation.method(#findById, [id])),
+          )
+          as _i6.NutritionalPlan);
+
+  @override
+  _i7.Meal? findMealById(int? id) =>
+      (super.noSuchMethod(Invocation.method(#findMealById, [id])) as _i7.Meal?);
+
+  @override
+  _i11.Future<void> fetchAndSetAllPlansSparse() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllPlansSparse, []),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  _i11.Future<void> fetchAndSetAllPlansFull() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetAllPlansFull, []),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  _i11.Future<_i6.NutritionalPlan> fetchAndSetPlanSparse(int? planId) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetPlanSparse, [planId]),
+            returnValue: _i11.Future<_i6.NutritionalPlan>.value(
+              _FakeNutritionalPlan_4(this, Invocation.method(#fetchAndSetPlanSparse, [planId])),
+            ),
+          )
+          as _i11.Future<_i6.NutritionalPlan>);
+
+  @override
+  _i11.Future<_i6.NutritionalPlan> fetchAndSetPlanFull(int? planId) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetPlanFull, [planId]),
+            returnValue: _i11.Future<_i6.NutritionalPlan>.value(
+              _FakeNutritionalPlan_4(this, Invocation.method(#fetchAndSetPlanFull, [planId])),
+            ),
+          )
+          as _i11.Future<_i6.NutritionalPlan>);
+
+  @override
+  _i11.Future<_i6.NutritionalPlan> addPlan(_i6.NutritionalPlan? planData) =>
+      (super.noSuchMethod(
+            Invocation.method(#addPlan, [planData]),
+            returnValue: _i11.Future<_i6.NutritionalPlan>.value(
+              _FakeNutritionalPlan_4(this, Invocation.method(#addPlan, [planData])),
+            ),
+          )
+          as _i11.Future<_i6.NutritionalPlan>);
+
+  @override
+  _i11.Future<void> editPlan(_i6.NutritionalPlan? plan) =>
+      (super.noSuchMethod(
+            Invocation.method(#editPlan, [plan]),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  _i11.Future<void> deletePlan(int? id) =>
+      (super.noSuchMethod(
+            Invocation.method(#deletePlan, [id]),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  _i11.Future<_i7.Meal> addMeal(_i7.Meal? meal, int? planId) =>
+      (super.noSuchMethod(
+            Invocation.method(#addMeal, [meal, planId]),
+            returnValue: _i11.Future<_i7.Meal>.value(
+              _FakeMeal_5(this, Invocation.method(#addMeal, [meal, planId])),
+            ),
+          )
+          as _i11.Future<_i7.Meal>);
+
+  @override
+  _i11.Future<_i7.Meal> editMeal(_i7.Meal? meal) =>
+      (super.noSuchMethod(
+            Invocation.method(#editMeal, [meal]),
+            returnValue: _i11.Future<_i7.Meal>.value(
+              _FakeMeal_5(this, Invocation.method(#editMeal, [meal])),
+            ),
+          )
+          as _i11.Future<_i7.Meal>);
+
+  @override
+  _i11.Future<void> deleteMeal(_i7.Meal? meal) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteMeal, [meal]),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  _i11.Future<_i8.MealItem> addMealItem(_i8.MealItem? mealItem, _i7.Meal? meal) =>
+      (super.noSuchMethod(
+            Invocation.method(#addMealItem, [mealItem, meal]),
+            returnValue: _i11.Future<_i8.MealItem>.value(
+              _FakeMealItem_6(this, Invocation.method(#addMealItem, [mealItem, meal])),
+            ),
+          )
+          as _i11.Future<_i8.MealItem>);
+
+  @override
+  _i11.Future<void> deleteMealItem(_i8.MealItem? mealItem) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteMealItem, [mealItem]),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  _i11.Future<void> clearIngredientCache() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearIngredientCache, []),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  _i11.Future<_i9.Ingredient> fetchIngredient(
+    int? ingredientId, {
+    _i5.IngredientDatabase? database,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchIngredient, [ingredientId], {#database: database}),
+            returnValue: _i11.Future<_i9.Ingredient>.value(
+              _FakeIngredient_7(
+                this,
+                Invocation.method(#fetchIngredient, [ingredientId], {#database: database}),
+              ),
+            ),
+          )
+          as _i11.Future<_i9.Ingredient>);
+
+  @override
+  _i11.Future<void> fetchIngredientsFromCache() =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchIngredientsFromCache, []),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  _i11.Future<List<_i9.Ingredient>> searchIngredient(
+    String? name, {
+    String? languageCode = 'en',
+    bool? searchEnglish = false,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(
+              #searchIngredient,
+              [name],
+              {#languageCode: languageCode, #searchEnglish: searchEnglish},
+            ),
+            returnValue: _i11.Future<List<_i9.Ingredient>>.value(<_i9.Ingredient>[]),
+          )
+          as _i11.Future<List<_i9.Ingredient>>);
+
+  @override
+  _i11.Future<_i9.Ingredient?> searchIngredientWithBarcode(String? barcode) =>
+      (super.noSuchMethod(
+            Invocation.method(#searchIngredientWithBarcode, [barcode]),
+            returnValue: _i11.Future<_i9.Ingredient?>.value(),
+          )
+          as _i11.Future<_i9.Ingredient?>);
+
+  @override
+  _i11.Future<void> logMealToDiary(_i7.Meal? meal, DateTime? mealDateTime) =>
+      (super.noSuchMethod(
+            Invocation.method(#logMealToDiary, [meal, mealDateTime]),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  _i11.Future<void> logIngredientToDiary(
+    _i8.MealItem? mealItem,
+    int? planId, [
+    DateTime? dateTime,
+  ]) =>
+      (super.noSuchMethod(
+            Invocation.method(#logIngredientToDiary, [mealItem, planId, dateTime]),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  _i11.Future<void> deleteLog(int? logId, int? planId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteLog, [logId, planId]),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  _i11.Future<void> fetchAndSetLogs(_i6.NutritionalPlan? plan) =>
+      (super.noSuchMethod(
+            Invocation.method(#fetchAndSetLogs, [plan]),
+            returnValue: _i11.Future<void>.value(),
+            returnValueForMissingStub: _i11.Future<void>.value(),
+          )
+          as _i11.Future<void>);
+
+  @override
+  void addListener(_i12.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#addListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void removeListener(_i12.VoidCallback? listener) => super.noSuchMethod(
+    Invocation.method(#removeListener, [listener]),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  void dispose() =>
+      super.noSuchMethod(Invocation.method(#dispose, []), returnValueForMissingStub: null);
+
+  @override
+  void notifyListeners() =>
+      super.noSuchMethod(Invocation.method(#notifyListeners, []), returnValueForMissingStub: null);
 }
diff --git a/test/widgets/routines/plate_calculator_test.dart b/test/widgets/routines/plate_calculator_test.dart
new file mode 100644
index 00000000..9c1b7ad0
--- /dev/null
+++ b/test/widgets/routines/plate_calculator_test.dart
@@ -0,0 +1,92 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
+import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/providers/plate_weights.dart';
+import 'package:wger/widgets/routines/plate_calculator.dart';
+
+Future<void> pumpWidget(
+  WidgetTester tester, {
+  PlateCalculatorNotifier? notifier,
+}) async {
+  await tester.pumpWidget(
+    ProviderScope(
+      overrides: [
+        if (notifier != null) plateCalculatorProvider.overrideWith((ref) => notifier),
+      ],
+      child: const MaterialApp(
+        locale: Locale('en'),
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: Scaffold(body: ConfigureAvailablePlates()),
+      ),
+    ),
+  );
+}
+
+void main() {
+  setUp(() {
+    SharedPreferencesAsyncPlatform.instance = InMemorySharedPreferencesAsync.empty();
+  });
+
+  testWidgets('Smoke test for ConfigureAvailablePlates', (WidgetTester tester) async {
+    await pumpWidget(tester);
+
+    expect(find.text('Unit'), findsWidgets);
+    expect(find.text('Bar weight'), findsWidgets);
+    expect(find.byType(SwitchListTile), findsOneWidget);
+    expect(find.byType(FilledButton), findsOneWidget);
+    expect(find.byType(PlateWeight), findsWidgets);
+  });
+
+  testWidgets(
+    'ConfigureAvailablePlates correctly updates state',
+    (WidgetTester tester) async {
+      // Arrange
+      final notifier = PlateCalculatorNotifier();
+      notifier.state = PlateCalculatorState(
+        isMetric: true,
+        barWeight: 20,
+        useColors: false,
+        selectedPlates: [1.25, 2.5],
+      );
+
+      await pumpWidget(tester, notifier: notifier);
+
+      // Correctly changes the unit
+      expect(notifier.state.isMetric, isTrue);
+      await tester.tap(find.byKey(const ValueKey('weightUnitDropdown')));
+      await tester.pumpAndSettle();
+      await tester.tap(find.text('lb').last);
+      await tester.pumpAndSettle();
+      expect(notifier.state.isMetric, isFalse);
+
+      // Correctly changes the bar weight
+      expect(notifier.state.barWeight, 45);
+      await tester.tap(find.byKey(const ValueKey('barWeightDropdown')));
+      await tester.pumpAndSettle();
+      final menuItem = find.ancestor(
+        of: find.text('25'),
+        matching: find.byType(InkWell),
+      );
+      expect(menuItem, findsOneWidget);
+      await tester.tap(menuItem);
+      await tester.pumpAndSettle();
+      expect(notifier.state.barWeight, 25);
+
+      // Correctly toggles the useColors switch
+      expect(notifier.state.useColors, isFalse);
+      await tester.tap(find.byKey(const ValueKey('useColorsSwitch')));
+      await tester.pumpAndSettle();
+      expect(notifier.state.useColors, isTrue);
+
+      // Correctly adds and removes plates
+      expect(notifier.state.selectedPlates.contains(5.0), isTrue);
+      await tester.tap(find.byKey(const ValueKey('plateWeight-5')));
+      await tester.pumpAndSettle();
+      expect(notifier.state.selectedPlates.contains(5.0), isFalse);
+    },
+  );
+}
diff --git a/test/workout/gym_mode_screen_test.dart b/test/workout/gym_mode_screen_test.dart
deleted file mode 100644
index cfe51f0f..00000000
--- a/test/workout/gym_mode_screen_test.dart
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * This file is part of wger Workout Manager <https://github.com/wger-project>.
- * Copyright (C) 2020, 2021 wger Team
- *
- * wger Workout Manager is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * wger Workout Manager is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:mockito/annotations.dart';
-import 'package:mockito/mockito.dart';
-import 'package:provider/provider.dart';
-import 'package:wger/l10n/generated/app_localizations.dart';
-import 'package:wger/providers/base_provider.dart';
-import 'package:wger/providers/exercises.dart';
-import 'package:wger/providers/workout_plans.dart';
-import 'package:wger/screens/gym_mode.dart';
-import 'package:wger/screens/workout_plan_screen.dart';
-import 'package:wger/widgets/workouts/forms.dart';
-import 'package:wger/widgets/workouts/gym_mode.dart';
-
-import '../../test_data/exercises.dart';
-import '../../test_data/workouts.dart';
-import 'gym_mode_screen_test.mocks.dart';
-
-@GenerateMocks([WgerBaseProvider, ExercisesProvider])
-void main() {
-  final mockBaseProvider = MockWgerBaseProvider();
-  final key = GlobalKey<NavigatorState>();
-
-  final mockExerciseProvider = MockExercisesProvider();
-  final workoutPlan = getWorkout();
-  final bases = getTestExercises();
-
-  Widget createHomeScreen({locale = 'en'}) {
-    return ChangeNotifierProvider<WorkoutPlansProvider>(
-      create: (context) =>
-          WorkoutPlansProvider(mockBaseProvider, mockExerciseProvider, [workoutPlan]),
-      child: ChangeNotifierProvider<ExercisesProvider>(
-        create: (context) => mockExerciseProvider,
-        child: MaterialApp(
-          locale: Locale(locale),
-          localizationsDelegates: AppLocalizations.localizationsDelegates,
-          supportedLocales: AppLocalizations.supportedLocales,
-          navigatorKey: key,
-          home: TextButton(
-            onPressed: () => key.currentState!.push(
-              MaterialPageRoute<void>(
-                settings: RouteSettings(arguments: workoutPlan.days.first),
-                builder: (_) => const GymModeScreen(),
-              ),
-            ),
-            child: const SizedBox(),
-          ),
-          routes: {WorkoutPlanScreen.routeName: (ctx) => const WorkoutPlanScreen()},
-        ),
-      ),
-    );
-  }
-
-  testWidgets('Test the widgets on the gym mode screen', (WidgetTester tester) async {
-    when(mockExerciseProvider.findExerciseById(1)).thenReturn(bases[0]);
-    when(mockExerciseProvider.findExerciseById(6)).thenReturn(bases[5]);
-
-    await tester.pumpWidget(createHomeScreen());
-    await tester.tap(find.byType(TextButton));
-    await tester.pumpAndSettle();
-
-    //
-    // Start page
-    //
-    expect(find.byType(StartPage), findsOneWidget);
-    expect(find.text('Your workout today'), findsOneWidget);
-    expect(find.text('Bench press'), findsOneWidget);
-    expect(find.text('Side raises'), findsOneWidget);
-    expect(find.byIcon(Icons.close), findsOneWidget);
-    expect(find.byIcon(Icons.toc), findsOneWidget);
-    expect(find.byIcon(Icons.chevron_left), findsNothing);
-    expect(find.byIcon(Icons.chevron_right), findsOneWidget);
-    await tester.tap(find.byIcon(Icons.chevron_right));
-    await tester.pumpAndSettle();
-
-    //
-    // Bench press - exercise overview page
-    //
-    expect(find.text('Bench press'), findsOneWidget);
-    expect(find.byType(ExerciseOverview), findsOneWidget);
-    expect(find.byIcon(Icons.close), findsOneWidget);
-    expect(find.byIcon(Icons.toc), findsOneWidget);
-    expect(find.byIcon(Icons.chevron_left), findsOneWidget);
-    expect(find.byIcon(Icons.chevron_right), findsOneWidget);
-    await tester.drag(find.byType(ExerciseOverview), const Offset(-500.0, 0.0));
-    await tester.pumpAndSettle();
-
-    //
-    // Bench press - Log
-    //
-    expect(find.text('Bench press'), findsOneWidget);
-    expect(find.byType(LogPage), findsOneWidget);
-    expect(find.byType(Form), findsOneWidget);
-    expect(find.byType(ListTile), findsNWidgets(3), reason: 'Two logs and the switch tile');
-    expect(find.text('10 × 10 kg  (1.5 RiR)'), findsOneWidget);
-    expect(find.text('12 × 10 kg  (2 RiR)'), findsOneWidget);
-    expect(find.text('Make sure to warm up'), findsOneWidget, reason: 'Set comment');
-    expect(find.byIcon(Icons.close), findsOneWidget);
-    expect(find.byIcon(Icons.toc), findsOneWidget);
-    expect(find.byIcon(Icons.chevron_left), findsOneWidget);
-    expect(find.byIcon(Icons.chevron_right), findsOneWidget);
-
-    // Form shows only weight and reps
-    expect(find.byType(SwitchListTile), findsOneWidget);
-    expect(find.byType(TextFormField), findsNWidgets(2));
-    expect(find.byType(RepetitionUnitInputWidget), findsNothing);
-    expect(find.byType(WeightUnitInputWidget), findsNothing);
-    expect(find.byType(RiRInputWidget), findsNothing);
-
-    // Form shows unit and rir after tapping the toggle button
-    await tester.tap(find.byType(SwitchListTile));
-    await tester.pump();
-    expect(find.byType(RepetitionUnitInputWidget), findsOneWidget);
-    expect(find.byType(WeightUnitInputWidget), findsOneWidget);
-    expect(find.byType(RiRInputWidget), findsOneWidget);
-    await tester.drag(find.byType(LogPage), const Offset(-500.0, 0.0));
-    await tester.pumpAndSettle();
-
-    //
-    // Bench press - pause
-    //
-    expect(find.text('Pause'), findsOneWidget);
-    expect(find.byType(TimerWidget), findsOneWidget);
-    expect(find.byIcon(Icons.close), findsOneWidget);
-    expect(find.byIcon(Icons.toc), findsOneWidget);
-    expect(find.byIcon(Icons.chevron_left), findsOneWidget);
-    expect(find.byIcon(Icons.chevron_right), findsOneWidget);
-    await tester.tap(find.byIcon(Icons.chevron_right));
-    await tester.pumpAndSettle();
-
-    //
-    // Bench press - log
-    //
-    expect(find.text('Bench press'), findsOneWidget);
-    expect(find.byType(LogPage), findsOneWidget);
-    expect(find.byType(Form), findsOneWidget);
-    await tester.drag(find.byType(LogPage), const Offset(-500.0, 0.0));
-    await tester.pumpAndSettle();
-
-    //
-    // Pause
-    //
-    expect(find.text('Pause'), findsOneWidget);
-    expect(find.byType(TimerWidget), findsOneWidget);
-    expect(find.byIcon(Icons.chevron_left), findsOneWidget);
-    expect(find.byIcon(Icons.close), findsOneWidget);
-    expect(find.byIcon(Icons.chevron_right), findsOneWidget);
-    await tester.tap(find.byIcon(Icons.chevron_right));
-    await tester.pumpAndSettle();
-
-    //
-    // Side raises - exercise overview page
-    //
-    expect(find.text('Side raises'), findsOneWidget);
-    expect(find.byType(ExerciseOverview), findsOneWidget);
-    await tester.tap(find.byIcon(Icons.chevron_right));
-    await tester.pumpAndSettle();
-
-    //
-    // Side raises - log
-    //
-    expect(find.byType(LogPage), findsOneWidget);
-    await tester.tap(find.byIcon(Icons.chevron_right));
-    await tester.pumpAndSettle();
-
-    //
-    // Side raises - timer
-    //
-    expect(find.byType(TimerWidget), findsOneWidget);
-    await tester.tap(find.byIcon(Icons.chevron_right));
-    await tester.pumpAndSettle();
-
-    //
-    // Side raises - log
-    //
-    expect(find.byType(LogPage), findsOneWidget);
-    await tester.tap(find.byIcon(Icons.chevron_right));
-    await tester.pumpAndSettle();
-
-    //
-    // Side raises - timer
-    //
-    expect(find.byType(TimerWidget), findsOneWidget);
-    await tester.tap(find.byIcon(Icons.chevron_right));
-    await tester.pumpAndSettle();
-
-    //
-    // Session
-    //
-    expect(find.text('Workout session'), findsOneWidget);
-    expect(find.byType(SessionPage), findsOneWidget);
-    expect(find.byType(Form), findsOneWidget);
-    expect(find.byIcon(Icons.sentiment_very_dissatisfied), findsOneWidget);
-    expect(find.byIcon(Icons.sentiment_neutral), findsOneWidget);
-    expect(find.byIcon(Icons.sentiment_very_satisfied), findsOneWidget);
-    expect(find.byIcon(Icons.chevron_left), findsOneWidget);
-    expect(find.byIcon(Icons.close), findsOneWidget);
-    expect(find.byIcon(Icons.chevron_right), findsNothing);
-
-    //
-  });
-}
diff --git a/test/workout/gym_mode_screen_test.mocks.dart b/test/workout/gym_mode_screen_test.mocks.dart
deleted file mode 100644
index 5647a1f0..00000000
--- a/test/workout/gym_mode_screen_test.mocks.dart
+++ /dev/null
@@ -1,787 +0,0 @@
-// Mocks generated by Mockito 5.4.4 from annotations
-// in wger/test/workout/gym_mode_screen_test.dart.
-// Do not manually edit this file.
-
-// ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i11;
-import 'dart:ui' as _i13;
-
-import 'package:http/http.dart' as _i3;
-import 'package:mockito/mockito.dart' as _i1;
-import 'package:wger/database/exercises/exercise_database.dart' as _i5;
-import 'package:wger/models/exercises/category.dart' as _i7;
-import 'package:wger/models/exercises/equipment.dart' as _i8;
-import 'package:wger/models/exercises/exercise.dart' as _i6;
-import 'package:wger/models/exercises/language.dart' as _i10;
-import 'package:wger/models/exercises/muscle.dart' as _i9;
-import 'package:wger/providers/auth.dart' as _i2;
-import 'package:wger/providers/base_provider.dart' as _i4;
-import 'package:wger/providers/exercises.dart' as _i12;
-
-// ignore_for_file: type=lint
-// ignore_for_file: avoid_redundant_argument_values
-// ignore_for_file: avoid_setters_without_getters
-// ignore_for_file: comment_references
-// ignore_for_file: deprecated_member_use
-// ignore_for_file: deprecated_member_use_from_same_package
-// ignore_for_file: implementation_imports
-// ignore_for_file: invalid_use_of_visible_for_testing_member
-// ignore_for_file: prefer_const_constructors
-// ignore_for_file: unnecessary_parenthesis
-// ignore_for_file: camel_case_types
-// ignore_for_file: subtype_of_sealed_class
-
-class _FakeAuthProvider_0 extends _i1.SmartFake implements _i2.AuthProvider {
-  _FakeAuthProvider_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
-  _FakeClient_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeUri_2 extends _i1.SmartFake implements Uri {
-  _FakeUri_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeResponse_3 extends _i1.SmartFake implements _i3.Response {
-  _FakeResponse_3(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeWgerBaseProvider_4 extends _i1.SmartFake
-    implements _i4.WgerBaseProvider {
-  _FakeWgerBaseProvider_4(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeExerciseDatabase_5 extends _i1.SmartFake
-    implements _i5.ExerciseDatabase {
-  _FakeExerciseDatabase_5(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeExercise_6 extends _i1.SmartFake implements _i6.Exercise {
-  _FakeExercise_6(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeExerciseCategory_7 extends _i1.SmartFake
-    implements _i7.ExerciseCategory {
-  _FakeExerciseCategory_7(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeEquipment_8 extends _i1.SmartFake implements _i8.Equipment {
-  _FakeEquipment_8(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeMuscle_9 extends _i1.SmartFake implements _i9.Muscle {
-  _FakeMuscle_9(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeLanguage_10 extends _i1.SmartFake implements _i10.Language {
-  _FakeLanguage_10(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-/// A class which mocks [WgerBaseProvider].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
-  MockWgerBaseProvider() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  _i2.AuthProvider get auth => (super.noSuchMethod(
-        Invocation.getter(#auth),
-        returnValue: _FakeAuthProvider_0(
-          this,
-          Invocation.getter(#auth),
-        ),
-      ) as _i2.AuthProvider);
-
-  @override
-  set auth(_i2.AuthProvider? _auth) => super.noSuchMethod(
-        Invocation.setter(
-          #auth,
-          _auth,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  _i3.Client get client => (super.noSuchMethod(
-        Invocation.getter(#client),
-        returnValue: _FakeClient_1(
-          this,
-          Invocation.getter(#client),
-        ),
-      ) as _i3.Client);
-
-  @override
-  set client(_i3.Client? _client) => super.noSuchMethod(
-        Invocation.setter(
-          #client,
-          _client,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  Map<String, String> getDefaultHeaders({bool? includeAuth = false}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getDefaultHeaders,
-          [],
-          {#includeAuth: includeAuth},
-        ),
-        returnValue: <String, String>{},
-      ) as Map<String, String>);
-
-  @override
-  Uri makeUrl(
-    String? path, {
-    int? id,
-    String? objectMethod,
-    Map<String, dynamic>? query,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #makeUrl,
-          [path],
-          {
-            #id: id,
-            #objectMethod: objectMethod,
-            #query: query,
-          },
-        ),
-        returnValue: _FakeUri_2(
-          this,
-          Invocation.method(
-            #makeUrl,
-            [path],
-            {
-              #id: id,
-              #objectMethod: objectMethod,
-              #query: query,
-            },
-          ),
-        ),
-      ) as Uri);
-
-  @override
-  _i11.Future<Map<String, dynamic>> fetch(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetch,
-          [uri],
-        ),
-        returnValue:
-            _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i11.Future<Map<String, dynamic>>);
-
-  @override
-  _i11.Future<List<dynamic>> fetchPaginated(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchPaginated,
-          [uri],
-        ),
-        returnValue: _i11.Future<List<dynamic>>.value(<dynamic>[]),
-      ) as _i11.Future<List<dynamic>>);
-
-  @override
-  _i11.Future<Map<String, dynamic>> post(
-    Map<String, dynamic>? data,
-    Uri? uri,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #post,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue:
-            _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i11.Future<Map<String, dynamic>>);
-
-  @override
-  _i11.Future<Map<String, dynamic>> patch(
-    Map<String, dynamic>? data,
-    Uri? uri,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #patch,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue:
-            _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i11.Future<Map<String, dynamic>>);
-
-  @override
-  _i11.Future<_i3.Response> deleteRequest(
-    String? url,
-    int? id,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #deleteRequest,
-          [
-            url,
-            id,
-          ],
-        ),
-        returnValue: _i11.Future<_i3.Response>.value(_FakeResponse_3(
-          this,
-          Invocation.method(
-            #deleteRequest,
-            [
-              url,
-              id,
-            ],
-          ),
-        )),
-      ) as _i11.Future<_i3.Response>);
-}
-
-/// A class which mocks [ExercisesProvider].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockExercisesProvider extends _i1.Mock implements _i12.ExercisesProvider {
-  MockExercisesProvider() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  _i4.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_4(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i4.WgerBaseProvider);
-
-  @override
-  _i5.ExerciseDatabase get database => (super.noSuchMethod(
-        Invocation.getter(#database),
-        returnValue: _FakeExerciseDatabase_5(
-          this,
-          Invocation.getter(#database),
-        ),
-      ) as _i5.ExerciseDatabase);
-
-  @override
-  set database(_i5.ExerciseDatabase? _database) => super.noSuchMethod(
-        Invocation.setter(
-          #database,
-          _database,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  List<_i6.Exercise> get exercises => (super.noSuchMethod(
-        Invocation.getter(#exercises),
-        returnValue: <_i6.Exercise>[],
-      ) as List<_i6.Exercise>);
-
-  @override
-  set exercises(List<_i6.Exercise>? _exercises) => super.noSuchMethod(
-        Invocation.setter(
-          #exercises,
-          _exercises,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  List<_i6.Exercise> get filteredExercises => (super.noSuchMethod(
-        Invocation.getter(#filteredExercises),
-        returnValue: <_i6.Exercise>[],
-      ) as List<_i6.Exercise>);
-
-  @override
-  set filteredExercises(List<_i6.Exercise>? newFilteredExercises) =>
-      super.noSuchMethod(
-        Invocation.setter(
-          #filteredExercises,
-          newFilteredExercises,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  Map<int, List<_i6.Exercise>> get exerciseBasesByVariation =>
-      (super.noSuchMethod(
-        Invocation.getter(#exerciseBasesByVariation),
-        returnValue: <int, List<_i6.Exercise>>{},
-      ) as Map<int, List<_i6.Exercise>>);
-
-  @override
-  List<_i7.ExerciseCategory> get categories => (super.noSuchMethod(
-        Invocation.getter(#categories),
-        returnValue: <_i7.ExerciseCategory>[],
-      ) as List<_i7.ExerciseCategory>);
-
-  @override
-  List<_i9.Muscle> get muscles => (super.noSuchMethod(
-        Invocation.getter(#muscles),
-        returnValue: <_i9.Muscle>[],
-      ) as List<_i9.Muscle>);
-
-  @override
-  List<_i8.Equipment> get equipment => (super.noSuchMethod(
-        Invocation.getter(#equipment),
-        returnValue: <_i8.Equipment>[],
-      ) as List<_i8.Equipment>);
-
-  @override
-  List<_i10.Language> get languages => (super.noSuchMethod(
-        Invocation.getter(#languages),
-        returnValue: <_i10.Language>[],
-      ) as List<_i10.Language>);
-
-  @override
-  set languages(List<_i10.Language>? languages) => super.noSuchMethod(
-        Invocation.setter(
-          #languages,
-          languages,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  bool get hasListeners => (super.noSuchMethod(
-        Invocation.getter(#hasListeners),
-        returnValue: false,
-      ) as bool);
-
-  @override
-  _i11.Future<void> setFilters(_i12.Filters? newFilters) => (super.noSuchMethod(
-        Invocation.method(
-          #setFilters,
-          [newFilters],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
-
-  @override
-  void initFilters() => super.noSuchMethod(
-        Invocation.method(
-          #initFilters,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  _i11.Future<void> findByFilters() => (super.noSuchMethod(
-        Invocation.method(
-          #findByFilters,
-          [],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
-
-  @override
-  void clear() => super.noSuchMethod(
-        Invocation.method(
-          #clear,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  _i6.Exercise findExerciseById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findExerciseById,
-          [id],
-        ),
-        returnValue: _FakeExercise_6(
-          this,
-          Invocation.method(
-            #findExerciseById,
-            [id],
-          ),
-        ),
-      ) as _i6.Exercise);
-
-  @override
-  List<_i6.Exercise> findExercisesByVariationId(
-    int? id, {
-    int? exerciseBaseIdToExclude,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #findExercisesByVariationId,
-          [id],
-          {#exerciseBaseIdToExclude: exerciseBaseIdToExclude},
-        ),
-        returnValue: <_i6.Exercise>[],
-      ) as List<_i6.Exercise>);
-
-  @override
-  _i7.ExerciseCategory findCategoryById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findCategoryById,
-          [id],
-        ),
-        returnValue: _FakeExerciseCategory_7(
-          this,
-          Invocation.method(
-            #findCategoryById,
-            [id],
-          ),
-        ),
-      ) as _i7.ExerciseCategory);
-
-  @override
-  _i8.Equipment findEquipmentById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findEquipmentById,
-          [id],
-        ),
-        returnValue: _FakeEquipment_8(
-          this,
-          Invocation.method(
-            #findEquipmentById,
-            [id],
-          ),
-        ),
-      ) as _i8.Equipment);
-
-  @override
-  _i9.Muscle findMuscleById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findMuscleById,
-          [id],
-        ),
-        returnValue: _FakeMuscle_9(
-          this,
-          Invocation.method(
-            #findMuscleById,
-            [id],
-          ),
-        ),
-      ) as _i9.Muscle);
-
-  @override
-  _i10.Language findLanguageById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findLanguageById,
-          [id],
-        ),
-        returnValue: _FakeLanguage_10(
-          this,
-          Invocation.method(
-            #findLanguageById,
-            [id],
-          ),
-        ),
-      ) as _i10.Language);
-
-  @override
-  _i11.Future<void> fetchAndSetCategoriesFromApi() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetCategoriesFromApi,
-          [],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
-
-  @override
-  _i11.Future<void> fetchAndSetMusclesFromApi() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetMusclesFromApi,
-          [],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
-
-  @override
-  _i11.Future<void> fetchAndSetEquipmentsFromApi() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetEquipmentsFromApi,
-          [],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
-
-  @override
-  _i11.Future<void> fetchAndSetLanguagesFromApi() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetLanguagesFromApi,
-          [],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
-
-  @override
-  _i11.Future<_i6.Exercise> fetchAndSetExercise(int? exerciseId) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetExercise,
-          [exerciseId],
-        ),
-        returnValue: _i11.Future<_i6.Exercise>.value(_FakeExercise_6(
-          this,
-          Invocation.method(
-            #fetchAndSetExercise,
-            [exerciseId],
-          ),
-        )),
-      ) as _i11.Future<_i6.Exercise>);
-
-  @override
-  _i11.Future<_i6.Exercise> handleUpdateExerciseFromApi(
-    _i5.ExerciseDatabase? database,
-    int? exerciseId,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #handleUpdateExerciseFromApi,
-          [
-            database,
-            exerciseId,
-          ],
-        ),
-        returnValue: _i11.Future<_i6.Exercise>.value(_FakeExercise_6(
-          this,
-          Invocation.method(
-            #handleUpdateExerciseFromApi,
-            [
-              database,
-              exerciseId,
-            ],
-          ),
-        )),
-      ) as _i11.Future<_i6.Exercise>);
-
-  @override
-  _i11.Future<void> initCacheTimesLocalPrefs({dynamic forceInit = false}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #initCacheTimesLocalPrefs,
-          [],
-          {#forceInit: forceInit},
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
-
-  @override
-  _i11.Future<void> clearAllCachesAndPrefs() => (super.noSuchMethod(
-        Invocation.method(
-          #clearAllCachesAndPrefs,
-          [],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
-
-  @override
-  _i11.Future<void> fetchAndSetInitialData() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetInitialData,
-          [],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
-
-  @override
-  _i11.Future<void> setExercisesFromDatabase(
-    _i5.ExerciseDatabase? database, {
-    bool? forceDeleteCache = false,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #setExercisesFromDatabase,
-          [database],
-          {#forceDeleteCache: forceDeleteCache},
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
-
-  @override
-  _i11.Future<void> updateExerciseCache(_i5.ExerciseDatabase? database) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #updateExerciseCache,
-          [database],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
-
-  @override
-  _i11.Future<void> fetchAndSetMuscles(_i5.ExerciseDatabase? database) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetMuscles,
-          [database],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
-
-  @override
-  _i11.Future<void> fetchAndSetCategories(_i5.ExerciseDatabase? database) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetCategories,
-          [database],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
-
-  @override
-  _i11.Future<void> fetchAndSetLanguages(_i5.ExerciseDatabase? database) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetLanguages,
-          [database],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
-
-  @override
-  _i11.Future<void> fetchAndSetEquipments(_i5.ExerciseDatabase? database) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetEquipments,
-          [database],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
-
-  @override
-  _i11.Future<List<_i6.Exercise>> searchExercise(
-    String? name, {
-    String? languageCode = r'en',
-    bool? searchEnglish = false,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #searchExercise,
-          [name],
-          {
-            #languageCode: languageCode,
-            #searchEnglish: searchEnglish,
-          },
-        ),
-        returnValue: _i11.Future<List<_i6.Exercise>>.value(<_i6.Exercise>[]),
-      ) as _i11.Future<List<_i6.Exercise>>);
-
-  @override
-  void addListener(_i13.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  void removeListener(_i13.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-}
diff --git a/test/workout/repetition_unit_form_widget_test.mocks.dart b/test/workout/repetition_unit_form_widget_test.mocks.dart
deleted file mode 100644
index 85af2f8a..00000000
--- a/test/workout/repetition_unit_form_widget_test.mocks.dart
+++ /dev/null
@@ -1,620 +0,0 @@
-// Mocks generated by Mockito 5.4.4 from annotations
-// in wger/test/workout/repetition_unit_form_widget_test.dart.
-// Do not manually edit this file.
-
-// ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i12;
-import 'dart:ui' as _i16;
-
-import 'package:mockito/mockito.dart' as _i1;
-import 'package:mockito/src/dummies.dart' as _i15;
-import 'package:wger/models/exercises/exercise.dart' as _i13;
-import 'package:wger/models/exercises/translation.dart' as _i14;
-import 'package:wger/models/workouts/day.dart' as _i6;
-import 'package:wger/models/workouts/log.dart' as _i10;
-import 'package:wger/models/workouts/repetition_unit.dart' as _i4;
-import 'package:wger/models/workouts/session.dart' as _i9;
-import 'package:wger/models/workouts/set.dart' as _i7;
-import 'package:wger/models/workouts/setting.dart' as _i8;
-import 'package:wger/models/workouts/weight_unit.dart' as _i3;
-import 'package:wger/models/workouts/workout_plan.dart' as _i5;
-import 'package:wger/providers/base_provider.dart' as _i2;
-import 'package:wger/providers/workout_plans.dart' as _i11;
-
-// ignore_for_file: type=lint
-// ignore_for_file: avoid_redundant_argument_values
-// ignore_for_file: avoid_setters_without_getters
-// ignore_for_file: comment_references
-// ignore_for_file: deprecated_member_use
-// ignore_for_file: deprecated_member_use_from_same_package
-// ignore_for_file: implementation_imports
-// ignore_for_file: invalid_use_of_visible_for_testing_member
-// ignore_for_file: prefer_const_constructors
-// ignore_for_file: unnecessary_parenthesis
-// ignore_for_file: camel_case_types
-// ignore_for_file: subtype_of_sealed_class
-
-class _FakeWgerBaseProvider_0 extends _i1.SmartFake
-    implements _i2.WgerBaseProvider {
-  _FakeWgerBaseProvider_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeWeightUnit_1 extends _i1.SmartFake implements _i3.WeightUnit {
-  _FakeWeightUnit_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeRepetitionUnit_2 extends _i1.SmartFake
-    implements _i4.RepetitionUnit {
-  _FakeRepetitionUnit_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeWorkoutPlan_3 extends _i1.SmartFake implements _i5.WorkoutPlan {
-  _FakeWorkoutPlan_3(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeDay_4 extends _i1.SmartFake implements _i6.Day {
-  _FakeDay_4(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeSet_5 extends _i1.SmartFake implements _i7.Set {
-  _FakeSet_5(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeSetting_6 extends _i1.SmartFake implements _i8.Setting {
-  _FakeSetting_6(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeWorkoutSession_7 extends _i1.SmartFake
-    implements _i9.WorkoutSession {
-  _FakeWorkoutSession_7(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeLog_8 extends _i1.SmartFake implements _i10.Log {
-  _FakeLog_8(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-/// A class which mocks [WorkoutPlansProvider].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockWorkoutPlansProvider extends _i1.Mock
-    implements _i11.WorkoutPlansProvider {
-  MockWorkoutPlansProvider() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_0(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i2.WgerBaseProvider);
-
-  @override
-  List<_i5.WorkoutPlan> get items => (super.noSuchMethod(
-        Invocation.getter(#items),
-        returnValue: <_i5.WorkoutPlan>[],
-      ) as List<_i5.WorkoutPlan>);
-
-  @override
-  List<_i3.WeightUnit> get weightUnits => (super.noSuchMethod(
-        Invocation.getter(#weightUnits),
-        returnValue: <_i3.WeightUnit>[],
-      ) as List<_i3.WeightUnit>);
-
-  @override
-  _i3.WeightUnit get defaultWeightUnit => (super.noSuchMethod(
-        Invocation.getter(#defaultWeightUnit),
-        returnValue: _FakeWeightUnit_1(
-          this,
-          Invocation.getter(#defaultWeightUnit),
-        ),
-      ) as _i3.WeightUnit);
-
-  @override
-  List<_i4.RepetitionUnit> get repetitionUnits => (super.noSuchMethod(
-        Invocation.getter(#repetitionUnits),
-        returnValue: <_i4.RepetitionUnit>[],
-      ) as List<_i4.RepetitionUnit>);
-
-  @override
-  _i4.RepetitionUnit get defaultRepetitionUnit => (super.noSuchMethod(
-        Invocation.getter(#defaultRepetitionUnit),
-        returnValue: _FakeRepetitionUnit_2(
-          this,
-          Invocation.getter(#defaultRepetitionUnit),
-        ),
-      ) as _i4.RepetitionUnit);
-
-  @override
-  bool get hasListeners => (super.noSuchMethod(
-        Invocation.getter(#hasListeners),
-        returnValue: false,
-      ) as bool);
-
-  @override
-  void clear() => super.noSuchMethod(
-        Invocation.method(
-          #clear,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  List<_i5.WorkoutPlan> getPlans() => (super.noSuchMethod(
-        Invocation.method(
-          #getPlans,
-          [],
-        ),
-        returnValue: <_i5.WorkoutPlan>[],
-      ) as List<_i5.WorkoutPlan>);
-
-  @override
-  _i5.WorkoutPlan findById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findById,
-          [id],
-        ),
-        returnValue: _FakeWorkoutPlan_3(
-          this,
-          Invocation.method(
-            #findById,
-            [id],
-          ),
-        ),
-      ) as _i5.WorkoutPlan);
-
-  @override
-  int findIndexById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findIndexById,
-          [id],
-        ),
-        returnValue: 0,
-      ) as int);
-
-  @override
-  void setCurrentPlan(int? id) => super.noSuchMethod(
-        Invocation.method(
-          #setCurrentPlan,
-          [id],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  void resetCurrentPlan() => super.noSuchMethod(
-        Invocation.method(
-          #resetCurrentPlan,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  _i12.Future<void> fetchAndSetAllPlansFull() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllPlansFull,
-          [],
-        ),
-        returnValue: _i12.Future<void>.value(),
-        returnValueForMissingStub: _i12.Future<void>.value(),
-      ) as _i12.Future<void>);
-
-  @override
-  _i12.Future<void> fetchAndSetAllPlansSparse() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllPlansSparse,
-          [],
-        ),
-        returnValue: _i12.Future<void>.value(),
-        returnValueForMissingStub: _i12.Future<void>.value(),
-      ) as _i12.Future<void>);
-
-  @override
-  _i12.Future<_i5.WorkoutPlan> fetchAndSetPlanSparse(int? planId) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetPlanSparse,
-          [planId],
-        ),
-        returnValue: _i12.Future<_i5.WorkoutPlan>.value(_FakeWorkoutPlan_3(
-          this,
-          Invocation.method(
-            #fetchAndSetPlanSparse,
-            [planId],
-          ),
-        )),
-      ) as _i12.Future<_i5.WorkoutPlan>);
-
-  @override
-  _i12.Future<_i5.WorkoutPlan> fetchAndSetWorkoutPlanFull(int? workoutId) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetWorkoutPlanFull,
-          [workoutId],
-        ),
-        returnValue: _i12.Future<_i5.WorkoutPlan>.value(_FakeWorkoutPlan_3(
-          this,
-          Invocation.method(
-            #fetchAndSetWorkoutPlanFull,
-            [workoutId],
-          ),
-        )),
-      ) as _i12.Future<_i5.WorkoutPlan>);
-
-  @override
-  _i12.Future<_i5.WorkoutPlan> addWorkout(_i5.WorkoutPlan? workout) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #addWorkout,
-          [workout],
-        ),
-        returnValue: _i12.Future<_i5.WorkoutPlan>.value(_FakeWorkoutPlan_3(
-          this,
-          Invocation.method(
-            #addWorkout,
-            [workout],
-          ),
-        )),
-      ) as _i12.Future<_i5.WorkoutPlan>);
-
-  @override
-  _i12.Future<void> editWorkout(_i5.WorkoutPlan? workout) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #editWorkout,
-          [workout],
-        ),
-        returnValue: _i12.Future<void>.value(),
-        returnValueForMissingStub: _i12.Future<void>.value(),
-      ) as _i12.Future<void>);
-
-  @override
-  _i12.Future<void> deleteWorkout(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteWorkout,
-          [id],
-        ),
-        returnValue: _i12.Future<void>.value(),
-        returnValueForMissingStub: _i12.Future<void>.value(),
-      ) as _i12.Future<void>);
-
-  @override
-  _i12.Future<Map<String, dynamic>> fetchLogData(
-    _i5.WorkoutPlan? workout,
-    _i13.Exercise? base,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchLogData,
-          [
-            workout,
-            base,
-          ],
-        ),
-        returnValue:
-            _i12.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i12.Future<Map<String, dynamic>>);
-
-  @override
-  _i12.Future<void> fetchAndSetRepetitionUnits() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetRepetitionUnits,
-          [],
-        ),
-        returnValue: _i12.Future<void>.value(),
-        returnValueForMissingStub: _i12.Future<void>.value(),
-      ) as _i12.Future<void>);
-
-  @override
-  _i12.Future<void> fetchAndSetWeightUnits() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetWeightUnits,
-          [],
-        ),
-        returnValue: _i12.Future<void>.value(),
-        returnValueForMissingStub: _i12.Future<void>.value(),
-      ) as _i12.Future<void>);
-
-  @override
-  _i12.Future<void> fetchAndSetUnits() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetUnits,
-          [],
-        ),
-        returnValue: _i12.Future<void>.value(),
-        returnValueForMissingStub: _i12.Future<void>.value(),
-      ) as _i12.Future<void>);
-
-  @override
-  _i12.Future<_i6.Day> addDay(
-    _i6.Day? day,
-    _i5.WorkoutPlan? workout,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #addDay,
-          [
-            day,
-            workout,
-          ],
-        ),
-        returnValue: _i12.Future<_i6.Day>.value(_FakeDay_4(
-          this,
-          Invocation.method(
-            #addDay,
-            [
-              day,
-              workout,
-            ],
-          ),
-        )),
-      ) as _i12.Future<_i6.Day>);
-
-  @override
-  _i12.Future<void> editDay(_i6.Day? day) => (super.noSuchMethod(
-        Invocation.method(
-          #editDay,
-          [day],
-        ),
-        returnValue: _i12.Future<void>.value(),
-        returnValueForMissingStub: _i12.Future<void>.value(),
-      ) as _i12.Future<void>);
-
-  @override
-  _i12.Future<void> deleteDay(_i6.Day? day) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteDay,
-          [day],
-        ),
-        returnValue: _i12.Future<void>.value(),
-        returnValueForMissingStub: _i12.Future<void>.value(),
-      ) as _i12.Future<void>);
-
-  @override
-  _i12.Future<_i7.Set> addSet(_i7.Set? workoutSet) => (super.noSuchMethod(
-        Invocation.method(
-          #addSet,
-          [workoutSet],
-        ),
-        returnValue: _i12.Future<_i7.Set>.value(_FakeSet_5(
-          this,
-          Invocation.method(
-            #addSet,
-            [workoutSet],
-          ),
-        )),
-      ) as _i12.Future<_i7.Set>);
-
-  @override
-  _i12.Future<void> editSet(_i7.Set? workoutSet) => (super.noSuchMethod(
-        Invocation.method(
-          #editSet,
-          [workoutSet],
-        ),
-        returnValue: _i12.Future<void>.value(),
-        returnValueForMissingStub: _i12.Future<void>.value(),
-      ) as _i12.Future<void>);
-
-  @override
-  _i12.Future<List<_i7.Set>> reorderSets(
-    List<_i7.Set>? sets,
-    int? startIndex,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #reorderSets,
-          [
-            sets,
-            startIndex,
-          ],
-        ),
-        returnValue: _i12.Future<List<_i7.Set>>.value(<_i7.Set>[]),
-      ) as _i12.Future<List<_i7.Set>>);
-
-  @override
-  _i12.Future<void> fetchComputedSettings(_i7.Set? workoutSet) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchComputedSettings,
-          [workoutSet],
-        ),
-        returnValue: _i12.Future<void>.value(),
-        returnValueForMissingStub: _i12.Future<void>.value(),
-      ) as _i12.Future<void>);
-
-  @override
-  _i12.Future<String> fetchSmartText(
-    _i7.Set? workoutSet,
-    _i14.Translation? exercise,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchSmartText,
-          [
-            workoutSet,
-            exercise,
-          ],
-        ),
-        returnValue: _i12.Future<String>.value(_i15.dummyValue<String>(
-          this,
-          Invocation.method(
-            #fetchSmartText,
-            [
-              workoutSet,
-              exercise,
-            ],
-          ),
-        )),
-      ) as _i12.Future<String>);
-
-  @override
-  _i12.Future<void> deleteSet(_i7.Set? workoutSet) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteSet,
-          [workoutSet],
-        ),
-        returnValue: _i12.Future<void>.value(),
-        returnValueForMissingStub: _i12.Future<void>.value(),
-      ) as _i12.Future<void>);
-
-  @override
-  _i12.Future<_i8.Setting> addSetting(_i8.Setting? workoutSetting) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #addSetting,
-          [workoutSetting],
-        ),
-        returnValue: _i12.Future<_i8.Setting>.value(_FakeSetting_6(
-          this,
-          Invocation.method(
-            #addSetting,
-            [workoutSetting],
-          ),
-        )),
-      ) as _i12.Future<_i8.Setting>);
-
-  @override
-  _i12.Future<dynamic> fetchSessionData() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchSessionData,
-          [],
-        ),
-        returnValue: _i12.Future<dynamic>.value(),
-      ) as _i12.Future<dynamic>);
-
-  @override
-  _i12.Future<_i9.WorkoutSession> addSession(_i9.WorkoutSession? session) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #addSession,
-          [session],
-        ),
-        returnValue:
-            _i12.Future<_i9.WorkoutSession>.value(_FakeWorkoutSession_7(
-          this,
-          Invocation.method(
-            #addSession,
-            [session],
-          ),
-        )),
-      ) as _i12.Future<_i9.WorkoutSession>);
-
-  @override
-  _i12.Future<_i10.Log> addLog(_i10.Log? log) => (super.noSuchMethod(
-        Invocation.method(
-          #addLog,
-          [log],
-        ),
-        returnValue: _i12.Future<_i10.Log>.value(_FakeLog_8(
-          this,
-          Invocation.method(
-            #addLog,
-            [log],
-          ),
-        )),
-      ) as _i12.Future<_i10.Log>);
-
-  @override
-  _i12.Future<void> deleteLog(_i10.Log? log) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteLog,
-          [log],
-        ),
-        returnValue: _i12.Future<void>.value(),
-        returnValueForMissingStub: _i12.Future<void>.value(),
-      ) as _i12.Future<void>);
-
-  @override
-  void addListener(_i16.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  void removeListener(_i16.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-}
diff --git a/test/workout/setting_model_test.dart b/test/workout/setting_model_test.dart
deleted file mode 100644
index bec0a052..00000000
--- a/test/workout/setting_model_test.dart
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * This file is part of wger Workout Manager <https://github.com/wger-project>.
- * Copyright (C) 2020, 2021 wger Team
- *
- * wger Workout Manager is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * wger Workout Manager is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import 'package:flutter_test/flutter_test.dart';
-import 'package:wger/models/workouts/repetition_unit.dart';
-import 'package:wger/models/workouts/setting.dart';
-import 'package:wger/models/workouts/weight_unit.dart';
-
-void main() {
-  group('Test the singleSettingRepText method', () {
-    test('Default rep and weight units, no RiR', () {
-      const repUnit = RepetitionUnit(id: 1, name: 'mol');
-      const weightUnit = WeightUnit(id: 1, name: 'mg');
-
-      final setting = Setting.empty();
-      setting.reps = 2;
-      setting.weight = 30;
-      setting.rir = '';
-      setting.repetitionUnit = repUnit;
-      setting.weightUnit = weightUnit;
-      expect(setting.singleSettingRepText, '2 × 30 mg');
-    });
-
-    test('Default rep and weight units', () {
-      const repUnit = RepetitionUnit(id: 1, name: 'mol');
-      const weightUnit = WeightUnit(id: 1, name: 'mg');
-
-      final setting = Setting.empty();
-      setting.reps = 2;
-      setting.weight = 30;
-      setting.rir = '1.5';
-      setting.repetitionUnit = repUnit;
-      setting.weightUnit = weightUnit;
-      expect(setting.singleSettingRepText, '2 × 30 mg \n (1.5 RiR)');
-    });
-
-    test('No weight, default rep and weight units', () {
-      const repUnit = RepetitionUnit(id: 1, name: 'mol');
-      const weightUnit = WeightUnit(id: 1, name: 'mg');
-
-      final setting = Setting.empty();
-      setting.reps = 2;
-      setting.weight = null;
-      setting.rir = '1.5';
-      setting.repetitionUnit = repUnit;
-      setting.weightUnit = weightUnit;
-      expect(setting.singleSettingRepText, '2 mol \n (1.5 RiR)');
-    });
-
-    test('Custom rep and weight units, no RiR', () {
-      const repUnit = RepetitionUnit(id: 2, name: 'mol');
-      const weightUnit = WeightUnit(id: 2, name: 'mg');
-
-      final setting = Setting.empty();
-      setting.reps = 2;
-      setting.weight = 30;
-      setting.rir = '';
-      setting.repetitionUnit = repUnit;
-      setting.weightUnit = weightUnit;
-      expect(setting.singleSettingRepText, '2 mol × 30 mg');
-    });
-
-    test('Custom rep and weight units, RiR', () {
-      const repUnit = RepetitionUnit(id: 2, name: 'mol');
-      const weightUnit = WeightUnit(id: 2, name: 'mg');
-
-      final setting = Setting.empty();
-      setting.reps = 2;
-      setting.weight = 30;
-      setting.rir = '3';
-      setting.repetitionUnit = repUnit;
-      setting.weightUnit = weightUnit;
-      expect(setting.singleSettingRepText, '2 mol × 30 mg \n (3 RiR)');
-    });
-  });
-}
diff --git a/test/workout/weight_unit_form_widget_test.mocks.dart b/test/workout/weight_unit_form_widget_test.mocks.dart
deleted file mode 100644
index b43f1d2a..00000000
--- a/test/workout/weight_unit_form_widget_test.mocks.dart
+++ /dev/null
@@ -1,199 +0,0 @@
-// Mocks generated by Mockito 5.4.4 from annotations
-// in wger/test/workout/weight_unit_form_widget_test.dart.
-// Do not manually edit this file.
-
-// ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i5;
-import 'dart:ui' as _i6;
-
-import 'package:mockito/mockito.dart' as _i1;
-import 'package:wger/models/body_weight/weight_entry.dart' as _i3;
-import 'package:wger/providers/base_provider.dart' as _i2;
-import 'package:wger/providers/body_weight.dart' as _i4;
-
-// ignore_for_file: type=lint
-// ignore_for_file: avoid_redundant_argument_values
-// ignore_for_file: avoid_setters_without_getters
-// ignore_for_file: comment_references
-// ignore_for_file: deprecated_member_use
-// ignore_for_file: deprecated_member_use_from_same_package
-// ignore_for_file: implementation_imports
-// ignore_for_file: invalid_use_of_visible_for_testing_member
-// ignore_for_file: prefer_const_constructors
-// ignore_for_file: unnecessary_parenthesis
-// ignore_for_file: camel_case_types
-// ignore_for_file: subtype_of_sealed_class
-
-class _FakeWgerBaseProvider_0 extends _i1.SmartFake
-    implements _i2.WgerBaseProvider {
-  _FakeWgerBaseProvider_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeWeightEntry_1 extends _i1.SmartFake implements _i3.WeightEntry {
-  _FakeWeightEntry_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-/// A class which mocks [BodyWeightProvider].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockBodyWeightProvider extends _i1.Mock
-    implements _i4.BodyWeightProvider {
-  MockBodyWeightProvider() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_0(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i2.WgerBaseProvider);
-
-  @override
-  List<_i3.WeightEntry> get items => (super.noSuchMethod(
-        Invocation.getter(#items),
-        returnValue: <_i3.WeightEntry>[],
-      ) as List<_i3.WeightEntry>);
-
-  @override
-  set items(List<_i3.WeightEntry>? entries) => super.noSuchMethod(
-        Invocation.setter(
-          #items,
-          entries,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  bool get hasListeners => (super.noSuchMethod(
-        Invocation.getter(#hasListeners),
-        returnValue: false,
-      ) as bool);
-
-  @override
-  void clear() => super.noSuchMethod(
-        Invocation.method(
-          #clear,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  _i3.WeightEntry findById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findById,
-          [id],
-        ),
-        returnValue: _FakeWeightEntry_1(
-          this,
-          Invocation.method(
-            #findById,
-            [id],
-          ),
-        ),
-      ) as _i3.WeightEntry);
-
-  @override
-  _i3.WeightEntry? findByDate(DateTime? date) =>
-      (super.noSuchMethod(Invocation.method(
-        #findByDate,
-        [date],
-      )) as _i3.WeightEntry?);
-
-  @override
-  _i5.Future<List<_i3.WeightEntry>> fetchAndSetEntries() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetEntries,
-          [],
-        ),
-        returnValue:
-            _i5.Future<List<_i3.WeightEntry>>.value(<_i3.WeightEntry>[]),
-      ) as _i5.Future<List<_i3.WeightEntry>>);
-
-  @override
-  _i5.Future<_i3.WeightEntry> addEntry(_i3.WeightEntry? entry) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #addEntry,
-          [entry],
-        ),
-        returnValue: _i5.Future<_i3.WeightEntry>.value(_FakeWeightEntry_1(
-          this,
-          Invocation.method(
-            #addEntry,
-            [entry],
-          ),
-        )),
-      ) as _i5.Future<_i3.WeightEntry>);
-
-  @override
-  _i5.Future<void> editEntry(_i3.WeightEntry? entry) => (super.noSuchMethod(
-        Invocation.method(
-          #editEntry,
-          [entry],
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
-
-  @override
-  _i5.Future<void> deleteEntry(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteEntry,
-          [id],
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
-
-  @override
-  void addListener(_i6.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  void removeListener(_i6.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-}
diff --git a/test/workout/workout_day_form_test.dart b/test/workout/workout_day_form_test.dart
deleted file mode 100644
index fe0331d6..00000000
--- a/test/workout/workout_day_form_test.dart
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * This file is part of wger Workout Manager <https://github.com/wger-project>.
- * Copyright (C) 2020, 2021 wger Team
- *
- * wger Workout Manager is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * wger Workout Manager is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:mockito/annotations.dart';
-import 'package:mockito/mockito.dart';
-import 'package:provider/provider.dart';
-import 'package:wger/helpers/consts.dart';
-import 'package:wger/l10n/generated/app_localizations.dart';
-import 'package:wger/models/workouts/day.dart';
-import 'package:wger/models/workouts/workout_plan.dart';
-import 'package:wger/providers/workout_plans.dart';
-import 'package:wger/widgets/workouts/forms.dart';
-
-import '../../test_data/workouts.dart';
-import 'workout_day_form_test.mocks.dart';
-
-@GenerateMocks([WorkoutPlansProvider])
-void main() {
-  var mockWorkoutPlans = MockWorkoutPlansProvider();
-  WorkoutPlan workoutPlan = WorkoutPlan.empty();
-
-  setUp(() {
-    workoutPlan = getWorkout();
-    mockWorkoutPlans = MockWorkoutPlansProvider();
-  });
-
-  Widget createHomeScreen({locale = 'en'}) {
-    final key = GlobalKey<NavigatorState>();
-
-    return ChangeNotifierProvider<WorkoutPlansProvider>(
-      create: (context) => mockWorkoutPlans,
-      child: MaterialApp(
-        locale: Locale(locale),
-        localizationsDelegates: AppLocalizations.localizationsDelegates,
-        supportedLocales: AppLocalizations.supportedLocales,
-        navigatorKey: key,
-        home: Scaffold(body: DayFormWidget(workoutPlan)),
-      ),
-    );
-  }
-
-  testWidgets('Test the widgets on the DayFormWidget', (WidgetTester tester) async {
-    await tester.pumpWidget(createHomeScreen());
-    await tester.pumpAndSettle();
-
-    expect(find.byType(TextFormField), findsOneWidget);
-    expect(find.byType(CheckboxListTile), findsNWidgets(7));
-    expect(find.byType(ElevatedButton), findsOneWidget);
-  });
-
-  testWidgets('Test creating a new day', (WidgetTester tester) async {
-    when(mockWorkoutPlans.addDay(any, any)).thenAnswer((_) => Future.value(Day()));
-
-    await tester.pumpWidget(createHomeScreen());
-    await tester.pumpAndSettle();
-
-    expect(find.text(''), findsOneWidget, reason: 'New day has no description');
-    await tester.enterText(find.byKey(const Key('field-description')), 'Leg day!');
-    await tester.tap(find.byKey(const Key('field-checkbox-1')));
-    await tester.tap(find.byKey(const Key(SUBMIT_BUTTON_KEY_NAME)));
-
-    verify(mockWorkoutPlans.addDay(any, any));
-
-    // Successful redirect to workout plan detail page
-    //await tester.pumpAndSettle();
-    //verify(mockObserver.didPop(any, any));
-  });
-
-  testWidgets('Tests the localization of days - EN', (WidgetTester tester) async {
-    await tester.pumpWidget(createHomeScreen());
-
-    expect(find.text('Monday'), findsOneWidget);
-    expect(find.text('Tuesday'), findsOneWidget);
-    expect(find.text('Thursday'), findsOneWidget);
-  });
-
-  testWidgets('Tests the localization of days - DE', (WidgetTester tester) async {
-    await tester.pumpWidget(createHomeScreen(locale: 'de'));
-
-    expect(find.text('Montag'), findsOneWidget);
-    expect(find.text('Dienstag'), findsOneWidget);
-    expect(find.text('Donnerstag'), findsOneWidget);
-  });
-}
diff --git a/test/workout/workout_day_form_test.mocks.dart b/test/workout/workout_day_form_test.mocks.dart
deleted file mode 100644
index a9dd966e..00000000
--- a/test/workout/workout_day_form_test.mocks.dart
+++ /dev/null
@@ -1,620 +0,0 @@
-// Mocks generated by Mockito 5.4.4 from annotations
-// in wger/test/workout/workout_day_form_test.dart.
-// Do not manually edit this file.
-
-// ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i12;
-import 'dart:ui' as _i16;
-
-import 'package:mockito/mockito.dart' as _i1;
-import 'package:mockito/src/dummies.dart' as _i15;
-import 'package:wger/models/exercises/exercise.dart' as _i13;
-import 'package:wger/models/exercises/translation.dart' as _i14;
-import 'package:wger/models/workouts/day.dart' as _i6;
-import 'package:wger/models/workouts/log.dart' as _i10;
-import 'package:wger/models/workouts/repetition_unit.dart' as _i4;
-import 'package:wger/models/workouts/session.dart' as _i9;
-import 'package:wger/models/workouts/set.dart' as _i7;
-import 'package:wger/models/workouts/setting.dart' as _i8;
-import 'package:wger/models/workouts/weight_unit.dart' as _i3;
-import 'package:wger/models/workouts/workout_plan.dart' as _i5;
-import 'package:wger/providers/base_provider.dart' as _i2;
-import 'package:wger/providers/workout_plans.dart' as _i11;
-
-// ignore_for_file: type=lint
-// ignore_for_file: avoid_redundant_argument_values
-// ignore_for_file: avoid_setters_without_getters
-// ignore_for_file: comment_references
-// ignore_for_file: deprecated_member_use
-// ignore_for_file: deprecated_member_use_from_same_package
-// ignore_for_file: implementation_imports
-// ignore_for_file: invalid_use_of_visible_for_testing_member
-// ignore_for_file: prefer_const_constructors
-// ignore_for_file: unnecessary_parenthesis
-// ignore_for_file: camel_case_types
-// ignore_for_file: subtype_of_sealed_class
-
-class _FakeWgerBaseProvider_0 extends _i1.SmartFake
-    implements _i2.WgerBaseProvider {
-  _FakeWgerBaseProvider_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeWeightUnit_1 extends _i1.SmartFake implements _i3.WeightUnit {
-  _FakeWeightUnit_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeRepetitionUnit_2 extends _i1.SmartFake
-    implements _i4.RepetitionUnit {
-  _FakeRepetitionUnit_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeWorkoutPlan_3 extends _i1.SmartFake implements _i5.WorkoutPlan {
-  _FakeWorkoutPlan_3(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeDay_4 extends _i1.SmartFake implements _i6.Day {
-  _FakeDay_4(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeSet_5 extends _i1.SmartFake implements _i7.Set {
-  _FakeSet_5(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeSetting_6 extends _i1.SmartFake implements _i8.Setting {
-  _FakeSetting_6(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeWorkoutSession_7 extends _i1.SmartFake
-    implements _i9.WorkoutSession {
-  _FakeWorkoutSession_7(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeLog_8 extends _i1.SmartFake implements _i10.Log {
-  _FakeLog_8(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-/// A class which mocks [WorkoutPlansProvider].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockWorkoutPlansProvider extends _i1.Mock
-    implements _i11.WorkoutPlansProvider {
-  MockWorkoutPlansProvider() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_0(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i2.WgerBaseProvider);
-
-  @override
-  List<_i5.WorkoutPlan> get items => (super.noSuchMethod(
-        Invocation.getter(#items),
-        returnValue: <_i5.WorkoutPlan>[],
-      ) as List<_i5.WorkoutPlan>);
-
-  @override
-  List<_i3.WeightUnit> get weightUnits => (super.noSuchMethod(
-        Invocation.getter(#weightUnits),
-        returnValue: <_i3.WeightUnit>[],
-      ) as List<_i3.WeightUnit>);
-
-  @override
-  _i3.WeightUnit get defaultWeightUnit => (super.noSuchMethod(
-        Invocation.getter(#defaultWeightUnit),
-        returnValue: _FakeWeightUnit_1(
-          this,
-          Invocation.getter(#defaultWeightUnit),
-        ),
-      ) as _i3.WeightUnit);
-
-  @override
-  List<_i4.RepetitionUnit> get repetitionUnits => (super.noSuchMethod(
-        Invocation.getter(#repetitionUnits),
-        returnValue: <_i4.RepetitionUnit>[],
-      ) as List<_i4.RepetitionUnit>);
-
-  @override
-  _i4.RepetitionUnit get defaultRepetitionUnit => (super.noSuchMethod(
-        Invocation.getter(#defaultRepetitionUnit),
-        returnValue: _FakeRepetitionUnit_2(
-          this,
-          Invocation.getter(#defaultRepetitionUnit),
-        ),
-      ) as _i4.RepetitionUnit);
-
-  @override
-  bool get hasListeners => (super.noSuchMethod(
-        Invocation.getter(#hasListeners),
-        returnValue: false,
-      ) as bool);
-
-  @override
-  void clear() => super.noSuchMethod(
-        Invocation.method(
-          #clear,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  List<_i5.WorkoutPlan> getPlans() => (super.noSuchMethod(
-        Invocation.method(
-          #getPlans,
-          [],
-        ),
-        returnValue: <_i5.WorkoutPlan>[],
-      ) as List<_i5.WorkoutPlan>);
-
-  @override
-  _i5.WorkoutPlan findById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findById,
-          [id],
-        ),
-        returnValue: _FakeWorkoutPlan_3(
-          this,
-          Invocation.method(
-            #findById,
-            [id],
-          ),
-        ),
-      ) as _i5.WorkoutPlan);
-
-  @override
-  int findIndexById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findIndexById,
-          [id],
-        ),
-        returnValue: 0,
-      ) as int);
-
-  @override
-  void setCurrentPlan(int? id) => super.noSuchMethod(
-        Invocation.method(
-          #setCurrentPlan,
-          [id],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  void resetCurrentPlan() => super.noSuchMethod(
-        Invocation.method(
-          #resetCurrentPlan,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  _i12.Future<void> fetchAndSetAllPlansFull() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllPlansFull,
-          [],
-        ),
-        returnValue: _i12.Future<void>.value(),
-        returnValueForMissingStub: _i12.Future<void>.value(),
-      ) as _i12.Future<void>);
-
-  @override
-  _i12.Future<void> fetchAndSetAllPlansSparse() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllPlansSparse,
-          [],
-        ),
-        returnValue: _i12.Future<void>.value(),
-        returnValueForMissingStub: _i12.Future<void>.value(),
-      ) as _i12.Future<void>);
-
-  @override
-  _i12.Future<_i5.WorkoutPlan> fetchAndSetPlanSparse(int? planId) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetPlanSparse,
-          [planId],
-        ),
-        returnValue: _i12.Future<_i5.WorkoutPlan>.value(_FakeWorkoutPlan_3(
-          this,
-          Invocation.method(
-            #fetchAndSetPlanSparse,
-            [planId],
-          ),
-        )),
-      ) as _i12.Future<_i5.WorkoutPlan>);
-
-  @override
-  _i12.Future<_i5.WorkoutPlan> fetchAndSetWorkoutPlanFull(int? workoutId) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetWorkoutPlanFull,
-          [workoutId],
-        ),
-        returnValue: _i12.Future<_i5.WorkoutPlan>.value(_FakeWorkoutPlan_3(
-          this,
-          Invocation.method(
-            #fetchAndSetWorkoutPlanFull,
-            [workoutId],
-          ),
-        )),
-      ) as _i12.Future<_i5.WorkoutPlan>);
-
-  @override
-  _i12.Future<_i5.WorkoutPlan> addWorkout(_i5.WorkoutPlan? workout) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #addWorkout,
-          [workout],
-        ),
-        returnValue: _i12.Future<_i5.WorkoutPlan>.value(_FakeWorkoutPlan_3(
-          this,
-          Invocation.method(
-            #addWorkout,
-            [workout],
-          ),
-        )),
-      ) as _i12.Future<_i5.WorkoutPlan>);
-
-  @override
-  _i12.Future<void> editWorkout(_i5.WorkoutPlan? workout) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #editWorkout,
-          [workout],
-        ),
-        returnValue: _i12.Future<void>.value(),
-        returnValueForMissingStub: _i12.Future<void>.value(),
-      ) as _i12.Future<void>);
-
-  @override
-  _i12.Future<void> deleteWorkout(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteWorkout,
-          [id],
-        ),
-        returnValue: _i12.Future<void>.value(),
-        returnValueForMissingStub: _i12.Future<void>.value(),
-      ) as _i12.Future<void>);
-
-  @override
-  _i12.Future<Map<String, dynamic>> fetchLogData(
-    _i5.WorkoutPlan? workout,
-    _i13.Exercise? base,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchLogData,
-          [
-            workout,
-            base,
-          ],
-        ),
-        returnValue:
-            _i12.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i12.Future<Map<String, dynamic>>);
-
-  @override
-  _i12.Future<void> fetchAndSetRepetitionUnits() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetRepetitionUnits,
-          [],
-        ),
-        returnValue: _i12.Future<void>.value(),
-        returnValueForMissingStub: _i12.Future<void>.value(),
-      ) as _i12.Future<void>);
-
-  @override
-  _i12.Future<void> fetchAndSetWeightUnits() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetWeightUnits,
-          [],
-        ),
-        returnValue: _i12.Future<void>.value(),
-        returnValueForMissingStub: _i12.Future<void>.value(),
-      ) as _i12.Future<void>);
-
-  @override
-  _i12.Future<void> fetchAndSetUnits() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetUnits,
-          [],
-        ),
-        returnValue: _i12.Future<void>.value(),
-        returnValueForMissingStub: _i12.Future<void>.value(),
-      ) as _i12.Future<void>);
-
-  @override
-  _i12.Future<_i6.Day> addDay(
-    _i6.Day? day,
-    _i5.WorkoutPlan? workout,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #addDay,
-          [
-            day,
-            workout,
-          ],
-        ),
-        returnValue: _i12.Future<_i6.Day>.value(_FakeDay_4(
-          this,
-          Invocation.method(
-            #addDay,
-            [
-              day,
-              workout,
-            ],
-          ),
-        )),
-      ) as _i12.Future<_i6.Day>);
-
-  @override
-  _i12.Future<void> editDay(_i6.Day? day) => (super.noSuchMethod(
-        Invocation.method(
-          #editDay,
-          [day],
-        ),
-        returnValue: _i12.Future<void>.value(),
-        returnValueForMissingStub: _i12.Future<void>.value(),
-      ) as _i12.Future<void>);
-
-  @override
-  _i12.Future<void> deleteDay(_i6.Day? day) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteDay,
-          [day],
-        ),
-        returnValue: _i12.Future<void>.value(),
-        returnValueForMissingStub: _i12.Future<void>.value(),
-      ) as _i12.Future<void>);
-
-  @override
-  _i12.Future<_i7.Set> addSet(_i7.Set? workoutSet) => (super.noSuchMethod(
-        Invocation.method(
-          #addSet,
-          [workoutSet],
-        ),
-        returnValue: _i12.Future<_i7.Set>.value(_FakeSet_5(
-          this,
-          Invocation.method(
-            #addSet,
-            [workoutSet],
-          ),
-        )),
-      ) as _i12.Future<_i7.Set>);
-
-  @override
-  _i12.Future<void> editSet(_i7.Set? workoutSet) => (super.noSuchMethod(
-        Invocation.method(
-          #editSet,
-          [workoutSet],
-        ),
-        returnValue: _i12.Future<void>.value(),
-        returnValueForMissingStub: _i12.Future<void>.value(),
-      ) as _i12.Future<void>);
-
-  @override
-  _i12.Future<List<_i7.Set>> reorderSets(
-    List<_i7.Set>? sets,
-    int? startIndex,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #reorderSets,
-          [
-            sets,
-            startIndex,
-          ],
-        ),
-        returnValue: _i12.Future<List<_i7.Set>>.value(<_i7.Set>[]),
-      ) as _i12.Future<List<_i7.Set>>);
-
-  @override
-  _i12.Future<void> fetchComputedSettings(_i7.Set? workoutSet) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchComputedSettings,
-          [workoutSet],
-        ),
-        returnValue: _i12.Future<void>.value(),
-        returnValueForMissingStub: _i12.Future<void>.value(),
-      ) as _i12.Future<void>);
-
-  @override
-  _i12.Future<String> fetchSmartText(
-    _i7.Set? workoutSet,
-    _i14.Translation? exercise,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchSmartText,
-          [
-            workoutSet,
-            exercise,
-          ],
-        ),
-        returnValue: _i12.Future<String>.value(_i15.dummyValue<String>(
-          this,
-          Invocation.method(
-            #fetchSmartText,
-            [
-              workoutSet,
-              exercise,
-            ],
-          ),
-        )),
-      ) as _i12.Future<String>);
-
-  @override
-  _i12.Future<void> deleteSet(_i7.Set? workoutSet) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteSet,
-          [workoutSet],
-        ),
-        returnValue: _i12.Future<void>.value(),
-        returnValueForMissingStub: _i12.Future<void>.value(),
-      ) as _i12.Future<void>);
-
-  @override
-  _i12.Future<_i8.Setting> addSetting(_i8.Setting? workoutSetting) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #addSetting,
-          [workoutSetting],
-        ),
-        returnValue: _i12.Future<_i8.Setting>.value(_FakeSetting_6(
-          this,
-          Invocation.method(
-            #addSetting,
-            [workoutSetting],
-          ),
-        )),
-      ) as _i12.Future<_i8.Setting>);
-
-  @override
-  _i12.Future<dynamic> fetchSessionData() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchSessionData,
-          [],
-        ),
-        returnValue: _i12.Future<dynamic>.value(),
-      ) as _i12.Future<dynamic>);
-
-  @override
-  _i12.Future<_i9.WorkoutSession> addSession(_i9.WorkoutSession? session) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #addSession,
-          [session],
-        ),
-        returnValue:
-            _i12.Future<_i9.WorkoutSession>.value(_FakeWorkoutSession_7(
-          this,
-          Invocation.method(
-            #addSession,
-            [session],
-          ),
-        )),
-      ) as _i12.Future<_i9.WorkoutSession>);
-
-  @override
-  _i12.Future<_i10.Log> addLog(_i10.Log? log) => (super.noSuchMethod(
-        Invocation.method(
-          #addLog,
-          [log],
-        ),
-        returnValue: _i12.Future<_i10.Log>.value(_FakeLog_8(
-          this,
-          Invocation.method(
-            #addLog,
-            [log],
-          ),
-        )),
-      ) as _i12.Future<_i10.Log>);
-
-  @override
-  _i12.Future<void> deleteLog(_i10.Log? log) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteLog,
-          [log],
-        ),
-        returnValue: _i12.Future<void>.value(),
-        returnValueForMissingStub: _i12.Future<void>.value(),
-      ) as _i12.Future<void>);
-
-  @override
-  void addListener(_i16.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  void removeListener(_i16.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-}
diff --git a/test/workout/workout_form_test.dart b/test/workout/workout_form_test.dart
deleted file mode 100644
index 4ae21ebb..00000000
--- a/test/workout/workout_form_test.dart
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * This file is part of wger Workout Manager <https://github.com/wger-project>.
- * Copyright (C) 2020, 2021 wger Team
- *
- * wger Workout Manager is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * wger Workout Manager is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:mockito/annotations.dart';
-import 'package:mockito/mockito.dart';
-import 'package:provider/provider.dart';
-import 'package:wger/helpers/consts.dart';
-import 'package:wger/l10n/generated/app_localizations.dart';
-import 'package:wger/models/workouts/workout_plan.dart';
-import 'package:wger/providers/workout_plans.dart';
-import 'package:wger/screens/workout_plan_screen.dart';
-import 'package:wger/widgets/workouts/forms.dart';
-
-import './workout_form_test.mocks.dart';
-
-@GenerateMocks([WorkoutPlansProvider])
-void main() {
-  var mockWorkoutPlans = MockWorkoutPlansProvider();
-
-  final existingPlan = WorkoutPlan(
-    id: 1,
-    creationDate: DateTime(2021, 1, 1),
-    name: 'test 1',
-    description: 'description 1',
-  );
-  final newPlan = WorkoutPlan.empty();
-
-  setUp(() {
-    mockWorkoutPlans = MockWorkoutPlansProvider();
-    when(mockWorkoutPlans.editWorkout(any)).thenAnswer((_) => Future.value(existingPlan));
-    when(
-      mockWorkoutPlans.fetchAndSetWorkoutPlanFull(any),
-    ).thenAnswer((_) => Future.value(existingPlan));
-  });
-
-  Widget createHomeScreen(WorkoutPlan workoutPlan, {locale = 'en'}) {
-    final key = GlobalKey<NavigatorState>();
-
-    return ChangeNotifierProvider<WorkoutPlansProvider>(
-      create: (context) => mockWorkoutPlans,
-      child: MaterialApp(
-        locale: Locale(locale),
-        localizationsDelegates: AppLocalizations.localizationsDelegates,
-        supportedLocales: AppLocalizations.supportedLocales,
-        navigatorKey: key,
-        home: Scaffold(body: WorkoutForm(workoutPlan)),
-        routes: {WorkoutPlanScreen.routeName: (ctx) => const WorkoutPlanScreen()},
-      ),
-    );
-  }
-
-  testWidgets('Test the widgets on the workout form', (WidgetTester tester) async {
-    await tester.pumpWidget(createHomeScreen(existingPlan));
-    await tester.pumpAndSettle();
-
-    expect(find.byType(TextFormField), findsNWidgets(2));
-    expect(find.byType(ElevatedButton), findsOneWidget);
-  });
-
-  testWidgets('Test editing an existing workout', (WidgetTester tester) async {
-    await tester.pumpWidget(createHomeScreen(existingPlan));
-    await tester.pumpAndSettle();
-
-    expect(find.text('test 1'), findsOneWidget, reason: 'Name of existing workout plan');
-    expect(
-      find.text('description 1'),
-      findsOneWidget,
-      reason: 'Description of existing workout plan',
-    );
-    await tester.enterText(find.byKey(const Key('field-name')), 'New description');
-    await tester.tap(find.byKey(const Key(SUBMIT_BUTTON_KEY_NAME)));
-
-    // Correct method was called
-    verify(mockWorkoutPlans.editWorkout(any));
-    verifyNever(mockWorkoutPlans.addWorkout(any));
-
-    // TODO(x): edit calls Navigator.pop(), since the form can only be reached from the
-    //       detail page. The test needs to add the detail page to the stack so that
-    //       this can be checked.
-    // https://stackoverflow.com/questions/50704647/how-to-test-navigation-via-navigator-in-flutter
-    // Detail page
-    //await tester.pumpAndSettle();
-    //expect(find.text(('New description')), findsOneWidget, reason: 'Workout plan detail page');
-  });
-
-  testWidgets('Test creating a new workout - only name', (WidgetTester tester) async {
-    final editWorkout = WorkoutPlan(
-      id: 2,
-      creationDate: newPlan.creationDate,
-      name: 'New cool workout',
-    );
-
-    when(mockWorkoutPlans.addWorkout(any)).thenAnswer((_) => Future.value(editWorkout));
-
-    await tester.pumpWidget(createHomeScreen(newPlan));
-    await tester.pumpAndSettle();
-
-    expect(find.text(''), findsNWidgets(2), reason: 'New workout has no name or description');
-    await tester.enterText(find.byKey(const Key('field-name')), editWorkout.name);
-    await tester.tap(find.byKey(const Key(SUBMIT_BUTTON_KEY_NAME)));
-
-    verifyNever(mockWorkoutPlans.editWorkout(any));
-    verify(mockWorkoutPlans.addWorkout(any));
-
-    // Detail page
-    await tester.pumpAndSettle();
-    expect(find.text('New cool workout'), findsOneWidget, reason: 'Workout plan detail page');
-  });
-
-  testWidgets('Test creating a new workout - name and description', (WidgetTester tester) async {
-    final editWorkout = WorkoutPlan(
-      id: 2,
-      creationDate: newPlan.creationDate,
-      name: 'My workout',
-      description: 'Get yuuuge',
-    );
-    when(mockWorkoutPlans.addWorkout(any)).thenAnswer((_) => Future.value(editWorkout));
-
-    await tester.pumpWidget(createHomeScreen(newPlan));
-    await tester.pumpAndSettle();
-
-    expect(find.text(''), findsNWidgets(2), reason: 'New workout has no name or description');
-    await tester.enterText(find.byKey(const Key('field-name')), editWorkout.name);
-    await tester.enterText(find.byKey(const Key('field-description')), editWorkout.description);
-    await tester.tap(find.byKey(const Key(SUBMIT_BUTTON_KEY_NAME)));
-
-    verifyNever(mockWorkoutPlans.editWorkout(any));
-    verify(mockWorkoutPlans.addWorkout(any));
-
-    // Detail page
-    await tester.pumpAndSettle();
-    expect(find.text('My workout'), findsOneWidget, reason: 'Workout plan detail page');
-  });
-}
diff --git a/test/workout/workout_form_test.mocks.dart b/test/workout/workout_form_test.mocks.dart
deleted file mode 100644
index 2e083a5c..00000000
--- a/test/workout/workout_form_test.mocks.dart
+++ /dev/null
@@ -1,620 +0,0 @@
-// Mocks generated by Mockito 5.4.4 from annotations
-// in wger/test/workout/workout_form_test.dart.
-// Do not manually edit this file.
-
-// ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i12;
-import 'dart:ui' as _i16;
-
-import 'package:mockito/mockito.dart' as _i1;
-import 'package:mockito/src/dummies.dart' as _i15;
-import 'package:wger/models/exercises/exercise.dart' as _i13;
-import 'package:wger/models/exercises/translation.dart' as _i14;
-import 'package:wger/models/workouts/day.dart' as _i6;
-import 'package:wger/models/workouts/log.dart' as _i10;
-import 'package:wger/models/workouts/repetition_unit.dart' as _i4;
-import 'package:wger/models/workouts/session.dart' as _i9;
-import 'package:wger/models/workouts/set.dart' as _i7;
-import 'package:wger/models/workouts/setting.dart' as _i8;
-import 'package:wger/models/workouts/weight_unit.dart' as _i3;
-import 'package:wger/models/workouts/workout_plan.dart' as _i5;
-import 'package:wger/providers/base_provider.dart' as _i2;
-import 'package:wger/providers/workout_plans.dart' as _i11;
-
-// ignore_for_file: type=lint
-// ignore_for_file: avoid_redundant_argument_values
-// ignore_for_file: avoid_setters_without_getters
-// ignore_for_file: comment_references
-// ignore_for_file: deprecated_member_use
-// ignore_for_file: deprecated_member_use_from_same_package
-// ignore_for_file: implementation_imports
-// ignore_for_file: invalid_use_of_visible_for_testing_member
-// ignore_for_file: prefer_const_constructors
-// ignore_for_file: unnecessary_parenthesis
-// ignore_for_file: camel_case_types
-// ignore_for_file: subtype_of_sealed_class
-
-class _FakeWgerBaseProvider_0 extends _i1.SmartFake
-    implements _i2.WgerBaseProvider {
-  _FakeWgerBaseProvider_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeWeightUnit_1 extends _i1.SmartFake implements _i3.WeightUnit {
-  _FakeWeightUnit_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeRepetitionUnit_2 extends _i1.SmartFake
-    implements _i4.RepetitionUnit {
-  _FakeRepetitionUnit_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeWorkoutPlan_3 extends _i1.SmartFake implements _i5.WorkoutPlan {
-  _FakeWorkoutPlan_3(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeDay_4 extends _i1.SmartFake implements _i6.Day {
-  _FakeDay_4(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeSet_5 extends _i1.SmartFake implements _i7.Set {
-  _FakeSet_5(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeSetting_6 extends _i1.SmartFake implements _i8.Setting {
-  _FakeSetting_6(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeWorkoutSession_7 extends _i1.SmartFake
-    implements _i9.WorkoutSession {
-  _FakeWorkoutSession_7(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeLog_8 extends _i1.SmartFake implements _i10.Log {
-  _FakeLog_8(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-/// A class which mocks [WorkoutPlansProvider].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockWorkoutPlansProvider extends _i1.Mock
-    implements _i11.WorkoutPlansProvider {
-  MockWorkoutPlansProvider() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_0(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i2.WgerBaseProvider);
-
-  @override
-  List<_i5.WorkoutPlan> get items => (super.noSuchMethod(
-        Invocation.getter(#items),
-        returnValue: <_i5.WorkoutPlan>[],
-      ) as List<_i5.WorkoutPlan>);
-
-  @override
-  List<_i3.WeightUnit> get weightUnits => (super.noSuchMethod(
-        Invocation.getter(#weightUnits),
-        returnValue: <_i3.WeightUnit>[],
-      ) as List<_i3.WeightUnit>);
-
-  @override
-  _i3.WeightUnit get defaultWeightUnit => (super.noSuchMethod(
-        Invocation.getter(#defaultWeightUnit),
-        returnValue: _FakeWeightUnit_1(
-          this,
-          Invocation.getter(#defaultWeightUnit),
-        ),
-      ) as _i3.WeightUnit);
-
-  @override
-  List<_i4.RepetitionUnit> get repetitionUnits => (super.noSuchMethod(
-        Invocation.getter(#repetitionUnits),
-        returnValue: <_i4.RepetitionUnit>[],
-      ) as List<_i4.RepetitionUnit>);
-
-  @override
-  _i4.RepetitionUnit get defaultRepetitionUnit => (super.noSuchMethod(
-        Invocation.getter(#defaultRepetitionUnit),
-        returnValue: _FakeRepetitionUnit_2(
-          this,
-          Invocation.getter(#defaultRepetitionUnit),
-        ),
-      ) as _i4.RepetitionUnit);
-
-  @override
-  bool get hasListeners => (super.noSuchMethod(
-        Invocation.getter(#hasListeners),
-        returnValue: false,
-      ) as bool);
-
-  @override
-  void clear() => super.noSuchMethod(
-        Invocation.method(
-          #clear,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  List<_i5.WorkoutPlan> getPlans() => (super.noSuchMethod(
-        Invocation.method(
-          #getPlans,
-          [],
-        ),
-        returnValue: <_i5.WorkoutPlan>[],
-      ) as List<_i5.WorkoutPlan>);
-
-  @override
-  _i5.WorkoutPlan findById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findById,
-          [id],
-        ),
-        returnValue: _FakeWorkoutPlan_3(
-          this,
-          Invocation.method(
-            #findById,
-            [id],
-          ),
-        ),
-      ) as _i5.WorkoutPlan);
-
-  @override
-  int findIndexById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findIndexById,
-          [id],
-        ),
-        returnValue: 0,
-      ) as int);
-
-  @override
-  void setCurrentPlan(int? id) => super.noSuchMethod(
-        Invocation.method(
-          #setCurrentPlan,
-          [id],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  void resetCurrentPlan() => super.noSuchMethod(
-        Invocation.method(
-          #resetCurrentPlan,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  _i12.Future<void> fetchAndSetAllPlansFull() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllPlansFull,
-          [],
-        ),
-        returnValue: _i12.Future<void>.value(),
-        returnValueForMissingStub: _i12.Future<void>.value(),
-      ) as _i12.Future<void>);
-
-  @override
-  _i12.Future<void> fetchAndSetAllPlansSparse() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllPlansSparse,
-          [],
-        ),
-        returnValue: _i12.Future<void>.value(),
-        returnValueForMissingStub: _i12.Future<void>.value(),
-      ) as _i12.Future<void>);
-
-  @override
-  _i12.Future<_i5.WorkoutPlan> fetchAndSetPlanSparse(int? planId) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetPlanSparse,
-          [planId],
-        ),
-        returnValue: _i12.Future<_i5.WorkoutPlan>.value(_FakeWorkoutPlan_3(
-          this,
-          Invocation.method(
-            #fetchAndSetPlanSparse,
-            [planId],
-          ),
-        )),
-      ) as _i12.Future<_i5.WorkoutPlan>);
-
-  @override
-  _i12.Future<_i5.WorkoutPlan> fetchAndSetWorkoutPlanFull(int? workoutId) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetWorkoutPlanFull,
-          [workoutId],
-        ),
-        returnValue: _i12.Future<_i5.WorkoutPlan>.value(_FakeWorkoutPlan_3(
-          this,
-          Invocation.method(
-            #fetchAndSetWorkoutPlanFull,
-            [workoutId],
-          ),
-        )),
-      ) as _i12.Future<_i5.WorkoutPlan>);
-
-  @override
-  _i12.Future<_i5.WorkoutPlan> addWorkout(_i5.WorkoutPlan? workout) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #addWorkout,
-          [workout],
-        ),
-        returnValue: _i12.Future<_i5.WorkoutPlan>.value(_FakeWorkoutPlan_3(
-          this,
-          Invocation.method(
-            #addWorkout,
-            [workout],
-          ),
-        )),
-      ) as _i12.Future<_i5.WorkoutPlan>);
-
-  @override
-  _i12.Future<void> editWorkout(_i5.WorkoutPlan? workout) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #editWorkout,
-          [workout],
-        ),
-        returnValue: _i12.Future<void>.value(),
-        returnValueForMissingStub: _i12.Future<void>.value(),
-      ) as _i12.Future<void>);
-
-  @override
-  _i12.Future<void> deleteWorkout(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteWorkout,
-          [id],
-        ),
-        returnValue: _i12.Future<void>.value(),
-        returnValueForMissingStub: _i12.Future<void>.value(),
-      ) as _i12.Future<void>);
-
-  @override
-  _i12.Future<Map<String, dynamic>> fetchLogData(
-    _i5.WorkoutPlan? workout,
-    _i13.Exercise? base,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchLogData,
-          [
-            workout,
-            base,
-          ],
-        ),
-        returnValue:
-            _i12.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i12.Future<Map<String, dynamic>>);
-
-  @override
-  _i12.Future<void> fetchAndSetRepetitionUnits() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetRepetitionUnits,
-          [],
-        ),
-        returnValue: _i12.Future<void>.value(),
-        returnValueForMissingStub: _i12.Future<void>.value(),
-      ) as _i12.Future<void>);
-
-  @override
-  _i12.Future<void> fetchAndSetWeightUnits() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetWeightUnits,
-          [],
-        ),
-        returnValue: _i12.Future<void>.value(),
-        returnValueForMissingStub: _i12.Future<void>.value(),
-      ) as _i12.Future<void>);
-
-  @override
-  _i12.Future<void> fetchAndSetUnits() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetUnits,
-          [],
-        ),
-        returnValue: _i12.Future<void>.value(),
-        returnValueForMissingStub: _i12.Future<void>.value(),
-      ) as _i12.Future<void>);
-
-  @override
-  _i12.Future<_i6.Day> addDay(
-    _i6.Day? day,
-    _i5.WorkoutPlan? workout,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #addDay,
-          [
-            day,
-            workout,
-          ],
-        ),
-        returnValue: _i12.Future<_i6.Day>.value(_FakeDay_4(
-          this,
-          Invocation.method(
-            #addDay,
-            [
-              day,
-              workout,
-            ],
-          ),
-        )),
-      ) as _i12.Future<_i6.Day>);
-
-  @override
-  _i12.Future<void> editDay(_i6.Day? day) => (super.noSuchMethod(
-        Invocation.method(
-          #editDay,
-          [day],
-        ),
-        returnValue: _i12.Future<void>.value(),
-        returnValueForMissingStub: _i12.Future<void>.value(),
-      ) as _i12.Future<void>);
-
-  @override
-  _i12.Future<void> deleteDay(_i6.Day? day) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteDay,
-          [day],
-        ),
-        returnValue: _i12.Future<void>.value(),
-        returnValueForMissingStub: _i12.Future<void>.value(),
-      ) as _i12.Future<void>);
-
-  @override
-  _i12.Future<_i7.Set> addSet(_i7.Set? workoutSet) => (super.noSuchMethod(
-        Invocation.method(
-          #addSet,
-          [workoutSet],
-        ),
-        returnValue: _i12.Future<_i7.Set>.value(_FakeSet_5(
-          this,
-          Invocation.method(
-            #addSet,
-            [workoutSet],
-          ),
-        )),
-      ) as _i12.Future<_i7.Set>);
-
-  @override
-  _i12.Future<void> editSet(_i7.Set? workoutSet) => (super.noSuchMethod(
-        Invocation.method(
-          #editSet,
-          [workoutSet],
-        ),
-        returnValue: _i12.Future<void>.value(),
-        returnValueForMissingStub: _i12.Future<void>.value(),
-      ) as _i12.Future<void>);
-
-  @override
-  _i12.Future<List<_i7.Set>> reorderSets(
-    List<_i7.Set>? sets,
-    int? startIndex,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #reorderSets,
-          [
-            sets,
-            startIndex,
-          ],
-        ),
-        returnValue: _i12.Future<List<_i7.Set>>.value(<_i7.Set>[]),
-      ) as _i12.Future<List<_i7.Set>>);
-
-  @override
-  _i12.Future<void> fetchComputedSettings(_i7.Set? workoutSet) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchComputedSettings,
-          [workoutSet],
-        ),
-        returnValue: _i12.Future<void>.value(),
-        returnValueForMissingStub: _i12.Future<void>.value(),
-      ) as _i12.Future<void>);
-
-  @override
-  _i12.Future<String> fetchSmartText(
-    _i7.Set? workoutSet,
-    _i14.Translation? exercise,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchSmartText,
-          [
-            workoutSet,
-            exercise,
-          ],
-        ),
-        returnValue: _i12.Future<String>.value(_i15.dummyValue<String>(
-          this,
-          Invocation.method(
-            #fetchSmartText,
-            [
-              workoutSet,
-              exercise,
-            ],
-          ),
-        )),
-      ) as _i12.Future<String>);
-
-  @override
-  _i12.Future<void> deleteSet(_i7.Set? workoutSet) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteSet,
-          [workoutSet],
-        ),
-        returnValue: _i12.Future<void>.value(),
-        returnValueForMissingStub: _i12.Future<void>.value(),
-      ) as _i12.Future<void>);
-
-  @override
-  _i12.Future<_i8.Setting> addSetting(_i8.Setting? workoutSetting) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #addSetting,
-          [workoutSetting],
-        ),
-        returnValue: _i12.Future<_i8.Setting>.value(_FakeSetting_6(
-          this,
-          Invocation.method(
-            #addSetting,
-            [workoutSetting],
-          ),
-        )),
-      ) as _i12.Future<_i8.Setting>);
-
-  @override
-  _i12.Future<dynamic> fetchSessionData() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchSessionData,
-          [],
-        ),
-        returnValue: _i12.Future<dynamic>.value(),
-      ) as _i12.Future<dynamic>);
-
-  @override
-  _i12.Future<_i9.WorkoutSession> addSession(_i9.WorkoutSession? session) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #addSession,
-          [session],
-        ),
-        returnValue:
-            _i12.Future<_i9.WorkoutSession>.value(_FakeWorkoutSession_7(
-          this,
-          Invocation.method(
-            #addSession,
-            [session],
-          ),
-        )),
-      ) as _i12.Future<_i9.WorkoutSession>);
-
-  @override
-  _i12.Future<_i10.Log> addLog(_i10.Log? log) => (super.noSuchMethod(
-        Invocation.method(
-          #addLog,
-          [log],
-        ),
-        returnValue: _i12.Future<_i10.Log>.value(_FakeLog_8(
-          this,
-          Invocation.method(
-            #addLog,
-            [log],
-          ),
-        )),
-      ) as _i12.Future<_i10.Log>);
-
-  @override
-  _i12.Future<void> deleteLog(_i10.Log? log) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteLog,
-          [log],
-        ),
-        returnValue: _i12.Future<void>.value(),
-        returnValueForMissingStub: _i12.Future<void>.value(),
-      ) as _i12.Future<void>);
-
-  @override
-  void addListener(_i16.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  void removeListener(_i16.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-}
diff --git a/test/workout/workout_plan_screen_test.mocks.dart b/test/workout/workout_plan_screen_test.mocks.dart
deleted file mode 100644
index 0d3a7e09..00000000
--- a/test/workout/workout_plan_screen_test.mocks.dart
+++ /dev/null
@@ -1,229 +0,0 @@
-// Mocks generated by Mockito 5.4.4 from annotations
-// in wger/test/workout/workout_plan_screen_test.dart.
-// Do not manually edit this file.
-
-// ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i5;
-
-import 'package:http/http.dart' as _i3;
-import 'package:mockito/mockito.dart' as _i1;
-import 'package:wger/providers/auth.dart' as _i2;
-import 'package:wger/providers/base_provider.dart' as _i4;
-
-// ignore_for_file: type=lint
-// ignore_for_file: avoid_redundant_argument_values
-// ignore_for_file: avoid_setters_without_getters
-// ignore_for_file: comment_references
-// ignore_for_file: deprecated_member_use
-// ignore_for_file: deprecated_member_use_from_same_package
-// ignore_for_file: implementation_imports
-// ignore_for_file: invalid_use_of_visible_for_testing_member
-// ignore_for_file: prefer_const_constructors
-// ignore_for_file: unnecessary_parenthesis
-// ignore_for_file: camel_case_types
-// ignore_for_file: subtype_of_sealed_class
-
-class _FakeAuthProvider_0 extends _i1.SmartFake implements _i2.AuthProvider {
-  _FakeAuthProvider_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
-  _FakeClient_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeUri_2 extends _i1.SmartFake implements Uri {
-  _FakeUri_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeResponse_3 extends _i1.SmartFake implements _i3.Response {
-  _FakeResponse_3(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-/// A class which mocks [WgerBaseProvider].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
-  MockWgerBaseProvider() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  _i2.AuthProvider get auth => (super.noSuchMethod(
-        Invocation.getter(#auth),
-        returnValue: _FakeAuthProvider_0(
-          this,
-          Invocation.getter(#auth),
-        ),
-      ) as _i2.AuthProvider);
-
-  @override
-  set auth(_i2.AuthProvider? _auth) => super.noSuchMethod(
-        Invocation.setter(
-          #auth,
-          _auth,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  _i3.Client get client => (super.noSuchMethod(
-        Invocation.getter(#client),
-        returnValue: _FakeClient_1(
-          this,
-          Invocation.getter(#client),
-        ),
-      ) as _i3.Client);
-
-  @override
-  set client(_i3.Client? _client) => super.noSuchMethod(
-        Invocation.setter(
-          #client,
-          _client,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  Map<String, String> getDefaultHeaders({bool? includeAuth = false}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getDefaultHeaders,
-          [],
-          {#includeAuth: includeAuth},
-        ),
-        returnValue: <String, String>{},
-      ) as Map<String, String>);
-
-  @override
-  Uri makeUrl(
-    String? path, {
-    int? id,
-    String? objectMethod,
-    Map<String, dynamic>? query,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #makeUrl,
-          [path],
-          {
-            #id: id,
-            #objectMethod: objectMethod,
-            #query: query,
-          },
-        ),
-        returnValue: _FakeUri_2(
-          this,
-          Invocation.method(
-            #makeUrl,
-            [path],
-            {
-              #id: id,
-              #objectMethod: objectMethod,
-              #query: query,
-            },
-          ),
-        ),
-      ) as Uri);
-
-  @override
-  _i5.Future<Map<String, dynamic>> fetch(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetch,
-          [uri],
-        ),
-        returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
-
-  @override
-  _i5.Future<List<dynamic>> fetchPaginated(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchPaginated,
-          [uri],
-        ),
-        returnValue: _i5.Future<List<dynamic>>.value(<dynamic>[]),
-      ) as _i5.Future<List<dynamic>>);
-
-  @override
-  _i5.Future<Map<String, dynamic>> post(
-    Map<String, dynamic>? data,
-    Uri? uri,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #post,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
-
-  @override
-  _i5.Future<Map<String, dynamic>> patch(
-    Map<String, dynamic>? data,
-    Uri? uri,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #patch,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
-
-  @override
-  _i5.Future<_i3.Response> deleteRequest(
-    String? url,
-    int? id,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #deleteRequest,
-          [
-            url,
-            id,
-          ],
-        ),
-        returnValue: _i5.Future<_i3.Response>.value(_FakeResponse_3(
-          this,
-          Invocation.method(
-            #deleteRequest,
-            [
-              url,
-              id,
-            ],
-          ),
-        )),
-      ) as _i5.Future<_i3.Response>);
-}
diff --git a/test/workout/workout_plans_screen_test.mocks.dart b/test/workout/workout_plans_screen_test.mocks.dart
deleted file mode 100644
index 5e250a52..00000000
--- a/test/workout/workout_plans_screen_test.mocks.dart
+++ /dev/null
@@ -1,229 +0,0 @@
-// Mocks generated by Mockito 5.4.4 from annotations
-// in wger/test/workout/workout_plans_screen_test.dart.
-// Do not manually edit this file.
-
-// ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i5;
-
-import 'package:http/http.dart' as _i3;
-import 'package:mockito/mockito.dart' as _i1;
-import 'package:wger/providers/auth.dart' as _i2;
-import 'package:wger/providers/base_provider.dart' as _i4;
-
-// ignore_for_file: type=lint
-// ignore_for_file: avoid_redundant_argument_values
-// ignore_for_file: avoid_setters_without_getters
-// ignore_for_file: comment_references
-// ignore_for_file: deprecated_member_use
-// ignore_for_file: deprecated_member_use_from_same_package
-// ignore_for_file: implementation_imports
-// ignore_for_file: invalid_use_of_visible_for_testing_member
-// ignore_for_file: prefer_const_constructors
-// ignore_for_file: unnecessary_parenthesis
-// ignore_for_file: camel_case_types
-// ignore_for_file: subtype_of_sealed_class
-
-class _FakeAuthProvider_0 extends _i1.SmartFake implements _i2.AuthProvider {
-  _FakeAuthProvider_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
-  _FakeClient_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeUri_2 extends _i1.SmartFake implements Uri {
-  _FakeUri_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeResponse_3 extends _i1.SmartFake implements _i3.Response {
-  _FakeResponse_3(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-/// A class which mocks [WgerBaseProvider].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
-  MockWgerBaseProvider() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  _i2.AuthProvider get auth => (super.noSuchMethod(
-        Invocation.getter(#auth),
-        returnValue: _FakeAuthProvider_0(
-          this,
-          Invocation.getter(#auth),
-        ),
-      ) as _i2.AuthProvider);
-
-  @override
-  set auth(_i2.AuthProvider? _auth) => super.noSuchMethod(
-        Invocation.setter(
-          #auth,
-          _auth,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  _i3.Client get client => (super.noSuchMethod(
-        Invocation.getter(#client),
-        returnValue: _FakeClient_1(
-          this,
-          Invocation.getter(#client),
-        ),
-      ) as _i3.Client);
-
-  @override
-  set client(_i3.Client? _client) => super.noSuchMethod(
-        Invocation.setter(
-          #client,
-          _client,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  Map<String, String> getDefaultHeaders({bool? includeAuth = false}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getDefaultHeaders,
-          [],
-          {#includeAuth: includeAuth},
-        ),
-        returnValue: <String, String>{},
-      ) as Map<String, String>);
-
-  @override
-  Uri makeUrl(
-    String? path, {
-    int? id,
-    String? objectMethod,
-    Map<String, dynamic>? query,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #makeUrl,
-          [path],
-          {
-            #id: id,
-            #objectMethod: objectMethod,
-            #query: query,
-          },
-        ),
-        returnValue: _FakeUri_2(
-          this,
-          Invocation.method(
-            #makeUrl,
-            [path],
-            {
-              #id: id,
-              #objectMethod: objectMethod,
-              #query: query,
-            },
-          ),
-        ),
-      ) as Uri);
-
-  @override
-  _i5.Future<Map<String, dynamic>> fetch(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetch,
-          [uri],
-        ),
-        returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
-
-  @override
-  _i5.Future<List<dynamic>> fetchPaginated(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchPaginated,
-          [uri],
-        ),
-        returnValue: _i5.Future<List<dynamic>>.value(<dynamic>[]),
-      ) as _i5.Future<List<dynamic>>);
-
-  @override
-  _i5.Future<Map<String, dynamic>> post(
-    Map<String, dynamic>? data,
-    Uri? uri,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #post,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
-
-  @override
-  _i5.Future<Map<String, dynamic>> patch(
-    Map<String, dynamic>? data,
-    Uri? uri,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #patch,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
-
-  @override
-  _i5.Future<_i3.Response> deleteRequest(
-    String? url,
-    int? id,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #deleteRequest,
-          [
-            url,
-            id,
-          ],
-        ),
-        returnValue: _i5.Future<_i3.Response>.value(_FakeResponse_3(
-          this,
-          Invocation.method(
-            #deleteRequest,
-            [
-              url,
-              id,
-            ],
-          ),
-        )),
-      ) as _i5.Future<_i3.Response>);
-}
diff --git a/test/workout/workout_provider_test.mocks.dart b/test/workout/workout_provider_test.mocks.dart
deleted file mode 100644
index cbd1cb05..00000000
--- a/test/workout/workout_provider_test.mocks.dart
+++ /dev/null
@@ -1,229 +0,0 @@
-// Mocks generated by Mockito 5.4.4 from annotations
-// in wger/test/workout/workout_provider_test.dart.
-// Do not manually edit this file.
-
-// ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i5;
-
-import 'package:http/http.dart' as _i3;
-import 'package:mockito/mockito.dart' as _i1;
-import 'package:wger/providers/auth.dart' as _i2;
-import 'package:wger/providers/base_provider.dart' as _i4;
-
-// ignore_for_file: type=lint
-// ignore_for_file: avoid_redundant_argument_values
-// ignore_for_file: avoid_setters_without_getters
-// ignore_for_file: comment_references
-// ignore_for_file: deprecated_member_use
-// ignore_for_file: deprecated_member_use_from_same_package
-// ignore_for_file: implementation_imports
-// ignore_for_file: invalid_use_of_visible_for_testing_member
-// ignore_for_file: prefer_const_constructors
-// ignore_for_file: unnecessary_parenthesis
-// ignore_for_file: camel_case_types
-// ignore_for_file: subtype_of_sealed_class
-
-class _FakeAuthProvider_0 extends _i1.SmartFake implements _i2.AuthProvider {
-  _FakeAuthProvider_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeClient_1 extends _i1.SmartFake implements _i3.Client {
-  _FakeClient_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeUri_2 extends _i1.SmartFake implements Uri {
-  _FakeUri_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeResponse_3 extends _i1.SmartFake implements _i3.Response {
-  _FakeResponse_3(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-/// A class which mocks [WgerBaseProvider].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
-  MockWgerBaseProvider() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  _i2.AuthProvider get auth => (super.noSuchMethod(
-        Invocation.getter(#auth),
-        returnValue: _FakeAuthProvider_0(
-          this,
-          Invocation.getter(#auth),
-        ),
-      ) as _i2.AuthProvider);
-
-  @override
-  set auth(_i2.AuthProvider? _auth) => super.noSuchMethod(
-        Invocation.setter(
-          #auth,
-          _auth,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  _i3.Client get client => (super.noSuchMethod(
-        Invocation.getter(#client),
-        returnValue: _FakeClient_1(
-          this,
-          Invocation.getter(#client),
-        ),
-      ) as _i3.Client);
-
-  @override
-  set client(_i3.Client? _client) => super.noSuchMethod(
-        Invocation.setter(
-          #client,
-          _client,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  Map<String, String> getDefaultHeaders({bool? includeAuth = false}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getDefaultHeaders,
-          [],
-          {#includeAuth: includeAuth},
-        ),
-        returnValue: <String, String>{},
-      ) as Map<String, String>);
-
-  @override
-  Uri makeUrl(
-    String? path, {
-    int? id,
-    String? objectMethod,
-    Map<String, dynamic>? query,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #makeUrl,
-          [path],
-          {
-            #id: id,
-            #objectMethod: objectMethod,
-            #query: query,
-          },
-        ),
-        returnValue: _FakeUri_2(
-          this,
-          Invocation.method(
-            #makeUrl,
-            [path],
-            {
-              #id: id,
-              #objectMethod: objectMethod,
-              #query: query,
-            },
-          ),
-        ),
-      ) as Uri);
-
-  @override
-  _i5.Future<Map<String, dynamic>> fetch(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetch,
-          [uri],
-        ),
-        returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
-
-  @override
-  _i5.Future<List<dynamic>> fetchPaginated(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchPaginated,
-          [uri],
-        ),
-        returnValue: _i5.Future<List<dynamic>>.value(<dynamic>[]),
-      ) as _i5.Future<List<dynamic>>);
-
-  @override
-  _i5.Future<Map<String, dynamic>> post(
-    Map<String, dynamic>? data,
-    Uri? uri,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #post,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
-
-  @override
-  _i5.Future<Map<String, dynamic>> patch(
-    Map<String, dynamic>? data,
-    Uri? uri,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #patch,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
-
-  @override
-  _i5.Future<_i3.Response> deleteRequest(
-    String? url,
-    int? id,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #deleteRequest,
-          [
-            url,
-            id,
-          ],
-        ),
-        returnValue: _i5.Future<_i3.Response>.value(_FakeResponse_3(
-          this,
-          Invocation.method(
-            #deleteRequest,
-            [
-              url,
-              id,
-            ],
-          ),
-        )),
-      ) as _i5.Future<_i3.Response>);
-}
diff --git a/test/workout/workout_set_form_test.dart b/test/workout/workout_set_form_test.dart
deleted file mode 100644
index b808bc41..00000000
--- a/test/workout/workout_set_form_test.dart
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * This file is part of wger Workout Manager <https://github.com/wger-project>.
- * Copyright (C) 2020, 2021 wger Team
- *
- * wger Workout Manager is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * wger Workout Manager is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:mockito/annotations.dart';
-import 'package:mockito/mockito.dart';
-import 'package:provider/provider.dart';
-import 'package:wger/helpers/consts.dart';
-import 'package:wger/l10n/generated/app_localizations.dart';
-import 'package:wger/models/workouts/day.dart';
-import 'package:wger/models/workouts/set.dart';
-import 'package:wger/models/workouts/setting.dart';
-import 'package:wger/providers/base_provider.dart';
-import 'package:wger/providers/exercises.dart';
-import 'package:wger/providers/workout_plans.dart';
-import 'package:wger/widgets/workouts/forms.dart';
-
-import '../../test_data/exercises.dart';
-import '../../test_data/workouts.dart';
-import 'workout_set_form_test.mocks.dart';
-
-@GenerateMocks([ExercisesProvider, WgerBaseProvider, WorkoutPlansProvider])
-void main() {
-  var mockWorkoutPlans = MockWorkoutPlansProvider();
-  final mockBaseProvider = MockWgerBaseProvider();
-  final mockExerciseProvider = MockExercisesProvider();
-  final workoutPlan = getWorkout();
-
-  Day day = Day();
-
-  setUp(() {
-    day = workoutPlan.days.first;
-    mockWorkoutPlans = MockWorkoutPlansProvider();
-  });
-
-  Widget createHomeScreen({locale = 'en'}) {
-    return ChangeNotifierProvider<WorkoutPlansProvider>(
-      create: (context) =>
-          WorkoutPlansProvider(mockBaseProvider, mockExerciseProvider, [workoutPlan]),
-      child: ChangeNotifierProvider<ExercisesProvider>(
-        create: (context) => mockExerciseProvider,
-        child: MaterialApp(
-          locale: Locale(locale),
-          localizationsDelegates: AppLocalizations.localizationsDelegates,
-          supportedLocales: AppLocalizations.supportedLocales,
-          navigatorKey: GlobalKey<NavigatorState>(),
-          home: Scaffold(body: SetFormWidget(day)),
-        ),
-      ),
-    );
-  }
-
-  testWidgets('Test the widgets on the SetFormWidget', (WidgetTester tester) async {
-    await tester.pumpWidget(createHomeScreen());
-    await tester.pumpAndSettle();
-
-    //TODO: why doesn't it find the typeahead?
-    //expect(find.byType(TypeAheadFormField), findsOneWidget);
-    expect(find.byType(Slider), findsOneWidget);
-    expect(find.byKey(const Key(SUBMIT_BUTTON_KEY_NAME)), findsOneWidget);
-    expect(find.byType(ElevatedButton), findsOneWidget);
-  });
-
-  testWidgets('Test creating a new set', (WidgetTester tester) async {
-    when(mockWorkoutPlans.addSet(any)).thenAnswer((_) => Future.value(Set.empty()));
-    when(mockWorkoutPlans.addSetting(any)).thenAnswer((_) => Future.value(Setting.empty()));
-    when(mockWorkoutPlans.fetchSmartText(any, any)).thenAnswer((_) => Future.value('2 x 10'));
-    when(
-      mockExerciseProvider.searchExercise(
-        any,
-        languageCode: anyNamed('languageCode'),
-        searchEnglish: anyNamed('searchEnglish'),
-      ),
-    ).thenAnswer((_) => Future.value([getTestExercises().first]));
-
-    await tester.pumpWidget(createHomeScreen());
-    await tester.pumpAndSettle();
-
-    await tester.enterText(find.byKey(const Key('field-typeahead')), 'exercise');
-    await tester.pumpAndSettle();
-
-    //await tester.tap(find.byKey(const Key('exercise-1')));
-    await tester.tap(find.byKey(const Key(SUBMIT_BUTTON_KEY_NAME)));
-
-    //verify(mockWorkoutPlans.addSet(any));
-    //verify(mockWorkoutPlans.addSettinbg(any));
-    //verify(mockWorkoutPlans.fetchSmartText(any, any));
-  });
-}
diff --git a/test/workout/workout_set_form_test.mocks.dart b/test/workout/workout_set_form_test.mocks.dart
deleted file mode 100644
index 4f0851bc..00000000
--- a/test/workout/workout_set_form_test.mocks.dart
+++ /dev/null
@@ -1,1372 +0,0 @@
-// Mocks generated by Mockito 5.4.4 from annotations
-// in wger/test/workout/workout_set_form_test.dart.
-// Do not manually edit this file.
-
-// ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i20;
-import 'dart:ui' as _i21;
-
-import 'package:http/http.dart' as _i10;
-import 'package:mockito/mockito.dart' as _i1;
-import 'package:mockito/src/dummies.dart' as _i24;
-import 'package:wger/database/exercises/exercise_database.dart' as _i3;
-import 'package:wger/models/exercises/category.dart' as _i5;
-import 'package:wger/models/exercises/equipment.dart' as _i6;
-import 'package:wger/models/exercises/exercise.dart' as _i4;
-import 'package:wger/models/exercises/language.dart' as _i8;
-import 'package:wger/models/exercises/muscle.dart' as _i7;
-import 'package:wger/models/exercises/translation.dart' as _i23;
-import 'package:wger/models/workouts/day.dart' as _i14;
-import 'package:wger/models/workouts/log.dart' as _i18;
-import 'package:wger/models/workouts/repetition_unit.dart' as _i12;
-import 'package:wger/models/workouts/session.dart' as _i17;
-import 'package:wger/models/workouts/set.dart' as _i15;
-import 'package:wger/models/workouts/setting.dart' as _i16;
-import 'package:wger/models/workouts/weight_unit.dart' as _i11;
-import 'package:wger/models/workouts/workout_plan.dart' as _i13;
-import 'package:wger/providers/auth.dart' as _i9;
-import 'package:wger/providers/base_provider.dart' as _i2;
-import 'package:wger/providers/exercises.dart' as _i19;
-import 'package:wger/providers/workout_plans.dart' as _i22;
-
-// ignore_for_file: type=lint
-// ignore_for_file: avoid_redundant_argument_values
-// ignore_for_file: avoid_setters_without_getters
-// ignore_for_file: comment_references
-// ignore_for_file: deprecated_member_use
-// ignore_for_file: deprecated_member_use_from_same_package
-// ignore_for_file: implementation_imports
-// ignore_for_file: invalid_use_of_visible_for_testing_member
-// ignore_for_file: prefer_const_constructors
-// ignore_for_file: unnecessary_parenthesis
-// ignore_for_file: camel_case_types
-// ignore_for_file: subtype_of_sealed_class
-
-class _FakeWgerBaseProvider_0 extends _i1.SmartFake
-    implements _i2.WgerBaseProvider {
-  _FakeWgerBaseProvider_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeExerciseDatabase_1 extends _i1.SmartFake
-    implements _i3.ExerciseDatabase {
-  _FakeExerciseDatabase_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeExercise_2 extends _i1.SmartFake implements _i4.Exercise {
-  _FakeExercise_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeExerciseCategory_3 extends _i1.SmartFake
-    implements _i5.ExerciseCategory {
-  _FakeExerciseCategory_3(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeEquipment_4 extends _i1.SmartFake implements _i6.Equipment {
-  _FakeEquipment_4(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeMuscle_5 extends _i1.SmartFake implements _i7.Muscle {
-  _FakeMuscle_5(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeLanguage_6 extends _i1.SmartFake implements _i8.Language {
-  _FakeLanguage_6(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeAuthProvider_7 extends _i1.SmartFake implements _i9.AuthProvider {
-  _FakeAuthProvider_7(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeClient_8 extends _i1.SmartFake implements _i10.Client {
-  _FakeClient_8(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeUri_9 extends _i1.SmartFake implements Uri {
-  _FakeUri_9(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeResponse_10 extends _i1.SmartFake implements _i10.Response {
-  _FakeResponse_10(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeWeightUnit_11 extends _i1.SmartFake implements _i11.WeightUnit {
-  _FakeWeightUnit_11(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeRepetitionUnit_12 extends _i1.SmartFake
-    implements _i12.RepetitionUnit {
-  _FakeRepetitionUnit_12(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeWorkoutPlan_13 extends _i1.SmartFake implements _i13.WorkoutPlan {
-  _FakeWorkoutPlan_13(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeDay_14 extends _i1.SmartFake implements _i14.Day {
-  _FakeDay_14(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeSet_15 extends _i1.SmartFake implements _i15.Set {
-  _FakeSet_15(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeSetting_16 extends _i1.SmartFake implements _i16.Setting {
-  _FakeSetting_16(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeWorkoutSession_17 extends _i1.SmartFake
-    implements _i17.WorkoutSession {
-  _FakeWorkoutSession_17(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeLog_18 extends _i1.SmartFake implements _i18.Log {
-  _FakeLog_18(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-/// A class which mocks [ExercisesProvider].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockExercisesProvider extends _i1.Mock implements _i19.ExercisesProvider {
-  MockExercisesProvider() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_0(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i2.WgerBaseProvider);
-
-  @override
-  _i3.ExerciseDatabase get database => (super.noSuchMethod(
-        Invocation.getter(#database),
-        returnValue: _FakeExerciseDatabase_1(
-          this,
-          Invocation.getter(#database),
-        ),
-      ) as _i3.ExerciseDatabase);
-
-  @override
-  set database(_i3.ExerciseDatabase? _database) => super.noSuchMethod(
-        Invocation.setter(
-          #database,
-          _database,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  List<_i4.Exercise> get exercises => (super.noSuchMethod(
-        Invocation.getter(#exercises),
-        returnValue: <_i4.Exercise>[],
-      ) as List<_i4.Exercise>);
-
-  @override
-  set exercises(List<_i4.Exercise>? _exercises) => super.noSuchMethod(
-        Invocation.setter(
-          #exercises,
-          _exercises,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  List<_i4.Exercise> get filteredExercises => (super.noSuchMethod(
-        Invocation.getter(#filteredExercises),
-        returnValue: <_i4.Exercise>[],
-      ) as List<_i4.Exercise>);
-
-  @override
-  set filteredExercises(List<_i4.Exercise>? newFilteredExercises) =>
-      super.noSuchMethod(
-        Invocation.setter(
-          #filteredExercises,
-          newFilteredExercises,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  Map<int, List<_i4.Exercise>> get exerciseBasesByVariation =>
-      (super.noSuchMethod(
-        Invocation.getter(#exerciseBasesByVariation),
-        returnValue: <int, List<_i4.Exercise>>{},
-      ) as Map<int, List<_i4.Exercise>>);
-
-  @override
-  List<_i5.ExerciseCategory> get categories => (super.noSuchMethod(
-        Invocation.getter(#categories),
-        returnValue: <_i5.ExerciseCategory>[],
-      ) as List<_i5.ExerciseCategory>);
-
-  @override
-  List<_i7.Muscle> get muscles => (super.noSuchMethod(
-        Invocation.getter(#muscles),
-        returnValue: <_i7.Muscle>[],
-      ) as List<_i7.Muscle>);
-
-  @override
-  List<_i6.Equipment> get equipment => (super.noSuchMethod(
-        Invocation.getter(#equipment),
-        returnValue: <_i6.Equipment>[],
-      ) as List<_i6.Equipment>);
-
-  @override
-  List<_i8.Language> get languages => (super.noSuchMethod(
-        Invocation.getter(#languages),
-        returnValue: <_i8.Language>[],
-      ) as List<_i8.Language>);
-
-  @override
-  set languages(List<_i8.Language>? languages) => super.noSuchMethod(
-        Invocation.setter(
-          #languages,
-          languages,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  bool get hasListeners => (super.noSuchMethod(
-        Invocation.getter(#hasListeners),
-        returnValue: false,
-      ) as bool);
-
-  @override
-  _i20.Future<void> setFilters(_i19.Filters? newFilters) => (super.noSuchMethod(
-        Invocation.method(
-          #setFilters,
-          [newFilters],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
-
-  @override
-  void initFilters() => super.noSuchMethod(
-        Invocation.method(
-          #initFilters,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  _i20.Future<void> findByFilters() => (super.noSuchMethod(
-        Invocation.method(
-          #findByFilters,
-          [],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
-
-  @override
-  void clear() => super.noSuchMethod(
-        Invocation.method(
-          #clear,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  _i4.Exercise findExerciseById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findExerciseById,
-          [id],
-        ),
-        returnValue: _FakeExercise_2(
-          this,
-          Invocation.method(
-            #findExerciseById,
-            [id],
-          ),
-        ),
-      ) as _i4.Exercise);
-
-  @override
-  List<_i4.Exercise> findExercisesByVariationId(
-    int? id, {
-    int? exerciseBaseIdToExclude,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #findExercisesByVariationId,
-          [id],
-          {#exerciseBaseIdToExclude: exerciseBaseIdToExclude},
-        ),
-        returnValue: <_i4.Exercise>[],
-      ) as List<_i4.Exercise>);
-
-  @override
-  _i5.ExerciseCategory findCategoryById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findCategoryById,
-          [id],
-        ),
-        returnValue: _FakeExerciseCategory_3(
-          this,
-          Invocation.method(
-            #findCategoryById,
-            [id],
-          ),
-        ),
-      ) as _i5.ExerciseCategory);
-
-  @override
-  _i6.Equipment findEquipmentById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findEquipmentById,
-          [id],
-        ),
-        returnValue: _FakeEquipment_4(
-          this,
-          Invocation.method(
-            #findEquipmentById,
-            [id],
-          ),
-        ),
-      ) as _i6.Equipment);
-
-  @override
-  _i7.Muscle findMuscleById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findMuscleById,
-          [id],
-        ),
-        returnValue: _FakeMuscle_5(
-          this,
-          Invocation.method(
-            #findMuscleById,
-            [id],
-          ),
-        ),
-      ) as _i7.Muscle);
-
-  @override
-  _i8.Language findLanguageById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findLanguageById,
-          [id],
-        ),
-        returnValue: _FakeLanguage_6(
-          this,
-          Invocation.method(
-            #findLanguageById,
-            [id],
-          ),
-        ),
-      ) as _i8.Language);
-
-  @override
-  _i20.Future<void> fetchAndSetCategoriesFromApi() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetCategoriesFromApi,
-          [],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
-
-  @override
-  _i20.Future<void> fetchAndSetMusclesFromApi() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetMusclesFromApi,
-          [],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
-
-  @override
-  _i20.Future<void> fetchAndSetEquipmentsFromApi() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetEquipmentsFromApi,
-          [],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
-
-  @override
-  _i20.Future<void> fetchAndSetLanguagesFromApi() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetLanguagesFromApi,
-          [],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
-
-  @override
-  _i20.Future<_i4.Exercise> fetchAndSetExercise(int? exerciseId) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetExercise,
-          [exerciseId],
-        ),
-        returnValue: _i20.Future<_i4.Exercise>.value(_FakeExercise_2(
-          this,
-          Invocation.method(
-            #fetchAndSetExercise,
-            [exerciseId],
-          ),
-        )),
-      ) as _i20.Future<_i4.Exercise>);
-
-  @override
-  _i20.Future<_i4.Exercise> handleUpdateExerciseFromApi(
-    _i3.ExerciseDatabase? database,
-    int? exerciseId,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #handleUpdateExerciseFromApi,
-          [
-            database,
-            exerciseId,
-          ],
-        ),
-        returnValue: _i20.Future<_i4.Exercise>.value(_FakeExercise_2(
-          this,
-          Invocation.method(
-            #handleUpdateExerciseFromApi,
-            [
-              database,
-              exerciseId,
-            ],
-          ),
-        )),
-      ) as _i20.Future<_i4.Exercise>);
-
-  @override
-  _i20.Future<void> initCacheTimesLocalPrefs({dynamic forceInit = false}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #initCacheTimesLocalPrefs,
-          [],
-          {#forceInit: forceInit},
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
-
-  @override
-  _i20.Future<void> clearAllCachesAndPrefs() => (super.noSuchMethod(
-        Invocation.method(
-          #clearAllCachesAndPrefs,
-          [],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
-
-  @override
-  _i20.Future<void> fetchAndSetInitialData() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetInitialData,
-          [],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
-
-  @override
-  _i20.Future<void> setExercisesFromDatabase(
-    _i3.ExerciseDatabase? database, {
-    bool? forceDeleteCache = false,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #setExercisesFromDatabase,
-          [database],
-          {#forceDeleteCache: forceDeleteCache},
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
-
-  @override
-  _i20.Future<void> updateExerciseCache(_i3.ExerciseDatabase? database) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #updateExerciseCache,
-          [database],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
-
-  @override
-  _i20.Future<void> fetchAndSetMuscles(_i3.ExerciseDatabase? database) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetMuscles,
-          [database],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
-
-  @override
-  _i20.Future<void> fetchAndSetCategories(_i3.ExerciseDatabase? database) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetCategories,
-          [database],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
-
-  @override
-  _i20.Future<void> fetchAndSetLanguages(_i3.ExerciseDatabase? database) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetLanguages,
-          [database],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
-
-  @override
-  _i20.Future<void> fetchAndSetEquipments(_i3.ExerciseDatabase? database) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetEquipments,
-          [database],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
-
-  @override
-  _i20.Future<List<_i4.Exercise>> searchExercise(
-    String? name, {
-    String? languageCode = r'en',
-    bool? searchEnglish = false,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #searchExercise,
-          [name],
-          {
-            #languageCode: languageCode,
-            #searchEnglish: searchEnglish,
-          },
-        ),
-        returnValue: _i20.Future<List<_i4.Exercise>>.value(<_i4.Exercise>[]),
-      ) as _i20.Future<List<_i4.Exercise>>);
-
-  @override
-  void addListener(_i21.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  void removeListener(_i21.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-}
-
-/// A class which mocks [WgerBaseProvider].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockWgerBaseProvider extends _i1.Mock implements _i2.WgerBaseProvider {
-  MockWgerBaseProvider() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  _i9.AuthProvider get auth => (super.noSuchMethod(
-        Invocation.getter(#auth),
-        returnValue: _FakeAuthProvider_7(
-          this,
-          Invocation.getter(#auth),
-        ),
-      ) as _i9.AuthProvider);
-
-  @override
-  set auth(_i9.AuthProvider? _auth) => super.noSuchMethod(
-        Invocation.setter(
-          #auth,
-          _auth,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  _i10.Client get client => (super.noSuchMethod(
-        Invocation.getter(#client),
-        returnValue: _FakeClient_8(
-          this,
-          Invocation.getter(#client),
-        ),
-      ) as _i10.Client);
-
-  @override
-  set client(_i10.Client? _client) => super.noSuchMethod(
-        Invocation.setter(
-          #client,
-          _client,
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  Map<String, String> getDefaultHeaders({bool? includeAuth = false}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getDefaultHeaders,
-          [],
-          {#includeAuth: includeAuth},
-        ),
-        returnValue: <String, String>{},
-      ) as Map<String, String>);
-
-  @override
-  Uri makeUrl(
-    String? path, {
-    int? id,
-    String? objectMethod,
-    Map<String, dynamic>? query,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #makeUrl,
-          [path],
-          {
-            #id: id,
-            #objectMethod: objectMethod,
-            #query: query,
-          },
-        ),
-        returnValue: _FakeUri_9(
-          this,
-          Invocation.method(
-            #makeUrl,
-            [path],
-            {
-              #id: id,
-              #objectMethod: objectMethod,
-              #query: query,
-            },
-          ),
-        ),
-      ) as Uri);
-
-  @override
-  _i20.Future<Map<String, dynamic>> fetch(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetch,
-          [uri],
-        ),
-        returnValue:
-            _i20.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i20.Future<Map<String, dynamic>>);
-
-  @override
-  _i20.Future<List<dynamic>> fetchPaginated(Uri? uri) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchPaginated,
-          [uri],
-        ),
-        returnValue: _i20.Future<List<dynamic>>.value(<dynamic>[]),
-      ) as _i20.Future<List<dynamic>>);
-
-  @override
-  _i20.Future<Map<String, dynamic>> post(
-    Map<String, dynamic>? data,
-    Uri? uri,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #post,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue:
-            _i20.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i20.Future<Map<String, dynamic>>);
-
-  @override
-  _i20.Future<Map<String, dynamic>> patch(
-    Map<String, dynamic>? data,
-    Uri? uri,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #patch,
-          [
-            data,
-            uri,
-          ],
-        ),
-        returnValue:
-            _i20.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i20.Future<Map<String, dynamic>>);
-
-  @override
-  _i20.Future<_i10.Response> deleteRequest(
-    String? url,
-    int? id,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #deleteRequest,
-          [
-            url,
-            id,
-          ],
-        ),
-        returnValue: _i20.Future<_i10.Response>.value(_FakeResponse_10(
-          this,
-          Invocation.method(
-            #deleteRequest,
-            [
-              url,
-              id,
-            ],
-          ),
-        )),
-      ) as _i20.Future<_i10.Response>);
-}
-
-/// A class which mocks [WorkoutPlansProvider].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockWorkoutPlansProvider extends _i1.Mock
-    implements _i22.WorkoutPlansProvider {
-  MockWorkoutPlansProvider() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  _i2.WgerBaseProvider get baseProvider => (super.noSuchMethod(
-        Invocation.getter(#baseProvider),
-        returnValue: _FakeWgerBaseProvider_0(
-          this,
-          Invocation.getter(#baseProvider),
-        ),
-      ) as _i2.WgerBaseProvider);
-
-  @override
-  List<_i13.WorkoutPlan> get items => (super.noSuchMethod(
-        Invocation.getter(#items),
-        returnValue: <_i13.WorkoutPlan>[],
-      ) as List<_i13.WorkoutPlan>);
-
-  @override
-  List<_i11.WeightUnit> get weightUnits => (super.noSuchMethod(
-        Invocation.getter(#weightUnits),
-        returnValue: <_i11.WeightUnit>[],
-      ) as List<_i11.WeightUnit>);
-
-  @override
-  _i11.WeightUnit get defaultWeightUnit => (super.noSuchMethod(
-        Invocation.getter(#defaultWeightUnit),
-        returnValue: _FakeWeightUnit_11(
-          this,
-          Invocation.getter(#defaultWeightUnit),
-        ),
-      ) as _i11.WeightUnit);
-
-  @override
-  List<_i12.RepetitionUnit> get repetitionUnits => (super.noSuchMethod(
-        Invocation.getter(#repetitionUnits),
-        returnValue: <_i12.RepetitionUnit>[],
-      ) as List<_i12.RepetitionUnit>);
-
-  @override
-  _i12.RepetitionUnit get defaultRepetitionUnit => (super.noSuchMethod(
-        Invocation.getter(#defaultRepetitionUnit),
-        returnValue: _FakeRepetitionUnit_12(
-          this,
-          Invocation.getter(#defaultRepetitionUnit),
-        ),
-      ) as _i12.RepetitionUnit);
-
-  @override
-  bool get hasListeners => (super.noSuchMethod(
-        Invocation.getter(#hasListeners),
-        returnValue: false,
-      ) as bool);
-
-  @override
-  void clear() => super.noSuchMethod(
-        Invocation.method(
-          #clear,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  List<_i13.WorkoutPlan> getPlans() => (super.noSuchMethod(
-        Invocation.method(
-          #getPlans,
-          [],
-        ),
-        returnValue: <_i13.WorkoutPlan>[],
-      ) as List<_i13.WorkoutPlan>);
-
-  @override
-  _i13.WorkoutPlan findById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findById,
-          [id],
-        ),
-        returnValue: _FakeWorkoutPlan_13(
-          this,
-          Invocation.method(
-            #findById,
-            [id],
-          ),
-        ),
-      ) as _i13.WorkoutPlan);
-
-  @override
-  int findIndexById(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #findIndexById,
-          [id],
-        ),
-        returnValue: 0,
-      ) as int);
-
-  @override
-  void setCurrentPlan(int? id) => super.noSuchMethod(
-        Invocation.method(
-          #setCurrentPlan,
-          [id],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  void resetCurrentPlan() => super.noSuchMethod(
-        Invocation.method(
-          #resetCurrentPlan,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  _i20.Future<void> fetchAndSetAllPlansFull() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllPlansFull,
-          [],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
-
-  @override
-  _i20.Future<void> fetchAndSetAllPlansSparse() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetAllPlansSparse,
-          [],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
-
-  @override
-  _i20.Future<_i13.WorkoutPlan> fetchAndSetPlanSparse(int? planId) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetPlanSparse,
-          [planId],
-        ),
-        returnValue: _i20.Future<_i13.WorkoutPlan>.value(_FakeWorkoutPlan_13(
-          this,
-          Invocation.method(
-            #fetchAndSetPlanSparse,
-            [planId],
-          ),
-        )),
-      ) as _i20.Future<_i13.WorkoutPlan>);
-
-  @override
-  _i20.Future<_i13.WorkoutPlan> fetchAndSetWorkoutPlanFull(int? workoutId) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetWorkoutPlanFull,
-          [workoutId],
-        ),
-        returnValue: _i20.Future<_i13.WorkoutPlan>.value(_FakeWorkoutPlan_13(
-          this,
-          Invocation.method(
-            #fetchAndSetWorkoutPlanFull,
-            [workoutId],
-          ),
-        )),
-      ) as _i20.Future<_i13.WorkoutPlan>);
-
-  @override
-  _i20.Future<_i13.WorkoutPlan> addWorkout(_i13.WorkoutPlan? workout) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #addWorkout,
-          [workout],
-        ),
-        returnValue: _i20.Future<_i13.WorkoutPlan>.value(_FakeWorkoutPlan_13(
-          this,
-          Invocation.method(
-            #addWorkout,
-            [workout],
-          ),
-        )),
-      ) as _i20.Future<_i13.WorkoutPlan>);
-
-  @override
-  _i20.Future<void> editWorkout(_i13.WorkoutPlan? workout) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #editWorkout,
-          [workout],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
-
-  @override
-  _i20.Future<void> deleteWorkout(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteWorkout,
-          [id],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
-
-  @override
-  _i20.Future<Map<String, dynamic>> fetchLogData(
-    _i13.WorkoutPlan? workout,
-    _i4.Exercise? base,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchLogData,
-          [
-            workout,
-            base,
-          ],
-        ),
-        returnValue:
-            _i20.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i20.Future<Map<String, dynamic>>);
-
-  @override
-  _i20.Future<void> fetchAndSetRepetitionUnits() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetRepetitionUnits,
-          [],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
-
-  @override
-  _i20.Future<void> fetchAndSetWeightUnits() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetWeightUnits,
-          [],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
-
-  @override
-  _i20.Future<void> fetchAndSetUnits() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetUnits,
-          [],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
-
-  @override
-  _i20.Future<_i14.Day> addDay(
-    _i14.Day? day,
-    _i13.WorkoutPlan? workout,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #addDay,
-          [
-            day,
-            workout,
-          ],
-        ),
-        returnValue: _i20.Future<_i14.Day>.value(_FakeDay_14(
-          this,
-          Invocation.method(
-            #addDay,
-            [
-              day,
-              workout,
-            ],
-          ),
-        )),
-      ) as _i20.Future<_i14.Day>);
-
-  @override
-  _i20.Future<void> editDay(_i14.Day? day) => (super.noSuchMethod(
-        Invocation.method(
-          #editDay,
-          [day],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
-
-  @override
-  _i20.Future<void> deleteDay(_i14.Day? day) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteDay,
-          [day],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
-
-  @override
-  _i20.Future<_i15.Set> addSet(_i15.Set? workoutSet) => (super.noSuchMethod(
-        Invocation.method(
-          #addSet,
-          [workoutSet],
-        ),
-        returnValue: _i20.Future<_i15.Set>.value(_FakeSet_15(
-          this,
-          Invocation.method(
-            #addSet,
-            [workoutSet],
-          ),
-        )),
-      ) as _i20.Future<_i15.Set>);
-
-  @override
-  _i20.Future<void> editSet(_i15.Set? workoutSet) => (super.noSuchMethod(
-        Invocation.method(
-          #editSet,
-          [workoutSet],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
-
-  @override
-  _i20.Future<List<_i15.Set>> reorderSets(
-    List<_i15.Set>? sets,
-    int? startIndex,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #reorderSets,
-          [
-            sets,
-            startIndex,
-          ],
-        ),
-        returnValue: _i20.Future<List<_i15.Set>>.value(<_i15.Set>[]),
-      ) as _i20.Future<List<_i15.Set>>);
-
-  @override
-  _i20.Future<void> fetchComputedSettings(_i15.Set? workoutSet) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchComputedSettings,
-          [workoutSet],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
-
-  @override
-  _i20.Future<String> fetchSmartText(
-    _i15.Set? workoutSet,
-    _i23.Translation? exercise,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchSmartText,
-          [
-            workoutSet,
-            exercise,
-          ],
-        ),
-        returnValue: _i20.Future<String>.value(_i24.dummyValue<String>(
-          this,
-          Invocation.method(
-            #fetchSmartText,
-            [
-              workoutSet,
-              exercise,
-            ],
-          ),
-        )),
-      ) as _i20.Future<String>);
-
-  @override
-  _i20.Future<void> deleteSet(_i15.Set? workoutSet) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteSet,
-          [workoutSet],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
-
-  @override
-  _i20.Future<_i16.Setting> addSetting(_i16.Setting? workoutSetting) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #addSetting,
-          [workoutSetting],
-        ),
-        returnValue: _i20.Future<_i16.Setting>.value(_FakeSetting_16(
-          this,
-          Invocation.method(
-            #addSetting,
-            [workoutSetting],
-          ),
-        )),
-      ) as _i20.Future<_i16.Setting>);
-
-  @override
-  _i20.Future<dynamic> fetchSessionData() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchSessionData,
-          [],
-        ),
-        returnValue: _i20.Future<dynamic>.value(),
-      ) as _i20.Future<dynamic>);
-
-  @override
-  _i20.Future<_i17.WorkoutSession> addSession(_i17.WorkoutSession? session) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #addSession,
-          [session],
-        ),
-        returnValue:
-            _i20.Future<_i17.WorkoutSession>.value(_FakeWorkoutSession_17(
-          this,
-          Invocation.method(
-            #addSession,
-            [session],
-          ),
-        )),
-      ) as _i20.Future<_i17.WorkoutSession>);
-
-  @override
-  _i20.Future<_i18.Log> addLog(_i18.Log? log) => (super.noSuchMethod(
-        Invocation.method(
-          #addLog,
-          [log],
-        ),
-        returnValue: _i20.Future<_i18.Log>.value(_FakeLog_18(
-          this,
-          Invocation.method(
-            #addLog,
-            [log],
-          ),
-        )),
-      ) as _i20.Future<_i18.Log>);
-
-  @override
-  _i20.Future<void> deleteLog(_i18.Log? log) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteLog,
-          [log],
-        ),
-        returnValue: _i20.Future<void>.value(),
-        returnValueForMissingStub: _i20.Future<void>.value(),
-      ) as _i20.Future<void>);
-
-  @override
-  void addListener(_i21.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  void removeListener(_i21.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-
-  @override
-  void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-}
diff --git a/test_data/body_weight.dart b/test_data/body_weight.dart
index b9f89200..ac806a69 100644
--- a/test_data/body_weight.dart
+++ b/test_data/body_weight.dart
@@ -18,8 +18,8 @@
 
 import 'package:wger/models/body_weight/weight_entry.dart';
 
-final testWeightEntry1 = WeightEntry(id: 1, weight: 80, date: DateTime(2021, 01, 01));
-final testWeightEntry2 = WeightEntry(id: 2, weight: 81, date: DateTime(2021, 01, 10));
+final testWeightEntry1 = WeightEntry(id: 1, weight: 80, date: DateTime(2021, 01, 01, 15, 30));
+final testWeightEntry2 = WeightEntry(id: 2, weight: 81, date: DateTime(2021, 01, 10, 10, 0));
 
 List<WeightEntry> getWeightEntries() {
   return [testWeightEntry1, testWeightEntry2];
diff --git a/test_data/dart_test.yaml b/test_data/dart_test.yaml
deleted file mode 100644
index 62bd2746..00000000
--- a/test_data/dart_test.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-tags:
-  golden:
\ No newline at end of file
diff --git a/test_data/exercises.dart b/test_data/exercises.dart
index f9ea5789..ab23e265 100644
--- a/test_data/exercises.dart
+++ b/test_data/exercises.dart
@@ -50,7 +50,7 @@ const tEquipment3 = Equipment(id: 3, name: 'Bench');
 const tEquipment4 = Equipment(id: 10, name: 'Gym mat');
 const testEquipment = [tEquipment1, tEquipment2, tEquipment3];
 
-final benchPress = Exercise(
+final testBenchPress = Exercise(
   id: 1,
   uuid: '364f196c-881b-4839-8bfc-9e8f651521b6',
   created: DateTime(2021, 09, 01),
@@ -59,9 +59,10 @@ final benchPress = Exercise(
   equipment: const [tEquipment1, tEquipment2],
   muscles: const [tMuscle1, tMuscle2],
   musclesSecondary: const [tMuscle3],
+  translations: [benchPressEn, benchPressDe],
 );
 
-final crunches = Exercise(
+final testCrunches = Exercise(
   id: 2,
   uuid: '82415754-fc4c-49ea-8ca7-1516dd36d5a0',
   created: DateTime(2021, 08, 01),
@@ -70,9 +71,10 @@ final crunches = Exercise(
   equipment: const [tEquipment2],
   muscles: const [tMuscle1],
   musclesSecondary: const [tMuscle2],
+  translations: [crunchesEn, crunchesDe, crunchesFr],
 );
 
-final deadLift = Exercise(
+final testDeadLift = Exercise(
   id: 3,
   uuid: 'ca84e2c5-5608-4d6d-ba57-6d4b6b5e7acd',
   created: DateTime(2021, 08, 01),
@@ -81,9 +83,10 @@ final deadLift = Exercise(
   equipment: const [tEquipment2],
   muscles: const [tMuscle1],
   musclesSecondary: const [tMuscle2],
+  translations: [deadLiftEn],
 );
 
-final curls = Exercise(
+final testCurls = Exercise(
   id: 4,
   uuid: '361f024c-fdf8-4146-b7d7-0c1b67c58141',
   created: DateTime(2021, 08, 01),
@@ -92,8 +95,10 @@ final curls = Exercise(
   equipment: const [tEquipment2],
   muscles: const [tMuscle1],
   musclesSecondary: const [tMuscle2],
+  translations: [curlsEn],
 );
-final squats = Exercise(
+
+final testSquats = Exercise(
   id: 5,
   uuid: '361f024c-fdf8-4146-b7d7-0c1b67c58141',
   created: DateTime(2021, 08, 01),
@@ -102,8 +107,10 @@ final squats = Exercise(
   equipment: const [tEquipment2],
   muscles: const [tMuscle1],
   musclesSecondary: const [tMuscle2],
+  translations: [squatsEn],
 );
-final sideRaises = Exercise(
+
+final testSideRaises = Exercise(
   id: 6,
   uuid: '721ff972-c568-41e3-8cf5-cf1e5c5c801c',
   created: DateTime(2022, 11, 01),
@@ -112,6 +119,7 @@ final sideRaises = Exercise(
   equipment: const [tEquipment2],
   muscles: const [tMuscle1],
   musclesSecondary: const [tMuscle2],
+  translations: [sideRaisesEn],
 );
 
 final benchPressDe = Translation(
@@ -120,16 +128,17 @@ final benchPressDe = Translation(
   created: DateTime(2021, 1, 15),
   name: 'Bankdrücken',
   description: 'add clever text',
-  exerciseId: benchPress.id,
+  exerciseId: 1,
   language: tLanguage1,
 );
+
 final benchPressEn = Translation(
   id: 7,
   uuid: 'f4cc326b-e497-4bd7-a71d-0eb1db522743',
   created: DateTime(2021, 1, 15),
   name: 'Bench press',
   description: 'add clever text',
-  exerciseId: benchPress.id,
+  exerciseId: 1,
   language: tLanguage1,
 );
 
@@ -139,7 +148,7 @@ final deadLiftEn = Translation(
   created: DateTime(2021, 1, 15),
   name: 'Dead Lift',
   description: 'Lorem ipsum etc',
-  exerciseId: crunches.id,
+  exerciseId: 3,
   language: tLanguage2,
 );
 
@@ -149,7 +158,7 @@ final crunchesFr = Translation(
   created: DateTime(2021, 4, 1),
   name: 'Crunches',
   description: 'The man in black fled across the desert, and the gunslinger followed',
-  exerciseId: deadLift.id,
+  exerciseId: 2,
   language: tLanguage3,
 );
 
@@ -159,7 +168,7 @@ final crunchesDe = Translation(
   created: DateTime(2021, 4, 1),
   name: 'Crunches',
   description: 'The story so far: in the beginning, the universe was created',
-  exerciseId: deadLift.id,
+  exerciseId: 2,
   language: tLanguage1,
 );
 
@@ -169,7 +178,7 @@ final crunchesEn = Translation(
   created: DateTime(2021, 4, 1),
   name: 'test exercise 5',
   description: 'I am an invisible man',
-  exerciseId: deadLift.id,
+  exerciseId: 2,
   language: tLanguage2,
 );
 
@@ -179,7 +188,7 @@ final curlsEn = Translation(
   created: DateTime(2021, 4, 1),
   name: 'Curls',
   description: 'It was a bright cold day in April, and the clocks were striking thirteen',
-  exerciseId: curls.id,
+  exerciseId: 4,
   language: tLanguage2,
 );
 
@@ -189,7 +198,7 @@ final squatsEn = Translation(
   created: DateTime(2021, 4, 1),
   name: 'Squats',
   description: 'It was a bright cold day in April, and the clocks were striking thirteen',
-  exerciseId: curls.id,
+  exerciseId: 5,
   language: tLanguage2,
 );
 
@@ -199,28 +208,21 @@ final sideRaisesEn = Translation(
   created: DateTime(2022, 11, 1),
   name: 'Side raises',
   description: 'It was a bright cold day in April, and the clocks were striking thirteen',
-  exerciseId: curls.id,
+  exerciseId: 6,
   language: tLanguage2,
 );
 
 List<Exercise> getTestExercises() {
-  benchPress.translations = [benchPressEn, benchPressDe];
-  crunches.translations = [crunchesEn, crunchesDe, crunchesFr];
-  deadLift.translations = [deadLiftEn];
-  curls.translations = [curlsEn];
-  squats.translations = [squatsEn];
-  sideRaises.translations = [sideRaisesEn];
-
-  return [benchPress, crunches, deadLift, curls, squats, sideRaises];
+  return [testBenchPress, testCrunches, testDeadLift, testCurls, testSquats, testSideRaises];
 }
 
 List<Exercise> getScreenshotExercises() {
-  benchPress.translations = benchPressTranslations;
-  crunches.translations = crunchesTranslations;
-  deadLift.translations = deadLiftTranslations;
-  curls.translations = curlsTranslations;
-  squats.translations = squatsTranslations;
-  sideRaises.translations = raisesTranslations;
+  testBenchPress.translations = benchPressTranslations;
+  testCrunches.translations = crunchesTranslations;
+  testDeadLift.translations = deadLiftTranslations;
+  testCurls.translations = curlsTranslations;
+  testSquats.translations = squatsTranslations;
+  testSideRaises.translations = raisesTranslations;
 
-  return [benchPress, crunches, deadLift, curls, squats, sideRaises];
+  return [testBenchPress, testCrunches, testDeadLift, testCurls, testSquats, testSideRaises];
 }
diff --git a/test_data/nutritional_plans.dart b/test_data/nutritional_plans.dart
index 9a202bc4..733d259d 100644
--- a/test_data/nutritional_plans.dart
+++ b/test_data/nutritional_plans.dart
@@ -175,6 +175,7 @@ NutritionalPlan getNutritionalPlan() {
     id: 'deadbeefc',
     description: 'Less fat, more protein',
     creationDate: DateTime(2021, 5, 23),
+    startDate: DateTime(2021, 5, 23),
   );
   plan.meals = [meal1, meal2];
 
@@ -213,6 +214,7 @@ NutritionalPlan getNutritionalPlanScreenshot() {
     id: '1',
     description: 'Diet',
     creationDate: DateTime(2021, 5, 23),
+    startDate: DateTime(2021, 5, 23),
     meals: [meal1, meal2],
   );
 
diff --git a/test_data/routines.dart b/test_data/routines.dart
new file mode 100644
index 00000000..73e330a4
--- /dev/null
+++ b/test_data/routines.dart
@@ -0,0 +1,484 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:wger/models/exercises/exercise.dart';
+import 'package:wger/models/workouts/base_config.dart';
+import 'package:wger/models/workouts/day.dart';
+import 'package:wger/models/workouts/day_data.dart';
+import 'package:wger/models/workouts/log.dart';
+import 'package:wger/models/workouts/repetition_unit.dart';
+import 'package:wger/models/workouts/routine.dart';
+import 'package:wger/models/workouts/session.dart';
+import 'package:wger/models/workouts/session_api.dart';
+import 'package:wger/models/workouts/set_config_data.dart';
+import 'package:wger/models/workouts/slot.dart';
+import 'package:wger/models/workouts/slot_data.dart';
+import 'package:wger/models/workouts/slot_entry.dart';
+import 'package:wger/models/workouts/weight_unit.dart';
+
+import './exercises.dart';
+
+const testWeightUnit1 = WeightUnit(id: 1, name: 'kg');
+const testWeightUnit2 = WeightUnit(id: 2, name: 'metric tonnes');
+const testWeightUnits = [testWeightUnit1, testWeightUnit2];
+
+const RepetitionUnit testRepetitionUnit1 = RepetitionUnit(id: 1, name: 'Repetitions');
+const RepetitionUnit testRepetitionUnit2 = RepetitionUnit(id: 2, name: 'Hours');
+const testRepetitionUnits = [testRepetitionUnit1, testRepetitionUnit2];
+
+Routine getTestRoutine({List<Exercise>? exercises}) {
+  final testExercises = exercises ?? getTestExercises();
+
+  final log1 = Log.empty()
+    ..id = 1
+    ..iteration = 2
+    ..slotEntryId = 3
+    ..weight = 10
+    ..rir = 1.5
+    ..date = DateTime(2021, 5, 1)
+    ..repetitions = 10
+    ..routineId = 1;
+  log1.exerciseBase = testExercises[0];
+  log1.weightUnit = testWeightUnit1;
+  log1.repetitionUnit = testRepetitionUnit1;
+
+  final log2 = Log.empty()
+    ..id = 2
+    ..iteration = 4
+    ..slotEntryId = 1
+    ..weight = 10
+    ..rir = 2
+    ..date = DateTime(2021, 5, 1)
+    ..repetitions = 12
+    ..routineId = 1;
+  log2.exerciseBase = testExercises[0];
+  log2.weightUnit = testWeightUnit1;
+  log2.repetitionUnit = testRepetitionUnit1;
+
+  final log3 = Log.empty()
+    ..id = 3
+    ..iteration = 5
+    ..slotEntryId = 1
+    ..weight = 50
+    ..rir = null
+    ..date = DateTime(2021, 5, 2)
+    ..repetitions = 8
+    ..routineId = 1;
+  log3.exerciseBase = testExercises[1];
+  log3.weightUnit = testWeightUnit1;
+  log3.repetitionUnit = testRepetitionUnit1;
+
+  final session1 = WorkoutSessionApi(
+    session: WorkoutSession(
+      id: 1,
+      routineId: 1,
+      date: DateTime(2021, 5, 1),
+      impression: 3,
+      notes: 'This is a note',
+      timeStart: const TimeOfDay(hour: 10, minute: 0),
+      timeEnd: const TimeOfDay(hour: 12, minute: 34),
+    ),
+    logs: [log1, log2],
+  );
+
+  final session2 = WorkoutSessionApi(
+    session: WorkoutSession(
+      id: 2,
+      routineId: 1,
+      date: DateTime(2021, 5, 2),
+      impression: 1,
+      notes: 'This is a note',
+      timeStart: const TimeOfDay(hour: 6, minute: 12),
+      timeEnd: const TimeOfDay(hour: 8, minute: 1),
+    ),
+    logs: [log3],
+  );
+
+  final slotEntryBenchPress = SlotEntry(
+    slotId: 1,
+    type: SlotEntryType.normal,
+    order: 1,
+    exerciseId: 1,
+    repetitionUnitId: 1,
+    repetitionRounding: 1,
+    weightUnitId: 1,
+    weightRounding: 1.25,
+    comment: 'ddd',
+    repetitionUnit: testRepetitionUnit1,
+    weightUnit: testWeightUnit1,
+    exercise: testExercises[0],
+    nrOfSetsConfigs: [BaseConfig.firstIteration(4, 1)],
+    repetitionsConfigs: [BaseConfig.firstIteration(3, 1)],
+    weightConfigs: [
+      BaseConfig.firstIteration(100, 1),
+      BaseConfig(
+        id: 1,
+        slotEntryId: 1,
+        iteration: 2,
+        value: 5,
+        operation: '+',
+        step: 'abs',
+        requirements: null,
+        repeat: true,
+      ),
+    ],
+  );
+
+  final slotBenchPress = Slot.withData(id: 1, day: 1, order: 1, comment: 'Make sure to warm up');
+  slotBenchPress.addExerciseBase(testExercises[0]);
+  slotBenchPress.entries.add(slotEntryBenchPress);
+
+  final slotEntrySquat = SlotEntry(
+    slotId: 2,
+    type: SlotEntryType.normal,
+    order: 1,
+    exerciseId: 8,
+    repetitionUnitId: 1,
+    repetitionRounding: 0.25,
+    weightUnitId: 1,
+    weightRounding: 0.25,
+    comment: 'ddd',
+    repetitionUnit: testRepetitionUnit1,
+    weightUnit: testWeightUnit1,
+    exercise: testExercises[4],
+    weightConfigs: [BaseConfig.firstIteration(80, 1)],
+    repetitionsConfigs: [BaseConfig.firstIteration(5, 1)],
+    nrOfSetsConfigs: [BaseConfig.firstIteration(3, 1)],
+  );
+
+  final slotSquat = Slot.withData(id: 2, day: 1, order: 1);
+  slotSquat.addExerciseBase(testExercises[4]);
+  slotSquat.entries.add(slotEntrySquat);
+
+  final slotEntrySideRaises = SlotEntry(
+    slotId: 2,
+    type: SlotEntryType.normal,
+    order: 1,
+    exerciseId: 8,
+    repetitionUnitId: 1,
+    repetitionRounding: 0.25,
+    weightUnitId: 1,
+    weightRounding: 0.25,
+    comment: 'ddd',
+    repetitionUnit: testRepetitionUnit1,
+    weightUnit: testWeightUnit1,
+    exercise: testExercises[5],
+    nrOfSetsConfigs: [BaseConfig.firstIteration(4, 1)],
+    repetitionsConfigs: [BaseConfig.firstIteration(12, 1)],
+    weightConfigs: [BaseConfig.firstIteration(10, 1)],
+  );
+  // settingSideRaises.weight = 6;
+
+  final slotSideRaises = Slot.withData(id: 3, day: 1, order: 1);
+  slotSideRaises.addExerciseBase(testExercises[5]);
+  slotSideRaises.entries.add(slotEntrySideRaises);
+
+  final dayChestShoulders = Day(
+    id: 1,
+    routineId: 1,
+    name: 'first day',
+    description: 'chest, shoulders',
+    slots: [slotBenchPress, slotSideRaises],
+  );
+
+  final dayLegs = Day(
+    id: 2,
+    routineId: 1,
+    name: 'second day',
+    description: 'legs',
+    slots: [slotSquat],
+  );
+
+  final List<DayData> dayDataGym = [
+    DayData(
+      iteration: 1,
+      date: DateTime(2024, 11, 01),
+      label: '',
+      day: dayChestShoulders,
+      slots: [
+        SlotData(
+          comment: 'Make sure to warm up',
+          isSuperset: false,
+          exerciseIds: [testExercises[0].id!],
+          setConfigs: [
+            SetConfigData(
+              exerciseId: 1,
+              exercise: testExercises[0],
+              slotEntryId: 1,
+              nrOfSets: 1,
+              repetitions: 3,
+              repetitionsUnit: testRepetitionUnit1,
+              weight: 100,
+              weightUnit: testWeightUnit1,
+              restTime: 120,
+              rir: 1.5,
+              rpe: 8,
+              textRepr: '3x100kg',
+            ),
+            SetConfigData(
+              exerciseId: testExercises[0].id!,
+              exercise: testExercises[0],
+              slotEntryId: 1,
+              nrOfSets: 1,
+              repetitions: 3,
+              repetitionsUnit: testRepetitionUnit1,
+              weight: 100,
+              weightUnit: testWeightUnit1,
+              restTime: 120,
+              rir: 1.5,
+              rpe: 8,
+              textRepr: '3x100kg',
+            ),
+            SetConfigData(
+              exerciseId: testExercises[0].id!,
+              exercise: testExercises[0],
+              slotEntryId: 1,
+              nrOfSets: 1,
+              repetitions: 3,
+              repetitionsUnit: testRepetitionUnit1,
+              weight: 100,
+              weightUnit: testWeightUnit1,
+              restTime: 120,
+              rir: 1.5,
+              rpe: 8,
+              textRepr: '3x100kg',
+            ),
+          ],
+        ),
+        SlotData(
+          comment: 'Side rises',
+          isSuperset: false,
+          exerciseIds: [testExercises[5].id!],
+          setConfigs: [
+            SetConfigData(
+              exerciseId: testExercises[5].id!,
+              exercise: testExercises[5],
+              slotEntryId: 1,
+              nrOfSets: 1,
+              repetitions: 12,
+              repetitionsUnit: testRepetitionUnit1,
+              weight: 10,
+              weightUnit: testWeightUnit1,
+              restTime: null,
+              rir: null,
+              rpe: null,
+              textRepr: '12x10kg',
+            ),
+            SetConfigData(
+              exerciseId: testExercises[5].id!,
+              exercise: testExercises[5],
+              slotEntryId: 1,
+              nrOfSets: 1,
+              repetitions: 12,
+              repetitionsUnit: testRepetitionUnit1,
+              weight: 10,
+              weightUnit: testWeightUnit1,
+              restTime: null,
+              rir: null,
+              rpe: null,
+              textRepr: '12x10kg',
+            ),
+            SetConfigData(
+              exerciseId: testExercises[5].id!,
+              exercise: testExercises[5],
+              slotEntryId: 1,
+              nrOfSets: 1,
+              repetitions: 12,
+              repetitionsUnit: testRepetitionUnit1,
+              weight: 10,
+              weightUnit: testWeightUnit1,
+              restTime: null,
+              rir: null,
+              rpe: null,
+              textRepr: '12x10kg',
+            ),
+          ],
+        ),
+      ],
+    ),
+    DayData(
+      iteration: 1,
+      date: DateTime(2024, 11, 02),
+      label: '',
+      day: dayLegs,
+      slots: [
+        SlotData(
+          comment: 'Squats',
+          isSuperset: false,
+          exerciseIds: [testExercises[4].id!],
+          setConfigs: [
+            SetConfigData(
+              exerciseId: 8,
+              exercise: testExercises[4],
+              slotEntryId: 1,
+              nrOfSets: 1,
+              repetitions: 3,
+              repetitionsUnit: testRepetitionUnit1,
+              weight: 100,
+              weightUnit: testWeightUnit1,
+              restTime: 120,
+              rir: 1.5,
+              rpe: 8,
+              textRepr: '3x100kg',
+            ),
+            SetConfigData(
+              exerciseId: testExercises[4].id!,
+              exercise: testExercises[4],
+              slotEntryId: 1,
+              nrOfSets: 1,
+              repetitions: 3,
+              repetitionsUnit: testRepetitionUnit1,
+              weight: 100,
+              weightUnit: testWeightUnit1,
+              restTime: 120,
+              rir: 1.5,
+              rpe: 8,
+              textRepr: '3x100kg',
+            ),
+            SetConfigData(
+              exerciseId: testExercises[4].id!,
+              exercise: testExercises[4],
+              slotEntryId: 1,
+              nrOfSets: 1,
+              repetitions: 3,
+              repetitionsUnit: testRepetitionUnit1,
+              weight: 100,
+              weightUnit: testWeightUnit1,
+              restTime: 120,
+              rir: 1.5,
+              rpe: 8,
+              textRepr: '3x100kg',
+            ),
+          ],
+        ),
+      ],
+    ),
+  ];
+
+  final List<DayData> dayDataDisplay = [
+    DayData(
+      iteration: 1,
+      date: DateTime(2024, 11, 01),
+      label: '',
+      day: dayChestShoulders,
+      slots: [
+        SlotData(
+          comment: 'Bench press',
+          isSuperset: false,
+          exerciseIds: [1],
+          setConfigs: [
+            SetConfigData(
+              exerciseId: 1,
+              exercise: testExercises[0],
+              slotEntryId: 1,
+              nrOfSets: 4,
+              repetitions: 3,
+              repetitionsUnit: testRepetitionUnit1,
+              weight: 100,
+              weightUnit: testWeightUnit1,
+              restTime: 120,
+              rir: 1.5,
+              rpe: 8,
+              textRepr: '4 sets 3x100kg',
+            ),
+          ],
+        ),
+        SlotData(
+          comment: 'Side rises',
+          isSuperset: false,
+          exerciseIds: [6],
+          setConfigs: [
+            SetConfigData(
+              exerciseId: 6,
+              exercise: testExercises[5],
+              slotEntryId: 1,
+              nrOfSets: 4,
+              repetitions: 12,
+              repetitionsUnit: testRepetitionUnit1,
+              weight: 10,
+              weightUnit: testWeightUnit1,
+              restTime: 60,
+              rir: null,
+              rpe: null,
+              textRepr: '4 sets 12x10kg',
+            ),
+          ],
+        ),
+      ],
+    ),
+    DayData(
+      iteration: 1,
+      date: DateTime(2024, 11, 02),
+      label: '',
+      day: dayLegs,
+      slots: [
+        SlotData(
+          comment: 'Squats',
+          isSuperset: false,
+          exerciseIds: [8],
+          setConfigs: [
+            SetConfigData(
+              exerciseId: 8,
+              exercise: testExercises[4],
+              slotEntryId: 1,
+              nrOfSets: 4,
+              repetitions: 3,
+              repetitionsUnit: testRepetitionUnit1,
+              weight: 100,
+              weightUnit: testWeightUnit1,
+              restTime: 120,
+              rir: 1.5,
+              rpe: 8,
+              textRepr: '4 sets 3x100kg',
+            ),
+          ],
+        ),
+      ],
+    ),
+    DayData(
+      iteration: 1,
+      date: DateTime(2024, 11, 02),
+      label: 'null day (filled because of fitInWeek flag)',
+      day: null,
+      slots: [],
+    ),
+    DayData(
+      iteration: 1,
+      date: DateTime(2024, 11, 02),
+      label: 'null day (filled because of fitInWeek flag)',
+      day: null,
+      slots: [],
+    ),
+  ];
+
+  final routine = Routine(
+    id: 1,
+    created: DateTime(2021, 01, 01),
+    name: '3 day workout',
+    description: 'This is a 3 day workout and this text is important',
+    start: DateTime(2024, 11, 01),
+    end: DateTime(2024, 12, 01),
+    days: [dayChestShoulders, dayLegs],
+    sessions: [session1, session2],
+    dayData: dayDataDisplay,
+    dayDataGym: dayDataGym,
+  );
+
+  return routine;
+}
diff --git a/test_data/workouts.dart b/test_data/workouts.dart
deleted file mode 100644
index 2491c50d..00000000
--- a/test_data/workouts.dart
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * This file is part of wger Workout Manager <https://github.com/wger-project>.
- * Copyright (C) 2020, 2021 wger Team
- *
- * wger Workout Manager is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * wger Workout Manager is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import 'package:wger/models/exercises/exercise.dart';
-import 'package:wger/models/workouts/day.dart';
-import 'package:wger/models/workouts/log.dart';
-import 'package:wger/models/workouts/repetition_unit.dart';
-import 'package:wger/models/workouts/set.dart';
-import 'package:wger/models/workouts/setting.dart';
-import 'package:wger/models/workouts/weight_unit.dart';
-import 'package:wger/models/workouts/workout_plan.dart';
-
-import './exercises.dart';
-
-const weightUnit1 = WeightUnit(id: 1, name: 'kg');
-const weightUnit2 = WeightUnit(id: 2, name: 'metric tonnes');
-
-const RepetitionUnit repetitionUnit1 = RepetitionUnit(id: 1, name: 'Repetitions');
-const RepetitionUnit repetitionUnit2 = RepetitionUnit(id: 2, name: 'Hours');
-
-WorkoutPlan getWorkout({List<Exercise>? exercises}) {
-  final testBases = exercises ?? getTestExercises();
-
-  final log1 = Log.empty()
-    ..id = 1
-    ..weight = 10
-    ..rir = '1.5'
-    ..date = DateTime(2021, 5, 1)
-    ..reps = 10
-    ..workoutPlan = 1;
-  log1.exerciseBase = testBases[0];
-  log1.weightUnit = weightUnit1;
-  log1.repetitionUnit = repetitionUnit1;
-
-  final log2 = Log.empty()
-    ..id = 2
-    ..weight = 10
-    ..rir = '2'
-    ..date = DateTime(2021, 5, 1)
-    ..reps = 12
-    ..workoutPlan = 1;
-  log2.exerciseBase = testBases[0];
-  log2.weightUnit = weightUnit1;
-  log2.repetitionUnit = repetitionUnit1;
-
-  final log3 = Log.empty()
-    ..id = 3
-    ..weight = 50
-    ..rir = ''
-    ..date = DateTime(2021, 5, 2)
-    ..reps = 8
-    ..workoutPlan = 1;
-  log3.exerciseBase = testBases[1];
-  log3.weightUnit = weightUnit1;
-  log3.repetitionUnit = repetitionUnit1;
-
-  final settingBenchPress = Setting(
-    setId: 1,
-    order: 1,
-    exerciseId: 1,
-    repetitionUnitId: 1,
-    reps: 6,
-    weightUnitId: 1,
-    comment: 'ddd',
-    rir: '3',
-  );
-  settingBenchPress.repetitionUnit = repetitionUnit1;
-  settingBenchPress.weightUnit = weightUnit1;
-  settingBenchPress.exercise = testBases[0];
-  settingBenchPress.weight = 80;
-
-  final setBenchPress = Set.withData(
-    id: 1,
-    day: 1,
-    sets: 3,
-    order: 1,
-    comment: 'Make sure to warm up',
-  );
-  setBenchPress.addExerciseBase(testBases[0]);
-  setBenchPress.settings.add(settingBenchPress);
-  setBenchPress.settingsComputed = [settingBenchPress, settingBenchPress];
-
-  final settingSquat = Setting(
-    setId: 2,
-    order: 1,
-    exerciseId: 8,
-    repetitionUnitId: 1,
-    reps: 8,
-    weightUnitId: 1,
-    comment: 'ddd',
-    rir: '2',
-  );
-  settingSquat.repetitionUnit = repetitionUnit1;
-  settingSquat.weightUnit = weightUnit1;
-  settingSquat.exercise = testBases[4];
-  settingSquat.weight = 120;
-
-  final setSquat = Set.withData(id: 2, day: 1, sets: 3, order: 1);
-  setSquat.addExerciseBase(testBases[4]);
-  setSquat.settings.add(settingSquat);
-  setSquat.settingsComputed = [settingSquat, settingSquat];
-
-  final settingSideRaises = Setting(
-    setId: 2,
-    order: 1,
-    exerciseId: 8,
-    repetitionUnitId: 1,
-    reps: 12,
-    weightUnitId: 1,
-    comment: 'ddd',
-    rir: '',
-  );
-  settingSideRaises.repetitionUnit = repetitionUnit1;
-  settingSideRaises.weightUnit = weightUnit1;
-  settingSideRaises.exercise = testBases[5];
-  settingSideRaises.weight = 6;
-
-  final setSideRaises = Set.withData(id: 3, day: 1, sets: 3, order: 1);
-  setSideRaises.addExerciseBase(testBases[5]);
-  setSideRaises.settings.add(settingSideRaises);
-  setSideRaises.settingsComputed = [settingSideRaises, settingSideRaises];
-
-  final dayChestShoulders = Day()
-    ..id = 1
-    ..workoutId = 1
-    ..description = 'chest, shoulders'
-    ..daysOfWeek = [1, 2];
-  dayChestShoulders.sets.add(setBenchPress);
-  dayChestShoulders.sets.add(setSideRaises);
-
-  final dayLegs = Day()
-    ..id = 2
-    ..workoutId = 1
-    ..description = 'legs'
-    ..daysOfWeek = [4];
-  dayLegs.sets.add(setSquat);
-
-  final workout = WorkoutPlan(
-    id: 1,
-    creationDate: DateTime(2021, 01, 01),
-    name: '3 day workout',
-    days: [dayChestShoulders, dayLegs],
-    logs: [log1, log2, log3],
-  );
-
-  return workout;
-}
diff --git a/windows/.gitignore b/windows/.gitignore
new file mode 100644
index 00000000..d492d0d9
--- /dev/null
+++ b/windows/.gitignore
@@ -0,0 +1,17 @@
+flutter/ephemeral/
+
+# Visual Studio user-specific files.
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# Visual Studio build-related files.
+x64/
+x86/
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt
new file mode 100644
index 00000000..6d37811b
--- /dev/null
+++ b/windows/CMakeLists.txt
@@ -0,0 +1,111 @@
+# Project-level configuration.
+cmake_minimum_required(VERSION 3.14)
+project(wger LANGUAGES CXX)
+
+# The name of the executable created for the application. Change this to change
+# the on-disk name of your application.
+set(BINARY_NAME "wger")
+
+# Explicitly opt in to modern CMake behaviors to avoid warnings with recent
+# versions of CMake.
+cmake_policy(VERSION 3.14...3.25)
+
+# Define build configuration option.
+get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+if (IS_MULTICONFIG)
+    set(CMAKE_CONFIGURATION_TYPES "Debug;Profile;Release"
+            CACHE STRING "" FORCE)
+else ()
+    if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+        set(CMAKE_BUILD_TYPE "Debug" CACHE
+                STRING "Flutter build mode" FORCE)
+        set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
+                "Debug" "Profile" "Release")
+    endif ()
+endif ()
+# Define settings for the Profile build mode.
+set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}")
+set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}")
+set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE}")
+set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE}")
+
+# Use Unicode for all projects.
+add_definitions(-DUNICODE -D_UNICODE)
+
+# Compilation settings that should be applied to most targets.
+#
+# Be cautious about adding new options here, as plugins use this function by
+# default. In most cases, you should add new options to specific targets instead
+# of modifying this function.
+function(APPLY_STANDARD_SETTINGS TARGET)
+    target_compile_features(${TARGET} PUBLIC cxx_std_17)
+
+    # Workaround for https://github.com/wger-project/flutter/issues/577 / https://github.com/rive-app/rive-flutter/issues/390
+    # target_compile_options(${TARGET} PRIVATE /W4 /WX /wd"4100") --> Original options
+    target_compile_options(${TARGET} PRIVATE /W4 /wd"4100")
+    target_compile_options(${TARGET} PRIVATE /EHsc)
+    target_compile_definitions(${TARGET} PRIVATE "_HAS_EXCEPTIONS=0")
+    target_compile_definitions(${TARGET} PRIVATE "$<$<CONFIG:Debug>:_DEBUG>")
+endfunction()
+
+# Flutter library and tool build rules.
+set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter")
+add_subdirectory(${FLUTTER_MANAGED_DIR})
+
+# Application build; see runner/CMakeLists.txt.
+add_subdirectory("runner")
+
+
+# Generated plugin build rules, which manage building the plugins and adding
+# them to the application.
+include(flutter/generated_plugins.cmake)
+
+
+# === Installation ===
+# Support files are copied into place next to the executable, so that it can
+# run in place. This is done instead of making a separate bundle (as on Linux)
+# so that building and running from within Visual Studio will work.
+set(BUILD_BUNDLE_DIR "$<TARGET_FILE_DIR:${BINARY_NAME}>")
+# Make the "install" step default, as it's required to run.
+set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1)
+if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+    set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE)
+endif ()
+
+set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data")
+set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}")
+
+install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}"
+        COMPONENT Runtime)
+
+install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}"
+        COMPONENT Runtime)
+
+install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
+        COMPONENT Runtime)
+
+if (PLUGIN_BUNDLED_LIBRARIES)
+    install(FILES "${PLUGIN_BUNDLED_LIBRARIES}"
+            DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
+            COMPONENT Runtime)
+endif ()
+
+# Copy the native assets provided by the build.dart from all packages.
+set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/windows/")
+install(DIRECTORY "${NATIVE_ASSETS_DIR}"
+        DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
+        COMPONENT Runtime)
+
+# Fully re-copy the assets directory on each build to avoid having stale files
+# from a previous install.
+set(FLUTTER_ASSET_DIR_NAME "flutter_assets")
+install(CODE "
+  file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\")
+  " COMPONENT Runtime)
+install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}"
+        DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime)
+
+# Install the AOT library on non-Debug builds only.
+install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}"
+        CONFIGURATIONS Profile;Release
+        COMPONENT Runtime)
diff --git a/windows/flutter/CMakeLists.txt b/windows/flutter/CMakeLists.txt
new file mode 100644
index 00000000..903f4899
--- /dev/null
+++ b/windows/flutter/CMakeLists.txt
@@ -0,0 +1,109 @@
+# This file controls Flutter-level build steps. It should not be edited.
+cmake_minimum_required(VERSION 3.14)
+
+set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral")
+
+# Configuration provided via flutter tool.
+include(${EPHEMERAL_DIR}/generated_config.cmake)
+
+# TODO: Move the rest of this into files in ephemeral. See
+# https://github.com/flutter/flutter/issues/57146.
+set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper")
+
+# Set fallback configurations for older versions of the flutter tool.
+if (NOT DEFINED FLUTTER_TARGET_PLATFORM)
+  set(FLUTTER_TARGET_PLATFORM "windows-x64")
+endif()
+
+# === Flutter Library ===
+set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll")
+
+# Published to parent scope for install step.
+set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE)
+set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE)
+set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE)
+set(AOT_LIBRARY "${PROJECT_DIR}/build/windows/app.so" PARENT_SCOPE)
+
+list(APPEND FLUTTER_LIBRARY_HEADERS
+  "flutter_export.h"
+  "flutter_windows.h"
+  "flutter_messenger.h"
+  "flutter_plugin_registrar.h"
+  "flutter_texture_registrar.h"
+)
+list(TRANSFORM FLUTTER_LIBRARY_HEADERS PREPEND "${EPHEMERAL_DIR}/")
+add_library(flutter INTERFACE)
+target_include_directories(flutter INTERFACE
+  "${EPHEMERAL_DIR}"
+)
+target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}.lib")
+add_dependencies(flutter flutter_assemble)
+
+# === Wrapper ===
+list(APPEND CPP_WRAPPER_SOURCES_CORE
+  "core_implementations.cc"
+  "standard_codec.cc"
+)
+list(TRANSFORM CPP_WRAPPER_SOURCES_CORE PREPEND "${WRAPPER_ROOT}/")
+list(APPEND CPP_WRAPPER_SOURCES_PLUGIN
+  "plugin_registrar.cc"
+)
+list(TRANSFORM CPP_WRAPPER_SOURCES_PLUGIN PREPEND "${WRAPPER_ROOT}/")
+list(APPEND CPP_WRAPPER_SOURCES_APP
+  "flutter_engine.cc"
+  "flutter_view_controller.cc"
+)
+list(TRANSFORM CPP_WRAPPER_SOURCES_APP PREPEND "${WRAPPER_ROOT}/")
+
+# Wrapper sources needed for a plugin.
+add_library(flutter_wrapper_plugin STATIC
+  ${CPP_WRAPPER_SOURCES_CORE}
+  ${CPP_WRAPPER_SOURCES_PLUGIN}
+)
+apply_standard_settings(flutter_wrapper_plugin)
+set_target_properties(flutter_wrapper_plugin PROPERTIES
+  POSITION_INDEPENDENT_CODE ON)
+set_target_properties(flutter_wrapper_plugin PROPERTIES
+  CXX_VISIBILITY_PRESET hidden)
+target_link_libraries(flutter_wrapper_plugin PUBLIC flutter)
+target_include_directories(flutter_wrapper_plugin PUBLIC
+  "${WRAPPER_ROOT}/include"
+)
+add_dependencies(flutter_wrapper_plugin flutter_assemble)
+
+# Wrapper sources needed for the runner.
+add_library(flutter_wrapper_app STATIC
+  ${CPP_WRAPPER_SOURCES_CORE}
+  ${CPP_WRAPPER_SOURCES_APP}
+)
+apply_standard_settings(flutter_wrapper_app)
+target_link_libraries(flutter_wrapper_app PUBLIC flutter)
+target_include_directories(flutter_wrapper_app PUBLIC
+  "${WRAPPER_ROOT}/include"
+)
+add_dependencies(flutter_wrapper_app flutter_assemble)
+
+# === Flutter tool backend ===
+# _phony_ is a non-existent file to force this command to run every time,
+# since currently there's no way to get a full input/output list from the
+# flutter tool.
+set(PHONY_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/_phony_")
+set_source_files_properties("${PHONY_OUTPUT}" PROPERTIES SYMBOLIC TRUE)
+add_custom_command(
+  OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS}
+    ${CPP_WRAPPER_SOURCES_CORE} ${CPP_WRAPPER_SOURCES_PLUGIN}
+    ${CPP_WRAPPER_SOURCES_APP}
+    ${PHONY_OUTPUT}
+  COMMAND ${CMAKE_COMMAND} -E env
+    ${FLUTTER_TOOL_ENVIRONMENT}
+    "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat"
+      ${FLUTTER_TARGET_PLATFORM} $<CONFIG>
+  VERBATIM
+)
+add_custom_target(flutter_assemble DEPENDS
+  "${FLUTTER_LIBRARY}"
+  ${FLUTTER_LIBRARY_HEADERS}
+  ${CPP_WRAPPER_SOURCES_CORE}
+  ${CPP_WRAPPER_SOURCES_PLUGIN}
+  ${CPP_WRAPPER_SOURCES_APP}
+)
diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc
new file mode 100644
index 00000000..3a31fc83
--- /dev/null
+++ b/windows/flutter/generated_plugin_registrant.cc
@@ -0,0 +1,23 @@
+//
+//  Generated file. Do not edit.
+//
+
+// clang-format off
+
+#include "generated_plugin_registrant.h"
+
+#include <file_selector_windows/file_selector_windows.h>
+#include <rive_common/rive_plugin.h>
+#include <sqlite3_flutter_libs/sqlite3_flutter_libs_plugin.h>
+#include <url_launcher_windows/url_launcher_windows.h>
+
+void RegisterPlugins(flutter::PluginRegistry* registry) {
+  FileSelectorWindowsRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("FileSelectorWindows"));
+  RivePluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("RivePlugin"));
+  Sqlite3FlutterLibsPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("Sqlite3FlutterLibsPlugin"));
+  UrlLauncherWindowsRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("UrlLauncherWindows"));
+}
diff --git a/windows/flutter/generated_plugin_registrant.h b/windows/flutter/generated_plugin_registrant.h
new file mode 100644
index 00000000..dc139d85
--- /dev/null
+++ b/windows/flutter/generated_plugin_registrant.h
@@ -0,0 +1,15 @@
+//
+//  Generated file. Do not edit.
+//
+
+// clang-format off
+
+#ifndef GENERATED_PLUGIN_REGISTRANT_
+#define GENERATED_PLUGIN_REGISTRANT_
+
+#include <flutter/plugin_registry.h>
+
+// Registers Flutter plugins.
+void RegisterPlugins(flutter::PluginRegistry* registry);
+
+#endif  // GENERATED_PLUGIN_REGISTRANT_
diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake
new file mode 100644
index 00000000..fa00096b
--- /dev/null
+++ b/windows/flutter/generated_plugins.cmake
@@ -0,0 +1,28 @@
+#
+# Generated file, do not edit.
+#
+
+list(APPEND FLUTTER_PLUGIN_LIST
+  file_selector_windows
+  rive_common
+  sqlite3_flutter_libs
+  url_launcher_windows
+)
+
+list(APPEND FLUTTER_FFI_PLUGIN_LIST
+  flutter_zxing
+)
+
+set(PLUGIN_BUNDLED_LIBRARIES)
+
+foreach(plugin ${FLUTTER_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin})
+  target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin)
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
+endforeach(plugin)
+
+foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin})
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
+endforeach(ffi_plugin)
diff --git a/windows/runner/CMakeLists.txt b/windows/runner/CMakeLists.txt
new file mode 100644
index 00000000..394917c0
--- /dev/null
+++ b/windows/runner/CMakeLists.txt
@@ -0,0 +1,40 @@
+cmake_minimum_required(VERSION 3.14)
+project(runner LANGUAGES CXX)
+
+# Define the application target. To change its name, change BINARY_NAME in the
+# top-level CMakeLists.txt, not the value here, or `flutter run` will no longer
+# work.
+#
+# Any new source files that you add to the application should be added here.
+add_executable(${BINARY_NAME} WIN32
+  "flutter_window.cpp"
+  "main.cpp"
+  "utils.cpp"
+  "win32_window.cpp"
+  "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc"
+  "Runner.rc"
+  "runner.exe.manifest"
+)
+
+# Apply the standard set of build settings. This can be removed for applications
+# that need different build settings.
+apply_standard_settings(${BINARY_NAME})
+
+# Add preprocessor definitions for the build version.
+target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"")
+target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}")
+target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}")
+target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}")
+target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}")
+
+# Disable Windows macros that collide with C++ standard library functions.
+target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX")
+
+# Add dependency libraries and include directories. Add any application-specific
+# dependencies here.
+target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app)
+target_link_libraries(${BINARY_NAME} PRIVATE "dwmapi.lib")
+target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}")
+
+# Run the Flutter tool portions of the build. This must not be removed.
+add_dependencies(${BINARY_NAME} flutter_assemble)
diff --git a/windows/runner/Runner.rc b/windows/runner/Runner.rc
new file mode 100644
index 00000000..b0bcb7cb
--- /dev/null
+++ b/windows/runner/Runner.rc
@@ -0,0 +1,121 @@
+// Microsoft Visual C++ generated resource script.
+//
+#pragma code_page(65001)
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "winres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (United States) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+    "#include ""winres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_APP_ICON            ICON                    "resources\\app_icon.ico"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD)
+#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD
+#else
+#define VERSION_AS_NUMBER 1,0,0,0
+#endif
+
+#if defined(FLUTTER_VERSION)
+#define VERSION_AS_STRING FLUTTER_VERSION
+#else
+#define VERSION_AS_STRING "1.0.0"
+#endif
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION VERSION_AS_NUMBER
+ PRODUCTVERSION VERSION_AS_NUMBER
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+ FILEFLAGS VS_FF_DEBUG
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS VOS__WINDOWS32
+ FILETYPE VFT_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904e4"
+        BEGIN
+            VALUE "CompanyName", "de.wger" "\0"
+            VALUE "FileDescription", "wger" "\0"
+            VALUE "FileVersion", VERSION_AS_STRING "\0"
+            VALUE "InternalName", "wger" "\0"
+            VALUE "LegalCopyright", "Copyright (C) 2024 de.wger. All rights reserved." "\0"
+            VALUE "OriginalFilename", "wger.exe" "\0"
+            VALUE "ProductName", "wger" "\0"
+            VALUE "ProductVersion", VERSION_AS_STRING "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1252
+    END
+END
+
+#endif    // English (United States) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
diff --git a/windows/runner/flutter_window.cpp b/windows/runner/flutter_window.cpp
new file mode 100644
index 00000000..955ee303
--- /dev/null
+++ b/windows/runner/flutter_window.cpp
@@ -0,0 +1,71 @@
+#include "flutter_window.h"
+
+#include <optional>
+
+#include "flutter/generated_plugin_registrant.h"
+
+FlutterWindow::FlutterWindow(const flutter::DartProject& project)
+    : project_(project) {}
+
+FlutterWindow::~FlutterWindow() {}
+
+bool FlutterWindow::OnCreate() {
+  if (!Win32Window::OnCreate()) {
+    return false;
+  }
+
+  RECT frame = GetClientArea();
+
+  // The size here must match the window dimensions to avoid unnecessary surface
+  // creation / destruction in the startup path.
+  flutter_controller_ = std::make_unique<flutter::FlutterViewController>(
+      frame.right - frame.left, frame.bottom - frame.top, project_);
+  // Ensure that basic setup of the controller was successful.
+  if (!flutter_controller_->engine() || !flutter_controller_->view()) {
+    return false;
+  }
+  RegisterPlugins(flutter_controller_->engine());
+  SetChildContent(flutter_controller_->view()->GetNativeWindow());
+
+  flutter_controller_->engine()->SetNextFrameCallback([&]() {
+    this->Show();
+  });
+
+  // Flutter can complete the first frame before the "show window" callback is
+  // registered. The following call ensures a frame is pending to ensure the
+  // window is shown. It is a no-op if the first frame hasn't completed yet.
+  flutter_controller_->ForceRedraw();
+
+  return true;
+}
+
+void FlutterWindow::OnDestroy() {
+  if (flutter_controller_) {
+    flutter_controller_ = nullptr;
+  }
+
+  Win32Window::OnDestroy();
+}
+
+LRESULT
+FlutterWindow::MessageHandler(HWND hwnd, UINT const message,
+                              WPARAM const wparam,
+                              LPARAM const lparam) noexcept {
+  // Give Flutter, including plugins, an opportunity to handle window messages.
+  if (flutter_controller_) {
+    std::optional<LRESULT> result =
+        flutter_controller_->HandleTopLevelWindowProc(hwnd, message, wparam,
+                                                      lparam);
+    if (result) {
+      return *result;
+    }
+  }
+
+  switch (message) {
+    case WM_FONTCHANGE:
+      flutter_controller_->engine()->ReloadSystemFonts();
+      break;
+  }
+
+  return Win32Window::MessageHandler(hwnd, message, wparam, lparam);
+}
diff --git a/windows/runner/flutter_window.h b/windows/runner/flutter_window.h
new file mode 100644
index 00000000..6da0652f
--- /dev/null
+++ b/windows/runner/flutter_window.h
@@ -0,0 +1,33 @@
+#ifndef RUNNER_FLUTTER_WINDOW_H_
+#define RUNNER_FLUTTER_WINDOW_H_
+
+#include <flutter/dart_project.h>
+#include <flutter/flutter_view_controller.h>
+
+#include <memory>
+
+#include "win32_window.h"
+
+// A window that does nothing but host a Flutter view.
+class FlutterWindow : public Win32Window {
+ public:
+  // Creates a new FlutterWindow hosting a Flutter view running |project|.
+  explicit FlutterWindow(const flutter::DartProject& project);
+  virtual ~FlutterWindow();
+
+ protected:
+  // Win32Window:
+  bool OnCreate() override;
+  void OnDestroy() override;
+  LRESULT MessageHandler(HWND window, UINT const message, WPARAM const wparam,
+                         LPARAM const lparam) noexcept override;
+
+ private:
+  // The project to run.
+  flutter::DartProject project_;
+
+  // The Flutter instance hosted by this window.
+  std::unique_ptr<flutter::FlutterViewController> flutter_controller_;
+};
+
+#endif  // RUNNER_FLUTTER_WINDOW_H_
diff --git a/windows/runner/main.cpp b/windows/runner/main.cpp
new file mode 100644
index 00000000..99e94cad
--- /dev/null
+++ b/windows/runner/main.cpp
@@ -0,0 +1,43 @@
+#include <flutter/dart_project.h>
+#include <flutter/flutter_view_controller.h>
+#include <windows.h>
+
+#include "flutter_window.h"
+#include "utils.h"
+
+int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
+                      _In_ wchar_t *command_line, _In_ int show_command) {
+  // Attach to console when present (e.g., 'flutter run') or create a
+  // new console when running with a debugger.
+  if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) {
+    CreateAndAttachConsole();
+  }
+
+  // Initialize COM, so that it is available for use in the library and/or
+  // plugins.
+  ::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED);
+
+  flutter::DartProject project(L"data");
+
+  std::vector<std::string> command_line_arguments =
+      GetCommandLineArguments();
+
+  project.set_dart_entrypoint_arguments(std::move(command_line_arguments));
+
+  FlutterWindow window(project);
+  Win32Window::Point origin(10, 10);
+  Win32Window::Size size(1280, 720);
+  if (!window.Create(L"wger", origin, size)) {
+    return EXIT_FAILURE;
+  }
+  window.SetQuitOnClose(true);
+
+  ::MSG msg;
+  while (::GetMessage(&msg, nullptr, 0, 0)) {
+    ::TranslateMessage(&msg);
+    ::DispatchMessage(&msg);
+  }
+
+  ::CoUninitialize();
+  return EXIT_SUCCESS;
+}
diff --git a/windows/runner/resource.h b/windows/runner/resource.h
new file mode 100644
index 00000000..66a65d1e
--- /dev/null
+++ b/windows/runner/resource.h
@@ -0,0 +1,16 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by Runner.rc
+//
+#define IDI_APP_ICON                    101
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        102
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/windows/runner/resources/app_icon.ico b/windows/runner/resources/app_icon.ico
new file mode 100644
index 00000000..c04e20ca
Binary files /dev/null and b/windows/runner/resources/app_icon.ico differ
diff --git a/windows/runner/runner.exe.manifest b/windows/runner/runner.exe.manifest
new file mode 100644
index 00000000..a42ea768
--- /dev/null
+++ b/windows/runner/runner.exe.manifest
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+    </windowsSettings>
+  </application>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- Windows 10 and Windows 11 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+      <!-- Windows 8.1 -->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+      <!-- Windows 8 -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+      <!-- Windows 7 -->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+    </application>
+  </compatibility>
+</assembly>
diff --git a/windows/runner/utils.cpp b/windows/runner/utils.cpp
new file mode 100644
index 00000000..3a0b4651
--- /dev/null
+++ b/windows/runner/utils.cpp
@@ -0,0 +1,65 @@
+#include "utils.h"
+
+#include <flutter_windows.h>
+#include <io.h>
+#include <stdio.h>
+#include <windows.h>
+
+#include <iostream>
+
+void CreateAndAttachConsole() {
+  if (::AllocConsole()) {
+    FILE *unused;
+    if (freopen_s(&unused, "CONOUT$", "w", stdout)) {
+      _dup2(_fileno(stdout), 1);
+    }
+    if (freopen_s(&unused, "CONOUT$", "w", stderr)) {
+      _dup2(_fileno(stdout), 2);
+    }
+    std::ios::sync_with_stdio();
+    FlutterDesktopResyncOutputStreams();
+  }
+}
+
+std::vector<std::string> GetCommandLineArguments() {
+  // Convert the UTF-16 command line arguments to UTF-8 for the Engine to use.
+  int argc;
+  wchar_t** argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc);
+  if (argv == nullptr) {
+    return std::vector<std::string>();
+  }
+
+  std::vector<std::string> command_line_arguments;
+
+  // Skip the first argument as it's the binary name.
+  for (int i = 1; i < argc; i++) {
+    command_line_arguments.push_back(Utf8FromUtf16(argv[i]));
+  }
+
+  ::LocalFree(argv);
+
+  return command_line_arguments;
+}
+
+std::string Utf8FromUtf16(const wchar_t* utf16_string) {
+  if (utf16_string == nullptr) {
+    return std::string();
+  }
+  unsigned int target_length = ::WideCharToMultiByte(
+      CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string,
+      -1, nullptr, 0, nullptr, nullptr)
+    -1; // remove the trailing null character
+  int input_length = (int)wcslen(utf16_string);
+  std::string utf8_string;
+  if (target_length == 0 || target_length > utf8_string.max_size()) {
+    return utf8_string;
+  }
+  utf8_string.resize(target_length);
+  int converted_length = ::WideCharToMultiByte(
+      CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string,
+      input_length, utf8_string.data(), target_length, nullptr, nullptr);
+  if (converted_length == 0) {
+    return std::string();
+  }
+  return utf8_string;
+}
diff --git a/windows/runner/utils.h b/windows/runner/utils.h
new file mode 100644
index 00000000..3879d547
--- /dev/null
+++ b/windows/runner/utils.h
@@ -0,0 +1,19 @@
+#ifndef RUNNER_UTILS_H_
+#define RUNNER_UTILS_H_
+
+#include <string>
+#include <vector>
+
+// Creates a console for the process, and redirects stdout and stderr to
+// it for both the runner and the Flutter library.
+void CreateAndAttachConsole();
+
+// Takes a null-terminated wchar_t* encoded in UTF-16 and returns a std::string
+// encoded in UTF-8. Returns an empty std::string on failure.
+std::string Utf8FromUtf16(const wchar_t* utf16_string);
+
+// Gets the command line arguments passed in as a std::vector<std::string>,
+// encoded in UTF-8. Returns an empty std::vector<std::string> on failure.
+std::vector<std::string> GetCommandLineArguments();
+
+#endif  // RUNNER_UTILS_H_
diff --git a/windows/runner/win32_window.cpp b/windows/runner/win32_window.cpp
new file mode 100644
index 00000000..60608d0f
--- /dev/null
+++ b/windows/runner/win32_window.cpp
@@ -0,0 +1,288 @@
+#include "win32_window.h"
+
+#include <dwmapi.h>
+#include <flutter_windows.h>
+
+#include "resource.h"
+
+namespace {
+
+/// Window attribute that enables dark mode window decorations.
+///
+/// Redefined in case the developer's machine has a Windows SDK older than
+/// version 10.0.22000.0.
+/// See: https://docs.microsoft.com/windows/win32/api/dwmapi/ne-dwmapi-dwmwindowattribute
+#ifndef DWMWA_USE_IMMERSIVE_DARK_MODE
+#define DWMWA_USE_IMMERSIVE_DARK_MODE 20
+#endif
+
+constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW";
+
+/// Registry key for app theme preference.
+///
+/// A value of 0 indicates apps should use dark mode. A non-zero or missing
+/// value indicates apps should use light mode.
+constexpr const wchar_t kGetPreferredBrightnessRegKey[] =
+  L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize";
+constexpr const wchar_t kGetPreferredBrightnessRegValue[] = L"AppsUseLightTheme";
+
+// The number of Win32Window objects that currently exist.
+static int g_active_window_count = 0;
+
+using EnableNonClientDpiScaling = BOOL __stdcall(HWND hwnd);
+
+// Scale helper to convert logical scaler values to physical using passed in
+// scale factor
+int Scale(int source, double scale_factor) {
+  return static_cast<int>(source * scale_factor);
+}
+
+// Dynamically loads the |EnableNonClientDpiScaling| from the User32 module.
+// This API is only needed for PerMonitor V1 awareness mode.
+void EnableFullDpiSupportIfAvailable(HWND hwnd) {
+  HMODULE user32_module = LoadLibraryA("User32.dll");
+  if (!user32_module) {
+    return;
+  }
+  auto enable_non_client_dpi_scaling =
+      reinterpret_cast<EnableNonClientDpiScaling*>(
+          GetProcAddress(user32_module, "EnableNonClientDpiScaling"));
+  if (enable_non_client_dpi_scaling != nullptr) {
+    enable_non_client_dpi_scaling(hwnd);
+  }
+  FreeLibrary(user32_module);
+}
+
+}  // namespace
+
+// Manages the Win32Window's window class registration.
+class WindowClassRegistrar {
+ public:
+  ~WindowClassRegistrar() = default;
+
+  // Returns the singleton registrar instance.
+  static WindowClassRegistrar* GetInstance() {
+    if (!instance_) {
+      instance_ = new WindowClassRegistrar();
+    }
+    return instance_;
+  }
+
+  // Returns the name of the window class, registering the class if it hasn't
+  // previously been registered.
+  const wchar_t* GetWindowClass();
+
+  // Unregisters the window class. Should only be called if there are no
+  // instances of the window.
+  void UnregisterWindowClass();
+
+ private:
+  WindowClassRegistrar() = default;
+
+  static WindowClassRegistrar* instance_;
+
+  bool class_registered_ = false;
+};
+
+WindowClassRegistrar* WindowClassRegistrar::instance_ = nullptr;
+
+const wchar_t* WindowClassRegistrar::GetWindowClass() {
+  if (!class_registered_) {
+    WNDCLASS window_class{};
+    window_class.hCursor = LoadCursor(nullptr, IDC_ARROW);
+    window_class.lpszClassName = kWindowClassName;
+    window_class.style = CS_HREDRAW | CS_VREDRAW;
+    window_class.cbClsExtra = 0;
+    window_class.cbWndExtra = 0;
+    window_class.hInstance = GetModuleHandle(nullptr);
+    window_class.hIcon =
+        LoadIcon(window_class.hInstance, MAKEINTRESOURCE(IDI_APP_ICON));
+    window_class.hbrBackground = 0;
+    window_class.lpszMenuName = nullptr;
+    window_class.lpfnWndProc = Win32Window::WndProc;
+    RegisterClass(&window_class);
+    class_registered_ = true;
+  }
+  return kWindowClassName;
+}
+
+void WindowClassRegistrar::UnregisterWindowClass() {
+  UnregisterClass(kWindowClassName, nullptr);
+  class_registered_ = false;
+}
+
+Win32Window::Win32Window() {
+  ++g_active_window_count;
+}
+
+Win32Window::~Win32Window() {
+  --g_active_window_count;
+  Destroy();
+}
+
+bool Win32Window::Create(const std::wstring& title,
+                         const Point& origin,
+                         const Size& size) {
+  Destroy();
+
+  const wchar_t* window_class =
+      WindowClassRegistrar::GetInstance()->GetWindowClass();
+
+  const POINT target_point = {static_cast<LONG>(origin.x),
+                              static_cast<LONG>(origin.y)};
+  HMONITOR monitor = MonitorFromPoint(target_point, MONITOR_DEFAULTTONEAREST);
+  UINT dpi = FlutterDesktopGetDpiForMonitor(monitor);
+  double scale_factor = dpi / 96.0;
+
+  HWND window = CreateWindow(
+      window_class, title.c_str(), WS_OVERLAPPEDWINDOW,
+      Scale(origin.x, scale_factor), Scale(origin.y, scale_factor),
+      Scale(size.width, scale_factor), Scale(size.height, scale_factor),
+      nullptr, nullptr, GetModuleHandle(nullptr), this);
+
+  if (!window) {
+    return false;
+  }
+
+  UpdateTheme(window);
+
+  return OnCreate();
+}
+
+bool Win32Window::Show() {
+  return ShowWindow(window_handle_, SW_SHOWNORMAL);
+}
+
+// static
+LRESULT CALLBACK Win32Window::WndProc(HWND const window,
+                                      UINT const message,
+                                      WPARAM const wparam,
+                                      LPARAM const lparam) noexcept {
+  if (message == WM_NCCREATE) {
+    auto window_struct = reinterpret_cast<CREATESTRUCT*>(lparam);
+    SetWindowLongPtr(window, GWLP_USERDATA,
+                     reinterpret_cast<LONG_PTR>(window_struct->lpCreateParams));
+
+    auto that = static_cast<Win32Window*>(window_struct->lpCreateParams);
+    EnableFullDpiSupportIfAvailable(window);
+    that->window_handle_ = window;
+  } else if (Win32Window* that = GetThisFromHandle(window)) {
+    return that->MessageHandler(window, message, wparam, lparam);
+  }
+
+  return DefWindowProc(window, message, wparam, lparam);
+}
+
+LRESULT
+Win32Window::MessageHandler(HWND hwnd,
+                            UINT const message,
+                            WPARAM const wparam,
+                            LPARAM const lparam) noexcept {
+  switch (message) {
+    case WM_DESTROY:
+      window_handle_ = nullptr;
+      Destroy();
+      if (quit_on_close_) {
+        PostQuitMessage(0);
+      }
+      return 0;
+
+    case WM_DPICHANGED: {
+      auto newRectSize = reinterpret_cast<RECT*>(lparam);
+      LONG newWidth = newRectSize->right - newRectSize->left;
+      LONG newHeight = newRectSize->bottom - newRectSize->top;
+
+      SetWindowPos(hwnd, nullptr, newRectSize->left, newRectSize->top, newWidth,
+                   newHeight, SWP_NOZORDER | SWP_NOACTIVATE);
+
+      return 0;
+    }
+    case WM_SIZE: {
+      RECT rect = GetClientArea();
+      if (child_content_ != nullptr) {
+        // Size and position the child window.
+        MoveWindow(child_content_, rect.left, rect.top, rect.right - rect.left,
+                   rect.bottom - rect.top, TRUE);
+      }
+      return 0;
+    }
+
+    case WM_ACTIVATE:
+      if (child_content_ != nullptr) {
+        SetFocus(child_content_);
+      }
+      return 0;
+
+    case WM_DWMCOLORIZATIONCOLORCHANGED:
+      UpdateTheme(hwnd);
+      return 0;
+  }
+
+  return DefWindowProc(window_handle_, message, wparam, lparam);
+}
+
+void Win32Window::Destroy() {
+  OnDestroy();
+
+  if (window_handle_) {
+    DestroyWindow(window_handle_);
+    window_handle_ = nullptr;
+  }
+  if (g_active_window_count == 0) {
+    WindowClassRegistrar::GetInstance()->UnregisterWindowClass();
+  }
+}
+
+Win32Window* Win32Window::GetThisFromHandle(HWND const window) noexcept {
+  return reinterpret_cast<Win32Window*>(
+      GetWindowLongPtr(window, GWLP_USERDATA));
+}
+
+void Win32Window::SetChildContent(HWND content) {
+  child_content_ = content;
+  SetParent(content, window_handle_);
+  RECT frame = GetClientArea();
+
+  MoveWindow(content, frame.left, frame.top, frame.right - frame.left,
+             frame.bottom - frame.top, true);
+
+  SetFocus(child_content_);
+}
+
+RECT Win32Window::GetClientArea() {
+  RECT frame;
+  GetClientRect(window_handle_, &frame);
+  return frame;
+}
+
+HWND Win32Window::GetHandle() {
+  return window_handle_;
+}
+
+void Win32Window::SetQuitOnClose(bool quit_on_close) {
+  quit_on_close_ = quit_on_close;
+}
+
+bool Win32Window::OnCreate() {
+  // No-op; provided for subclasses.
+  return true;
+}
+
+void Win32Window::OnDestroy() {
+  // No-op; provided for subclasses.
+}
+
+void Win32Window::UpdateTheme(HWND const window) {
+  DWORD light_mode;
+  DWORD light_mode_size = sizeof(light_mode);
+  LSTATUS result = RegGetValue(HKEY_CURRENT_USER, kGetPreferredBrightnessRegKey,
+                               kGetPreferredBrightnessRegValue,
+                               RRF_RT_REG_DWORD, nullptr, &light_mode,
+                               &light_mode_size);
+
+  if (result == ERROR_SUCCESS) {
+    BOOL enable_dark_mode = light_mode == 0;
+    DwmSetWindowAttribute(window, DWMWA_USE_IMMERSIVE_DARK_MODE,
+                          &enable_dark_mode, sizeof(enable_dark_mode));
+  }
+}
diff --git a/windows/runner/win32_window.h b/windows/runner/win32_window.h
new file mode 100644
index 00000000..e901dde6
--- /dev/null
+++ b/windows/runner/win32_window.h
@@ -0,0 +1,102 @@
+#ifndef RUNNER_WIN32_WINDOW_H_
+#define RUNNER_WIN32_WINDOW_H_
+
+#include <windows.h>
+
+#include <functional>
+#include <memory>
+#include <string>
+
+// A class abstraction for a high DPI-aware Win32 Window. Intended to be
+// inherited from by classes that wish to specialize with custom
+// rendering and input handling
+class Win32Window {
+ public:
+  struct Point {
+    unsigned int x;
+    unsigned int y;
+    Point(unsigned int x, unsigned int y) : x(x), y(y) {}
+  };
+
+  struct Size {
+    unsigned int width;
+    unsigned int height;
+    Size(unsigned int width, unsigned int height)
+        : width(width), height(height) {}
+  };
+
+  Win32Window();
+  virtual ~Win32Window();
+
+  // Creates a win32 window with |title| that is positioned and sized using
+  // |origin| and |size|. New windows are created on the default monitor. Window
+  // sizes are specified to the OS in physical pixels, hence to ensure a
+  // consistent size this function will scale the inputted width and height as
+  // as appropriate for the default monitor. The window is invisible until
+  // |Show| is called. Returns true if the window was created successfully.
+  bool Create(const std::wstring& title, const Point& origin, const Size& size);
+
+  // Show the current window. Returns true if the window was successfully shown.
+  bool Show();
+
+  // Release OS resources associated with window.
+  void Destroy();
+
+  // Inserts |content| into the window tree.
+  void SetChildContent(HWND content);
+
+  // Returns the backing Window handle to enable clients to set icon and other
+  // window properties. Returns nullptr if the window has been destroyed.
+  HWND GetHandle();
+
+  // If true, closing this window will quit the application.
+  void SetQuitOnClose(bool quit_on_close);
+
+  // Return a RECT representing the bounds of the current client area.
+  RECT GetClientArea();
+
+ protected:
+  // Processes and route salient window messages for mouse handling,
+  // size change and DPI. Delegates handling of these to member overloads that
+  // inheriting classes can handle.
+  virtual LRESULT MessageHandler(HWND window,
+                                 UINT const message,
+                                 WPARAM const wparam,
+                                 LPARAM const lparam) noexcept;
+
+  // Called when CreateAndShow is called, allowing subclass window-related
+  // setup. Subclasses should return false if setup fails.
+  virtual bool OnCreate();
+
+  // Called when Destroy is called.
+  virtual void OnDestroy();
+
+ private:
+  friend class WindowClassRegistrar;
+
+  // OS callback called by message pump. Handles the WM_NCCREATE message which
+  // is passed when the non-client area is being created and enables automatic
+  // non-client DPI scaling so that the non-client area automatically
+  // responds to changes in DPI. All other messages are handled by
+  // MessageHandler.
+  static LRESULT CALLBACK WndProc(HWND const window,
+                                  UINT const message,
+                                  WPARAM const wparam,
+                                  LPARAM const lparam) noexcept;
+
+  // Retrieves a class instance pointer for |window|
+  static Win32Window* GetThisFromHandle(HWND const window) noexcept;
+
+  // Update the window frame's theme to match the system theme.
+  static void UpdateTheme(HWND const window);
+
+  bool quit_on_close_ = false;
+
+  // window handle for top level window.
+  HWND window_handle_ = nullptr;
+
+  // window handle for hosted content.
+  HWND child_content_ = nullptr;
+};
+
+#endif  // RUNNER_WIN32_WINDOW_H_