diff --git a/fastlane/metadata/android/en-US/changelogs/35.txt b/fastlane/metadata/android/en-US/changelogs/35.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c20ed39173f1690cb6181457fe5d4c6cc0a061ab
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/35.txt
@@ -0,0 +1 @@
+Use ActivityParameters widgets from flutter_custom_toolbox.
diff --git a/fastlane/metadata/android/fr-FR/changelogs/35.txt b/fastlane/metadata/android/fr-FR/changelogs/35.txt
new file mode 100644
index 0000000000000000000000000000000000000000..f732ebd3738d66fdff72e28b0cf0bb4b0684e030
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/35.txt
@@ -0,0 +1 @@
+Utilisation des widgets ActivityParameters de flutter_custom_toolbox.
diff --git a/lib/common/config/activity_page.dart b/lib/common/config/activity_page.dart
index fd6827ce3016f000bc53a8b63ef760c92831a7fe..3be77f84a380fa0c0a914cd0ce21dfbbe1e2cce2 100644
--- a/lib/common/config/activity_page.dart
+++ b/lib/common/config/activity_page.dart
@@ -1,18 +1,21 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
-import 'package:memory/common/ui/pages/game.dart';
-import 'package:memory/common/ui/pages/parameters.dart';
+
+import 'package:memory/cubit/activity/activity_cubit.dart';
+import 'package:memory/config/application_config.dart';
+import 'package:memory/models/activity/activity.dart';
+import 'package:memory/ui/pages/game.dart';
 
 class ActivityPageItem {
   final String code;
   final Icon icon;
-  final Widget page;
+  final Widget Function({required Activity currentActivity})? builder;
 
   const ActivityPageItem({
     required this.code,
     required this.icon,
-    required this.page,
+    required this.builder,
   });
 }
 
