From 4dcf288a5070b45c72cb714efd67e426ec2d22ce Mon Sep 17 00:00:00 2001
From: Bastian Block <blockbasti99@gmail.com>
Date: Wed, 27 Oct 2021 08:36:06 +0200
Subject: [PATCH 1/4] chore: update dependencies

---
 .../src/main/res/values-night-v31/styles.xml  |  2 +-
 .../app/src/main/res/values-v31/styles.xml    |  2 +-
 pubspec.lock                                  | 69 +++++++++----------
 pubspec.yaml                                  | 22 +++---
 4 files changed, 42 insertions(+), 53 deletions(-)

diff --git a/android/app/src/main/res/values-night-v31/styles.xml b/android/app/src/main/res/values-night-v31/styles.xml
index b0a26671..3d9ed6de 100644
--- a/android/app/src/main/res/values-night-v31/styles.xml
+++ b/android/app/src/main/res/values-night-v31/styles.xml
@@ -2,8 +2,8 @@
 <resources>
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
     <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
-        <item name="android:windowSplashScreenBackground">@drawable/launch_background</item>
         <item name="android:windowFullscreen">true</item>
+        <item name="android:windowSplashScreenBackground">#303030</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
diff --git a/android/app/src/main/res/values-v31/styles.xml b/android/app/src/main/res/values-v31/styles.xml
index 2f6accf7..e8609d02 100644
--- a/android/app/src/main/res/values-v31/styles.xml
+++ b/android/app/src/main/res/values-v31/styles.xml
@@ -2,8 +2,8 @@
 <resources>
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
     <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
-        <item name="android:windowSplashScreenBackground">@drawable/launch_background</item>
         <item name="android:windowFullscreen">true</item>
+        <item name="android:windowSplashScreenBackground">#FFFFFF</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
diff --git a/pubspec.lock b/pubspec.lock
index c4a5b5f5..a529fc86 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -7,21 +7,21 @@ packages:
       name: _fe_analyzer_shared
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "26.0.0"
+    version: "30.0.0"
   analyzer:
-    dependency: "direct overridden"
+    dependency: transitive
     description:
       name: analyzer
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.3.0"
+    version: "2.7.0"
   archive:
     dependency: transitive
     description:
       name: archive
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.1.2"
+    version: "3.1.6"
   args:
     dependency: transitive
     description:
@@ -42,7 +42,7 @@ packages:
       name: build
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   build_config:
     dependency: transitive
     description:
@@ -56,7 +56,7 @@ packages:
       name: build_daemon
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0"
+    version: "3.0.1"
   build_resolvers:
     dependency: transitive
     description:
@@ -70,14 +70,14 @@ packages:
       name: build_runner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.4"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "7.1.0"
+    version: "7.2.2"
   built_collection:
     dependency: transitive
     description:
@@ -119,7 +119,7 @@ packages:
       name: cli_util
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.3"
+    version: "0.3.5"
   clock:
     dependency: transitive
     description:
@@ -161,7 +161,7 @@ packages:
       name: dart_style
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.2.0"
   effective_dart:
     dependency: "direct dev"
     description:
@@ -201,7 +201,7 @@ packages:
       name: flutter_file_dialog
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.1"
+    version: "2.3.0"
   flutter_launcher_icons:
     dependency: "direct dev"
     description:
@@ -220,7 +220,7 @@ packages:
       name: flutter_native_splash
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.3"
+    version: "1.3.0"
   flutter_oss_licenses:
     dependency: "direct dev"
     description:
@@ -267,7 +267,7 @@ packages:
       name: glob
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.2"
   graphs:
     dependency: transitive
     description:
@@ -281,7 +281,7 @@ packages:
       name: http
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.13.3"
+    version: "0.13.4"
   http_multi_server:
     dependency: transitive
     description:
@@ -302,7 +302,7 @@ packages:
       name: image
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.4"
+    version: "3.0.8"
   intl:
     dependency: transitive
     description:
@@ -316,7 +316,7 @@ packages:
       name: intl_utils
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.4.0"
+    version: "2.4.1"
   io:
     dependency: transitive
     description:
@@ -337,14 +337,14 @@ packages:
       name: json_annotation
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.1.0"
+    version: "4.3.0"
   json_serializable:
     dependency: "direct dev"
     description:
       name: json_serializable
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.0.2"
+    version: "6.0.1"
   logging:
     dependency: transitive
     description:
@@ -360,7 +360,7 @@ packages:
     source: hosted
     version: "0.12.11"
   meta:
-    dependency: "direct overridden"
+    dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
@@ -372,7 +372,7 @@ packages:
       name: mime
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.0"
+    version: "1.0.1"
   package_config:
     dependency: transitive
     description:
@@ -422,20 +422,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.3"
-  pedantic:
-    dependency: transitive
-    description:
-      name: pedantic
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.11.1"
   petitparser:
     dependency: transitive
     description:
       name: petitparser
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.3.0"
+    version: "4.4.0"
   platform:
     dependency: transitive
     description:
@@ -449,7 +442,7 @@ packages:
       name: plugin_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.2"
   pool:
     dependency: transitive
     description:
@@ -477,7 +470,7 @@ packages:
       name: process
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.2.3"
+    version: "4.2.4"
   pub_semver:
     dependency: transitive
     description:
@@ -498,7 +491,7 @@ packages:
       name: scrollable_positioned_list
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.0-nullsafety.0"
+    version: "0.2.2"
   shared_preferences:
     dependency: transitive
     description:
@@ -594,14 +587,14 @@ packages:
       name: source_gen
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   source_helper:
     dependency: transitive
     description:
       name: source_helper
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.1"
+    version: "1.3.0"
   source_span:
     dependency: transitive
     description:
@@ -671,7 +664,7 @@ packages:
       name: url_launcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.0.11"
+    version: "6.0.12"
   url_launcher_linux:
     dependency: transitive
     description:
@@ -713,7 +706,7 @@ packages:
       name: uuid
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.4"
+    version: "3.0.5"
   vector_math:
     dependency: transitive
     description:
@@ -762,7 +755,7 @@ packages:
       name: watcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.0"
+    version: "1.0.1"
   web_socket_channel:
     dependency: transitive
     description:
@@ -776,7 +769,7 @@ packages:
       name: win32
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.9"
+    version: "2.2.10"
   xdg_directories:
     dependency: transitive
     description:
@@ -790,7 +783,7 @@ packages:
       name: xml
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.3.0"
+    version: "5.3.1"
   yaml:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index a386861e..7ed9b6d6 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -11,32 +11,28 @@ dependencies:
     sdk: flutter
   flutter_tts: 3.2.2
   path_provider: 2.0.5
-  flutter_file_dialog: 2.1.1
+  flutter_file_dialog: 2.3.0
   pref: 2.4.0
   fluttertoast: 8.0.8
   prefs: 3.3.0
-  url_launcher: 6.0.11
+  url_launcher: 6.0.12
   wakelock: 0.5.6
   soundpool: 2.2.0
-  intl_utils: 2.4.0
-  json_annotation: 4.1.0
+  intl_utils: 2.4.1
+  json_annotation: 4.3.0
   flutter_phoenix: 1.0.0
-  scrollable_positioned_list: 0.2.0-nullsafety.0
+  scrollable_positioned_list: 0.2.2
   flutter_localizations:
     sdk: flutter
-  uuid: 3.0.4
+  uuid: 3.0.5
 
 dev_dependencies:
   flutter_launcher_icons: 0.9.2
   flutter_oss_licenses: 1.0.1
-  flutter_native_splash: 1.2.3
+  flutter_native_splash: 1.3.0
   effective_dart: 1.3.2
-  json_serializable: 5.0.2
-  build_runner: 2.1.2
-
-dependency_overrides:
-  meta: ^1.7.0
-  analyzer: ^2.3.0
+  json_serializable: 6.0.1
+  build_runner: 2.1.4
 
 flutter:
   uses-material-design: true

From d868beed8f7ac666b37a79d6244932577501dd2f Mon Sep 17 00:00:00 2001
From: Bastian Block <blockbasti99@gmail.com>
Date: Wed, 27 Oct 2021 15:41:19 +0200
Subject: [PATCH 2/4] fix: update translations

---
 android/build.gradle   |   4 +-
 lib/l10n/intl_de.arb   | 233 ++++++++++++++---------------------------
 lib/l10n/intl_en.arb   | 228 ++++++++++++++--------------------------
 lib/l10n/intl_fr.arb   | 229 ++++++++++++++--------------------------
 lib/l10n/intl_it.arb   | 229 ++++++++++++++--------------------------
 lib/l10n/intl_ru.arb   | 229 ++++++++++++++--------------------------
 lib/settings_page.dart |  11 +-
 localizely.yml         |  29 -----
 pubspec.yaml           |   2 -
 9 files changed, 401 insertions(+), 793 deletions(-)
 delete mode 100644 localizely.yml

