diff --git a/apps/wyatt_app_template/wyatt_app_template/.vscode/launch.json b/apps/wyatt_app_template/wyatt_app_template/.vscode/launch.json
new file mode 100644
index 0000000..3e84edd
--- /dev/null
+++ b/apps/wyatt_app_template/wyatt_app_template/.vscode/launch.json
@@ -0,0 +1,77 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Launch development/debug:mocks",
+            "request": "launch",
+            "type": "dart",
+            "program": "lib/main_development.dart",
+            "args": [
+                "--dart-define=dev_mode=mock",
+                "--target",
+                "lib/main_development.dart"
+            ],
+            "flutterMode": "debug"
+        },
+        {
+            "name": "Launch development/debug:emulator",
+            "request": "launch",
+            "type": "dart",
+            "program": "lib/main_development.dart",
+            "args": [
+                "--dart-define=dev_mode=emulator",
+                "--target",
+                "lib/main_development.dart"
+            ],
+            "flutterMode": "debug"
+        },
+        {
+            "name": "Launch development/debug:real",
+            "request": "launch",
+            "type": "dart",
+            "program": "lib/main_development.dart",
+            "args": [
+                "--dart-define=dev_mode=real",
+                "--target",
+                "lib/main_development.dart"
+            ],
+            "flutterMode": "debug"
+        },
+        {
+            "name": "Launch staging/debug",
+            "request": "launch",
+            "type": "dart",
+            "program": "lib/main_staging.dart",
+            "args": [
+                "--target",
+                "lib/main_staging.dart"
+            ],
+            "flutterMode": "debug"
+        },
+        {
+            "name": "Launch production/debug",
+            "request": "launch",
+            "type": "dart",
+            "program": "lib/main_production.dart",
+            "args": [
+                "--target",
+                "lib/main_production.dart"
+            ],
+            "flutterMode": "debug"
+        },
+        {
+            "name": "Launch production/release",
+            "request": "launch",
+            "type": "dart",
+            "program": "lib/main_production.dart",
+            "args": [
+                "--target",
+                "lib/main_production.dart"
+            ],
+            "flutterMode": "release"
+        },
+    ]
+}
\ No newline at end of file
diff --git a/apps/wyatt_app_template/wyatt_app_template/.vscode/settings.json b/apps/wyatt_app_template/wyatt_app_template/.vscode/settings.json
new file mode 100644
index 0000000..69ad607
--- /dev/null
+++ b/apps/wyatt_app_template/wyatt_app_template/.vscode/settings.json
@@ -0,0 +1,15 @@
+{
+    "bloc.newCubitTemplate.type": "equatable",
+    "psi-header.config": {
+        "blankLinesAfter": 0,
+        "forceToTop": true,
+    },
+    "psi-header.templates": [
+        {
+          "language": "*",
+          "template": [
+            "Wyatt App Copyright (c) <<year>>"
+          ]
+        }
+      ],
+}
\ No newline at end of file
diff --git a/apps/wyatt_app_template/wyatt_app_template/automation/generator.yml b/apps/wyatt_app_template/wyatt_app_template/automation/generator.yml
index beb507e..33cd1ea 100644
--- a/apps/wyatt_app_template/wyatt_app_template/automation/generator.yml
+++ b/apps/wyatt_app_template/wyatt_app_template/automation/generator.yml
@@ -59,4 +59,5 @@ tasks:
     desc: Running Trapeze config
     aliases: [t]
     cmds:
+      - echo -e "{{.GREEN}}{{.PREFIX}} Running Trapeze config...{{.COLOROFF}}"
       - npx trapeze run trapeze.yaml --android-project android --ios-project ios
diff --git a/apps/wyatt_app_template/wyatt_app_template/automation/pub.yml b/apps/wyatt_app_template/wyatt_app_template/automation/pub.yml
index 94cd880..fe49212 100644
--- a/apps/wyatt_app_template/wyatt_app_template/automation/pub.yml
+++ b/apps/wyatt_app_template/wyatt_app_template/automation/pub.yml
@@ -37,3 +37,11 @@ tasks:
     cmds:
       - echo -e "{{.GREEN}}{{.PREFIX}} Checking for outdated dependencies...{{.COLOROFF}}"
       - flutter pub upgrade
+  
+  validate:
+    desc: Running dependency validator
+    deps: [get]
+    aliases: [v]
+    cmds:
+      - echo -e "{{.GREEN}}{{.PREFIX}} Validating dependencies...{{.COLOROFF}}"
+      - flutter pub run dependency_validator
diff --git a/apps/wyatt_app_template/wyatt_app_template/automation/run.yml b/apps/wyatt_app_template/wyatt_app_template/automation/run.yml
index 66bff75..3b1eb77 100644
--- a/apps/wyatt_app_template/wyatt_app_template/automation/run.yml
+++ b/apps/wyatt_app_template/wyatt_app_template/automation/run.yml
@@ -17,42 +17,42 @@ tasks:
       - flutter logs
 
   mock:
-    desc: Run app in development environnement with mocks
+    desc: Run app in development environment with mocks
     aliases: [m]
     cmds:
-      - echo -e "{{.GREEN}}{{.PREFIX}} Running the app (development:mocks)...{{.COLOROFF}}"
+      - echo -e "{{.GREEN}}{{.PREFIX}} Running the app (development/debug:mocks)...{{.COLOROFF}}"
       - flutter run --target lib/main_development.dart --dart-define="dev_mode=mock"
 
   emu:
     desc: Run app in development with emulated environment
-    aliases: [m]
+    aliases: [e]
     cmds:
-      - echo -e "{{.GREEN}}{{.PREFIX}} Running the app (development:emulator)...{{.COLOROFF}}"
+      - echo -e "{{.GREEN}}{{.PREFIX}} Running the app (development/debug:emulator)...{{.COLOROFF}}"
       - flutter run --target lib/main_development.dart --dart-define="dev_mode=emulator"
 
   dev:
-    desc: Run app in development environnement
-    aliases: [m]
+    desc: Run app in development environment
+    aliases: [d]
     cmds:
-      - echo -e "{{.GREEN}}{{.PREFIX}} Running the app (development:real)...{{.COLOROFF}}"
+      - echo -e "{{.GREEN}}{{.PREFIX}} Running the app (development/debug:real)...{{.COLOROFF}}"
       - flutter run --target lib/main_development.dart --dart-define="dev_mode=real"
 
   staging:
-    desc: Run app in staging environnement
+    desc: Run app in staging environment
     aliases: [s]
     cmds:
-      - echo -e "{{.GREEN}}{{.PREFIX}} Running the app (staging)...{{.COLOROFF}}"
+      - echo -e "{{.GREEN}}{{.PREFIX}} Running the app (staging/debug)...{{.COLOROFF}}"
       - flutter run --target lib/main_staging.dart
 
   prod:
-    desc: Run app in production environnement
+    desc: Run app in production environment
     aliases: [p]
     cmds:
-      - echo -e "{{.GREEN}}{{.PREFIX}} Running the app (production)...{{.COLOROFF}}"
+      - echo -e "{{.GREEN}}{{.PREFIX}} Running the app (production/debug)...{{.COLOROFF}}"
       - flutter run --target lib/main_production.dart
 
   release:
-    desc: Run app in production environnement and in release mode
+    desc: Run app in production environment and in release mode
     aliases: [r]
     cmds:
       - echo -e "{{.GREEN}}{{.PREFIX}} Running the app (production/release)...{{.COLOROFF}}"