@@ -20,20 +23,27 @@ class ActivityPage {
   static const bool displayBottomNavBar = false;
 
   static const indexHome = 0;
-  static const pageHome = ActivityPageItem(
+  static final ActivityPageItem pageHome = ActivityPageItem(
     code: 'page_home',
     icon: Icon(UniconsLine.home),
-    page: PageParameters(),
+    builder: ({required Activity currentActivity}) {
+      return PageParameters(
+        config: ApplicationConfig.config,
+        canBeResumed: currentActivity.canBeResumed,
+      );
+    },
   );
 
   static const indexGame = 1;
-  static const pageGame = ActivityPageItem(
+  static final pageGame = ActivityPageItem(
     code: 'page_game',
     icon: Icon(UniconsLine.star),
-    page: PageGame(),
+    builder: ({required Activity currentActivity}) {
+      return PageGame();
+    },
   );
 
-  static const Map<int, ActivityPageItem> items = {
+  static final Map<int, ActivityPageItem> items = {
     indexHome: pageHome,
     indexGame: pageGame,
   };
@@ -45,6 +55,16 @@ class ActivityPage {
   }
 
   static Widget getWidget(int pageIndex) {
-    return items[pageIndex]?.page ?? pageHome.page;
+    return BlocBuilder<ActivityCubit, ActivityState>(
+      builder: (BuildContext context, ActivityState activityState) {
+        final Activity currentActivity = activityState.currentActivity;
+
+        if (items.keys.contains(pageIndex)) {
+          return items[pageIndex]?.builder!(currentActivity: currentActivity) ?? Text('oups');
+        } else {
+          return getWidget(defaultPageIndex);
+        }
+      },
+    );
   }
 }
diff --git a/lib/common/ui/pages/parameters.dart b/lib/common/ui/pages/parameters.dart
deleted file mode 100644
index f846c7b118b1fec4b5832f620dc26450b7dedd48..0000000000000000000000000000000000000000
--- a/lib/common/ui/pages/parameters.dart
+++ /dev/null
@@ -1,171 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:memory/common/cubit/nav/nav_cubit_pages.dart';
-import 'package:memory/common/ui/parameters/parameter_widget.dart';
-
-import 'package:memory/config/default_activity_settings.dart';
-import 'package:memory/config/default_global_settings.dart';
-import 'package:memory/cubit/activity/activity_cubit.dart';
-import 'package:memory/cubit/settings/settings_activity_cubit.dart';
-import 'package:memory/cubit/settings/settings_global_cubit.dart';
-import 'package:memory/models/activity/activity.dart';
-
-class PageParameters extends StatelessWidget {
-  const PageParameters({super.key});
-
-  final double separatorHeight = 8.0;
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocBuilder<ActivitySettingsCubit, ActivitySettingsState>(
-      builder: (BuildContext context, ActivitySettingsState activitySettingsState) {
-        return BlocBuilder<GlobalSettingsCubit, GlobalSettingsState>(
-          builder: (BuildContext context, GlobalSettingsState globalSettingsState) {
-            return BlocBuilder<ActivityCubit, ActivityState>(
-              builder: (BuildContext context, ActivityState activityState) {
-                final Activity currentActivity = activityState.currentActivity;
-
-                final List<Widget> lines = [];
-
-                // Activity settings
-                for (String code in DefaultActivitySettings.availableParameters) {
-                  lines.add(Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    children: buildParametersLine(
-                      code: code,
-                      isGlobal: false,
-                    ),
-                  ));
-
-                  lines.add(SizedBox(height: separatorHeight));
-                }
-
-                lines.add(Expanded(
-                  child: SizedBox(height: separatorHeight),
-                ));
-
-                if (currentActivity.canBeResumed == false) {
-                  // Start new activity
-                  lines.add(
-                    AspectRatio(
-                      aspectRatio: 3,
-                      child: ActivityButtonStartNew(
-                        onPressed: () {
-                          BlocProvider.of<ActivityCubit>(context).startNewActivity(
-                            activitySettings: activitySettingsState.settings,
-                            globalSettings: globalSettingsState.settings,
-                          );
-                          BlocProvider.of<NavCubitPage>(context).goToPageGame();
-                        },
-                      ),
-                    ),
-                  );
-                } else {
-                  // Resume activity
-                  lines.add(AspectRatio(
-                    aspectRatio: 3,
-                    child: ActivityButtonResumeSaved(
-                      onPressed: () {
-                        BlocProvider.of<ActivityCubit>(context).resumeSavedActivity();
-                        BlocProvider.of<NavCubitPage>(context).goToPageGame();
-                      },
-                    ),
-                  ));
-                  // Delete saved activity
-                  lines.add(SizedBox.square(
-                    dimension: MediaQuery.of(context).size.width / 5,
-                    child: ActivityButtonDeleteSaved(
-                      onPressed: () {
-                        BlocProvider.of<ActivityCubit>(context).deleteSavedActivity();
-                      },
-                    ),
-                  ));
-                }
-
-                lines.add(SizedBox(height: separatorHeight));
-
-                // Global settings
-                for (String code in DefaultGlobalSettings.availableParameters) {
-                  lines.add(Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    children: buildParametersLine(
-                      code: code,
-                      isGlobal: true,
-                    ),
-                  ));
-
-                  lines.add(SizedBox(height: separatorHeight));
-                }
-
-                return Column(
-                  children: lines,
-                );
-              },
-            );
-          },
-        );
-      },
-    );
-  }
-
-  List<Widget> buildParametersLine({
-    required String code,
-    required bool isGlobal,
-  }) {
-    final List<Widget> parameterButtons = [];
-
-    final List<String> availableValues = isGlobal
-        ? DefaultGlobalSettings.getAvailableValues(code)
-        : DefaultActivitySettings.getAvailableValues(code);
-
-    if (availableValues.length <= 1) {
-      return [];
-    }
-
-    for (String value in availableValues) {
-      final Widget parameterButton = BlocBuilder<ActivitySettingsCubit, ActivitySettingsState>(
-        builder: (BuildContext context, ActivitySettingsState activitySettingsState) {
-          return BlocBuilder<GlobalSettingsCubit, GlobalSettingsState>(
-            builder: (BuildContext context, GlobalSettingsState globalSettingsState) {
-              final ActivitySettingsCubit activitySettingsCubit =
-                  BlocProvider.of<ActivitySettingsCubit>(context);
-              final GlobalSettingsCubit globalSettingsCubit =
-                  BlocProvider.of<GlobalSettingsCubit>(context);
-
-              final String currentValue = isGlobal
-                  ? globalSettingsCubit.getParameterValue(code)
-                  : activitySettingsCubit.getParameterValue(code);
-
-              final bool isSelected = (value == currentValue);
-
-              final double displayWidth = MediaQuery.of(context).size.width;
-              final double itemWidth = displayWidth / availableValues.length - 4;
-
-              return SizedBox.square(
-                dimension: itemWidth,
-                child: ParameterWidget(
-                  code: code,
-                  value: value,
-                  isSelected: isSelected,
-                  size: itemWidth,
-                  activitySettings: activitySettingsState.settings,
-                  globalSettings: globalSettingsState.settings,
-                  onPressed: () {
-                    isGlobal
-                        ? globalSettingsCubit.setParameterValue(code, value)
-                        : activitySettingsCubit.setParameterValue(code, value);
-                  },
-                ),
-              );
-            },
-          );
-        },
-      );
-
-      parameterButtons.add(parameterButton);
-    }
-
-    return parameterButtons;
-  }
-}
diff --git a/lib/common/ui/parameters/parameter_painter.dart b/lib/common/ui/parameters/parameter_painter.dart
deleted file mode 100644
index 71aefbaec257fbf21bd28dd808ba2a86c7e678d1..0000000000000000000000000000000000000000
--- a/lib/common/ui/parameters/parameter_painter.dart
+++ /dev/null
@@ -1,71 +0,0 @@
-import 'dart:math';
-
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:memory/models/settings/settings_activity.dart';
-import 'package:memory/models/settings/settings_global.dart';
-
-class ParameterPainter extends CustomPainter {
-  const ParameterPainter({
-    required this.code,
-    required this.value,
-    required this.activitySettings,
-    required this.globalSettings,
-  });
-
-  final String code;
-  final String value;
-  final ActivitySettings activitySettings;
-  final GlobalSettings globalSettings;
-
-  @override
-  void paint(Canvas canvas, Size size) {
-    // force square
-    final double canvasSize = min(size.width, size.height);
-
-    // content
-    switch (code) {
-      default:
-        printlog('Unknown parameter: $code/$value');
-        paintUnknownParameterItem(canvas, canvasSize);
-    }
-  }
-
-  @override
-  bool shouldRepaint(CustomPainter oldDelegate) {
-    return false;
-  }
-
-  // "unknown" parameter -> simple block with text
-  void paintUnknownParameterItem(
-    final Canvas canvas,
-    final double size,
-  ) {
-    final paint = Paint();
-    paint.strokeJoin = StrokeJoin.round;
-    paint.strokeWidth = 3;
-
-    final textSpan = TextSpan(
-      text: '$code\n$value',
-      style: const TextStyle(
-        color: Colors.black,
-        fontSize: 18,
-        fontWeight: FontWeight.bold,
-      ),
-    );
-    final textPainter = TextPainter(
-      text: textSpan,
-      textDirection: TextDirection.ltr,
-      textAlign: TextAlign.center,
-    );
-    textPainter.layout();
-    textPainter.paint(
-      canvas,
-      Offset(
-        (size - textPainter.width) * 0.5,
-        (size - textPainter.height) * 0.5,
-      ),
-    );
-  }
-}
diff --git a/lib/common/ui/parameters/parameter_widget.dart b/lib/common/ui/parameters/parameter_widget.dart
deleted file mode 100644
index b7b044ac3c571b36a126b2147a93a1707c8926a0..0000000000000000000000000000000000000000
--- a/lib/common/ui/parameters/parameter_widget.dart
+++ /dev/null
@@ -1,129 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:memory/common/ui/parameters/parameter_painter.dart';
-
-import 'package:memory/config/default_activity_settings.dart';
-import 'package:memory/config/default_global_settings.dart';
-import 'package:memory/models/settings/settings_activity.dart';
-import 'package:memory/models/settings/settings_global.dart';
-
-class ParameterWidget extends StatelessWidget {
-  const ParameterWidget({
-    super.key,
-    required this.code,
-    required this.value,
-    required this.isSelected,
-    required this.size,
-    required this.activitySettings,
-    required this.globalSettings,
-    required this.onPressed,
-  });
-
-  final String code;
-  final String value;
-  final bool isSelected;
-  final double size;
-  final ActivitySettings activitySettings;
-  final GlobalSettings globalSettings;
-  final VoidCallback onPressed;
-
-  static const Color buttonColorActive = Colors.blue;
-  static const Color buttonColorInactive = Colors.white;
-  static const double buttonBorderWidth = 4.0;
-  static const double buttonBorderRadius = 12.0;
-
-  @override
-  Widget build(BuildContext context) {
-    Widget content = const SizedBox.shrink();
-
-    switch (code) {
-      case DefaultActivitySettings.parameterCodeLevel:
-        content = getLevelParameterItem();
-        break;
-      case DefaultGlobalSettings.parameterCodeSkin:
-        content = getSkinParameterItem();
-        break;
-      default:
-        printlog('Unknown parameter: $code/$value');
-        content = getUnknownParameterItem();
-    }
-
-    final Color buttonColor = isSelected ? buttonColorActive : buttonColorInactive;
-
-    return Container(
-      decoration: BoxDecoration(
-        color: buttonColor,
-        borderRadius: BorderRadius.circular(buttonBorderRadius),
-        border: Border.all(
-          color: buttonColor,
-          width: buttonBorderWidth,
-        ),
-      ),
-      child: content,
-    );
-  }
-
-  // "unknown" parameter -> simple block with text
-  Widget getUnknownParameterItem() {
-    return StyledButton.text(
-      caption: '$code / $value',
-      color: Colors.grey,
-      onPressed: null,
-    );
-  }
-
-  Widget getLevelParameterItem() {
-    Color backgroundColor = Colors.grey;
-
-    switch (value) {
-      case DefaultActivitySettings.levelValueMedium:
-        backgroundColor = Colors.green;
-        break;
-      default:
-        printlog('Wrong value for level parameter value: $value');
-    }
-
-    return StyledButton(
-      color: backgroundColor,
-      onPressed: onPressed,
-      child: CustomPaint(
-        size: Size(size, size),
-        willChange: false,
-        painter: ParameterPainter(
-          code: code,
-          value: value,
-          activitySettings: activitySettings,
-          globalSettings: globalSettings,
-        ),
-        isComplex: true,
-      ),
-    );
-  }
-
-  Widget getSkinParameterItem() {
-    return StyledButton(
-      color: Colors.green.shade800,
-      onPressed: onPressed,
-      child: Table(
-        children: [
-          TableRow(children: [
-            Image(image: AssetImage('assets/skins/${value}_1.png'), fit: BoxFit.fill),
-            Image(image: AssetImage('assets/skins/${value}_2.png'), fit: BoxFit.fill),
-            Image(image: AssetImage('assets/skins/${value}_3.png'), fit: BoxFit.fill),
-          ]),
-          TableRow(children: [
-            Image(image: AssetImage('assets/skins/${value}_4.png'), fit: BoxFit.fill),
-            Image(image: AssetImage('assets/skins/${value}_found.png'), fit: BoxFit.fill),
-            Image(image: AssetImage('assets/skins/${value}_5.png'), fit: BoxFit.fill),
-          ]),
-          TableRow(children: [
-            Image(image: AssetImage('assets/skins/${value}_6.png'), fit: BoxFit.fill),
-            Image(image: AssetImage('assets/skins/${value}_7.png'), fit: BoxFit.fill),
-            Image(image: AssetImage('assets/skins/${value}_8.png'), fit: BoxFit.fill),
-          ]),
-        ],
-      ),
-    );
-  }
-}
diff --git a/lib/config/application_config.dart b/lib/config/application_config.dart
index 7d10a96f5eba0ce4ee4cabe5861547a7772359e0..b5f023318f61c0e67079097ba9c9e9313e8a5f20 100644
--- a/lib/config/application_config.dart
+++ b/lib/config/application_config.dart
@@ -1,3 +1,107 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:memory/common/cubit/nav/nav_cubit_pages.dart';
+
+import 'package:memory/cubit/activity/activity_cubit.dart';
+
 class ApplicationConfig {
-  static const String appTitle = 'Memory';
+  static const String parameterCodeSkin = 'global.skin';
+
+  static const String skinValueDefault = 'default';
+  static const String skinValueAventure = 'aventure';
+  static const String skinValueNature = 'nature';
+  static const String skinValueItems = 'items';
+
+  static final ApplicationConfigDefinition config = ApplicationConfigDefinition(
+    appTitle: 'Memory',
+    activitySettings: [
+      // skin
+      ApplicationSettingsParameter(
+        code: parameterCodeSkin,
+        values: [
+          ApplicationSettingsParameterItemValue(
+            value: skinValueDefault,
+            isDefault: true,
+          ),
+          ApplicationSettingsParameterItemValue(
+            value: skinValueAventure,
+          ),
+          ApplicationSettingsParameterItemValue(
+            value: skinValueNature,
+          ),
+          ApplicationSettingsParameterItemValue(
+            value: skinValueItems,
+          ),
+        ],
+        builder: ({
+          required context,
+          required itemValue,
+          required onPressed,
+          required size,
+        }) =>
+            StyledButton(
+          color: Colors.green.shade800,
+          onPressed: onPressed,
+          child: Table(
+            children: [
+              TableRow(children: [
+                Image(
+                  image: AssetImage('assets/skins/${itemValue.value}_1.png'),
+                  fit: BoxFit.fill,
+                ),
+                Image(
+                  image: AssetImage('assets/skins/${itemValue.value}_2.png'),
+                  fit: BoxFit.fill,
+                ),
+                Image(
+                  image: AssetImage('assets/skins/${itemValue.value}_3.png'),
+                  fit: BoxFit.fill,
+                ),
+              ]),
+              TableRow(children: [
+                Image(
+                  image: AssetImage('assets/skins/${itemValue.value}_4.png'),
+                  fit: BoxFit.fill,
+                ),
+                Image(
+                  image: AssetImage('assets/skins/${itemValue.value}_found.png'),
+                  fit: BoxFit.fill,
+                ),
+                Image(
+                  image: AssetImage('assets/skins/${itemValue.value}_5.png'),
+                  fit: BoxFit.fill,
+                ),
+              ]),
+              TableRow(children: [
+                Image(
+                  image: AssetImage('assets/skins/${itemValue.value}_6.png'),
+                  fit: BoxFit.fill,
+                ),
+                Image(
+                  image: AssetImage('assets/skins/${itemValue.value}_7.png'),
+                  fit: BoxFit.fill,
+                ),
+                Image(
+                  image: AssetImage('assets/skins/${itemValue.value}_8.png'),
+                  fit: BoxFit.fill,
+                ),
+              ]),
+            ],
+          ),
+        ),
+      ),
+    ],
+    startNewActivity: (BuildContext context) {
+      BlocProvider.of<ActivityCubit>(context).startNewActivity(context);
+      BlocProvider.of<NavCubitPage>(context).goToPageGame();
+    },
+    deleteCurrentActivity: (BuildContext context) {
+      BlocProvider.of<ActivityCubit>(context).deleteSavedActivity();
+    },
+    resumeActivity: (BuildContext context) {
+      BlocProvider.of<ActivityCubit>(context).resumeSavedActivity();
+      BlocProvider.of<NavCubitPage>(context).goToPageGame();
+    },
+  );
 }