diff --git a/android/build.gradle b/android/build.gradle
index 3b9047ee..5f4af1d7 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.5.30'
+    ext.kotlin_version = '1.5.31'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.2'
+        classpath 'com.android.tools.build:gradle:7.0.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/lib/l10n/intl_de.arb b/lib/l10n/intl_de.arb
index 361b8bba..94aff15a 100644
--- a/lib/l10n/intl_de.arb
+++ b/lib/l10n/intl_de.arb
@@ -1,153 +1,82 @@
 {
-  "@@locale": "de",
-  "addExercise": "Übung hinzufügen",
-  "@addExercise": {},
-  "addRest": "Pause hinzufügen",
-  "@addRest": {},
-  "addSet": "Satz hinzufügen",
-  "@addSet": {},
-  "addWorkout": "Workout erstellen",
-  "@addWorkout": {},
-  "announceUpcomingExercise": "nächste Übung ansagen",
-  "@announceUpcomingExercise": {},
-  "AnnounceUpcomingExerciseDesc": "Wenn TTS aktiviert ist, wird die nächste Übung angesagt",
-  "@AnnounceUpcomingExerciseDesc": {},
-  "backup": "Sicherung",
-  "@backup": {},
-  "cancel": "Abbrechen",
-  "@cancel": {},
-  "countRepetitions": "{count} Wiederholungen",
-  "@countRepetitions": {},
-  "currentSet": "Aktueller Satz",
-  "@currentSet": {},
-  "delete": "Löschen",
-  "@delete": {},
-  "deleteConfirmation": "Möchtest du das Workout \"{title}\" wirklich löschen?",
-  "@deleteConfirmation": {},
-  "deleteExercise": "Übung löschen",
-  "@deleteExercise": {},
-  "deleteSet": "Satz löschen",
-  "@deleteSet": {},
-  "deleteWorkout": "Workout löschen",
-  "@deleteWorkout": {},
-  "duplicate": "Duplizieren",
-  "@duplicate": {},
-  "durationLeft": "{timeLeft} von {timeTotal} übrig",
-  "@durationLeft": {},
-  "durationWithTime": "Dauer: {formattedTime}",
-  "@durationWithTime": {},
-  "editWorkout": "Workout bearbeiten",
-  "@editWorkout": {},
-  "enterWorkoutName": "Bitte einen Namen für das Workout festlegen!",
-  "@enterWorkoutName": {},
-  "exercise": "Übung",
-  "@exercise": {},
-  "exerciseOf": "Übung {currentIndex} von {total}",
-  "@exerciseOf": {},
-  "exitCheck": "Möchtest du wirklich beenden?",
-  "@exitCheck": {},
-  "expanded_setlist": "Erweiterte Anzeige von Sätzen",
-  "@expanded_setlist": {},
-  "expanded_setlist_info": "Immer ganzen Satz anzeigen",
-  "@expanded_setlist_info": {},
-  "export": "Alle Workouts sichern",
-  "@export": {},
-  "firstExercise": "Beginnen mit: {name}",
-  "@firstExercise": {},
-  "general": "Allgemein",
-  "@general": {},
-  "halfwayDone": "Hälfte geschafft",
-  "@halfwayDone": {},
-  "import": "Sicherung laden",
-  "@import": {},
-  "importedCount": "{count} Workouts importiert",
-  "@importedCount": {},
-  "keepScreenAwake": "Bildschirm angeschaltet lassen",
-  "@keepScreenAwake": {},
-  "language": "Sprache",
-  "@language": {},
-  "licenses": "Lizenzen",
-  "@licenses": {},
-  "moveExerciseDown": "Übung nach unten verschieben",
-  "@moveExerciseDown": {},
-  "moveExerciseUp": "Übung nach oben verschieben",
-  "@moveExerciseUp": {},
-  "moveSetDown": "Satz nach unten verschieben",
-  "@moveSetDown": {},
-  "moveSetUp": "Satz nach oben verschieben",
-  "@moveSetUp": {},
-  "name": "Name",
-  "@name": {},
-  "nextExercise": "Nächste Übung: {name}",
-  "@nextExercise": {},
-  "nextSet": "Nächster Satz",
-  "@nextSet": {},
-  "no": "Nein",
-  "@no": {},
-  "noSound": "kein Ton",
-  "@noSound": {},
-  "noSoundDesc": "Ton stummschalten",
-  "@noSoundDesc": {},
-  "ossLicenses": "Open Source Lizenzen",
-  "@ossLicenses": {},
-  "overwriteExistingWorkout": "Existierendes Workout überschreiben?",
-  "@overwriteExistingWorkout": {},
-  "playTickEverySecond": "Jede Sekunde ein Ticken abspielen",
-  "@playTickEverySecond": {},
-  "repetitions": "Wiederholungen:",
-  "@repetitions": {},
-  "repOf": "Wiederholung {currentIndex} von {total}",
-  "@repOf": {},
-  "reportIssuesOrRequestAFeature": "Fehler melden oder neue Funktionen vorschlagen",
-  "@reportIssuesOrRequestAFeature": {},
-  "rest": "Pause",
-  "@rest": {},
-  "saved": "Gespeichert",
-  "@saved": {},
-  "saveWorkout": "Workout speichern",
-  "@saveWorkout": {},
-  "seconds": "Sekunden",
-  "@seconds": {},
-  "setIndex": "Satz {number}",
-  "@setIndex": {},
-  "setOf": "Satz {currentIndex} von {total}",
-  "@setOf": {},
-  "settingHalfway": "Ansage oder Ton in der Hälfte der Übung abspielen",
-  "@settingHalfway": {},
-  "settings": "Einstellungen",
-  "@settings": {},
-  "soundOutput": "Tonausgabe",
-  "@soundOutput": {},
-  "startWorkout": "Workout starten",
-  "@startWorkout": {},
-  "title": "Just Another Workout Timer",
-  "@title": {},
-  "tts": "Text-zu-Sprache (TTS)",
-  "@tts": {},
-  "ttsLang": "TTS Sprache",
-  "@ttsLang": {},
-  "ttsLangDesc": "Wähle eine Sprache aus\n(nur bei aktiviertem TTS)",
-  "@ttsLangDesc": {},
-  "useSound": "Töne nutzen",
-  "@useSound": {},
-  "useSoundDesc": "Übungsbeginn und -ende mit einfachen Tönen ankündigen",
-  "@useSoundDesc": {},
-  "useTTS": "Text-zu-Sprache nutzen",
-  "@useTTS": {},
-  "useTTSDesc": "Aktuelle und kommende Übungen ansagen",
-  "@useTTSDesc": {},
-  "viewLicense": "Lizenz anzeigen",
-  "@viewLicense": {},
-  "viewOnGithub": "Auf GitHub ansehen",
-  "@viewOnGithub": {},
-  "viewOSSLicenses": "Open Source Lizenzen anzeigen",
-  "@viewOSSLicenses": {},
-  "workoutComplete": "Workout abgeschlossen",
-  "@workoutComplete": {},
-  "workouts": "Workouts",
-  "@workouts": {},
-  "yes": "Ja",
-  "@yes": {},
-  "yesExit": "Ja",
-  "@yesExit": {}
-}
\ No newline at end of file
+    "@@locale": "de",
+    "addExercise": "Übung hinzufügen",
+    "addRest": "Pause hinzufügen",
+    "addSet": "Satz hinzufügen",
+    "addWorkout": "Workout erstellen",
+    "announceUpcomingExercise": "nächste Übung ansagen",
+    "AnnounceUpcomingExerciseDesc": "Wenn TTS aktiviert ist, wird die nächste Übung angesagt",
+    "backup": "Sicherung",
+    "cancel": "Abbrechen",
+    "countRepetitions": "{count} Wiederholungen",
+    "currentSet": "Aktueller Satz",
+    "delete": "Löschen",
+    "deleteConfirmation": "Möchtest du das Workout \"{title}\" wirklich löschen?",
+    "deleteExercise": "Übung löschen",
+    "deleteSet": "Satz löschen",
+    "deleteWorkout": "Workout löschen",
+    "duplicate": "Duplizieren",
+    "durationLeft": "{timeLeft} von {timeTotal} übrig",
+    "durationWithTime": "Dauer: {formattedTime}",
+    "editWorkout": "Workout bearbeiten",
+    "enterWorkoutName": "Bitte einen Namen für das Workout festlegen!",
+    "exercise": "Übung",
+    "exerciseOf": "Übung {currentIndex} von {total}",
+    "exitCheck": "Möchtest du wirklich beenden?",
+    "expanded_setlist": "Erweiterte Anzeige von Sätzen",
+    "expanded_setlist_info": "Immer ganzen Satz anzeigen",
+    "export": "Alle Workouts sichern",
+    "firstExercise": "Beginnen mit: {name}",
+    "general": "Allgemein",
+    "halfwayDone": "Hälfte geschafft",
+    "import": "Sicherung laden",
+    "importedCount": "{count} Workouts importiert",
+    "keepScreenAwake": "Bildschirm angeschaltet lassen",
+    "language": "Sprache",
+    "licenses": "Lizenzen",
+    "moveExerciseDown": "Übung nach unten verschieben",
+    "moveExerciseUp": "Übung nach oben verschieben",
+    "moveSetDown": "Satz nach unten verschieben",
+    "moveSetUp": "Satz nach oben verschieben",
+    "name": "Name",
+    "nextExercise": "Nächste Übung: {name}",
+    "nextSet": "Nächster Satz",
+    "no": "Nein",
+    "noSound": "kein Ton",
+    "noSoundDesc": "Ton stummschalten",
+    "ossLicenses": "Open Source Lizenzen",
+    "overwriteExistingWorkout": "Existierendes Workout überschreiben?",
+    "playTickEverySecond": "Jede Sekunde ein Ticken abspielen",
+    "repetitions": "Wiederholungen:",
+    "repOf": "Wiederholung {currentIndex} von {total}",
+    "reportIssuesOrRequestAFeature": "Fehler melden oder neue Funktionen vorschlagen",
+    "rest": "Pause",
+    "saved": "Gespeichert",
+    "saveWorkout": "Workout speichern",
+    "seconds": "Sekunden",
+    "setIndex": "Satz {number}",
+    "setOf": "Satz {currentIndex} von {total}",
+    "settingHalfway": "Ansage oder Ton in der Hälfte der Übung abspielen",
+    "settings": "Einstellungen",
+    "soundOutput": "Tonausgabe",
+    "startWorkout": "Workout starten",
+    "title": "Just Another Workout Timer",
+    "tts": "Text-zu-Sprache (TTS)",
+    "ttsLang": "TTS Sprache",
+    "ttsLangDesc": "Wähle eine Sprache aus\n(nur bei aktiviertem TTS)",
+    "useSound": "Töne nutzen",
+    "useSoundDesc": "Übungsbeginn und -ende mit einfachen Tönen ankündigen",
+    "useTTS": "Text-zu-Sprache nutzen",
+    "useTTSDesc": "Aktuelle und kommende Übungen ansagen",
+    "viewLicense": "Lizenz anzeigen",
+    "viewOnGithub": "Auf GitHub ansehen",
+    "viewOSSLicenses": "Open Source Lizenzen anzeigen",
+    "workoutComplete": "Workout abgeschlossen",
+    "workouts": "Workouts",
+    "yes": "Ja",
+    "yesExit": "Ja",
+    "theme": "Design",
+    "theme_dark": "Dunkel",
+    "theme_light": "Hell",
+    "theme_system": "System"
+  }
\ No newline at end of file
diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb
index 51ea07f2..30a4ba2d 100644
--- a/lib/l10n/intl_en.arb
+++ b/lib/l10n/intl_en.arb
@@ -1,150 +1,82 @@
 {
-  "@@locale": "en",
-  "addExercise": "Add exercise",
-  "@addExercise": {},
-  "addRest": "Add rest",
-  "@addRest": {},
-  "addSet": "Add Set",
-  "@addSet": {},
-  "addWorkout": "Add workout",
-  "@addWorkout": {},
-  "announceUpcomingExercise": "Announce upcoming exercise",
-  "@announceUpcomingExercise": {},
-  "AnnounceUpcomingExerciseDesc": "When TTS is enabled, announce the upcoming exercise",
-  "@AnnounceUpcomingExerciseDesc": {},
-  "backup": "Backup",
-  "@backup": {},
-  "cancel": "Cancel",
-  "@cancel": {},
-  "countRepetitions": "{count} repetitions",
-  "@countRepetitions": {},
-  "currentSet": "Current set",
-  "@currentSet": {},
-  "delete": "Delete",
-  "@delete": {},
-  "deleteConfirmation": "Would you like to delete the workout \"{title}\"?",
-  "@deleteConfirmation": {},
-  "deleteExercise": "Delete exercise",
-  "@deleteExercise": {},
-  "deleteSet": "Delete set",
-  "@deleteSet": {},
-  "deleteWorkout": "Delete workout",
-  "@deleteWorkout": {},
-  "duplicate": "Duplicate",
-  "@duplicate": {},
-  "durationLeft": "{timeLeft} of {timeTotal} left",
-  "@durationLeft": {},
-  "durationWithTime": "Duration: {formattedTime}",
-  "@durationWithTime": {},
-  "editWorkout": "Edit workout",
-  "@editWorkout": {},
-  "enterWorkoutName": "Please enter a name for the workout!",
-  "@enterWorkoutName": {},
-  "exercise": "Exercise",
-  "@exercise": {},
-  "exerciseOf": "Exercise {currentIndex} of {total}",
-  "@exerciseOf": {},
-  "exitCheck": "Are you sure you want to exit?",
-  "@exitCheck": {},
-  "export": "Export all workouts",
-  "@export": {},
-  "firstExercise": "First: {name}",
-  "@firstExercise": {},
-  "general": "General",
-  "@general": {},
-  "halfwayDone": "Halfway done",
-  "@halfwayDone": {},
-  "import": "Import a backup",
-  "@import": {},
-  "importedCount": "Imported {count} workouts",
-  "@importedCount": {},
-  "keepScreenAwake": "Keep screen awake",
-  "@keepScreenAwake": {},
-  "language": "Language",
-  "@language": {},
-  "licenses": "Licenses",
-  "@licenses": {},
-  "moveExerciseDown": "Move exercise down",
-  "@moveExerciseDown": {},
-  "moveExerciseUp": "Move exercise up",
-  "@moveExerciseUp": {},
-  "moveSetDown": "Move set down",
-  "@moveSetDown": {},
-  "moveSetUp": "Move set up",
-  "@moveSetUp": {},
-  "name": "Name",
-  "@name": {},
-  "nextExercise": "Next: {name}",
-  "@nextExercise": {},
-  "nextSet": "Next set",
-  "@nextSet": {},
-  "no": "No",
-  "@no": {},
-  "noSound": "No sound effects",
-  "@noSound": {},
-  "noSoundDesc": "Mute all sound output",
-  "@noSoundDesc": {},
-  "ossLicenses": "Open Source Licenses",
-  "@ossLicenses": {},
-  "overwriteExistingWorkout": "Overwrite existing workout?",
-  "@overwriteExistingWorkout": {},
-  "playTickEverySecond": "Play tick every second",
-  "@playTickEverySecond": {},
-  "repetitions": "Repetitions:",
-  "@repetitions": {},
-  "repOf": "Repetition {currentIndex} of {total}",
-  "@repOf": {},
-  "reportIssuesOrRequestAFeature": "Report issues or request a feature",
-  "@reportIssuesOrRequestAFeature": {},
-  "rest": "Rest",
-  "@rest": {},
-  "saved": "Saved",
-  "@saved": {},
-  "saveWorkout": "Save workout",
-  "@saveWorkout": {},
-  "setIndex": "Set {number}",
-  "@setIndex": {},
-  "setOf": "Set {currentIndex} of {total}",
-  "@setOf": {},
-  "settingHalfway": "Play sound or announcement halfway during exercise",
-  "@settingHalfway": {},
-  "settings": "Settings",
-  "@settings": {},
-  "soundOutput": "Sound output",
-  "@soundOutput": {},
-  "startWorkout": "Start workout",
-  "@startWorkout": {},
-  "title": "Just Another Workout Timer",
-  "@title": {},
-  "tts": "Text-to-Speech (TTS)",
-  "@tts": {},
-  "ttsLang": "TTS Language",
-  "@ttsLang": {},
-  "ttsLangDesc": "Select a language\n(only when TTS is enabled)",
-  "@ttsLangDesc": {},
-  "useSound": "Use sound effects",
-  "@useSound": {},
-  "useSoundDesc": "Use simple sounds to indicate starts and endings of exercises",
-  "@useSoundDesc": {},
-  "useTTS": "Use Text-to-Speech",
-  "@useTTS": {},
-  "useTTSDesc": "Announce current and upcoming exercises",
-  "@useTTSDesc": {},
-  "viewLicense": "View License",
-  "@viewLicense": {},
-  "viewOnGithub": "View on GitHub",
-  "@viewOnGithub": {},
-  "viewOSSLicenses": "View Open Source Licenses",
-  "@viewOSSLicenses": {},
-  "workoutComplete": "Workout complete",
-  "@workoutComplete": {},
-  "workouts": "Workouts",
-  "@workouts": {},
-  "yes": "Yes",
-  "@yes": {},
-  "yesExit": "Yes, exit",
-  "@yesExit": {},
-  "expanded_setlist": "Expanded set list",
-  "expanded_setlist_info": "Always show full set",
-  "seconds": "Seconds"
+    "@@locale": "en",
+    "addExercise": "Add exercise",
+    "addRest": "Add rest",
+    "addSet": "Add Set",
+    "addWorkout": "Add workout",
+    "announceUpcomingExercise": "Announce upcoming exercise",
+    "AnnounceUpcomingExerciseDesc": "When TTS is enabled, announce the upcoming exercise",
+    "backup": "Backup",
+    "cancel": "Cancel",
+    "countRepetitions": "{count} repetitions",
+    "currentSet": "Current set",
+    "delete": "Delete",
+    "deleteConfirmation": "Would you like to delete the workout \"{title}\"?",
+    "deleteExercise": "Delete exercise",
+    "deleteSet": "Delete set",
+    "deleteWorkout": "Delete workout",
+    "duplicate": "Duplicate",
+    "durationLeft": "{timeLeft} of {timeTotal} left",
+    "durationWithTime": "Duration: {formattedTime}",
+    "editWorkout": "Edit workout",
+    "enterWorkoutName": "Please enter a name for the workout!",
+    "exercise": "Exercise",
+    "exerciseOf": "Exercise {currentIndex} of {total}",
+    "exitCheck": "Are you sure you want to exit?",
+    "export": "Export all workouts",
+    "firstExercise": "First: {name}",
+    "general": "General",
+    "halfwayDone": "Halfway done",
+    "import": "Import a backup",
+    "importedCount": "Imported {count} workouts",
+    "keepScreenAwake": "Keep screen awake",
+    "language": "Language",
+    "licenses": "Licenses",
+    "moveExerciseDown": "Move exercise down",
+    "moveExerciseUp": "Move exercise up",
+    "moveSetDown": "Move set down",
+    "moveSetUp": "Move set up",
+    "name": "Name",
+    "nextExercise": "Next: {name}",
+    "nextSet": "Next set",
+    "no": "No",
+    "noSound": "No sound effects",
+    "noSoundDesc": "Mute all sound output",
+    "ossLicenses": "Open Source Licenses",
+    "overwriteExistingWorkout": "Overwrite existing workout?",
+    "playTickEverySecond": "Play tick every second",
+    "repetitions": "Repetitions:",
+    "repOf": "Repetition {currentIndex} of {total}",
+    "reportIssuesOrRequestAFeature": "Report issues or request a feature",
+    "rest": "Rest",
+    "saved": "Saved",
+    "saveWorkout": "Save workout",
+    "setIndex": "Set {number}",
+    "setOf": "Set {currentIndex} of {total}",
+    "settingHalfway": "Play sound or announcement halfway during exercise",
+    "settings": "Settings",
+    "soundOutput": "Sound output",
+    "startWorkout": "Start workout",
+    "title": "Just Another Workout Timer",
+    "tts": "Text-to-Speech (TTS)",
+    "ttsLang": "TTS Language",
+    "ttsLangDesc": "Select a language\n(only when TTS is enabled)",
+    "useSound": "Use sound effects",
+    "useSoundDesc": "Use simple sounds to indicate starts and endings of exercises",
+    "useTTS": "Use Text-to-Speech",
+    "useTTSDesc": "Announce current and upcoming exercises",
+    "viewLicense": "View License",
+    "viewOnGithub": "View on GitHub",
+    "viewOSSLicenses": "View Open Source Licenses",
+    "workoutComplete": "Workout complete",
+    "workouts": "Workouts",
+    "yes": "Yes",
+    "yesExit": "Yes, exit",
+    "expanded_setlist": "Expanded set list",
+    "expanded_setlist_info": "Always show full set",
+    "seconds": "Seconds",
+    "theme": "Theme",
+    "theme_dark": "Dark",
+    "theme_light": "Light",
+    "theme_system": "System"
 }
