diff --git a/lib/UI/exercise/add_exercise_widget.dart b/lib/UI/exercise/add_exercise_widget.dart
index 68314a5..1eec0c1 100644
--- a/lib/UI/exercise/add_exercise_widget.dart
+++ b/lib/UI/exercise/add_exercise_widget.dart
@@ -12,10 +12,10 @@ class ExerciseNameSelectionWidget extends StatefulWidget {
   }
   Function(String) setExercisename;
   @override
-  _ExerciseNameSelectionWidgetState createState() => _ExerciseNameSelectionWidgetState();
+  ExerciseNameSelectionWidgetState createState() => ExerciseNameSelectionWidgetState();
 }
 
-class _ExerciseNameSelectionWidgetState extends State<ExerciseNameSelectionWidget> {
+class ExerciseNameSelectionWidgetState extends State<ExerciseNameSelectionWidget> {
   @override
   Widget build(BuildContext context) {
     return ThemeProvider(
diff --git a/lib/UI/exercise/exercise_card.dart b/lib/UI/exercise/exercise_card.dart
index 3e554b1..b78bd3d 100644
--- a/lib/UI/exercise/exercise_card.dart
+++ b/lib/UI/exercise/exercise_card.dart
@@ -38,10 +38,10 @@ class ExerciseCard extends StatefulWidget {
   Function(Exercise, Sets, int) removeSet;
 
   @override
-  _ExerciseCardState createState() => _ExerciseCardState();
+  ExerciseCardState createState() => ExerciseCardState();
 }
 
-class _ExerciseCardState extends State<ExerciseCard> with AutomaticKeepAliveClientMixin {
+class ExerciseCardState extends State<ExerciseCard> with AutomaticKeepAliveClientMixin {
   static int counter = 0;
   List<SetWidget> setList = <SetWidget>[];
   static int index = 0;
diff --git a/lib/UI/exercise/exercise_information.dart b/lib/UI/exercise/exercise_information.dart
index cd3850c..5f5ec70 100644
--- a/lib/UI/exercise/exercise_information.dart
+++ b/lib/UI/exercise/exercise_information.dart
@@ -7,10 +7,10 @@ class ExerciseInformation extends StatefulWidget {
   final String id;
 
   @override
-  _ExerciseInformationState createState() => _ExerciseInformationState();
+  ExerciseInformationState createState() => ExerciseInformationState();
 }
 
-class _ExerciseInformationState extends State<ExerciseInformation> {
+class ExerciseInformationState extends State<ExerciseInformation> {
   @override
   Widget build(BuildContext context) {
     return FutureBuilder<Exercise>(
diff --git a/lib/UI/exercise/set_widget.dart b/lib/UI/exercise/set_widget.dart
index 04b1c97..d178ebd 100644
--- a/lib/UI/exercise/set_widget.dart
+++ b/lib/UI/exercise/set_widget.dart
@@ -34,10 +34,10 @@ class SetWidget extends StatefulWidget {
   Function updateTotal;
 
   @override
-  _SetWidgetState createState() => _SetWidgetState();
+  SetWidgetState createState() => SetWidgetState();
 }
 
-class _SetWidgetState extends State<SetWidget>
+class SetWidgetState extends State<SetWidget>
     with AutomaticKeepAliveClientMixin {
   int percent = 0;
   Max? oneRepMax;
diff --git a/lib/UI/exercise/totals_widget.dart b/lib/UI/exercise/totals_widget.dart
index ce0e515..cc226b1 100644
--- a/lib/UI/exercise/totals_widget.dart
+++ b/lib/UI/exercise/totals_widget.dart
@@ -10,10 +10,10 @@ class ExerciseTotalsWidget extends StatefulWidget {
   int index;
 
   @override
-  _ExerciseTotalsWidgetState createState() => _ExerciseTotalsWidgetState();
+  ExerciseTotalsWidgetState createState() => ExerciseTotalsWidgetState();
 }
 
-class _ExerciseTotalsWidgetState extends State<ExerciseTotalsWidget> {
+class ExerciseTotalsWidgetState extends State<ExerciseTotalsWidget> {
   List<num> _list = <num>[];
   List<String> endings = <String>[' reps', ' sets', ' kgs', ' kgs/rep'];
 
diff --git a/lib/UI/gradient_border_button.dart b/lib/UI/gradient_border_button.dart
index 3cbf632..a8a6066 100644
--- a/lib/UI/gradient_border_button.dart
+++ b/lib/UI/gradient_border_button.dart
@@ -25,10 +25,10 @@ class GradientBorderButton extends StatefulWidget {
   final double radius;
   final double borderSize;
   @override
-  _GradientBorderButtonState createState() => _GradientBorderButtonState();
+  GradientBorderButtonState createState() => GradientBorderButtonState();
 }
 
-class _GradientBorderButtonState extends State<GradientBorderButton> {
+class GradientBorderButtonState extends State<GradientBorderButton> {
   @override
   Widget build(BuildContext context) {
     return ThemeProvider(
diff --git a/lib/UI/maxes/max_builder.dart b/lib/UI/maxes/max_builder.dart
index 4421391..98c762e 100644
--- a/lib/UI/maxes/max_builder.dart
+++ b/lib/UI/maxes/max_builder.dart
@@ -20,10 +20,10 @@ class MaxInformation extends StatefulWidget {
   Function? setPercentage;
 
   @override
-  _MaxInformationState createState() => _MaxInformationState();
+  MaxInformationState createState() => MaxInformationState();
 }
 
-class _MaxInformationState extends State<MaxInformation> {
+class MaxInformationState extends State<MaxInformation> {
   double oneRepMax = 0.0;
   String text = '0%';
 
diff --git a/lib/UI/prev_workout/delete_prev_workout_dialog.dart b/lib/UI/prev_workout/delete_prev_workout_dialog.dart
index c2aae61..e7d9cd8 100644
--- a/lib/UI/prev_workout/delete_prev_workout_dialog.dart
+++ b/lib/UI/prev_workout/delete_prev_workout_dialog.dart
@@ -9,10 +9,10 @@ class DeleteWorkoutAlert extends StatefulWidget {
   const DeleteWorkoutAlert(this.deleteWorkoutButton, {Key? key}) : super(key: key);
   final RaisedGradientButton deleteWorkoutButton;
   @override
-  _DeleteWorkoutAlertState createState() => _DeleteWorkoutAlertState();
+  DeleteWorkoutAlertState createState() => DeleteWorkoutAlertState();
 }
 
-class _DeleteWorkoutAlertState extends State<DeleteWorkoutAlert> {
+class DeleteWorkoutAlertState extends State<DeleteWorkoutAlert> {
   String name = '';
   bool? template;
 
diff --git a/lib/UI/prev_workout/prev_exercise_card.dart b/lib/UI/prev_workout/prev_exercise_card.dart
index bce0403..85a5c28 100644
--- a/lib/UI/prev_workout/prev_exercise_card.dart
+++ b/lib/UI/prev_workout/prev_exercise_card.dart
@@ -29,10 +29,10 @@ class PrevExerciseCard extends StatefulWidget {
   List<PrevSetWidget> setList;
   PrevWorkoutData prevworkoutData;
   @override
-  _PrevExerciseCardState createState() => _PrevExerciseCardState();
+  PrevExerciseCardState createState() => PrevExerciseCardState();
 }
 
-class _PrevExerciseCardState extends State<PrevExerciseCard> with AutomaticKeepAliveClientMixin {
+class PrevExerciseCardState extends State<PrevExerciseCard> with AutomaticKeepAliveClientMixin {
   int index = 0;
   double height = screenHeight * 0.23;
   TotalsData totalData = TotalsData(0, 0, 0.0, 0.0);
diff --git a/lib/UI/prev_workout/prev_set_widget.dart b/lib/UI/prev_workout/prev_set_widget.dart
index 5dc56f7..952dec6 100644
--- a/lib/UI/prev_workout/prev_set_widget.dart
+++ b/lib/UI/prev_workout/prev_set_widget.dart
@@ -24,10 +24,10 @@ class PrevSetWidget extends StatefulWidget {
   Function(Exercise, Sets, int) addNewSet;
 
   @override
-  _PrevSetWidgetState createState() => _PrevSetWidgetState();
+  PrevSetWidgetState createState() => PrevSetWidgetState();
 }
 
-class _PrevSetWidgetState extends State<PrevSetWidget>
+class PrevSetWidgetState extends State<PrevSetWidget>
     with AutomaticKeepAliveClientMixin {
   int percent = 0;
   double oneRepMax = 0.0;
diff --git a/lib/UI/prev_workout/prev_workout_page.dart b/lib/UI/prev_workout/prev_workout_page.dart
index 21c195c..e7ba184 100644
--- a/lib/UI/prev_workout/prev_workout_page.dart
+++ b/lib/UI/prev_workout/prev_workout_page.dart
@@ -24,10 +24,10 @@ class PrevWorkoutPage extends StatefulWidget {
   Workout workout;
 
   @override
-  _PrevWorkoutPageState createState() => _PrevWorkoutPageState();
+  PrevWorkoutPageState createState() => PrevWorkoutPageState();
 }
 
-class _PrevWorkoutPageState extends State<PrevWorkoutPage> {
+class PrevWorkoutPageState extends State<PrevWorkoutPage> {
   late WorkoutTotalsWidget workoutTotalsWidget;
   late PrevWorkoutData workoutData;
   String exerciseName = '';
diff --git a/lib/UI/workout/save_workout_dialog.dart b/lib/UI/workout/save_workout_dialog.dart
index 19f78b1..4dbf13c 100644
--- a/lib/UI/workout/save_workout_dialog.dart
+++ b/lib/UI/workout/save_workout_dialog.dart
@@ -15,10 +15,10 @@ class SaveWorkoutAlert extends StatefulWidget {
   final Function(String, bool) setWorkout;
   final RaisedGradientButton saveWorkout;
   @override
-  _SaveWorkoutAlertState createState() => _SaveWorkoutAlertState();
+  SaveWorkoutAlertState createState() => SaveWorkoutAlertState();
 }
 
-class _SaveWorkoutAlertState extends State<SaveWorkoutAlert> {
+class SaveWorkoutAlertState extends State<SaveWorkoutAlert> {
   String name = '';
   bool? template;
 
diff --git a/lib/UI/workout/workout_builder.dart b/lib/UI/workout/workout_builder.dart
index 0640340..5494f60 100644
--- a/lib/UI/workout/workout_builder.dart
+++ b/lib/UI/workout/workout_builder.dart
@@ -11,11 +11,11 @@ class WorkoutInformation extends StatefulWidget {
 
   final String id;
   @override
-  _WorkoutInformationState createState() => _WorkoutInformationState();
+  WorkoutInformationState createState() => WorkoutInformationState();
 
 }
 
-class _WorkoutInformationState extends State<WorkoutInformation> {
+class WorkoutInformationState extends State<WorkoutInformation> {
   @override
   Widget build(BuildContext context) {
     return FutureBuilder<Workout>(
diff --git a/lib/UI/workout/workout_name_selection_widget.dart b/lib/UI/workout/workout_name_selection_widget.dart
index faf8c17..9d9dbb6 100644
--- a/lib/UI/workout/workout_name_selection_widget.dart
+++ b/lib/UI/workout/workout_name_selection_widget.dart
@@ -15,10 +15,10 @@ class WorkoutTemplateSelectionWidget extends StatefulWidget {
   Function(Workout) setWorkout;
   List <dynamic>workoutList;
   @override
-  _WorkoutNameSelectionWidgetState createState() => _WorkoutNameSelectionWidgetState();
+  WorkoutNameSelectionWidgetState createState() => WorkoutNameSelectionWidgetState();
 }
 
-class _WorkoutNameSelectionWidgetState extends State<WorkoutTemplateSelectionWidget> {
+class WorkoutNameSelectionWidgetState extends State<WorkoutTemplateSelectionWidget> {
   String? dropDownValue;
   Map<String, dynamic> workoutMap = <String, dynamic>{};
   @override
diff --git a/lib/UI/workout/workout_page.dart b/lib/UI/workout/workout_page.dart
index bb52219..b04b6da 100644
--- a/lib/UI/workout/workout_page.dart
+++ b/lib/UI/workout/workout_page.dart
@@ -22,10 +22,10 @@ class WorkoutPage extends StatefulWidget {
   Workout? workout;
 
   @override
-  _WorkoutPageState createState() => _WorkoutPageState();
+  WorkoutPageState createState() => WorkoutPageState();
 }
 
-class _WorkoutPageState extends State<WorkoutPage> {
+class WorkoutPageState extends State<WorkoutPage> {
   late WorkoutTotalsWidget workoutTotalsWidget;
   late WorkoutData workoutData;
   String exerciseName = '';
diff --git a/lib/UI/workout/workout_toatals_widget.dart b/lib/UI/workout/workout_toatals_widget.dart
index 3fa12f5..5b38de6 100644
--- a/lib/UI/workout/workout_toatals_widget.dart
+++ b/lib/UI/workout/workout_toatals_widget.dart
@@ -9,10 +9,10 @@ class WorkoutTotalsWidget extends StatefulWidget {
   final WorkoutTotals totals;
 
   @override
-  _WorkoutTotalsWidgetState createState() => _WorkoutTotalsWidgetState();
+  WorkoutTotalsWidgetState createState() => WorkoutTotalsWidgetState();
 }
 
-class _WorkoutTotalsWidgetState extends State<WorkoutTotalsWidget> {
+class WorkoutTotalsWidgetState extends State<WorkoutTotalsWidget> {
   @override
   Widget build(BuildContext context) {
     return ThemeProvider(
diff --git a/lib/src/feature/authentication/widgets/google_signin_button.dart b/lib/src/feature/authentication/widgets/google_signin_button.dart
index ee778e6..8b7e145 100644
--- a/lib/src/feature/authentication/widgets/google_signin_button.dart
+++ b/lib/src/feature/authentication/widgets/google_signin_button.dart
@@ -12,10 +12,10 @@ class GoogleSignInButton extends StatefulWidget {
   final Future<void> Function() onPressed;
 
   @override
-  _GoogleSignInButtonState createState() => _GoogleSignInButtonState();
+  GoogleSignInButtonState createState() => GoogleSignInButtonState();
 }
 
-class _GoogleSignInButtonState extends State<GoogleSignInButton> {
+class GoogleSignInButtonState extends State<GoogleSignInButton> {
   bool _isLoading = false;
 
   @override
diff --git a/lib/src/widgets/gradient_button.dart b/lib/src/widgets/gradient_button.dart
index 40c041e..7a246f8 100644
--- a/lib/src/widgets/gradient_button.dart
+++ b/lib/src/widgets/gradient_button.dart
@@ -23,10 +23,10 @@ class RaisedGradientButton extends StatefulWidget {
   final Gradient? gradient;
 
   @override
-  _RaisedGradientButtonState createState() => _RaisedGradientButtonState();
+  RaisedGradientButtonState createState() => RaisedGradientButtonState();
 }
 
-class _RaisedGradientButtonState extends State<RaisedGradientButton> {
+class RaisedGradientButtonState extends State<RaisedGradientButton> {
   bool _isLoading = false;
 
   @override