diff --git a/lib/config/default_activity_settings.dart b/lib/config/default_activity_settings.dart
deleted file mode 100644
index 28ca182ed00c9dce96fbfff6c3cf1756699edd28..0000000000000000000000000000000000000000
--- a/lib/config/default_activity_settings.dart
+++ /dev/null
@@ -1,28 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-class DefaultActivitySettings {
-  // available game parameters codes
-  static const String parameterCodeLevel = 'level';
-  static const List<String> availableParameters = [
-    parameterCodeLevel,
-  ];
-
-  // level: available values
-  static const String levelValueMedium = 'medium';
-  static const List<String> allowedLevelValues = [
-    levelValueMedium,
-  ];
-  // level: default value
-  static const String defaultLevelValue = levelValueMedium;
-
-  // available values from parameter code
-  static List<String> getAvailableValues(String parameterCode) {
-    switch (parameterCode) {
-      case parameterCodeLevel:
-        return DefaultActivitySettings.allowedLevelValues;
-    }
-
-    printlog('Did not find any available value for game parameter "$parameterCode".');
-    return [];
-  }
-}
diff --git a/lib/config/default_global_settings.dart b/lib/config/default_global_settings.dart
deleted file mode 100644
index 8883095aafa4bdfd6e413464c02b9aba0001f27e..0000000000000000000000000000000000000000
--- a/lib/config/default_global_settings.dart
+++ /dev/null
@@ -1,34 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-class DefaultGlobalSettings {
-  // available global parameters codes
-  static const String parameterCodeSkin = 'skin';
-  static const List<String> availableParameters = [
-    parameterCodeSkin,
-  ];
-
-  // skin: available values
-  static const String skinValueDefault = 'default';
-  static const String skinValueAventure = 'aventure';
-  static const String skinValueNature = 'nature';
-  static const String skinValueItems = 'items';
-  static const List<String> allowedSkinValues = [
-    skinValueDefault,
-    skinValueAventure,
-    skinValueNature,
-    skinValueItems,
-  ];
-  // skin: default value
-  static const String defaultSkinValue = skinValueDefault;
-
-  // available values from parameter code
-  static List<String> getAvailableValues(String parameterCode) {
-    switch (parameterCode) {
-      case parameterCodeSkin:
-        return DefaultGlobalSettings.allowedSkinValues;
-    }
-
-    printlog('Did not find any available value for global parameter "$parameterCode".');
-    return [];
-  }
-}
diff --git a/lib/cubit/activity/activity_cubit.dart b/lib/cubit/activity/activity_cubit.dart
index aac6a19fd93081abf169f92dd15942f16ff98cb6..d9986fc2b42958882e827e968a55a94f2697eae4 100644
--- a/lib/cubit/activity/activity_cubit.dart
+++ b/lib/cubit/activity/activity_cubit.dart
@@ -4,8 +4,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
 import 'package:memory/models/activity/activity.dart';