\ No newline at end of file
diff --git a/lib/l10n/intl_fr.arb b/lib/l10n/intl_fr.arb
index c2ae040a..b55a83ff 100644
--- a/lib/l10n/intl_fr.arb
+++ b/lib/l10n/intl_fr.arb
@@ -1,153 +1,78 @@
 {
-  "@@locale": "fr",
-  "addExercise": "Ajouter exercice",
-  "@addExercise": {},
-  "addRest": "Ajouter repos",
-  "@addRest": {},
-  "addSet": "Ajouter série",
-  "@addSet": {},
-  "addWorkout": "Ajouter programme",
-  "@addWorkout": {},
-  "announceUpcomingExercise": "Annoncer l'exercice suivant",
-  "@announceUpcomingExercise": {},
-  "AnnounceUpcomingExerciseDesc": "Si TTS est activé, annoncer l'exercice à venir",
-  "@AnnounceUpcomingExerciseDesc": {},
-  "backup": "Sauvegarde",
-  "@backup": {},
-  "cancel": "Annuler",
-  "@cancel": {},
-  "countRepetitions": "{count} répétitions",
-  "@countRepetitions": {},
-  "currentSet": "Série actuelle",
-  "@currentSet": {},
-  "delete": "Supprimer",
-  "@delete": {},
-  "deleteConfirmation": "Voulez-vous supprimer le programme \"{title}\" ?",
-  "@deleteConfirmation": {},
-  "deleteExercise": "Supprimer exercice",
-  "@deleteExercise": {},
-  "deleteSet": "Supprimer série",
-  "@deleteSet": {},
-  "deleteWorkout": "Supprimer programme",
-  "@deleteWorkout": {},
-  "duplicate": "Dupliquer",
-  "@duplicate": {},
-  "durationLeft": "{timeLeft} restant sur {timeTotal}",
-  "@durationLeft": {},
-  "durationWithTime": "Durée : {formattedTime}",
-  "@durationWithTime": {},
-  "editWorkout": "Éditer programme",
-  "@editWorkout": {},
-  "enterWorkoutName": "Merci d'entrer un nom pour votre entrainement !",
-  "@enterWorkoutName": {},
-  "exercise": "Exercice",
-  "@exercise": {},
-  "exerciseOf": "Exercice {currentIndex} sur {total}",
-  "@exerciseOf": {},
-  "exitCheck": "Voulez-vous vraiment quitter ?",
-  "@exitCheck": {},
-  "expanded_setlist": "Liste de série étendue",
-  "@expanded_setlist": {},
-  "expanded_setlist_info": "Toujours afficher la série entière",
-  "@expanded_setlist_info": {},
-  "export": "Exporter les entraînements",
-  "@export": {},
-  "firstExercise": "Premier : {name}",
-  "@firstExercise": {},
-  "general": "Général",
-  "@general": {},
-  "halfwayDone": "Mi-parcours",
-  "@halfwayDone": {},
-  "import": "Importer une sauvegarde",
-  "@import": {},
-  "importedCount": "{count} entraînements importés",
-  "@importedCount": {},
-  "keepScreenAwake": "Garder l'écran allumé",
-  "@keepScreenAwake": {},
-  "language": "Langue",
-  "@language": {},
-  "licenses": "Licences",
-  "@licenses": {},
-  "moveExerciseDown": "Descendre l'exercice",
-  "@moveExerciseDown": {},
-  "moveExerciseUp": "Monter l'exercice",
-  "@moveExerciseUp": {},
-  "moveSetDown": "Descendre la série",
-  "@moveSetDown": {},
-  "moveSetUp": "Monter la série",
-  "@moveSetUp": {},
-  "name": "Nom",
-  "@name": {},
-  "nextExercise": "Prochain : {name}",
-  "@nextExercise": {},
-  "nextSet": "Prochaine série",
-  "@nextSet": {},
-  "no": "Non",
-  "@no": {},
-  "noSound": "Aucun effet sonore",
-  "@noSound": {},
-  "noSoundDesc": "Couper tous les sons",
-  "@noSoundDesc": {},
-  "ossLicenses": "Licences Open Source",
-  "@ossLicenses": {},
-  "overwriteExistingWorkout": "Remplacer l'entrainement existant ?",
-  "@overwriteExistingWorkout": {},
-  "playTickEverySecond": "Jouer un tictac chaque seconde",
-  "@playTickEverySecond": {},
-  "repetitions": "Répetitions :",
-  "@repetitions": {},
-  "repOf": "Répétition {currentIndex} sur {total}",
-  "@repOf": {},
-  "reportIssuesOrRequestAFeature": "Reporter un problème ou demander une fonctionnalité",
-  "@reportIssuesOrRequestAFeature": {},
-  "rest": "Repos",
-  "@rest": {},
-  "saved": "Enregistré",
-  "@saved": {},
-  "saveWorkout": "Enregistrer entrainement",
-  "@saveWorkout": {},
-  "seconds": "Secondes",
-  "@seconds": {},
-  "setIndex": "Série {number}",
-  "@setIndex": {},
-  "setOf": "Série {currentIndex} sur {total}",
-  "@setOf": {},
-  "settingHalfway": "Jouer un son ou une annonce à mi-parcours d'un exercice",
-  "@settingHalfway": {},
-  "settings": "Paramètres",
-  "@settings": {},
-  "soundOutput": "Retour audio",
-  "@soundOutput": {},
-  "startWorkout": "Démarrer programme",
-  "@startWorkout": {},
-  "title": "Just Another Workout Timer",
-  "@title": {},
-  "tts": "Synthèse vocale (TTS)",
-  "@tts": {},
-  "ttsLang": "Langue du TTS",
-  "@ttsLang": {},
-  "ttsLangDesc": "Choisir une langue\n(quand TTS est activé seulement)",
-  "@ttsLangDesc": {},
-  "useSound": "Utiliser les sons",
-  "@useSound": {},
-  "useSoundDesc": "Utiliser des sons simples pour indiquer le début et la fin des exercices",
-  "@useSoundDesc": {},
-  "useTTS": "Utiliser la synthèse vocale",
-  "@useTTS": {},
-  "useTTSDesc": "Annoncer l'exercice en cours et le suivant",
-  "@useTTSDesc": {},
-  "viewLicense": "Voir Licence",
-  "@viewLicense": {},
-  "viewOnGithub": "Voir sur GitHub",
-  "@viewOnGithub": {},
-  "viewOSSLicenses": "Voir licences Open Source",
-  "@viewOSSLicenses": {},
-  "workoutComplete": "Entrainement terminé",
-  "@workoutComplete": {},
-  "workouts": "Programmes",
-  "@workouts": {},
-  "yes": "Oui",
-  "@yes": {},
-  "yesExit": "Oui, quitter",
-  "@yesExit": {}
-}
+    "@@locale": "fr",
+    "addExercise": "Ajouter exercice",
+    "addRest": "Ajouter repos",
+    "addSet": "Ajouter série",
+    "addWorkout": "Ajouter programme",
+    "announceUpcomingExercise": "Annoncer l'exercice suivant",
+    "AnnounceUpcomingExerciseDesc": "Si TTS est activé, annoncer l'exercice à venir",
+    "backup": "Sauvegarde",
+    "cancel": "Annuler",
+    "countRepetitions": "{count} répétitions",
+    "currentSet": "Série actuelle",
+    "delete": "Supprimer",
+    "deleteConfirmation": "Voulez-vous supprimer le programme \"{title}\" ?",
+    "deleteExercise": "Supprimer exercice",
+    "deleteSet": "Supprimer série",
+    "deleteWorkout": "Supprimer programme",
+    "duplicate": "Dupliquer",
+    "durationLeft": "{timeLeft} restant sur {timeTotal}",
+    "durationWithTime": "Durée : {formattedTime}",
+    "editWorkout": "Éditer programme",
+    "enterWorkoutName": "Merci d'entrer un nom pour votre entrainement !",
+    "exercise": "Exercice",
+    "exerciseOf": "Exercice {currentIndex} sur {total}",
+    "exitCheck": "Voulez-vous vraiment quitter ?",
+    "expanded_setlist": "Liste de série étendue",
+    "expanded_setlist_info": "Toujours afficher la série entière",
+    "export": "Exporter les entraînements",
+    "firstExercise": "Premier : {name}",
+    "general": "Général",
+    "halfwayDone": "Mi-parcours",
+    "import": "Importer une sauvegarde",
+    "importedCount": "{count} entraînements importés",
+    "keepScreenAwake": "Garder l'écran allumé",
+    "language": "Langue",
+    "licenses": "Licences",
+    "moveExerciseDown": "Descendre l'exercice",
+    "moveExerciseUp": "Monter l'exercice",
+    "moveSetDown": "Descendre la série",
+    "moveSetUp": "Monter la série",
+    "name": "Nom",
+    "nextExercise": "Prochain : {name}",
+    "nextSet": "Prochaine série",
+    "no": "Non",
+    "noSound": "Aucun effet sonore",
+    "noSoundDesc": "Couper tous les sons",
+    "ossLicenses": "Licences Open Source",
+    "overwriteExistingWorkout": "Remplacer l'entrainement existant ?",
+    "playTickEverySecond": "Jouer un tictac chaque seconde",
+    "repetitions": "Répetitions :",
+    "repOf": "Répétition {currentIndex} sur {total}",
+    "reportIssuesOrRequestAFeature": "Reporter un problème ou demander une fonctionnalité",
+    "rest": "Repos",
+    "saved": "Enregistré",
+    "saveWorkout": "Enregistrer entrainement",
+    "seconds": "Secondes",
+    "setIndex": "Série {number}",
+    "setOf": "Série {currentIndex} sur {total}",
+    "settingHalfway": "Jouer un son ou une annonce à mi-parcours d'un exercice",
+    "settings": "Paramètres",
+    "soundOutput": "Retour audio",
+    "startWorkout": "Démarrer programme",
+    "title": "Just Another Workout Timer",
+    "tts": "Synthèse vocale (TTS)",
+    "ttsLang": "Langue du TTS",
+    "ttsLangDesc": "Choisir une langue\n(quand TTS est activé seulement)",
+    "useSound": "Utiliser les sons",
+    "useSoundDesc": "Utiliser des sons simples pour indiquer le début et la fin des exercices",
+    "useTTS": "Utiliser la synthèse vocale",
+    "useTTSDesc": "Annoncer l'exercice en cours et le suivant",
+    "viewLicense": "Voir Licence",
+    "viewOnGithub": "Voir sur GitHub",
+    "viewOSSLicenses": "Voir licences Open Source",
+    "workoutComplete": "Entrainement terminé",
+    "workouts": "Programmes",
+    "yes": "Oui",
+    "yesExit": "Oui, quitter"
+  }
diff --git a/lib/l10n/intl_it.arb b/lib/l10n/intl_it.arb
index aec0319e..2fd4da51 100644
--- a/lib/l10n/intl_it.arb
+++ b/lib/l10n/intl_it.arb
@@ -1,153 +1,78 @@
 {
-  "@@locale": "it",
-  "addExercise": "Aggiungi un esercizio",
-  "@addExercise": {},
-  "addRest": "Aggiungi una pausa",
-  "@addRest": {},
-  "addSet": "Aggiungi una sessione",
-  "@addSet": {},
-  "addWorkout": "Inizia l'allenamento",
-  "@addWorkout": {},
-  "announceUpcomingExercise": "Annuncia il successivo esercizio",
-  "@announceUpcomingExercise": {},
-  "AnnounceUpcomingExerciseDesc": "Quando TTS è abilitato annuncierà l'esercizio seguente",
-  "@AnnounceUpcomingExerciseDesc": {},
-  "backup": "Backup",
-  "@backup": {},
-  "cancel": "Annulla",
-  "@cancel": {},
-  "countRepetitions": "{count} Ripetizioni",
-  "@countRepetitions": {},
-  "currentSet": "Sessione attuale",
-  "@currentSet": {},
-  "delete": "Cancella",
-  "@delete": {},
-  "deleteConfirmation": "Vuoi veramente cancellare l'allenamento \"{title}\"?",
-  "@deleteConfirmation": {},
-  "deleteExercise": "Cancella l'esercizio",
-  "@deleteExercise": {},
-  "deleteSet": "Cancella l'impostazione",
-  "@deleteSet": {},
-  "deleteWorkout": "Cacella l'allenamento",
-  "@deleteWorkout": {},
-  "duplicate": "Duplicare",
-  "@duplicate": {},
-  "durationLeft": "{timeLeft} su {timeTotal} mancanti",
-  "@durationLeft": {},
-  "durationWithTime": "Durata: {formattedTime}",
-  "@durationWithTime": {},
-  "editWorkout": "Modifica l'allenamento",
-  "@editWorkout": {},
-  "enterWorkoutName": "Per favore inserisci il nome dell'allenamento!",
-  "@enterWorkoutName": {},
-  "exercise": "Esercizio",
-  "@exercise": {},
-  "exerciseOf": "Esercizio {currentIndex} di {total}",
-  "@exerciseOf": {},
-  "exitCheck": "Vuoi veramente uscire?",
-  "@exitCheck": {},
-  "expanded_setlist": "Expanded set list",
-  "@expanded_setlist": {},
-  "expanded_setlist_info": "Always show full set",
-  "@expanded_setlist_info": {},
-  "export": "Export all workouts",
-  "@export": {},
-  "firstExercise": "Inizia con: {name}",
-  "@firstExercise": {},
-  "general": "Generale",
-  "@general": {},
-  "halfwayDone": "Metà esercizio eseguito",
-  "@halfwayDone": {},
-  "import": "Import a backup",
-  "@import": {},
-  "importedCount": "Imported {count} workouts",
-  "@importedCount": {},
-  "keepScreenAwake": "Mantieni schermo sempre acceso",
-  "@keepScreenAwake": {},
-  "language": "Lingua",
-  "@language": {},
-  "licenses": "Licenze",
-  "@licenses": {},
-  "moveExerciseDown": "Muovi la sessione verso il basso",
-  "@moveExerciseDown": {},
-  "moveExerciseUp": "Muovi l'esercizio verso l'alto",
-  "@moveExerciseUp": {},
-  "moveSetDown": "Muovi la sessione verso il basso",
-  "@moveSetDown": {},
-  "moveSetUp": "Muovi la sessione verso l'alto",
-  "@moveSetUp": {},
-  "name": "Nome",
-  "@name": {},
-  "nextExercise": "Prossimo esercizio: {name}",
-  "@nextExercise": {},
-  "nextSet": "Prossima sessione",
-  "@nextSet": {},
-  "no": "no",
-  "@no": {},
-  "noSound": "Nessun suono",
-  "@noSound": {},
-  "noSoundDesc": "Non sarà riprodotto alcun suono",
-  "@noSoundDesc": {},
-  "ossLicenses": "Licenza Open Source",
-  "@ossLicenses": {},
-  "overwriteExistingWorkout": "Vuoi sovrascrivere l'allenamento esistente?",
-  "@overwriteExistingWorkout": {},
-  "playTickEverySecond": "Suona un tick ogni secondo",
-  "@playTickEverySecond": {},
-  "repetitions": "Ripetizioni:",
-  "@repetitions": {},
-  "repOf": "Ripetizione {currentIndex} di {total}",
-  "@repOf": {},
-  "reportIssuesOrRequestAFeature": "Segnala problemi o fai richiesta di nuove caratteristiche",
-  "@reportIssuesOrRequestAFeature": {},
-  "rest": "Riposo",
-  "@rest": {},
-  "saved": "Salvato",
-  "@saved": {},
-  "saveWorkout": "Salva l'allenamento",
-  "@saveWorkout": {},
-  "seconds": "Secondi",
-  "@seconds": {},
-  "setIndex": "Sessione {number}",
-  "@setIndex": {},
-  "setOf": "Sessione {currentIndex} di {total}",
-  "@setOf": {},
-  "settingHalfway": "Suona un segnale o annuncia la metà esercizio durante l'esercizio stesso",
-  "@settingHalfway": {},
-  "settings": "Impostazioni",
-  "@settings": {},
-  "soundOutput": "Uscita suoni",
-  "@soundOutput": {},
-  "startWorkout": "Inizia l'allenamento",
-  "@startWorkout": {},
-  "title": "Just Another Workout Timer",
-  "@title": {},
-  "tts": "Sintesi vocale (TTS)",
-  "@tts": {},
-  "ttsLang": "Lingua TTS",
-  "@ttsLang": {},
-  "ttsLangDesc": "Scegli una lingua\n(Solo se TTS è attivo)",
-  "@ttsLangDesc": {},
-  "useSound": "Segnale sonoro",
-  "@useSound": {},
-  "useSoundDesc": "Un segnale sonoro indicherà l'inizio e la fine degli esercizi",
-  "@useSoundDesc": {},
-  "useTTS": "Usa la sintesi vocale Text-To-Speech (TTS)",
-  "@useTTS": {},
-  "useTTSDesc": "Annuncia l'esercizio attuale e il successivo",
-  "@useTTSDesc": {},
-  "viewLicense": "Vedi la licenza",
-  "@viewLicense": {},
-  "viewOnGithub": "Vedi su GitHub",
-  "@viewOnGithub": {},
-  "viewOSSLicenses": "Vedi la licenza Open Source",
-  "@viewOSSLicenses": {},
-  "workoutComplete": "Allenamento completato!",
-  "@workoutComplete": {},
-  "workouts": "allenamenti",
-  "@workouts": {},
-  "yes": "si",
-  "@yes": {},
-  "yesExit": "Si",
-  "@yesExit": {}
-}
\ No newline at end of file
+    "@@locale": "it",
+    "addExercise": "Aggiungi un esercizio",
+    "addRest": "Aggiungi una pausa",
+    "addSet": "Aggiungi una sessione",
+    "addWorkout": "Inizia l'allenamento",
+    "announceUpcomingExercise": "Annuncia il successivo esercizio",
+    "AnnounceUpcomingExerciseDesc": "Quando TTS è abilitato annuncierà l'esercizio seguente",
+    "backup": "Backup",
+    "cancel": "Annulla",
+    "countRepetitions": "{count} Ripetizioni",
+    "currentSet": "Sessione attuale",
+    "delete": "Cancella",
+    "deleteConfirmation": "Vuoi veramente cancellare l'allenamento \"{title}\"?",
+    "deleteExercise": "Cancella l'esercizio",
+    "deleteSet": "Cancella l'impostazione",
+    "deleteWorkout": "Cacella l'allenamento",
+    "duplicate": "Duplicare",
+    "durationLeft": "{timeLeft} su {timeTotal} mancanti",
+    "durationWithTime": "Durata: {formattedTime}",
+    "editWorkout": "Modifica l'allenamento",
+    "enterWorkoutName": "Per favore inserisci il nome dell'allenamento!",
+    "exercise": "Esercizio",
+    "exerciseOf": "Esercizio {currentIndex} di {total}",
+    "exitCheck": "Vuoi veramente uscire?",
+    "expanded_setlist": "Expanded set list",
+    "expanded_setlist_info": "Always show full set",
+    "export": "Export all workouts",
+    "firstExercise": "Inizia con: {name}",
+    "general": "Generale",
+    "halfwayDone": "Metà esercizio eseguito",
+    "import": "Import a backup",
+    "importedCount": "Imported {count} workouts",
+    "keepScreenAwake": "Mantieni schermo sempre acceso",
+    "language": "Lingua",
+    "licenses": "Licenze",
+    "moveExerciseDown": "Muovi la sessione verso il basso",
+    "moveExerciseUp": "Muovi l'esercizio verso l'alto",
+    "moveSetDown": "Muovi la sessione verso il basso",
+    "moveSetUp": "Muovi la sessione verso l'alto",
+    "name": "Nome",
+    "nextExercise": "Prossimo esercizio: {name}",
+    "nextSet": "Prossima sessione",
+    "no": "no",
+    "noSound": "Nessun suono",
+    "noSoundDesc": "Non sarà riprodotto alcun suono",
+    "ossLicenses": "Licenza Open Source",
+    "overwriteExistingWorkout": "Vuoi sovrascrivere l'allenamento esistente?",
+    "playTickEverySecond": "Suona un tick ogni secondo",
+    "repetitions": "Ripetizioni:",
+    "repOf": "Ripetizione {currentIndex} di {total}",
+    "reportIssuesOrRequestAFeature": "Segnala problemi o fai richiesta di nuove caratteristiche",
+    "rest": "Riposo",
+    "saved": "Salvato",
+    "saveWorkout": "Salva l'allenamento",
+    "seconds": "Secondi",
+    "setIndex": "Sessione {number}",
+    "setOf": "Sessione {currentIndex} di {total}",
+    "settingHalfway": "Suona un segnale o annuncia la metà esercizio durante l'esercizio stesso",
+    "settings": "Impostazioni",
+    "soundOutput": "Uscita suoni",
+    "startWorkout": "Inizia l'allenamento",
+    "title": "Just Another Workout Timer",
+    "tts": "Sintesi vocale (TTS)",
+    "ttsLang": "Lingua TTS",
+    "ttsLangDesc": "Scegli una lingua\n(Solo se TTS è attivo)",
+    "useSound": "Segnale sonoro",
+    "useSoundDesc": "Un segnale sonoro indicherà l'inizio e la fine degli esercizi",
+    "useTTS": "Usa la sintesi vocale Text-To-Speech (TTS)",
+    "useTTSDesc": "Annuncia l'esercizio attuale e il successivo",
+    "viewLicense": "Vedi la licenza",
+    "viewOnGithub": "Vedi su GitHub",
+    "viewOSSLicenses": "Vedi la licenza Open Source",
+    "workoutComplete": "Allenamento completato!",
+    "workouts": "allenamenti",
+    "yes": "si",
+    "yesExit": "Si"
+  }
\ No newline at end of file
diff --git a/lib/l10n/intl_ru.arb b/lib/l10n/intl_ru.arb
index e0cdf3ff..74061de6 100644
--- a/lib/l10n/intl_ru.arb
+++ b/lib/l10n/intl_ru.arb
@@ -1,153 +1,78 @@
 {
-  "@@locale": "ru",
-  "addExercise": "Добавить упражнение",
-  "@addExercise": {},
-  "addRest": "Добавить отдых",
-  "@addRest": {},
-  "addSet": "Добавить комплекс упражнений",
-  "@addSet": {},
-  "addWorkout": "Добавить тренировку",
-  "@addWorkout": {},
-  "announceUpcomingExercise": "Предупреждать о следующем упражнении",
-  "@announceUpcomingExercise": {},
-  "AnnounceUpcomingExerciseDesc": "Когда TTS включен, сообщать о следующем упражнения",
-  "@AnnounceUpcomingExerciseDesc": {},
-  "backup": "Backup",
-  "@backup": {},
-  "cancel": "Отмена",
-  "@cancel": {},
-  "countRepetitions": "{count} повторений",
-  "@countRepetitions": {},
-  "currentSet": "Текущий комплекс упражнений",
-  "@currentSet": {},
-  "delete": "Удалить",
-  "@delete": {},
-  "deleteConfirmation": "Вы бы хотели удалить тренировку \"{title}\"?",
-  "@deleteConfirmation": {},
-  "deleteExercise": "Удалить упражнение",
-  "@deleteExercise": {},
-  "deleteSet": "Удалить комплекс упражнений",
-  "@deleteSet": {},
-  "deleteWorkout": "Удалить тренировку",
-  "@deleteWorkout": {},
-  "duplicate": "Дублировать",
-  "@duplicate": {},
-  "durationLeft": "{timeLeft} из {timeTotal} осталось",
-  "@durationLeft": {},
-  "durationWithTime": "Продолжительность: {formattedTime}",
-  "@durationWithTime": {},
-  "editWorkout": "Изменить тренировку",
-  "@editWorkout": {},
-  "enterWorkoutName": "Пожалуйста, введите название тренировки!",
-  "@enterWorkoutName": {},
-  "exercise": "Упражнение",
-  "@exercise": {},
-  "exerciseOf": "Упражнение {currentIndex} из {total}",
-  "@exerciseOf": {},
-  "exitCheck": "Вы уверены, что хотите выйти?",
-  "@exitCheck": {},
-  "expanded_setlist": "Expanded set list",
-  "@expanded_setlist": {},
-  "expanded_setlist_info": "Always show full set",
-  "@expanded_setlist_info": {},
-  "export": "Export all workouts",
-  "@export": {},
-  "firstExercise": "Сначала: {name}",
-  "@firstExercise": {},
-  "general": "Общее",
-  "@general": {},
-  "halfwayDone": "Наполовину выполнено",
-  "@halfwayDone": {},
-  "import": "Import a backup",
-  "@import": {},
-  "importedCount": "Imported {count} workouts",
-  "@importedCount": {},
-  "keepScreenAwake": "Предотвратить выключение экрана",
-  "@keepScreenAwake": {},
-  "language": "Язык",
-  "@language": {},
-  "licenses": "Лицензии",
-  "@licenses": {},
-  "moveExerciseDown": "Опустить упражнение вниз",
-  "@moveExerciseDown": {},
-  "moveExerciseUp": "Поднять упражнение вверх",
-  "@moveExerciseUp": {},
-  "moveSetDown": "Опустить комплекс вниз",
-  "@moveSetDown": {},
-  "moveSetUp": "Поднять комплекс вверх",
-  "@moveSetUp": {},
-  "name": "Название",
-  "@name": {},
-  "nextExercise": "Следующее: {name}",
-  "@nextExercise": {},
-  "nextSet": "Следующий комплекс упражнений",
-  "@nextSet": {},
-  "no": "Нет",
-  "@no": {},
-  "noSound": "Без звуковых эффектов",
-  "@noSound": {},
-  "noSoundDesc": "Выключить все звуки",
-  "@noSoundDesc": {},
-  "ossLicenses": "Open Source лицензии",
-  "@ossLicenses": {},
-  "overwriteExistingWorkout": "Перезаписать существующую тренировку?",
-  "@overwriteExistingWorkout": {},
-  "playTickEverySecond": "Издавать щелчок каждую секунду",
-  "@playTickEverySecond": {},
-  "repetitions": "Повторения:",
-  "@repetitions": {},
-  "repOf": "Повторение {currentIndex} из {total}",
-  "@repOf": {},
-  "reportIssuesOrRequestAFeature": "Сообщить о проблемах или запросить функцию",
-  "@reportIssuesOrRequestAFeature": {},
-  "rest": "Отдых",
-  "@rest": {},
-  "saved": "Сохранено",
-  "@saved": {},
-  "saveWorkout": "Сохранить тренировку",
-  "@saveWorkout": {},
-  "seconds": "Секунды",
-  "@seconds": {},
-  "setIndex": "Комплекс {number}",
-  "@setIndex": {},
-  "setOf": "Комплекс {currentIndex} из {total}",
-  "@setOf": {},
-  "settingHalfway": "Воспроизвести звук или объявление на половине тренировки",
-  "@settingHalfway": {},
-  "settings": "Настройки",
-  "@settings": {},
-  "soundOutput": "Звуки",
-  "@soundOutput": {},
-  "startWorkout": "Начать тренировку",
-  "@startWorkout": {},
-  "title": "Just Another Workout Timer",
-  "@title": {},
-  "tts": "Text-to-Speech (TTS)",
-  "@tts": {},
-  "ttsLang": "TTS Язык",
-  "@ttsLang": {},
-  "ttsLangDesc": "Выберите язык\n(только когда TTS включен)",
-  "@ttsLangDesc": {},
-  "useSound": "Использовать звуковые эффекты",
-  "@useSound": {},
-  "useSoundDesc": "Использовать простые звуки, чтобы анонсировать начало и конец упражнения.",
-  "@useSoundDesc": {},
-  "useTTS": "Использовать Text-to-Speech",
-  "@useTTS": {},
-  "useTTSDesc": "Анонсировать текущие и предстоящие упражнения",
-  "@useTTSDesc": {},
-  "viewLicense": "Посмотреть лицензиию",
-  "@viewLicense": {},
-  "viewOnGithub": "Посмотреть на GitHub",
-  "@viewOnGithub": {},
-  "viewOSSLicenses": "Посмотреть Open Source лицензии",
-  "@viewOSSLicenses": {},
-  "workoutComplete": "Тренировка завершена",
-  "@workoutComplete": {},
-  "workouts": "Тренировки",
-  "@workouts": {},
-  "yes": "Да",
-  "@yes": {},
-  "yesExit": "Да, выйти",
-  "@yesExit": {}
-}
\ No newline at end of file
+    "@@locale": "ru",
+    "addExercise": "Добавить упражнение",
+    "addRest": "Добавить отдых",
+    "addSet": "Добавить комплекс упражнений",
+    "addWorkout": "Добавить тренировку",
+    "announceUpcomingExercise": "Предупреждать о следующем упражнении",
+    "AnnounceUpcomingExerciseDesc": "Когда TTS включен, сообщать о следующем упражнения",
+    "backup": "Backup",
+    "cancel": "Отмена",
+    "countRepetitions": "{count} повторений",
+    "currentSet": "Текущий комплекс упражнений",
+    "delete": "Удалить",
+    "deleteConfirmation": "Вы бы хотели удалить тренировку \"{title}\"?",
+    "deleteExercise": "Удалить упражнение",
+    "deleteSet": "Удалить комплекс упражнений",
+    "deleteWorkout": "Удалить тренировку",
+    "duplicate": "Дублировать",
+    "durationLeft": "{timeLeft} из {timeTotal} осталось",
+    "durationWithTime": "Продолжительность: {formattedTime}",
+    "editWorkout": "Изменить тренировку",
+    "enterWorkoutName": "Пожалуйста, введите название тренировки!",
+    "exercise": "Упражнение",
+    "exerciseOf": "Упражнение {currentIndex} из {total}",
+    "exitCheck": "Вы уверены, что хотите выйти?",
+    "expanded_setlist": "Expanded set list",
+    "expanded_setlist_info": "Always show full set",
+    "export": "Export all workouts",
+    "firstExercise": "Сначала: {name}",
+    "general": "Общее",
+    "halfwayDone": "Наполовину выполнено",
+    "import": "Import a backup",
+    "importedCount": "Imported {count} workouts",
+    "keepScreenAwake": "Предотвратить выключение экрана",
+    "language": "Язык",
+    "licenses": "Лицензии",
+    "moveExerciseDown": "Опустить упражнение вниз",
+    "moveExerciseUp": "Поднять упражнение вверх",
+    "moveSetDown": "Опустить комплекс вниз",
+    "moveSetUp": "Поднять комплекс вверх",
+    "name": "Название",
+    "nextExercise": "Следующее: {name}",
+    "nextSet": "Следующий комплекс упражнений",
+    "no": "Нет",
+    "noSound": "Без звуковых эффектов",
+    "noSoundDesc": "Выключить все звуки",
+    "ossLicenses": "Open Source лицензии",
+    "overwriteExistingWorkout": "Перезаписать существующую тренировку?",
+    "playTickEverySecond": "Издавать щелчок каждую секунду",
+    "repetitions": "Повторения:",
+    "repOf": "Повторение {currentIndex} из {total}",
+    "reportIssuesOrRequestAFeature": "Сообщить о проблемах или запросить функцию",
+    "rest": "Отдых",
+    "saved": "Сохранено",
+    "saveWorkout": "Сохранить тренировку",
+    "seconds": "Секунды",
+    "setIndex": "Комплекс {number}",
+    "setOf": "Комплекс {currentIndex} из {total}",
+    "settingHalfway": "Воспроизвести звук или объявление на половине тренировки",
+    "settings": "Настройки",
+    "soundOutput": "Звуки",
+    "startWorkout": "Начать тренировку",
+    "title": "Just Another Workout Timer",
+    "tts": "Text-to-Speech (TTS)",
+    "ttsLang": "TTS Язык",
+    "ttsLangDesc": "Выберите язык\n(только когда TTS включен)",
+    "useSound": "Использовать звуковые эффекты",
+    "useSoundDesc": "Использовать простые звуки, чтобы анонсировать начало и конец упражнения.",
+    "useTTS": "Использовать Text-to-Speech",
+    "useTTSDesc": "Анонсировать текущие и предстоящие упражнения",
+    "viewLicense": "Посмотреть лицензиию",
+    "viewOnGithub": "Посмотреть на GitHub",
+    "viewOSSLicenses": "Посмотреть Open Source лицензии",
+    "workoutComplete": "Тренировка завершена",
+    "workouts": "Тренировки",
+    "yes": "Да",
+    "yesExit": "Да, выйти"
+  }
\ No newline at end of file
diff --git a/lib/settings_page.dart b/lib/settings_page.dart
index 72981788..55d4ce06 100644
--- a/lib/settings_page.dart
+++ b/lib/settings_page.dart
@@ -61,15 +61,18 @@ class _SettingsPageState extends State<SettingsPage> {
             pref: 'lang',
           ),
           PrefDropdown(
-              title: Text(S.of(context).language),
+              title: Text(S.of(context).theme),
               pref: 'theme',
               onChange: (_) {
                 Phoenix.rebirth(context);
               },
               items: [
-                DropdownMenuItem(child: Text('Dark'), value: 'dark'),
-                DropdownMenuItem(child: Text('Light'), value: 'light'),
-                DropdownMenuItem(child: Text('System'), value: 'system'),
+                DropdownMenuItem(
+                    child: Text(S.of(context).theme_dark), value: 'dark'),
+                DropdownMenuItem(
+                    child: Text(S.of(context).theme_light), value: 'light'),
+                DropdownMenuItem(
+                    child: Text(S.of(context).theme_system), value: 'system'),
               ]),
           PrefSwitch(
             title: Text(S.of(context).keepScreenAwake),
diff --git a/localizely.yml b/localizely.yml
deleted file mode 100644
index 15bc8872..00000000
--- a/localizely.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-config_version: 1.0
-project_id: 6e3724ce-b0c2-459a-a840-311eb82328da
-file_type: flutter_arb
-upload:
-  files:
-    - file: lib/l10n/intl_en.arb
-      locale_code: en
-  params:
-    reviewed: true
-    tag_added:
-      - added
-    tag_removed:
-      - removed
-    tag_updated:
-      - updated
-download:
-  files:
-    - file: lib/l10n/intl_en.arb
-      locale_code: en
-    - file: lib/l10n/intl_de.arb
-      locale_code: de
-    - file: lib/l10n/intl_fr.arb
-      locale_code: fr
-    - file: lib/l10n/intl_it.arb
-      locale_code: it
-    - file: lib/l10n/intl_ru.arb
-      locale_code: ru
-  params:
-    export_empty_as: main
\ No newline at end of file
diff --git a/pubspec.yaml b/pubspec.yaml
index 3c076961..d94921d9 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -50,8 +50,6 @@ flutter_icons:
 
 flutter_intl:
   enabled: true
-  localizely:
-    project_id: 6e3724ce-b0c2-459a-a840-311eb82328da
 
 flutter_native_splash:
   color: "#FFFFFF"

From 9acd4ae5611782df53da3d30e482ea75be38a617 Mon Sep 17 00:00:00 2001
From: Bastian Block <blockbasti99@gmail.com>
Date: Sun, 14 Nov 2021 11:29:21 +0100
Subject: [PATCH 3/4] chore: update dependencies

---
 pubspec.lock | 29 ++++++++++++++++++-----------
 pubspec.yaml | 10 +++++-----
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/pubspec.lock b/pubspec.lock
index a529fc86..9cee6107 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -70,7 +70,7 @@ packages:
       name: build_runner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.5"
   build_runner_core:
     dependency: transitive
     description:
@@ -91,7 +91,7 @@ packages:
       name: built_value
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "8.1.2"
+    version: "8.1.3"
   characters:
     dependency: transitive
     description:
@@ -155,6 +155,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "3.0.1"
+  dart_pubspec_licenses:
+    dependency: transitive
+    description:
+      name: dart_pubspec_licenses
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.1"
   dart_style:
     dependency: transitive
     description:
@@ -220,14 +227,14 @@ packages:
       name: flutter_native_splash
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.3.1"
   flutter_oss_licenses:
     dependency: "direct dev"
     description:
       name: flutter_oss_licenses
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.1"
+    version: "1.1.1"
   flutter_phoenix:
     dependency: "direct main"
     description:
@@ -316,7 +323,7 @@ packages:
       name: intl_utils
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.4.1"
+    version: "2.5.1"
   io:
     dependency: transitive
     description:
@@ -393,14 +400,14 @@ packages:
       name: path_provider
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.5"
+    version: "2.0.6"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   path_provider_macos:
     dependency: transitive
     description:
@@ -421,7 +428,7 @@ packages:
       name: path_provider_windows
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.3"
+    version: "2.0.4"
   petitparser:
     dependency: transitive
     description:
@@ -505,7 +512,7 @@ packages:
       name: shared_preferences_linux
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.2"
+    version: "2.0.3"
   shared_preferences_macos:
     dependency: transitive
     description:
@@ -533,7 +540,7 @@ packages:
       name: shared_preferences_windows
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.2"
+    version: "2.0.3"
   shelf:
     dependency: transitive
     description:
@@ -769,7 +776,7 @@ packages:
       name: win32
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.10"
+    version: "2.3.0"
   xdg_directories:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index d94921d9..0ece3674 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -10,7 +10,7 @@ dependencies:
   flutter:
     sdk: flutter
   flutter_tts: 3.2.2
-  path_provider: 2.0.5
+  path_provider: 2.0.6
   flutter_file_dialog: 2.3.0
   pref: 2.4.0
   fluttertoast: 8.0.8
@@ -18,7 +18,7 @@ dependencies:
   url_launcher: 6.0.12
   wakelock: 0.5.6
   soundpool: 2.2.0
-  intl_utils: 2.4.1
+  intl_utils: 2.5.1
   json_annotation: 4.3.0
   flutter_phoenix: 1.0.0
   scrollable_positioned_list: 0.2.2
@@ -28,11 +28,11 @@ dependencies:
 
 dev_dependencies:
   flutter_launcher_icons: 0.9.2
-  flutter_oss_licenses: 1.0.1
-  flutter_native_splash: 1.3.0
+  flutter_oss_licenses: 1.1.1
+  flutter_native_splash: 1.3.1
   effective_dart: 1.3.2
   json_serializable: 6.0.1
-  build_runner: 2.1.4
+  build_runner: 2.1.5
 
 flutter:
   uses-material-design: true

From da21d1e0e5a721eb7f15b0c555544cc06b03393f Mon Sep 17 00:00:00 2001
From: Bastian Block <blockbasti99@gmail.com>
Date: Sun, 14 Nov 2021 11:48:17 +0100
Subject: [PATCH 4/4] fix: fix editing of duplicated sets/exercises (fixes #96)

---
 lib/workout_builder.dart | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/workout_builder.dart b/lib/workout_builder.dart
index cb12b473..4617b8a7 100644
--- a/lib/workout_builder.dart
+++ b/lib/workout_builder.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:fluttertoast/fluttertoast.dart';
+import 'package:uuid/uuid.dart';
 
 import 'generated/l10n.dart';
 import 'number_stepper.dart';
@@ -48,18 +49,20 @@ class _BuilderPageState extends State<BuilderPage> {
   }
 
   void _duplicateSet(int index) {
+    var newSet = Set.fromJson(_workout.sets[index].toJson());
+    newSet.id = Uuid().v4();
     setState(() {
-      _workout.sets.insert(index, Set.fromJson(_workout.sets[index].toJson()));
+      _workout.sets.insert(index, newSet);
       _dirty = true;
     });
   }
 
   void _duplicateExercise(int setIndex, int exIndex) {
+    var newEx =
+        Exercise.fromJson(_workout.sets[setIndex].exercises[exIndex].toJson());
+    newEx.id = Uuid().v4();
     setState(() {
-      _workout.sets[setIndex].exercises.insert(
-          exIndex,
-          Exercise.fromJson(
-              _workout.sets[setIndex].exercises[exIndex].toJson()));
+      _workout.sets[setIndex].exercises.insert(exIndex, newEx);
       _dirty = true;
     });
   }