-import 'package:memory/models/settings/settings_activity.dart';
-import 'package:memory/models/settings/settings_global.dart';
 
 part 'activity_state.dart';
 
@@ -25,7 +23,6 @@ class ActivityCubit extends HydratedCubit<ActivityState> {
     final Activity activity = Activity(
       // Settings
       activitySettings: state.currentActivity.activitySettings,
-      globalSettings: state.currentActivity.globalSettings,
       // State
       isRunning: state.currentActivity.isRunning,
       isStarted: state.currentActivity.isStarted,
@@ -43,14 +40,13 @@ class ActivityCubit extends HydratedCubit<ActivityState> {
     updateState(activity);
   }
 
-  void startNewActivity({
-    required ActivitySettings activitySettings,
-    required GlobalSettings globalSettings,
-  }) {
+  void startNewActivity(BuildContext context) {
+    final ActivitySettingsCubit activitySettingsCubit =
+        BlocProvider.of<ActivitySettingsCubit>(context);
+
     final Activity newActivity = Activity.createNew(
       // Settings
-      activitySettings: activitySettings,
-      globalSettings: globalSettings,
+      activitySettings: activitySettingsCubit.state.settings,
     );
 
     newActivity.dump();
@@ -59,6 +55,10 @@ class ActivityCubit extends HydratedCubit<ActivityState> {
     refresh();
   }
 
+  bool canBeResumed() {
+    return state.currentActivity.canBeResumed;
+  }
+
   void quitActivity() {
     state.currentActivity.isRunning = false;
     refresh();
diff --git a/lib/cubit/settings/settings_activity_cubit.dart b/lib/cubit/settings/settings_activity_cubit.dart
deleted file mode 100644
index 41dfddecef848127af73d1377939822536f7c257..0000000000000000000000000000000000000000
--- a/lib/cubit/settings/settings_activity_cubit.dart
+++ /dev/null
@@ -1,61 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:memory/config/default_activity_settings.dart';
-import 'package:memory/models/settings/settings_activity.dart';
-
-part 'settings_activity_state.dart';
-
-class ActivitySettingsCubit extends HydratedCubit<ActivitySettingsState> {
-  ActivitySettingsCubit()
-      : super(ActivitySettingsState(settings: ActivitySettings.createDefault()));
-
-  void setValues({
-    String? level,
-  }) {
-    emit(
-      ActivitySettingsState(
-        settings: ActivitySettings(
-          level: level ?? state.settings.level,
-        ),
-      ),
-    );
-  }
-
-  String getParameterValue(String code) {
-    switch (code) {
-      case DefaultActivitySettings.parameterCodeLevel:
-        return ActivitySettings.getLevelValueFromUnsafe(state.settings.level);
-    }
-
-    return '';
-  }
-
-  void setParameterValue(String code, String value) {
-    final String level = code == DefaultActivitySettings.parameterCodeLevel
-        ? value
-        : getParameterValue(DefaultActivitySettings.parameterCodeLevel);
-
-    setValues(
-      level: level,
-    );
-  }
-
-  @override
-  ActivitySettingsState? fromJson(Map<String, dynamic> json) {
-    final String level = json[DefaultActivitySettings.parameterCodeLevel] as String;
-
-    return ActivitySettingsState(
-      settings: ActivitySettings(
-        level: level,
-      ),
-    );
-  }
-
-  @override
-  Map<String, dynamic>? toJson(ActivitySettingsState state) {
-    return <String, dynamic>{
-      DefaultActivitySettings.parameterCodeLevel: state.settings.level,
-    };
-  }
-}
diff --git a/lib/cubit/settings/settings_activity_state.dart b/lib/cubit/settings/settings_activity_state.dart
deleted file mode 100644
index 2b2de42011634e81ae9e6f8bcaa1577f239c778b..0000000000000000000000000000000000000000
--- a/lib/cubit/settings/settings_activity_state.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-part of 'settings_activity_cubit.dart';
-
-@immutable
-class ActivitySettingsState extends Equatable {
-  const ActivitySettingsState({
-    required this.settings,
-  });
-
-  final ActivitySettings settings;
-
-  @override
-  List<dynamic> get props => <dynamic>[
-        settings,
-      ];
-}
diff --git a/lib/cubit/settings/settings_global_cubit.dart b/lib/cubit/settings/settings_global_cubit.dart
deleted file mode 100644
index 56deb3466cac6105de97443ab6949372530a5a8b..0000000000000000000000000000000000000000
--- a/lib/cubit/settings/settings_global_cubit.dart
+++ /dev/null
@@ -1,59 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:memory/config/default_global_settings.dart';
-import 'package:memory/models/settings/settings_global.dart';
-
-part 'settings_global_state.dart';
-
-class GlobalSettingsCubit extends HydratedCubit<GlobalSettingsState> {
-  GlobalSettingsCubit() : super(GlobalSettingsState(settings: GlobalSettings.createDefault()));
-
-  void setValues({
-    String? skin,
-  }) {
-    emit(
-      GlobalSettingsState(
-        settings: GlobalSettings(
-          skin: skin ?? state.settings.skin,
-        ),
-      ),
-    );
-  }
-
-  String getParameterValue(String code) {
-    switch (code) {
-      case DefaultGlobalSettings.parameterCodeSkin:
-        return GlobalSettings.getSkinValueFromUnsafe(state.settings.skin);
-    }
-    return '';
-  }
-
-  void setParameterValue(String code, String value) {
-    final String skin = (code == DefaultGlobalSettings.parameterCodeSkin)
-        ? value
-        : getParameterValue(DefaultGlobalSettings.parameterCodeSkin);
-
-    setValues(
-      skin: skin,
-    );
-  }
-
-  @override
-  GlobalSettingsState? fromJson(Map<String, dynamic> json) {
-    final String skin = json[DefaultGlobalSettings.parameterCodeSkin] as String;
-
-    return GlobalSettingsState(
-      settings: GlobalSettings(
-        skin: skin,
-      ),
-    );
-  }
-
-  @override
-  Map<String, dynamic>? toJson(GlobalSettingsState state) {
-    return <String, dynamic>{
-      DefaultGlobalSettings.parameterCodeSkin: state.settings.skin,
-    };
-  }
-}
diff --git a/lib/cubit/settings/settings_global_state.dart b/lib/cubit/settings/settings_global_state.dart
deleted file mode 100644
index ebcddd700f252257223ca8e16c85202b04f3ff24..0000000000000000000000000000000000000000
--- a/lib/cubit/settings/settings_global_state.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-part of 'settings_global_cubit.dart';
-
-@immutable
-class GlobalSettingsState extends Equatable {
-  const GlobalSettingsState({
-    required this.settings,
-  });
-
-  final GlobalSettings settings;
-
-  @override
-  List<dynamic> get props => <dynamic>[
-        settings,
-      ];
-}
diff --git a/lib/main.dart b/lib/main.dart
index 491b2e5ee6192d2b01308ee34257bad122168d03..a22954ee8fc5545901cfe5a1c70f3df69923a016 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -4,13 +4,12 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
+
 import 'package:memory/common/cubit/nav/nav_cubit_pages.dart';
 import 'package:memory/common/cubit/nav/nav_cubit_screens.dart';
 
 import 'package:memory/config/application_config.dart';
 import 'package:memory/cubit/activity/activity_cubit.dart';
-import 'package:memory/cubit/settings/settings_activity_cubit.dart';
-import 'package:memory/cubit/settings/settings_global_cubit.dart';
 import 'package:memory/ui/skeleton.dart';
 
 void main() async {
@@ -61,17 +60,14 @@ class MyApp extends StatelessWidget {
         BlocProvider<ActivityCubit>(
           create: (context) => ActivityCubit(),
         ),
-        BlocProvider<GlobalSettingsCubit>(
-          create: (context) => GlobalSettingsCubit(),
-        ),
         BlocProvider<ActivitySettingsCubit>(
-          create: (context) => ActivitySettingsCubit(),
+          create: (context) => ActivitySettingsCubit(appConfig: ApplicationConfig.config),
         ),
       ],
       child: BlocBuilder<ApplicationThemeModeCubit, ApplicationThemeModeState>(
         builder: (BuildContext context, ApplicationThemeModeState state) {
           return MaterialApp(
-            title: ApplicationConfig.appTitle,
+            title: ApplicationConfig.config.appTitle,
             home: const SkeletonScreen(),
 
             // Theme stuff
diff --git a/lib/models/activity/activity.dart b/lib/models/activity/activity.dart
index 10c8962d5420f4ba4b2eea0877577cb706953e9f..a73a32371da54ecfa1ad99e7509ebab984f0f8a9 100644
--- a/lib/models/activity/activity.dart
+++ b/lib/models/activity/activity.dart
@@ -1,8 +1,8 @@
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
+import 'package:memory/config/application_config.dart';
+
 import 'package:memory/models/activity/board.dart';
-import 'package:memory/models/settings/settings_activity.dart';
-import 'package:memory/models/settings/settings_global.dart';
 
 typedef MovingTile = String;
 typedef Move = Board;
@@ -16,7 +16,6 @@ class Activity {
   Activity({
     // Settings
     required this.activitySettings,
-    required this.globalSettings,
 
     // State
     this.isRunning = false,
@@ -35,7 +34,6 @@ class Activity {
 
   // Settings
   final ActivitySettings activitySettings;
-  final GlobalSettings globalSettings;
 
   // State
   bool isRunning;
@@ -54,8 +52,7 @@ class Activity {
   factory Activity.createNull() {
     return Activity(
       // Settings
-      activitySettings: ActivitySettings.createDefault(),
-      globalSettings: GlobalSettings.createDefault(),
+      activitySettings: ActivitySettings.createDefault(appConfig: ApplicationConfig.config),
       // Base data
       board: Board.createNull(),
       // Game data
@@ -66,11 +63,9 @@ class Activity {
 
   factory Activity.createNew({
     ActivitySettings? activitySettings,
-    GlobalSettings? globalSettings,
   }) {
-    final ActivitySettings newActivitySettings =
-        activitySettings ?? ActivitySettings.createDefault();
-    final GlobalSettings newGlobalSettings = globalSettings ?? GlobalSettings.createDefault();
+    final ActivitySettings newActivitySettings = activitySettings ??
+        ActivitySettings.createDefault(appConfig: ApplicationConfig.config);
 
     final Board board = Board.createNew(
       activitySettings: newActivitySettings,
@@ -79,7 +74,6 @@ class Activity {
     return Activity(
       // Settings
       activitySettings: newActivitySettings,
-      globalSettings: newGlobalSettings,
       // State
       isRunning: true,
       // Base data
@@ -103,7 +97,6 @@ class Activity {
     printlog('$Activity:');
     printlog('  Settings');
     activitySettings.dump();
-    globalSettings.dump();
     printlog('  State');
     printlog('    isRunning: $isRunning');
     printlog('    isStarted: $isStarted');
@@ -127,7 +120,6 @@ class Activity {
     return <String, dynamic>{
       // Settings
       'activitySettings': activitySettings.toJson(),
-      'globalSettings': globalSettings.toJson(),
       // State
       'isRunning': isRunning,
       'isStarted': isStarted,
diff --git a/lib/models/activity/board.dart b/lib/models/activity/board.dart
index e6168ee94cf647e8613b62a18164eaacabef1392..f15320c90cb390615951fa18c79b950b02b4e0a7 100644
--- a/lib/models/activity/board.dart
+++ b/lib/models/activity/board.dart
@@ -3,7 +3,6 @@ import 'dart:math';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
 import 'package:memory/models/activity/tile.dart';
-import 'package:memory/models/settings/settings_activity.dart';
 
 class Board {
   Board({
diff --git a/lib/models/settings/settings_activity.dart b/lib/models/settings/settings_activity.dart
deleted file mode 100644
index f7de2e66e491481269242801e990920a08397b80..0000000000000000000000000000000000000000
--- a/lib/models/settings/settings_activity.dart
+++ /dev/null
@@ -1,42 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:memory/config/default_activity_settings.dart';
-
-class ActivitySettings {
-  final String level;
-
-  ActivitySettings({
-    required this.level,
-  });
-
-  static String getLevelValueFromUnsafe(String level) {
-    if (DefaultActivitySettings.allowedLevelValues.contains(level)) {
-      return level;
-    }
-
-    return DefaultActivitySettings.defaultLevelValue;
-  }
-
-  factory ActivitySettings.createDefault() {
-    return ActivitySettings(
-      level: DefaultActivitySettings.defaultLevelValue,
-    );
-  }
-
-  void dump() {
-    printlog('$ActivitySettings:');
-    printlog('  ${DefaultActivitySettings.parameterCodeLevel}: $level');
-    printlog('');
-  }
-
-  @override
-  String toString() {
-    return '$ActivitySettings(${toJson()})';
-  }
-
-  Map<String, dynamic>? toJson() {
-    return <String, dynamic>{
-      DefaultActivitySettings.parameterCodeLevel: level,
-    };
-  }
-}
diff --git a/lib/models/settings/settings_global.dart b/lib/models/settings/settings_global.dart
deleted file mode 100644
index 2061a4d06f1203a9701d1e2f6321cf0c7c06497b..0000000000000000000000000000000000000000
--- a/lib/models/settings/settings_global.dart
+++ /dev/null
@@ -1,42 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:memory/config/default_global_settings.dart';
-
-class GlobalSettings {
-  String skin;
-
-  GlobalSettings({
-    required this.skin,
-  });
-
-  static String getSkinValueFromUnsafe(String skin) {
-    if (DefaultGlobalSettings.allowedSkinValues.contains(skin)) {
-      return skin;
-    }
-
-    return DefaultGlobalSettings.defaultSkinValue;
-  }
-
-  factory GlobalSettings.createDefault() {
-    return GlobalSettings(
-      skin: DefaultGlobalSettings.defaultSkinValue,
-    );
-  }
-
-  void dump() {
-    printlog('$GlobalSettings:');
-    printlog('  ${DefaultGlobalSettings.parameterCodeSkin}: $skin');
-    printlog('');
-  }
-
-  @override
-  String toString() {
-    return '$GlobalSettings(${toJson()})';
-  }
-
-  Map<String, dynamic>? toJson() {
-    return <String, dynamic>{
-      DefaultGlobalSettings.parameterCodeSkin: skin,
-    };
-  }
-}
diff --git a/lib/common/ui/pages/game.dart b/lib/ui/pages/game.dart
similarity index 100%
rename from lib/common/ui/pages/game.dart
rename to lib/ui/pages/game.dart
diff --git a/lib/ui/widgets/game/game_bottom.dart b/lib/ui/widgets/game/game_bottom.dart
index eee7f1aa18a4b54b4eabb322375675e4586f1c49..f3f758ad46d551fa7fb39bc898ffadff5bad402b 100644
--- a/lib/ui/widgets/game/game_bottom.dart
+++ b/lib/ui/widgets/game/game_bottom.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+import 'package:memory/config/application_config.dart';
 
 import 'package:memory/cubit/activity/activity_cubit.dart';
 import 'package:memory/models/activity/activity.dart';
@@ -19,7 +20,7 @@ class GameBottomWidget extends StatelessWidget {
         List<Widget> items = [];
         for (int value = 1; value <= values; value++) {
           final String assetName =
-              'assets/skins/${currentActivity.globalSettings.skin}_${currentActivity.pairsFound.contains(value) ? value.toString() : 'unknown'}.png';
+              'assets/skins/${currentActivity.activitySettings.get(ApplicationConfig.parameterCodeSkin)}_${currentActivity.pairsFound.contains(value) ? value.toString() : 'unknown'}.png';
           items.add(Padding(
             padding: const EdgeInsets.all(2),
             child: Image(
diff --git a/lib/ui/widgets/game/game_tile.dart b/lib/ui/widgets/game/game_tile.dart
index 7d69a5c667e916408a756db515bb68ebbc75f15a..07439223c6e1463e26e9550c3b340aa5f3f209cb 100644
--- a/lib/ui/widgets/game/game_tile.dart
+++ b/lib/ui/widgets/game/game_tile.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+import 'package:memory/config/application_config.dart';
 
 import 'package:memory/cubit/activity/activity_cubit.dart';
 import 'package:memory/models/activity/activity.dart';
@@ -21,7 +22,7 @@ class GameTileWidget extends StatelessWidget {
         final Tile tile = currentActivity.board.tiles[tileIndex];
 
         final String assetName =
-            'assets/skins/${currentActivity.globalSettings.skin}_${tile.paired ? 'found' : (tile.selected ? tile.value.toString() : 'unknown')}.png';
+            'assets/skins/${currentActivity.activitySettings.get(ApplicationConfig.parameterCodeSkin)}_${tile.paired ? 'found' : (tile.selected ? tile.value.toString() : 'unknown')}.png';
 
         return Padding(
           padding: const EdgeInsets.all(2),
diff --git a/pubspec.lock b/pubspec.lock
index 1896dfc3582bc30a9743cfeb6b5a0e3e3b46fcd3..0d7744cbc920c4c2cb00c639e11ef7197325b30e 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -122,11 +122,11 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "0.4.0"
-      resolved-ref: eb9c090bd00d73324eab8737f74b3339cc24c9e8
+      ref: "0.5.0"
+      resolved-ref: b8164a50489ba981ea57d9f02e2334f09cb8c6a7
       url: "https://git.harrault.fr/android/flutter-toolbox.git"
     source: git
-    version: "0.4.0"
+    version: "0.5.0"
   flutter_lints:
     dependency: "direct dev"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 44080feca7b519b923b670dbfe3fc5a816c8913b..8851234c1532f610a73490a765ba847d1ef47e6a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: A simple and classic memory game.
 
 publish_to: "none"
 
-version: 1.4.2+34
+version: 1.5.0+35
 
 environment:
   sdk: "^3.0.0"
@@ -16,7 +16,7 @@ dependencies:
   flutter_custom_toolbox:
     git:
       url: https://git.harrault.fr/android/flutter-toolbox.git
-      ref: 0.4.0
+      ref: 0.5.0
 
   # specific
   # (none)