diff --git a/.fvmrc b/.fvmrc
index c6c5344..ab8148c 100644
--- a/.fvmrc
+++ b/.fvmrc
@@ -1,3 +1,3 @@
 {
-  "flutter": "3.41.3"
+  "flutter": "3.47.5"
 }
\ No newline at end of file
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..280992f
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,78 @@
+name: ci
+
+# Runs in the Flutter Base template and in every project created from it.
+on:
+  push:
+    branches: [main]
+  pull_request:
+
+concurrency:
+  group: ci-${{ github.ref }}
+  cancel-in-progress: true
+
+env:
+  # Use the SDK installed by flutter-action instead of the FVM link (.fvm/),
+  # which only exists on developer machines.
+  MELOS_SDK_PATH: auto
+
+jobs:
+  verify:
+    name: Format, analyze and test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Read the pinned Flutter version
+        id: fvm
+        run: echo "version=$(jq -r '.flutter' .fvmrc)" >> "$GITHUB_OUTPUT"
+
+      - uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+          flutter-version: ${{ steps.fvm.outputs.version }}
+          cache: true
+
+      - name: Install Melos
+        run: dart pub global activate melos
+
+      - name: Bootstrap the workspace
+        run: melos bootstrap
+
+      - name: Format, analyze and test
+        run: melos run verify
+
+  build-android:
+    name: Build Android (debug)
+    runs-on: ubuntu-latest
+    needs: verify
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: "17"
+
+      - name: Read the pinned Flutter version
+        id: fvm
+        run: echo "version=$(jq -r '.flutter' .fvmrc)" >> "$GITHUB_OUTPUT"
+
+      - uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+          flutter-version: ${{ steps.fvm.outputs.version }}
+          cache: true
+
+      # compileSdk 37 (android/build.properties) is newer than the runner image.
+      - name: Install Android SDK platform 37
+        run: yes | "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --install "platforms;android-37.0" > /dev/null
+
+      - name: Install Melos
+        run: dart pub global activate melos
+
+      - name: Bootstrap the workspace
+        run: melos bootstrap
+
+      - name: Build the dev flavor
+        working-directory: app
+        run: flutter build apk --debug -t lib/main/env/main_dev.dart --dart-define-from-file=env/.dev
diff --git a/.github/workflows/sonar-qube-scann.yml b/.github/workflows/sonar-qube-scann.yml
index 0d0468d..931ac5b 100644
--- a/.github/workflows/sonar-qube-scann.yml
+++ b/.github/workflows/sonar-qube-scann.yml
@@ -1,10 +1,14 @@
 name: sonarqube
 
-# ────────────────────────────────────────────────────────────────
-# CI TRIGGERS
-#   · push on main      → historical baseline
-#   · pull_request PRs  → quality gate before merge
-# ────────────────────────────────────────────────────────────────
+# Project-only automation. It is skipped in the Flutter Base template and runs
+# in projects created from it: the `gate` job reads flutter_base.json, and
+# `melos run init` switches its "state" from "template" to "initialized".
+#
+# Required repository secrets once the project is initialized:
+#   SONAR_TOKEN     SonarQube project token
+#   SONAR_URL       SonarQube server URL
+# Optional:
+#   SSH_PRIVATE_KEY only needed for git-based pub dependencies
 on:
   push:
     branches: [main]
@@ -12,56 +16,67 @@ on:
     types: [opened, synchronize, reopened]
 
 jobs:
-  sonarQubeTrigger:
-    name: Sonarqube Trigger
+  gate:
+    name: Check repository state
     runs-on: ubuntu-latest
+    outputs:
+      initialized: ${{ steps.state.outputs.initialized }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          sparse-checkout: flutter_base.json
+          sparse-checkout-cone-mode: false
+
+      - name: Read flutter_base.json
+        id: state
+        run: |
+          state=$(jq -r '.state' flutter_base.json)
+          echo "Repository state: $state"
+          if [ "$state" = "initialized" ]; then
+            echo "initialized=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "initialized=false" >> "$GITHUB_OUTPUT"
+            echo "::notice::Template repository: SonarQube is disabled until 'melos run init' initializes a project."
+          fi
 
+  sonarqube:
+    name: SonarQube scan
+    needs: gate
+    if: needs.gate.outputs.initialized == 'true'
+    runs-on: ubuntu-latest
+    env:
+      MELOS_SDK_PATH: auto
+      SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
     steps:
-      # 1 — Checkout the repo
-      - name: Checkout code
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
 
-      # 2 — SSH agent for any Git-based pub dependencies
-      - name: Start ssh-agent
+      - name: Start ssh-agent for git-based pub dependencies
+        if: env.SSH_PRIVATE_KEY != ''
         uses: webfactory/ssh-agent@v0.9.0
         with:
           ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
 
-      # 3 — Read the pinned Flutter version from .fvmrc
-      - name: Read Flutter version
+      - name: Read the pinned Flutter version
         id: fvm
         run: echo "version=$(jq -r '.flutter' .fvmrc)" >> "$GITHUB_OUTPUT"
 
-      # 4 — Install Flutter SDK at the pinned version
-      - name: Set up Flutter
-        uses: subosito/flutter-action@v2
+      - uses: subosito/flutter-action@v2
         with:
           channel: stable
           flutter-version: ${{ steps.fvm.outputs.version }}
+          cache: true
 
-      # 5 — Install Melos
       - name: Install Melos
         run: dart pub global activate melos
 
-      # 6 — Resolve workspace dependencies
-      - name: Bootstrap workspace
+      - name: Bootstrap the workspace
         run: melos bootstrap
 
-      # 7 — Static analysis
-      - name: Analyze
-        run: melos run analyze
-
-      # 8 — Run tests (each package)
-      - name: Run tests
-        run: melos exec --dir-exists=test -- flutter test
-
-      # 9 — Install SonarScanner CLI (needed by full_coverage.py)
-      - name: Setup Sonarqube Scanner
+      - name: Set up SonarScanner
         uses: warchant/setup-sonar-scanner@v8
 
-      # 10 — Generate coverage & run SonarQube
-      - name: Generate coverage & run SonarQube
+      - name: Generate coverage and run SonarQube
         run: python3 coverage/full_coverage.py --ci
         env:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-          SONAR_URL: ${{ secrets.SONAR_URL }}
+          SONAR_HOST_URL: ${{ secrets.SONAR_URL }}
diff --git a/CLAUDE.md b/CLAUDE.md
index bbc341e..fd2557d 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -6,13 +6,21 @@ A **reusable company template**, not a product. Teams clone it to start new Flut
 here is inherited by future projects, so optimize for reuse and clear boundaries, and keep
 product-specific assumptions out of the base modules.
 
-If you are working in a **project cloned from this template**, the same rules apply, but the example
-features (auth, onboarding, home) and the placeholders are yours to replace.
-See [docs/development/bootstrap-customization.md](docs/development/bootstrap-customization.md).
+### Template or project? Check `flutter_base.json`
+
+`flutter_base.json` → `"state"` says which one you are in:
+
+- **`"template"`**: this is the Flutter Base itself. Keep project-specific values (real app names, bundle IDs,
+  endpoints, secrets) out of it. Project-only automation (the SonarQube workflow) is switched off.
+- **`"initialized"`**: a project created from the base with `melos run init`. The example features (auth,
+  onboarding, home) and the remaining manual placeholders are yours to replace.
+
+Never edit `flutter_base.json` or the identity values by hand to switch state. The lifecycle, parameters and
+manual steps are in [docs/development/project-initialization.md](docs/development/project-initialization.md).
 
 ## Architecture in one screen
 
-A Dart pub workspace, managed with Melos 7, with one Flutter app and three local path packages, layered like this:
+A Dart pub workspace, managed with Melos 8, with one Flutter app and three local path packages, layered like this:
 
 ```
 app  ──►  domain  ──►  common
@@ -28,6 +36,8 @@ app  ──►  domain  ──►  common
 | `modules/data/` | Data access | Repository **implementations**, Dio `NetworkConfig`, interceptors, `Preferences` (shared_preferences) |
 | `modules/common/` | Shared utilities with no feature knowledge | `ResultType`, `Resource`, `Failure`, platform/permission abstractions, analytics interface, validators |
 
+`tool/project_init/` is a fifth workspace member: the pure-Dart project initializer (tooling, not an app layer).
+
 - **State management:** `flutter_bloc` Cubits, which live in `domain` (not in `app`). Async screens use
   `BaseCubit<T>`, which emits `Resource<T>` (`RLoading`/`RSuccess`/`RError`).
 - **Result flow:** repository returns `Future<ResultType<T>>` (`TSuccess`/`TError`) → service → cubit → `Resource<T>` → widget via `BlocBuilder`.
@@ -37,19 +47,23 @@ app  ──►  domain  ──►  common
 - **Persistence:** the `Preferences` interface over `SharedPreferences` (in `data`).
 - **Errors:** the sealed `Failure` hierarchy plus the `DioException.toFailure()` mapper (in `common`).
 - **Flavors:** `dev` / `qa` / `prod` entrypoints + `flutter_dotenv`. Read [docs/architecture/overview.md § Environments](docs/architecture/overview.md#environments-and-flavors) before touching env handling. It has known inconsistencies.
+- **Project identity** (name, package, bundle IDs) is kept in a few files the initializer owns: `flutter_base.json`,
+  `app/android/build.properties`, `app/ios/Flutter/AppIdentity.xcconfig` (see the repository map).
 
 Deeper docs:
 - [docs/architecture/overview.md](docs/architecture/overview.md): layers, data flow, DI, navigation, env
 - [docs/architecture/modules.md](docs/architecture/modules.md): **module boundaries, dependency rules, creating a module**
 - [docs/development/feature-guide.md](docs/development/feature-guide.md): how to add a feature end to end
 - [docs/development/testing.md](docs/development/testing.md): testing strategy and commands
-- [docs/development/bootstrap-customization.md](docs/development/bootstrap-customization.md): what to change in a new project
+- [docs/development/project-initialization.md](docs/development/project-initialization.md): **template vs project, `melos run init`, toolchain requirements**
+- [docs/development/bootstrap-customization.md](docs/development/bootstrap-customization.md): what to keep, customize or replace in a new project
 - [docs/architecture/known-issues.md](docs/architecture/known-issues.md): verified defects and tech debt. **Read it before "fixing" something that looks wrong.**
 
 ## Repository map
 
 ```
-app/                      Flutter application (package name: app)
+flutter_base.json         repository state (template | initialized) + current identity. Written only by the initializer
+app/                      Flutter application (Dart package `app` in the template; init renames it)
   lib/main.dart           prod entrypoint
   lib/main/env/           main_dev.dart, main_qa.dart, env_config.dart (Flavor, FlavorConfig, Environment)
   lib/main/init.dart      composition root: dotenv load, GetIt registration, runApp
@@ -64,13 +78,17 @@ app/                      Flutter application (package name: app)
     resources/            Dimen, Images (part files of resources.dart), locale/*.arb + generated/
   env/                    dotenv files bundled as assets (.dev, .env.example)
   test/                   app tests
-  android/ ios/ web/ linux/   platform projects
+  android/build.properties   Android identity (applicationId, namespace, label) + SDK levels
+  ios/Flutter/AppIdentity.xcconfig  iOS identity (APP_BUNDLE_ID, APP_DISPLAY_NAME). Flavor xcconfigs: ios/dev.xcconfig, ios/qa.xcconfig
+  android/ ios/ web/ linux/   platform projects (iOS uses Swift Package Manager, no CocoaPods)
 modules/domain/lib/       bloc/, services/, repositories/ (interfaces), models/, env/, init.dart
 modules/data/lib/         repositories/ (impls), network/, preferences/, data_sources/ (placeholders), init.dart
 modules/common/lib/       core/, devices/, analytics/, ui/, validators/, init.dart
+tool/project_init/        the initializer (bin/init.dart, lib/src/, tests that initialize a copy of this repo)
 pubspec.yaml (root)       pub workspace root (`workspace:` members) + the `melos:` scripts; one shared pubspec.lock
 .fvmrc                    pinned Flutter SDK version (FVM). CI reads it too
-.github/workflows/        sonar-qube-scann.yml: analyze + tests + coverage/SonarQube on every PR and push to main
+.github/workflows/        ci.yml: format + analyze + test + Android build (template and project)
+                          sonar-qube-scann.yml: coverage + SonarQube, project-only (skipped in the template)
 coverage/full_coverage.py multi-package LCOV merge + SonarQube upload
 sonar-project.properties  SonarQube config (placeholders)
 addModule.py              pulls a module from rootstrap/flutter-modules (see known-issues)
@@ -78,25 +96,30 @@ addModule.py              pulls a module from rootstrap/flutter-modules (see kno
 
 ## Commands
 
-Prerequisites: FVM (`dart pub global activate fvm`, then `fvm install` installs the Flutter version pinned in
-`.fvmrc`, 3.41.3) and Melos 7 (`dart pub global activate melos`). Packages require Dart `>=3.6.0` and Flutter `>=3.41.0`.
-Run Flutter through FVM (`fvm flutter …`) so you use the pinned SDK. The commands below say `flutter` for brevity.
+Toolchain: Flutter **3.47.5** (Dart **3.13.4**) pinned in `.fvmrc` (`dart pub global activate fvm`, then `fvm install`),
+Melos **8.9** (`dart pub global activate melos`), JDK **17**, Android SDK platform **37** (compileSdk; install it with
+`sdkmanager "platforms;android-37.0"`), and Xcode with the iOS 15+ SDK. CocoaPods is not needed. Run Flutter through
+FVM (`fvm flutter …`) so you use the pinned SDK; the commands below say `flutter` for brevity.
 
 | Task | Command (from repo root unless noted) |
 |---|---|
+| Initialize a project (template only) | `melos run init` (prompts), or `dart tool/project_init/bin/init.dart --name "My App" --package-name my_app --bundle-id com.company.myapp`. Add `--dry-run` to preview. |
 | Install deps for the whole workspace | `melos bootstrap` |
-| Check toolchain | `melos doctor` |
-| Static analysis (CI gate) | `melos run analyze` (runs `dart analyze . --fatal-infos` per package) |
-| Format check | `melos run format` (runs `dart format --set-exit-if-changed .` per package, and fails on unformatted code) |
-| Analyze + format | `melos run lint:all` |
-| Regenerate l10n after editing `.arb` | `cd app && dart run intl_utils:generate` |
-| build_runner | `melos run pub:runner`. No generators are configured today (see known-issues #12). |
+| Everything CI checks | `melos run verify` (format, analyze, test) |
+| Static analysis | `melos analyze` (same as `melos run analyze`: `dart analyze . --fatal-infos` per package) |
+| Format (fails if a file changed) | `melos format` (same as `melos run format`) |
+| Test | `melos run test` (`flutter test` in Flutter packages, `dart test` in pure-Dart ones) |
+| Regenerate l10n after editing `.arb` | `melos run gen:l10n` |
+| build_runner | `melos run pub:runner` (only packages that depend on build_runner; none use generators today) |
 | Run (dev) | `cd app && flutter run -t lib/main/env/main_dev.dart --dart-define-from-file=env/.dev` |
-| Run web | `melos run run:web` (uses the **prod** entrypoint `lib/main.dart` with `env/.dev`) |
-| Test (CI gate) | `melos exec --dir-exists=test -- flutter test` (runs every package that has a `test/` directory) |
+| Run web (dev) | `melos run run:web` |
+| Check toolchain | `melos doctor` |
 | Coverage + Sonar | `python3 coverage/full_coverage.py --dry-run` (drop `--dry-run` to execute; `--ci` for non-interactive) |
-| Build Android | `cd app && flutter build appbundle -t lib/main.dart --dart-define-from-file=<env file>` |
-| Build iOS | `cd app && flutter build ipa --release -t lib/main.dart --dart-define-from-file=<env file>` |
+| Build Android | `cd app && flutter build apk --debug -t lib/main/env/main_dev.dart --dart-define-from-file=env/.dev` (release: `flutter build appbundle -t lib/main.dart --dart-define-from-file=<env file>`) |
+| Build iOS | `cd app && flutter build ios --simulator --debug -t lib/main/env/main_dev.dart --dart-define-from-file=env/.dev` (release: `flutter build ipa --release -t lib/main.dart --dart-define-from-file=<env file>`) |
+
+`analyze`, `format` and `test` are root scripts that shadow Melos's built-in commands of the same name, so
+`melos analyze` and `melos run analyze` run the same thing. Don't make such a script call the built-in: it recurses.
 
 Flavors: iOS has `Dev`/`QA`/`Runner` schemes (`--flavor dev|qa` works on iOS). Android has **no**
 `productFlavors`, so select the environment with `-t <entrypoint>` only. Details are in overview.md.
@@ -124,6 +147,9 @@ Flavors: iOS has `Dev`/`QA`/`Runner` schemes (`--flavor dev|qa` works on iOS). A
 9. **Don't introduce a second pattern** (Riverpod, Provider-only state, another HTTP client, another DI
    container, freezed/json_serializable) without an explicit architecture decision.
 10. **Don't edit generated or platform-generated files** (see below).
+    Identity files (`flutter_base.json`, `android/build.properties` identity keys, `ios/Flutter/AppIdentity.xcconfig`)
+    are changed by the initializer. If you change a template file the initializer edits, update
+    `tool/project_init/lib/src/plan.dart` too; its tests fail if the two drift apart.
 11. **Behavior changes need tests.** See [testing.md](docs/development/testing.md). Only `common` and `domain`
     have a few, so create the package's `test/` directory as the guide describes rather than skipping. CI picks it up automatically.
 12. **Report pre-existing problems; don't silently fix them** in unrelated changes. Record them in
@@ -133,6 +159,7 @@ Flavors: iOS has `Dev`/`QA`/`Runner` schemes (`--flavor dev|qa` works on iOS). A
 - `app/lib/presentation/resources/locale/generated/**`: intl_utils output. Edit the `.arb` files and regenerate.
 - `**/generated_plugin_registrant.*`, `app/linux/flutter/generated_*`, `ios/Flutter/Generated.xcconfig`: Flutter tool output.
 - `pubspec.lock` (a single workspace lock at the root, git-ignored), `.dart_tool/`, `.fvm/`, `build/`, `coverage/lcov*.info`.
+- `flutter_base.json`: written by the initializer only.
 - If you add build_runner generators: `*.g.dart`, `*.freezed.dart`, `*.mocks.dart` (already excluded in Sonar and coverage).
 
 ## Before implementing
@@ -148,18 +175,16 @@ Flavors: iOS has `Dev`/`QA`/`Runner` schemes (`--flavor dev|qa` works on iOS). A
 
 ## Definition of done
 
-- [ ] `melos run format` passes (run `dart format .` in the package to fix)
-- [ ] `melos run analyze` passes (it is `--fatal-infos`, so infos fail too)
-- [ ] `melos exec --dir-exists=test -- flutter test` passes
-- [ ] `.arb` edited in all locales and `dart run intl_utils:generate` output committed
+- [ ] `melos run verify` passes (format, analyze with fatal infos, test). `format` rewrites files, so commit the result
+- [ ] In the template, `flutter_base.json` still says `"template"` and no project-specific values were added
+- [ ] `.arb` edited in all locales and `melos run gen:l10n` output committed
 - [ ] New code registered in the right `init.dart`; no forbidden imports (the rules in § Rules and modules.md)
 - [ ] App still launches on the dev entrypoint; `flutter build` succeeds for platforms touched
 - [ ] Docs updated if you changed a boundary, command, extension point, or env handling
 - [ ] PR follows `.github/pull_request_template.md` (description, issue link, preview)
 
-CI (`.github/workflows/sonar-qube-scann.yml`) is meant to run analyze, the tests and coverage/SonarQube on
-every PR, but it currently fails before any of them run (missing `SSH_PRIVATE_KEY` secret). It also has no
-format or build step. Run the whole checklist locally (known-issues #3).
+CI (`.github/workflows/ci.yml`) runs `melos run verify` and an Android debug build on every PR, in the template and
+in projects. iOS is not built in CI, so build it locally when you touch iOS or shared native configuration.
 
 ## Delivery system
 
diff --git a/README.md b/README.md
index f7d6633..f2b8fca 100644
--- a/README.md
+++ b/README.md
@@ -1,277 +1,261 @@
-[![License](https://img.shields.io/github/license/rootstrap/ios-base.svg)](https://github.com/rootstrap/flutter-base/blob/master/LICENSE.md)
-
 # Flutter Base Template
 
-Flutter base is a boilerplate project created by Rootstrap for new projects using Flutter. The main
-objective is helping any new projects jump start into feature development by providing a handful of
-functionalities.
+Flutter Base is Rootstrap's starting point for new Flutter apps. It gives a new project a working architecture,
+tooling and CI from day one, so the team can start on features right away.
 
-## Documentation
+This repository is a **template**, not a product. You don't develop in it directly: you create a repository from it
+and run one command (`melos run init`) that turns the copy into your project. The example features (auth,
+onboarding, home, splash) are there to show the patterns. Replace them with your own.
+
+## What's included
 
-- [CLAUDE.md](CLAUDE.md): the entry point for AI agents and a quick reference for developers (architecture, commands, rules, definition of done)
-- [Architecture overview](docs/architecture/overview.md) · [Module guide](docs/architecture/modules.md) · [Known issues](docs/architecture/known-issues.md)
-- [Feature development](docs/development/feature-guide.md) · [Testing](docs/development/testing.md) · [Bootstrap customization](docs/development/bootstrap-customization.md)
+- **Architecture:** a Dart pub workspace with one app and three packages (`domain`, `data`, `common`) and enforced
+  dependency direction. See [modules.md](docs/architecture/modules.md).
+- **State management:** `flutter_bloc` Cubits, with `BaseCubit<T>` and a `Resource<T>` loading/success/error state.
+- **Dependency injection:** GetIt, registered per package.
+- **Networking:** a Dio client with an auth-token interceptor and failure mapping.
+- **Navigation:** go_router, with auth redirects and deep links (app_links).
+- **Environments:** `dev` / `qa` / `prod` entrypoints and flutter_dotenv files.
+- **Localization:** intl + intl_utils (English and Spanish).
+- **Theming:** Material 3 light and dark themes.
+- **Tooling:** Melos 8 scripts, the project initializer, FVM-pinned Flutter, and GitHub Actions CI with an optional
+  SonarQube scan.
 
-Where this README and `docs/` disagree, `docs/` reflects the current code (see known-issues #15).
+## Requirements
 
-# Features
+| Tool | Version | Install |
+|---|---|---|
+| Flutter / Dart | 3.47.5 / 3.13.4, pinned in `.fvmrc` | `dart pub global activate fvm`, then `fvm install` in the repo |
+| Melos | 8.9+ | `dart pub global activate melos` |
+| JDK | 17 | For Android builds |
+| Android SDK | platform 37 | `sdkmanager "platforms;android-37.0"` |
+| Xcode | with the iOS 15.0+ SDK | For iOS builds. CocoaPods is **not** needed: iOS plugins use Swift Package Manager |
 
-This template comes with:
+If your shell can't find `fvm` or `melos`, add `export PATH="$PATH":"$HOME/.pub-cache/bin"` to `~/.zshrc` or
+`~/.bashrc`.
 
-- Melos: Manage actions.
-- Dependency injection (GetIt).
-- HttpClient already configured for Rootstrap BE Projects(Dio).
-- Theming setup.
-- Navigation Router and DeepLinks config with go_router
-- Intl.
-- State Management (Blocs/Cubit).
-- Env config and flavors.
-- Chat with Gemini and Vertex AI (Documentation and setup WIP)
-- GitWorkflow config: RS-GPT-Review
-- GitWorkflow config: Sonarqube
+Always run Flutter through FVM (`fvm flutter <command>`), or add `alias flutter='fvm flutter'`, so everyone uses
+the pinned SDK. Melos scripts already use it.
 
-## Initial Setup
+## Start a new project
 
-1. Create a new repo using this template.
+1. **Create your repository** from this template on GitHub ("Use this template"), and clone it.
 
    ![template](app/template.png)
-2. Clone your new repo.
-3. Install [FVM](https://fvm.app) (Flutter Version Management):
-```text
-    dart pub global activate fvm
-```
-4. Install the Flutter SDK version pinned in `.fvmrc`:
-```text
-    fvm install
-```
-   This downloads the exact Flutter version the repo is pinned to and links it at `.fvm/flutter_sdk`. All contributors and CI use the same version.
-5. Run Flutter commands through FVM:
-```text
-    fvm flutter <command>
-```
-   Optionally add a shell alias (`alias flutter='fvm flutter'`) so you can keep typing `flutter ...`.
-6. Install [Melos](https://melos.invertase.dev/getting-started) 7.x globally:
-```text
-    dart pub global activate melos
-```
-7. Verify melos is on the path: `melos --version`. If your shell does not find the command, add `pub-cache` to `PATH` (e.g. in `~/.zshrc` or `~/.bashrc`):
-```text
-    export PATH="$PATH":"$HOME/.pub-cache/bin"
-```
-8. Bootstrap the workspace (downloads packages for every workspace member):
-```text
-    melos bootstrap
-```
-9. Run `melos doctor` to verify the setup.
 
-> Melos 7 uses [Dart pub workspaces](https://dart.dev/tools/pub/workspaces). The workspace is declared in the root `pubspec.yaml`, each package sets `resolution: workspace`, and there is a single shared `pubspec.lock` at the repo root.
+2. **Install the pinned Flutter version** from the repository root:
 
-### Upgrading the pinned Flutter version
+   ```bash
+   fvm install
+   ```
 
-When the team agrees to move to a new Flutter version, run `fvm use <version>` at the repo root and commit the updated `.fvmrc`. CI reads the pinned version from `.fvmrc`, so the change propagates automatically.
+3. **Initialize the project.** The command prompts for the app name, the Dart package name and the bundle ID, shows
+   every change, and asks for confirmation:
 
-### IDE setup
+   ```bash
+   melos run init
+   ```
 
-- **VS Code**: settings are already wired in `.vscode/settings.json` — the Dart extension picks up `.fvm/flutter_sdk` automatically.
-- **Android Studio / IntelliJ**: open `Preferences → Languages & Frameworks → Flutter` and set the SDK path to `<repo>/.fvm/flutter_sdk`.
-10. Setup Android:
-    - Add to the build.properties file (and update when needed):
-```text 
-    flutter.versionName=1.0.0
-    flutter.appId=base
-    flutter.versionCode=1
-    flutter.compileSdkVersion=33
-    flutter.minSdkVersion=21
-    flutter.targetSdkVersion=33 
-```
+   To run it without prompts (scripts, CI, agents), call the script directly. Use this form whenever a value
+   contains spaces:
 
-11. Android SignIn
-    - Create your release Key Store:
+   ```bash
+   dart tool/project_init/bin/init.dart --name "My App" --package-name my_app --bundle-id com.company.myapp
+   ```
 
-```text
-   keytool -genkey -v -keystore ~/keystore_name.jks -keyalg RSA -keysize 2048 -validity 10000 -alias your_alias"
-```
+   Add `--dry-run` to preview the changes. Init validates everything before writing, and it runs **only once**; after
+   that, change identifiers by hand. The parameters, rules and every file it edits are in
+   [project-initialization.md](docs/development/project-initialization.md).
 
-- Create the 'key.properties' file with the keystore information:
+4. **Install dependencies and check everything:**
 
-```text
-    storePassword=<YourStorePassword>
-    keyPassword=<YourKeyPassword>
-    keyAlias=<YourStoreAlias>>
-    storeFile=<FilePath>
-```
+   ```bash
+   melos bootstrap
+   melos run verify     # format, analyze and test, as CI does
+   ```
 
-12. Add your env vars, create a config file for each env:
-   ![me](env_config_files.png)
-    - add the env config, i.e:
+5. **Set up the environments** (see [Environments](#environments)).
 
-```text
-    {
-        "API_URL": "https://dummyjson.com"
-    }
-```
+6. **Run the app** (see [Run the app](#run-the-app)).
+
+7. **Finish the manual steps.** Init can't know these values:
+   - **Android release signing:** create a keystore and `app/android/key.properties`:
+
+     ```bash
+     keytool -genkey -v -keystore ~/upload-keystore.jks -keyalg RSA -keysize 2048 -validity 10000 -alias upload
+     ```
 
-10. Setup iOs App Name and id:
-   - Locate the config file for each flavor and configure the FLUTTER_APP_NAME i.e: Debug.xcconfig
-```text
-     FLUTTER_APP_ID=base.debug
-     FLUTTER_APP_NAME=RS Base Debug
+     ```properties
+     storePassword=<store password>
+     keyPassword=<key password>
+     keyAlias=upload
+     storeFile=<absolute path to the .jks file>
+     ```
+
+     Don't commit this file or the keystore. Without `key.properties`, release builds are signed with the **debug
+     key**, which the Play Store rejects.
+   - **iOS signing:** open `app/ios/Runner.xcworkspace` in Xcode and set your team and provisioning for the
+     `Runner` target.
+   - **Firebase** (optional): add the platform config files and uncomment `Firebase.initializeApp` in the
+     entrypoints.
+   - **SonarQube** (optional): add the `SONAR_TOKEN` and `SONAR_URL` repository secrets (see [CI](#ci)).
+   - **Branding:** app icons, launch screens, colors and fonts. See
+     [bootstrap-customization.md](docs/development/bootstrap-customization.md).
+   - **This README and a LICENSE** that fit your project.
+
+## Environments
+
+Each environment has an entrypoint and an env file in `app/env/`:
+
+| Environment | Entrypoint (`-t`) | Env file |
+|---|---|---|
+| dev | `lib/main/env/main_dev.dart` | `env/.dev` (committed, as an example) |
+| qa | `lib/main/env/main_qa.dart` | `env/.qa` (create it) |
+| prod | `lib/main.dart` | `env/.prod` (create it) |
+
+An env file looks like this:
+
+```properties
+API_URL=https://your-api.example.com
+ENV=dev
 ```
 
-## Set up an editor
+Pass it with `--dart-define-from-file=env/.<env>`. Its `ENV` value also selects which file flutter_dotenv loads, so
+`ENV` must match the file name (`ENV=prod` in `env/.prod`).
 
-- Follow the [Android Studio](https://docs.flutter.dev/get-started/editor?tab=androidstudio)
-  instructions to setup the editor
+> **Everything in `app/env/` is bundled into the app** and can be read by anyone who has the binary. Never put real
+> secrets there. Details and known inconsistencies:
+> [overview.md § Environments](docs/architecture/overview.md#environments-and-flavors).
 
-- Follow the [VS Code](https://docs.flutter.dev/get-started/editor?tab=vscode) instructions to setup
-  the editor
+## Run the app
 
-## Running the App
+From `app/`:
 
-1. Open a Simulator or Emulator
-2. Open your project in your editor of preference
+```bash
+# dev
+fvm flutter run -t lib/main/env/main_dev.dart --dart-define-from-file=env/.dev
 
-**Note:** Starting with **Flutter 2.8** in order for you to launch the app in **Android** you must
-define the `flutter.compileSdkVersion` inside the `local.properties` file.
+# qa
+fvm flutter run -t lib/main/env/main_qa.dart --dart-define-from-file=env/.qa
+```
 
-You can read more about
-this [here](https://docs.page/bizz84/complete-flutter-course/faq/android-build-gradle-issues).
+- **iOS:** add `--flavor dev` or `--flavor qa` to use the `Dev`/`QA` schemes. Each installs with its own bundle ID
+  (`<id>.debug.dev`, `<id>.debug.qa`), so the environments can sit side by side on one device.
+- **Android:** don't pass `--flavor`. Android has no product flavors, so the entrypoint alone selects the
+  environment, and every environment installs as `<id>.debug`.
+- **Web:** `melos run run:web` runs the dev environment in Chrome.
 
-### Android Studio
+**VS Code:** create a `.vscode/launch.json` (it is git-ignored) with one configuration per environment:
 
-1. Add a **Run Configuration**
-    1. Add new **Flutter** configuration
-    2. Give it a meaningful name **IE:** Dev, QA, Staging, Prod
-    3. Pick the entry point, main.dart file location **IE:** ``.../lib/main/env/main_dev.dart``
-2. Include any additional run arguments to launch the app.
-    1. Create each env files config files in your root **app/**
-       ![me](env_config_files.png)
-    2. Setup your build, add the env file to the build command in AE:
-       ![me](env_config.png)
-3. Setup your env vars, i.e the api_url for each env:
-    ```text
-        {
-            "API_URL": "https://dummyjson.com"
-        }
-    ```
-4. Select the device to launch the App
-5. Run the App
-
-### VS Code
-
-1. Go to **Run and Debug** section at the **Activity Bar**
-2. At the top of the section expand the list and **Add Configuration**
-3. Insert **Flutter Launch** configuration
-    1. Update the environment name **(dev)**
-    2. Update the launch program path **``/lib/main/env/main_dev.dart``**
-    3. Update the **Flutter Mode** (debug, profile, release)
-    4. Include any additional run argments to launch the app.
-        1. Environment variables
+```json
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "dev",
+      "request": "launch",
+      "type": "dart",
+      "cwd": "app",
+      "program": "lib/main/env/main_dev.dart",
+      "toolArgs": ["--dart-define-from-file=env/.dev"]
+    }
+  ]
+}
+```
+
+`.vscode/settings.json` already points the Dart extension at the FVM SDK.
+
+**Android Studio:** set the Flutter SDK path to `<repo>/.fvm/flutter_sdk` (Settings → Languages & Frameworks →
+Flutter). Then add a Flutter run configuration per environment, with the entrypoint as "Dart entrypoint" and
+`--dart-define-from-file=env/.dev` as "Additional run args".
+
+## Everyday commands
 
-           Add the env vars for each flavor with the property ``toolArgs``
-           ![launch configuration example](app/vs-code-launch-configuration.png)
+Run these from the repository root:
 
-4. Inside the **Run and Debug** section select the environment you want to excute
-5. Make sure you have the device you want to use already open
-6. Run the App
+| Task | Command |
+|---|---|
+| Install dependencies (whole workspace) | `melos bootstrap` |
+| Everything CI checks: format, analyze, test | `melos run verify` |
+| Static analysis (infos are fatal) | `melos run analyze` |
+| Format check | `melos run format` (fix with `dart format .` in the package) |
+| Tests | `melos run test` |
+| Regenerate localization after editing `.arb` files | `melos run gen:l10n` |
+| Check the toolchain | `melos run doctor` |
 
-**Note 1:** Create as much **Launch Configurations** as you need for any specific environment.
+A change is done when `melos run verify` passes and the app launches. The full checklist is in
+[CLAUDE.md § Definition of done](CLAUDE.md#definition-of-done).
 
-**Note 2:** You shouldn't commit the **``.vscode/launch.json``** file.
+**Before you add code**, read these:
+- [Feature guide](docs/development/feature-guide.md): add a feature end to end (repository → service → cubit → page).
+- [Module guide](docs/architecture/modules.md): what goes in which package, and which imports are allowed.
+- [Testing](docs/development/testing.md): what to test and how.
+- [Known issues](docs/architecture/known-issues.md): verified defects. Read it before "fixing" something that looks
+  wrong.
 
-## Build Production App:
+Key conventions:
+- Put user-facing strings in `app/lib/presentation/resources/locale/intl_*.arb` (all locales), then regenerate.
+  Never edit `locale/generated/`.
+- Take spacing from `Dimen` and colors from the theme; don't hardcode them.
+- Keep repository interfaces in `domain` and their implementations in `data`. Pages talk to cubits, not to
+  repositories.
 
-The production entry point is `lib/main.dart`. Run the commands from `app/`. The env file passed to
-`--dart-define-from-file` must define `ENV=prod`, because `init.dart` then loads `env/.prod` as the dotenv file.
-Create `app/env/.prod` first (following `app/env/.dev`) and don't commit real secrets.
+## Build for release
 
-1. Build your android appBundle or apk:
-    - run the following command to build your appBundle
+Run these from `app/`, after creating `env/.prod` (with `ENV=prod`) and setting up signing:
 
-    ```text
-        flutter build appbundle -t lib/main.dart --dart-define-from-file=env/.prod
-    ```
+```bash
+fvm flutter build appbundle -t lib/main.dart --dart-define-from-file=env/.prod
+fvm flutter build ipa --release -t lib/main.dart --dart-define-from-file=env/.prod
+```
+
+The version comes from `version:` in `app/pubspec.yaml`, for both platforms.
 
-   [TODO: add how to setup Xcode for apple signIn]
-2. Configure your iOs app sigIn.
-    - run the following command to build your ipa
+## CI
 
-    ```text
-        flutter build ipa --release -t lib/main.dart --dart-define-from-file=env/.prod
-    ```
+GitHub Actions runs on every pull request and every push to `main`:
 
-For more information you can check the [docs](https://dartcode.org/docs/launch-configuration/)
+- **`ci.yml`:** format, analyze and tests, plus an Android debug build. It runs in the template and in every project.
+- **`sonar-qube-scann.yml`:** coverage and a SonarQube scan. It runs **only in initialized projects**: its `gate` job
+  reads `flutter_base.json` and skips the scan in the template. To enable it, add the repository secrets `SONAR_TOKEN`
+  and `SONAR_URL`, and review `sonar-project.properties`. `SSH_PRIVATE_KEY` is only needed if you add private git
+  dependencies.
 
-## Packages
+CI reads the Flutter version from `.fvmrc`.
 
-- [GetIt](https://pub.dev/packages/get_it) For dependency injection.
-- [Dio](https://pub.dev/packages/dio) A http client.
-- [Blocs](https://pub.dev/packages/bloc) and [Cubit](https://pub.dev/packages/flutter_bloc) as State
-  management library.
+## Upgrading Flutter
 
-## Utilities
+When the team agrees on a new version, run `fvm use <version>` at the repository root, update the `sdk`/`flutter`
+constraints in the pubspecs if needed, check `melos run verify` and the platform builds, and commit the updated
+`.fvmrc`.
 
-- [intl](https://pub.dev/packages/intl) and [intl_utils](https://pub.dev/packages/intl_utils) for
-  localization.
-- [flutter_svg](https://pub.dev/packages/flutter_svg) Svg Image loader.
-- Auto generate translations files with [intl_utils](https://pub.dev/packages/intl_utils).
- 
--  ```text
-         dart run intl_utils:generate
-    ```
-## Code Quality Standards
-
-In order to meet the required code quality standards, this project is following
-this [tech guides considerations](https://github.com/rootstrap/tech-guides/blob/master/flutter/README.md)
-.
-It also runs [flutter analyze](https://dart.dev/tools/dart-analyze) for each build on your CI/CD
-tool.
-
-## Security recommendations
-
-### Obfuscation
-
-TBD
-
-## CI/CD configuration with Bitrise (updated on Dec 12th 2021)
-
-We are using Bitrise to configure and run
-the [CI/CD pipelines](https://www.notion.so/rootstrap/Flutter-CI-CD-9a0a5957ee8442908fc00c3ea8f49bf1)
-
-### Github Actions: RS-GPT-Review
-- Configure GPT secrets vars on your repo settings:
-    - OPENAI_KEY
-#### Note: The action will only run if the description or comments mentions @rs-gpt-review
-
-### Github Actions: Sonarqube
-- Go to you sonarqube server and configure a new project.
-- Configure the sonar-project.properties:
-    example:
-    '''
-        sonar.projectKey=your-app-key
-        sonar.projectName=your-project-name
-        sonar.host.url=https://your-sonarqube-server.net
-        sonar.projectVersion=1.0
-        sonar.sourceEncoding=UTF-8
-    '''
-# Main source directories
-sonar.sources=app/lib,modules/domain,modules/data,modules/common
-sonar.dart.exclusions=pubspec.yaml
-sonar.dart.analyzer.report.mode=LEGACY
-- Configure Sonarqube secrets vars on your repo settings:
-  - SONAR_TOKEN (your sonarqube project token)
-  - SONAR_URL (your sonarqube server url)
+## Contributing to the template
 
-## License
+These apply only when you change **this** repository, not a project created from it:
 
-Flutter-Base is available under the MIT license. See the LICENSE file for more info.
+- Keep it committed in the template state. `flutter_base.json` must say `"state": "template"`. Never commit the
+  result of running `melos run init`.
+- Every change is inherited by future projects. Keep the base modules generic and free of product-specific names,
+  endpoints or rules.
+- If you change a file the initializer edits, update `tool/project_init/lib/src/plan.dart` in the same change. If you
+  add or upgrade a dependency, the initializer tests may ask you to add package names to
+  `tool/project_init/lib/src/resolved_packages.dart`. See
+  [project-initialization.md § Maintaining the initializer](docs/development/project-initialization.md#maintaining-the-initializer).
+- Follow the pull request template in `.github/pull_request_template.md`.
+
+## Documentation
 
-**NOTE:** Remove the free LICENSE file for private projects or replace it with the corresponding
-license.
+- [CLAUDE.md](CLAUDE.md): quick reference for developers and AI agents (architecture, commands, rules, definition of
+  done).
+- Architecture: [overview](docs/architecture/overview.md) · [modules](docs/architecture/modules.md) ·
+  [known issues](docs/architecture/known-issues.md)
+- Development: [project initialization](docs/development/project-initialization.md) ·
+  [feature guide](docs/development/feature-guide.md) · [testing](docs/development/testing.md) ·
+  [bootstrap customization](docs/development/bootstrap-customization.md)
 
 ## Credits
 
-**Flutter Base** is maintained by [Rootstrap](http://www.rootstrap.com) with the help of
+**Flutter Base** is maintained by [Rootstrap](https://www.rootstrap.com) with the help of
 our [contributors](https://github.com/rootstrap/flutter-base/contributors).
 
-[<img src="https://s3-us-west-1.amazonaws.com/rootstrap.com/img/rs.png" width="100"/>](http://www.rootstrap.com)
+[<img src="https://s3-us-west-1.amazonaws.com/rootstrap.com/img/rs.png" width="100"/>](https://www.rootstrap.com)
diff --git a/app/.gitignore b/app/.gitignore
index f419504..d0fb9d2 100644
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -141,3 +141,7 @@ firebase-debug.log
 # Local development files
 local.properties
 *.properties
+
+# Tracked Android build configuration (the rules above would ignore it).
+!android/build.properties
+!android/gradle.properties
diff --git a/app/analysis_options.yaml b/app/analysis_options.yaml
index cd6fba3..a58a4df 100644
--- a/app/analysis_options.yaml
+++ b/app/analysis_options.yaml
@@ -3,6 +3,15 @@
 #
 # Lint rules come from `package:flutter_lints/flutter.yaml`. To customize, add
 # entries under `linter.rules` below.
+analyzer:
+  exclude:
+    - build/**
+    - android/**
+    - ios/**
+    - web/**
+    - linux/**
+    # intl_utils output (regenerate with `melos run gen:l10n`, never edit by hand).
+    - lib/presentation/resources/locale/generated/**
 include: package:flutter_lints/flutter.yaml
 
 linter:
diff --git a/app/android/app/build.gradle b/app/android/app/build.gradle
index 7e83317..f4b22e9 100644
--- a/app/android/app/build.gradle
+++ b/app/android/app/build.gradle
@@ -1,17 +1,13 @@
 plugins {
     id "com.android.application"
-    id "kotlin-android"
+    // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
     id "dev.flutter.flutter-gradle-plugin"
 }
 
-def flutterProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
-if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader('UTF-8') { reader ->
-        flutterProperties.load(reader)
-    }
-}
-
+/**
+ * Project identity and SDK levels live in android/build.properties.
+ * The identity keys are written by the project initializer (`melos run init`).
+ */
 def buildProperties = new Properties()
 def buildPropertiesFile = rootProject.file('build.properties')
 if (buildPropertiesFile.exists()) {
@@ -20,6 +16,14 @@ if (buildPropertiesFile.exists()) {
     }
 }
 
+def requiredBuildProperty = { String key ->
+    def value = buildProperties.getProperty(key)
+    if (value == null || value.trim().isEmpty()) {
+        throw new GradleException("Missing '$key' in android/build.properties")
+    }
+    return value.trim()
+}
+
 /**
  * Declare the env vars here
  * **/
@@ -36,70 +40,63 @@ if (project.hasProperty('dart-defines')) {
             }
 }
 
-def flutterVersionCode = flutterProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
-}
-
-def flutterVersionName = flutterProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
-}
-
 def keystoreProperties = new Properties()
 def keystorePropertiesFile = rootProject.file('key.properties')
-if (keystorePropertiesFile.exists()) {
-    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+def releaseSigningConfigured = keystorePropertiesFile.exists()
+if (releaseSigningConfigured) {
+    keystorePropertiesFile.withInputStream { keystoreProperties.load(it) }
 }
 
 android {
-    namespace 'com.rootstrap.base.flutter_base_rootstrap'
-    compileSdkVersion buildProperties.getProperty('flutter.compileSdkVersion').toInteger()
-    ndkVersion flutter.ndkVersion
+    namespace = requiredBuildProperty('flutter.namespace')
+    compileSdk = requiredBuildProperty('flutter.compileSdkVersion').toInteger()
+    ndkVersion = flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
-
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     defaultConfig {
-        applicationId "com.rs." + buildProperties.getProperty('flutter.appId')
-        // You can update the following values to match your application needs.
-        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
-        minSdkVersion buildProperties.getProperty('flutter.minSdkVersion')
-        targetSdkVersion buildProperties.getProperty('flutter.targetSdkVersion')
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
+        applicationId = requiredBuildProperty('flutter.applicationId')
+        minSdk = requiredBuildProperty('flutter.minSdkVersion').toInteger()
+        targetSdk = requiredBuildProperty('flutter.targetSdkVersion').toInteger()
+        // Uses the version from pubspec.yaml.
+        versionCode = flutter.versionCode
+        versionName = flutter.versionName
+        // Added to (not replacing) the placeholders the Flutter plugin sets.
+        manifestPlaceholders.put('appLabel', requiredBuildProperty('flutter.appName'))
     }
 
     signingConfigs {
-        release {
-            keyAlias keystoreProperties['keyAlias']
-            keyPassword keystoreProperties['keyPassword']
-            storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
-            storePassword keystoreProperties['storePassword']
+        if (releaseSigningConfigured) {
+            release {
+                keyAlias = keystoreProperties['keyAlias']
+                keyPassword = keystoreProperties['keyPassword']
+                storeFile = keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
+                storePassword = keystoreProperties['storePassword']
+            }
         }
     }
 
     buildTypes {
         release {
-            signingConfig signingConfigs.release
+            // Signed with android/key.properties when present. Without it, the debug keys are
+            // used so `flutter build apk --release` works in the template and in CI.
+            signingConfig = releaseSigningConfigured ? signingConfigs.release : signingConfigs.debug
         }
         debug {
-            applicationIdSuffix ".debug"
+            applicationIdSuffix = ".debug"
         }
     }
 }
 
-flutter {
-    source '../..'
+kotlin {
+    compilerOptions {
+        jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
+    }
 }
 
+flutter {
+    source = '../..'
+}
diff --git a/app/android/app/src/debug/AndroidManifest.xml b/app/android/app/src/debug/AndroidManifest.xml
index 85cce84..399f698 100644
--- a/app/android/app/src/debug/AndroidManifest.xml
+++ b/app/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.rootstrap.base.flutter_base_rootstrap">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/app/android/app/src/main/AndroidManifest.xml b/app/android/app/src/main/AndroidManifest.xml
index 1da29a1..0381788 100644
--- a/app/android/app/src/main/AndroidManifest.xml
+++ b/app/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.rootstrap.base.flutter_base_rootstrap">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -7,7 +6,7 @@
     <application
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
-        android:label="flutter_base_rootstrap">
+        android:label="${appLabel}">
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
diff --git a/app/android/app/src/profile/AndroidManifest.xml b/app/android/app/src/profile/AndroidManifest.xml
index 85cce84..399f698 100644
--- a/app/android/app/src/profile/AndroidManifest.xml
+++ b/app/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.rootstrap.base.flutter_base_rootstrap">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/app/android/build.gradle b/app/android/build.gradle
index 9078631..64bd623 100644
--- a/app/android/build.gradle
+++ b/app/android/build.gradle
@@ -3,10 +3,18 @@ allprojects {
         google()
         mavenCentral()
     }
+}
 
-    rootProject.buildDir = '../build'
-    subprojects {
-        project.buildDir = "${rootProject.buildDir}/${project.name}"
-        project.evaluationDependsOn(':app')
-    }
+def newBuildDir = rootProject.layout.buildDirectory.dir("../../build").get()
+rootProject.layout.buildDirectory.value(newBuildDir)
+
+subprojects {
+    project.layout.buildDirectory.value(newBuildDir.dir(project.name))
+}
+subprojects {
+    project.evaluationDependsOn(":app")
+}
+
+tasks.register("clean", Delete) {
+    delete rootProject.layout.buildDirectory
 }
diff --git a/app/android/build.properties b/app/android/build.properties
index 10b0a37..7f02d84 100644
--- a/app/android/build.properties
+++ b/app/android/build.properties
@@ -1,6 +1,10 @@
-flutter.versionName=1.0.0
-flutter.appId=base
-flutter.versionCode=1
-flutter.compileSdkVersion=36
+# Project identity. Written by the project initializer (`melos run init`);
+# see docs/development/project-initialization.md.
+flutter.applicationId=com.rs.base
+flutter.namespace=com.rootstrap.base.flutter_base_rootstrap
+flutter.appName=RS Base
+
+# SDK levels. compileSdk 37 is required by permission_handler 13.
+flutter.compileSdkVersion=37
 flutter.minSdkVersion=24
 flutter.targetSdkVersion=36
diff --git a/app/android/gradle.properties b/app/android/gradle.properties
index 94adc3a..a2b3c57 100644
--- a/app/android/gradle.properties
+++ b/app/android/gradle.properties
@@ -1,3 +1,5 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
-android.enableJetifier=true
+# AGP 9 compatibility flags, as generated by the Flutter 3.47 template.
+android.newDsl=false
+android.builtInKotlin=false
diff --git a/app/android/gradle/wrapper/gradle-wrapper.properties b/app/android/gradle/wrapper/gradle-wrapper.properties
index 2aaed3a..a20f2c4 100644
--- a/app/android/gradle/wrapper/gradle-wrapper.properties
+++ b/app/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-all.zip
diff --git a/app/android/settings.gradle b/app/android/settings.gradle
index 74c9a2b..d92e827 100644
--- a/app/android/settings.gradle
+++ b/app/android/settings.gradle
@@ -14,13 +14,12 @@ pluginManagement {
         mavenCentral()
         gradlePluginPortal()
     }
-
 }
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.7.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
+    id "com.android.application" version "9.1.0" apply false
+    id "org.jetbrains.kotlin.android" version "2.4.0" apply false
 }
 
-include ":app"
\ No newline at end of file
+include ":app"
diff --git a/app/ios/.gitignore b/app/ios/.gitignore
index 7a7f987..b85379c 100644
--- a/app/ios/.gitignore
+++ b/app/ios/.gitignore
@@ -32,3 +32,7 @@ Runner/GeneratedPluginRegistrant.*
 !default.mode2v3
 !default.pbxuser
 !default.perspectivev3
+
+# Swift Package Manager pins. Lock files are not committed in this repository
+# (see pubspec.lock / *.lock in the root .gitignore).
+**/xcshareddata/swiftpm/Package.resolved
diff --git a/app/ios/Flutter/AppFrameworkInfo.plist b/app/ios/Flutter/AppFrameworkInfo.plist
index 1dc6cf7..391a902 100644
--- a/app/ios/Flutter/AppFrameworkInfo.plist
+++ b/app/ios/Flutter/AppFrameworkInfo.plist
@@ -20,7 +20,5 @@
   <string>????</string>
   <key>CFBundleVersion</key>
   <string>1.0</string>
-  <key>MinimumOSVersion</key>
-  <string>13.0</string>
 </dict>
 </plist>
diff --git a/app/ios/Flutter/AppIdentity.xcconfig b/app/ios/Flutter/AppIdentity.xcconfig
new file mode 100644
index 0000000..dfd1606
--- /dev/null
+++ b/app/ios/Flutter/AppIdentity.xcconfig
@@ -0,0 +1,5 @@
+// Project identity. Written by the project initializer (`melos run init`);
+// see docs/development/project-initialization.md. Every build configuration
+// derives its bundle identifier and display name from these two values.
+APP_BUNDLE_ID=com.rs.base
+APP_DISPLAY_NAME=RS Base
diff --git a/app/ios/Flutter/Debug.xcconfig b/app/ios/Flutter/Debug.xcconfig
index 08974eb..2bae35a 100644
--- a/app/ios/Flutter/Debug.xcconfig
+++ b/app/ios/Flutter/Debug.xcconfig
@@ -1,9 +1,6 @@
-#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
+// Build configuration. Project identity comes from AppIdentity.xcconfig.
 #include "Generated.xcconfig"
+#include "AppIdentity.xcconfig"
 
 FLUTTER_TARGET=lib/main/env/main_dev.dart
-FLUTTER_BUILD_NAME=2.0.0
-FLUTTER_BUILD_NUMBER=1
-FLUTTER_APP_ID=base.debug
-FLUTTER_APP_NAME=RS Base Debug
-PREFIX=debug
+FLUTTER_APP_NAME=$(APP_DISPLAY_NAME) Debug
diff --git a/app/ios/Flutter/Release.xcconfig b/app/ios/Flutter/Release.xcconfig
index cb19d9a..aef5bce 100644
--- a/app/ios/Flutter/Release.xcconfig
+++ b/app/ios/Flutter/Release.xcconfig
@@ -1,9 +1,6 @@
-#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
+// Build configuration. Project identity comes from AppIdentity.xcconfig.
 #include "Generated.xcconfig"
+#include "AppIdentity.xcconfig"
 
 FLUTTER_TARGET=lib/main.dart
-FLUTTER_BUILD_NAME=2.0.0
-FLUTTER_BUILD_NUMBER=1
-FLUTTER_APP_ID=base
-FLUTTER_APP_NAME=RS Base
-PREFIX=release
\ No newline at end of file
+FLUTTER_APP_NAME=$(APP_DISPLAY_NAME)
diff --git a/app/ios/Podfile b/app/ios/Podfile
deleted file mode 100644
index 6885190..0000000
--- a/app/ios/Podfile
+++ /dev/null
@@ -1,97 +0,0 @@
-# Uncomment this line to define a global platform for your project
-platform :ios, '13.0'
-
-# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
-ENV['COCOAPODS_DISABLE_STATS'] = 'true'
-
-project 'Runner', {
-  'Debug' => :debug,
-  'Profile' => :release,
-  'Release' => :release,
-}
-
-def flutter_root
-  generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
-  unless File.exist?(generated_xcode_build_settings_path)
-    raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
-  end
-
-  File.foreach(generated_xcode_build_settings_path) do |line|
-    matches = line.match(/FLUTTER_ROOT\=(.*)/)
-    return matches[1].strip if matches
-  end
-  raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
-end
-
-require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
-
-flutter_ios_podfile_setup
-
-target 'Runner' do
-  use_frameworks!
-  use_modular_headers!
-
-  flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
-end
-
-post_install do |installer|
-  installer.pods_project.targets.each do |target|
-    flutter_additional_ios_build_settings(target)
-    target.build_configurations.each do |config|
-
-          # You can enable the permissions needed here. For example to enable camera
-          # permission, just remove the `#` character in front so it looks like this:
-          #
-          # ## dart: PermissionGroup.camera
-          # 'PERMISSION_CAMERA=1'
-          #
-          #  Preprocessor definitions can be found in: https://github.com/Baseflow/flutter-permission-handler/blob/master/permission_handler_apple/ios/Classes/PermissionHandlerEnums.h
-          config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
-            '$(inherited)',
-
-            ## dart: PermissionGroup.calendar
-            # 'PERMISSION_EVENTS=1',
-
-            ## dart: PermissionGroup.reminders
-            # 'PERMISSION_REMINDERS=1',
-
-            ## dart: PermissionGroup.contacts
-            # 'PERMISSION_CONTACTS=1',
-
-            ##dart: PermissionGroup.camera
-            'PERMISSION_CAMERA=1'
-
-            ##dart: PermissionGroup.photos
-            #'PERMISSION_PHOTOS=1'
-
-            ## dart: PermissionGroup.microphone
-            # 'PERMISSION_MICROPHONE=1',
-
-            ## dart: PermissionGroup.speech
-            # 'PERMISSION_SPEECH_RECOGNIZER=1',
-
-            ## dart: [PermissionGroup.location, PermissionGroup.locationAlways, PermissionGroup.locationWhenInUse]
-            # 'PERMISSION_LOCATION=1',
-
-            ## dart: PermissionGroup.notification
-            # 'PERMISSION_NOTIFICATIONS=1',
-
-            ## dart: PermissionGroup.mediaLibrary
-            # 'PERMISSION_MEDIA_LIBRARY=1',
-
-            ## dart: PermissionGroup.sensors
-            # 'PERMISSION_SENSORS=1',
-
-            ## dart: PermissionGroup.bluetooth
-            # 'PERMISSION_BLUETOOTH=1',
-
-            ## dart: PermissionGroup.appTrackingTransparency
-            # 'PERMISSION_APP_TRACKING_TRANSPARENCY=1',
-
-            ## dart: PermissionGroup.criticalAlerts
-            # 'PERMISSION_CRITICAL_ALERTS=1'
-          ]
-
-        end
-  end
-end
diff --git a/app/ios/Runner.xcodeproj/project.pbxproj b/app/ios/Runner.xcodeproj/project.pbxproj
index 7fcad86..26f23e4 100644
--- a/app/ios/Runner.xcodeproj/project.pbxproj
+++ b/app/ios/Runner.xcodeproj/project.pbxproj
@@ -9,13 +9,13 @@
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
-		4544347AD06B96A472BD5E0E /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5730B1BB3E1C3FE04E81A7CB /* Pods_Runner.framework */; };
 		66CB0DDB28E28FBC00FAD317 /* qa.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 66CB0DDA28E28FBC00FAD317 /* qa.xcconfig */; };
 		66CB0DDD28E28FD800FAD317 /* dev.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 66CB0DDC28E28FD800FAD317 /* dev.xcconfig */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
+		78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -32,31 +32,22 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		02EE5FE58DF9F5524045E05E /* Pods-Runner.profile dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile dev.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile dev.xcconfig"; sourceTree = "<group>"; };
-		11BE202C65D0088AD3C33A34 /* Pods-Runner.debug qa.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug qa.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug qa.xcconfig"; sourceTree = "<group>"; };
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
-		27CA9F75AF795D55A6C03336 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
-		4025F26F853DA476FFA87FCB /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
-		5730B1BB3E1C3FE04E81A7CB /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		6087F75C80712FB3BD7B5A70 /* Pods-Runner.profile qa.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile qa.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile qa.xcconfig"; sourceTree = "<group>"; };
-		6566A19E9D4D625DE7F68E32 /* Pods-Runner.release qa.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release qa.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release qa.xcconfig"; sourceTree = "<group>"; };
 		66CB0DDA28E28FBC00FAD317 /* qa.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = qa.xcconfig; sourceTree = "<group>"; };
 		66CB0DDC28E28FD800FAD317 /* dev.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = dev.xcconfig; sourceTree = "<group>"; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
-		7FCD1AAFFC74258114648268 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
-		97C146EE1CF9000F007C117D /* RS Base Debug 2.0.0.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "RS Base Debug 2.0.0.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Runner.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		D7CB58670CA60602A18EE27E /* Pods-Runner.debug dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug dev.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug dev.xcconfig"; sourceTree = "<group>"; };
-		E119DC735666E9662370C55A /* Pods-Runner.release dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release dev.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release dev.xcconfig"; sourceTree = "<group>"; };
+		78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -64,32 +55,17 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				4544347AD06B96A472BD5E0E /* Pods_Runner.framework in Frameworks */,
+				78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		55E3773A8035648ECA5506A9 /* Pods */ = {
-			isa = PBXGroup;
-			children = (
-				27CA9F75AF795D55A6C03336 /* Pods-Runner.debug.xcconfig */,
-				7FCD1AAFFC74258114648268 /* Pods-Runner.release.xcconfig */,
-				4025F26F853DA476FFA87FCB /* Pods-Runner.profile.xcconfig */,
-				D7CB58670CA60602A18EE27E /* Pods-Runner.debug dev.xcconfig */,
-				11BE202C65D0088AD3C33A34 /* Pods-Runner.debug qa.xcconfig */,
-				6566A19E9D4D625DE7F68E32 /* Pods-Runner.release qa.xcconfig */,
-				E119DC735666E9662370C55A /* Pods-Runner.release dev.xcconfig */,
-				02EE5FE58DF9F5524045E05E /* Pods-Runner.profile dev.xcconfig */,
-				6087F75C80712FB3BD7B5A70 /* Pods-Runner.profile qa.xcconfig */,
-			);
-			path = Pods;
-			sourceTree = "<group>";
-		};
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
+				78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */,
 				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
 				9740EEB21CF90195004384FC /* Debug.xcconfig */,
 				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
@@ -106,15 +82,13 @@
 				9740EEB11CF90186004384FC /* Flutter */,
 				97C146F01CF9000F007C117D /* Runner */,
 				97C146EF1CF9000F007C117D /* Products */,
-				55E3773A8035648ECA5506A9 /* Pods */,
-				BF7702CA177D02242960463B /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
 		97C146EF1CF9000F007C117D /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				97C146EE1CF9000F007C117D /* RS Base Debug 2.0.0.app */,
+				97C146EE1CF9000F007C117D /* Runner.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -134,30 +108,22 @@
 			path = Runner;
 			sourceTree = "<group>";
 		};
-		BF7702CA177D02242960463B /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				5730B1BB3E1C3FE04E81A7CB /* Pods_Runner.framework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
 		97C146ED1CF9000F007C117D /* Runner */ = {
+			packageProductDependencies = (
+				78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
+			);
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
-				FF5BB9E6590681A814988271 /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-				DD7C17448DBE0C72AFB53D97 /* [CP] Embed Pods Frameworks */,
-				0A3832D21E11A3F695107A97 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -165,13 +131,16 @@
 			);
 			name = Runner;
 			productName = Runner;
-			productReference = 97C146EE1CF9000F007C117D /* RS Base Debug 2.0.0.app */;
+			productReference = 97C146EE1CF9000F007C117D /* Runner.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
 		97C146E61CF9000F007C117D /* Project object */ = {
+			packageReferences = (
+				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */,
+			);
 			isa = PBXProject;
 			attributes = {
 				LastUpgradeCheck = 1510;
@@ -218,23 +187,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		0A3832D21E11A3F695107A97 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@@ -266,45 +218,6 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 		};
-		DD7C17448DBE0C72AFB53D97 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		FF5BB9E6590681A814988271 /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -380,7 +293,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -398,13 +311,14 @@
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "com.rs.$(FLUTTER_APP_ID)";
-				PRODUCT_NAME = "$(FLUTTER_APP_NAME)";
+				PRODUCT_BUNDLE_IDENTIFIER = "$(APP_BUNDLE_ID)";
+				APP_BUNDLE_DISPLAY_NAME = "$(FLUTTER_APP_NAME)";
+				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -459,7 +373,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -476,13 +390,14 @@
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "com.rs.$(FLUTTER_APP_ID).debug.qa";
-				PRODUCT_NAME = "$(FLUTTER_APP_NAME) $(FLUTTER_BUILD_NAME)";
+				PRODUCT_BUNDLE_IDENTIFIER = "$(APP_BUNDLE_ID).debug.qa";
+				APP_BUNDLE_DISPLAY_NAME = "$(FLUTTER_APP_NAME) $(FLUTTER_BUILD_NAME)";
+				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -538,7 +453,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -555,13 +470,14 @@
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "com.rs.$(FLUTTER_APP_ID).debug.dev";
-				PRODUCT_NAME = "$(FLUTTER_APP_NAME)";
+				PRODUCT_BUNDLE_IDENTIFIER = "$(APP_BUNDLE_ID).debug.dev";
+				APP_BUNDLE_DISPLAY_NAME = "$(FLUTTER_APP_NAME)";
+				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -611,7 +527,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -631,13 +547,14 @@
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "com.rs.$(FLUTTER_APP_ID).dev";
-				PRODUCT_NAME = "$(FLUTTER_APP_NAME)";
+				PRODUCT_BUNDLE_IDENTIFIER = "$(APP_BUNDLE_ID).dev";
+				APP_BUNDLE_DISPLAY_NAME = "$(FLUTTER_APP_NAME)";
+				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -686,7 +603,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -706,13 +623,14 @@
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "com.rs.$(FLUTTER_APP_ID).qa";
-				PRODUCT_NAME = "$(FLUTTER_APP_NAME)";
+				PRODUCT_BUNDLE_IDENTIFIER = "$(APP_BUNDLE_ID).qa";
+				APP_BUNDLE_DISPLAY_NAME = "$(FLUTTER_APP_NAME)";
+				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -761,7 +679,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -779,13 +697,14 @@
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "com.rs.$(FLUTTER_APP_ID).qa";
-				PRODUCT_NAME = "$(FLUTTER_APP_NAME)";
+				PRODUCT_BUNDLE_IDENTIFIER = "$(APP_BUNDLE_ID).qa";
+				APP_BUNDLE_DISPLAY_NAME = "$(FLUTTER_APP_NAME)";
+				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -834,7 +753,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -852,13 +771,14 @@
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "com.rs.$(FLUTTER_APP_ID).dev";
-				PRODUCT_NAME = "$(FLUTTER_APP_NAME)";
+				PRODUCT_BUNDLE_IDENTIFIER = "$(APP_BUNDLE_ID).dev";
+				APP_BUNDLE_DISPLAY_NAME = "$(FLUTTER_APP_NAME)";
+				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -912,7 +832,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -961,7 +881,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -981,13 +901,14 @@
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "com.rs.$(FLUTTER_APP_ID).debug";
-				PRODUCT_NAME = "$(FLUTTER_APP_NAME) $(FLUTTER_BUILD_NAME)";
+				PRODUCT_BUNDLE_IDENTIFIER = "$(APP_BUNDLE_ID).debug";
+				APP_BUNDLE_DISPLAY_NAME = "$(FLUTTER_APP_NAME) $(FLUTTER_BUILD_NAME)";
+				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -1004,13 +925,14 @@
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "com.rs.$(FLUTTER_APP_ID)";
-				PRODUCT_NAME = "$(FLUTTER_APP_NAME)";
+				PRODUCT_BUNDLE_IDENTIFIER = "$(APP_BUNDLE_ID)";
+				APP_BUNDLE_DISPLAY_NAME = "$(FLUTTER_APP_NAME)";
+				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -1053,6 +975,18 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
+/* Begin XCLocalSwiftPackageReference section */
+		781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = {
+			isa = XCLocalSwiftPackageReference;
+			relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
+		};
+/* End XCLocalSwiftPackageReference section */
+/* Begin XCSwiftPackageProductDependency section */
+		78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = FlutterGeneratedPluginSwiftPackage;
+		};
+/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 97C146E61CF9000F007C117D /* Project object */;
 }
diff --git a/app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Dev.xcscheme b/app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Dev.xcscheme
index 45ebb15..3de0df2 100644
--- a/app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Dev.xcscheme
+++ b/app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Dev.xcscheme
@@ -5,6 +5,24 @@
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
+      <PreActions>
+         <ExecutionAction
+            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+            <ActionContent
+               title = "Run Prepare Flutter Framework Script"
+               scriptText = "/bin/sh &quot;$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh&quot; prepare&#10;">
+               <EnvironmentBuildable>
+                  <BuildableReference
+                     BuildableIdentifier = "primary"
+                     BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+                     BuildableName = "Runner.app"
+                     BlueprintName = "Runner"
+                     ReferencedContainer = "container:Runner.xcodeproj">
+                  </BuildableReference>
+               </EnvironmentBuildable>
+            </ActionContent>
+         </ExecutionAction>
+      </PreActions>
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
@@ -15,7 +33,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "97C146ED1CF9000F007C117D"
-               BuildableName = "RS Base.app"
+               BuildableName = "Runner.app"
                BlueprintName = "Runner"
                ReferencedContainer = "container:Runner.xcodeproj">
             </BuildableReference>
@@ -26,6 +44,7 @@
       buildConfiguration = "Debug dev"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -34,6 +53,7 @@
       buildConfiguration = "Debug dev"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
@@ -45,7 +65,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "97C146ED1CF9000F007C117D"
-            BuildableName = "RS Base.app"
+            BuildableName = "Runner.app"
             BlueprintName = "Runner"
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
@@ -62,7 +82,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "97C146ED1CF9000F007C117D"
-            BuildableName = "RS Base.app"
+            BuildableName = "Runner.app"
             BlueprintName = "Runner"
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
diff --git a/app/ios/Runner.xcodeproj/xcshareddata/xcschemes/QA.xcscheme b/app/ios/Runner.xcodeproj/xcshareddata/xcschemes/QA.xcscheme
index 9cc6e9d..a3eec39 100644
--- a/app/ios/Runner.xcodeproj/xcshareddata/xcschemes/QA.xcscheme
+++ b/app/ios/Runner.xcodeproj/xcshareddata/xcschemes/QA.xcscheme
@@ -5,6 +5,24 @@
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
+      <PreActions>
+         <ExecutionAction
+            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+            <ActionContent
+               title = "Run Prepare Flutter Framework Script"
+               scriptText = "/bin/sh &quot;$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh&quot; prepare&#10;">
+               <EnvironmentBuildable>
+                  <BuildableReference
+                     BuildableIdentifier = "primary"
+                     BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+                     BuildableName = "Runner.app"
+                     BlueprintName = "Runner"
+                     ReferencedContainer = "container:Runner.xcodeproj">
+                  </BuildableReference>
+               </EnvironmentBuildable>
+            </ActionContent>
+         </ExecutionAction>
+      </PreActions>
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
@@ -15,7 +33,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "97C146ED1CF9000F007C117D"
-               BuildableName = "RS Base.app"
+               BuildableName = "Runner.app"
                BlueprintName = "Runner"
                ReferencedContainer = "container:Runner.xcodeproj">
             </BuildableReference>
@@ -45,7 +63,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "97C146ED1CF9000F007C117D"
-            BuildableName = "RS Base.app"
+            BuildableName = "Runner.app"
             BlueprintName = "Runner"
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
@@ -62,7 +80,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "97C146ED1CF9000F007C117D"
-            BuildableName = "RS Base.app"
+            BuildableName = "Runner.app"
             BlueprintName = "Runner"
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
diff --git a/app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index 7304a1e..5db441f 100644
--- a/app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -5,6 +5,24 @@
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
+      <PreActions>
+         <ExecutionAction
+            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+            <ActionContent
+               title = "Run Prepare Flutter Framework Script"
+               scriptText = "/bin/sh &quot;$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh&quot; prepare&#10;">
+               <EnvironmentBuildable>
+                  <BuildableReference
+                     BuildableIdentifier = "primary"
+                     BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+                     BuildableName = "Runner.app"
+                     BlueprintName = "Runner"
+                     ReferencedContainer = "container:Runner.xcodeproj">
+                  </BuildableReference>
+               </EnvironmentBuildable>
+            </ActionContent>
+         </ExecutionAction>
+      </PreActions>
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
@@ -15,7 +33,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "97C146ED1CF9000F007C117D"
-               BuildableName = "RS Base.app"
+               BuildableName = "Runner.app"
                BlueprintName = "Runner"
                ReferencedContainer = "container:Runner.xcodeproj">
             </BuildableReference>
@@ -26,12 +44,13 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "97C146ED1CF9000F007C117D"
-            BuildableName = "RS Base.app"
+            BuildableName = "Runner.app"
             BlueprintName = "Runner"
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
@@ -43,6 +62,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
@@ -55,7 +75,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "97C146ED1CF9000F007C117D"
-            BuildableName = "RS Base.app"
+            BuildableName = "Runner.app"
             BlueprintName = "Runner"
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
@@ -72,7 +92,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "97C146ED1CF9000F007C117D"
-            BuildableName = "RS Base.app"
+            BuildableName = "Runner.app"
             BlueprintName = "Runner"
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
diff --git a/app/ios/Runner.xcworkspace/contents.xcworkspacedata b/app/ios/Runner.xcworkspace/contents.xcworkspacedata
index 21a3cc1..1d526a1 100644
--- a/app/ios/Runner.xcworkspace/contents.xcworkspacedata
+++ b/app/ios/Runner.xcworkspace/contents.xcworkspacedata
@@ -4,7 +4,4 @@
    <FileRef
       location = "group:Runner.xcodeproj">
    </FileRef>
-   <FileRef
-      location = "group:Pods/Pods.xcodeproj">
-   </FileRef>
 </Workspace>
diff --git a/app/ios/Runner/AppDelegate.swift b/app/ios/Runner/AppDelegate.swift
index b636303..c30b367 100644
--- a/app/ios/Runner/AppDelegate.swift
+++ b/app/ios/Runner/AppDelegate.swift
@@ -1,13 +1,16 @@
-import UIKit
 import Flutter
+import UIKit
 
 @main
-@objc class AppDelegate: FlutterAppDelegate {
+@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate {
   override func application(
     _ application: UIApplication,
     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
   ) -> Bool {
-    GeneratedPluginRegistrant.register(with: self)
     return super.application(application, didFinishLaunchingWithOptions: launchOptions)
   }
+
+  func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) {
+    GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry)
+  }
 }
diff --git a/app/ios/Runner/Info.plist b/app/ios/Runner/Info.plist
index 4be44e9..01a7891 100644
--- a/app/ios/Runner/Info.plist
+++ b/app/ios/Runner/Info.plist
@@ -2,10 +2,12 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>$(PRODUCT_NAME)</string>
+	<string>$(APP_BUNDLE_DISPLAY_NAME)</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -13,7 +15,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>flutter_base_rootstrap</string>
+	<string>$(APP_BUNDLE_DISPLAY_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
@@ -24,6 +26,33 @@
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSCameraUsageDescription</key>
+	<string>To capture photo please grant camera access</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>App needs access to photo lib</string>
+	<key>UIApplicationSceneManifest</key>
+	<dict>
+		<key>UIApplicationSupportsMultipleScenes</key>
+		<false/>
+		<key>UISceneConfigurations</key>
+		<dict>
+			<key>UIWindowSceneSessionRoleApplication</key>
+			<array>
+				<dict>
+					<key>UISceneClassName</key>
+					<string>UIWindowScene</string>
+					<key>UISceneConfigurationName</key>
+					<string>flutter</string>
+					<key>UISceneDelegateClassName</key>
+					<string>FlutterSceneDelegate</string>
+					<key>UISceneStoryboardFile</key>
+					<string>Main</string>
+				</dict>
+			</array>
+		</dict>
+	</dict>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
@@ -43,13 +72,5 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
-	<key>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
-	<key>NSPhotoLibraryUsageDescription</key>
-    <string>App needs access to photo lib</string>
-    <key>NSCameraUsageDescription</key>
-    <string>To capture photo please grant camera access</string>
-	<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
 </dict>
 </plist>
diff --git a/app/ios/dev.xcconfig b/app/ios/dev.xcconfig
index a5df68e..0420ffc 100644
--- a/app/ios/dev.xcconfig
+++ b/app/ios/dev.xcconfig
@@ -1,9 +1,7 @@
-#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
-#include "Generated.xcconfig"
+// dev flavor (Debug dev / Release dev / Profile dev). Project identity comes from
+// Flutter/AppIdentity.xcconfig.
+#include "Flutter/Generated.xcconfig"
+#include "Flutter/AppIdentity.xcconfig"
 
 FLUTTER_TARGET=lib/main/env/main_dev.dart
-FLUTTER_BUILD_NAME=2.0.0
-FLUTTER_BUILD_NUMBER=1
-FLUTTER_APP_ID=base
-FLUTTER_APP_NAME=RS Base Dev
-PREFIX=dev
+FLUTTER_APP_NAME=$(APP_DISPLAY_NAME) Dev
diff --git a/app/ios/qa.xcconfig b/app/ios/qa.xcconfig
index 1053c32..928f49f 100644
--- a/app/ios/qa.xcconfig
+++ b/app/ios/qa.xcconfig
@@ -1,9 +1,7 @@
-#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
-#include "Generated.xcconfig"
+// qa flavor (Debug qa / Release qa / Profile qa). Project identity comes from
+// Flutter/AppIdentity.xcconfig.
+#include "Flutter/Generated.xcconfig"
+#include "Flutter/AppIdentity.xcconfig"
 
 FLUTTER_TARGET=lib/main/env/main_qa.dart
-FLUTTER_BUILD_NAME=2.0.0
-FLUTTER_BUILD_NUMBER=1
-FLUTTER_APP_ID=base
-FLUTTER_APP_NAME=RS Base QA
-PREFIX=qa
\ No newline at end of file
+FLUTTER_APP_NAME=$(APP_DISPLAY_NAME) QA
diff --git a/app/lib/main.dart b/app/lib/main.dart
index 337e98d..73aad52 100644
--- a/app/lib/main.dart
+++ b/app/lib/main.dart
@@ -4,10 +4,7 @@ import 'package:app/main/init.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
-  FlavorConfig(
-    flavor: Flavor.prod,
-    values: FlavorValues(),
-  );
+  FlavorConfig(flavor: Flavor.prod, values: FlavorValues());
   //Add your firebase configuration here
   /*await Firebase.initializeApp(
     options: const FirebaseOptions(
diff --git a/app/lib/main/app.dart b/app/lib/main/app.dart
index 8d9e56a..d9878a0 100644
--- a/app/lib/main/app.dart
+++ b/app/lib/main/app.dart
@@ -50,10 +50,7 @@ class _AppState extends State<App> {
 
     if (mounted) {
       setState(() {
-        _router = Routes.init(
-          context,
-          initialLocation: initialLocation,
-        );
+        _router = Routes.init(context, initialLocation: initialLocation);
         _isRouterReady = true;
       });
     }
@@ -67,11 +64,7 @@ class _AppState extends State<App> {
         BlocProvider(create: (_) => getIt<AuthCubit>()),
       ],
       child: !_isRouterReady
-          ? const Material(
-              child: Center(
-                child: CircularProgressIndicator(),
-              ),
-            )
+          ? const Material(child: Center(child: CircularProgressIndicator()))
           : BlocBuilder<AppCubit, AppState>(
               builder: (context, state) {
                 return MaterialApp.router(
@@ -88,9 +81,7 @@ class _AppState extends State<App> {
                   builder: (context, child) =>
                       child ??
                       const Material(
-                        child: Center(
-                          child: CircularProgressIndicator(),
-                        ),
+                        child: Center(child: CircularProgressIndicator()),
                       ),
                   routerConfig: _router,
                 );
diff --git a/app/lib/main/env/env_config.dart b/app/lib/main/env/env_config.dart
index a14d0f7..9351cba 100644
--- a/app/lib/main/env/env_config.dart
+++ b/app/lib/main/env/env_config.dart
@@ -19,10 +19,8 @@ class Environment {
 
   static String? get portalUrl => dotenv.env['API_URL'];
 
-  static String get envName => const String.fromEnvironment(
-        'ENV',
-        defaultValue: 'dev',
-      );
+  static String get envName =>
+      const String.fromEnvironment('ENV', defaultValue: 'dev');
 
   static String get envConfigFile => 'env/.$envName';
 }
@@ -38,15 +36,8 @@ class FlavorConfig {
 
   static FlavorConfig? _instance;
 
-  factory FlavorConfig({
-    required Flavor flavor,
-    required FlavorValues values,
-  }) {
-    _instance ??= FlavorConfig._internal(
-      flavor,
-      flavor.toString(),
-      values,
-    );
+  factory FlavorConfig({required Flavor flavor, required FlavorValues values}) {
+    _instance ??= FlavorConfig._internal(flavor, flavor.toString(), values);
     switch (flavor) {
       case Flavor.dev:
         EnvConfig.env = EnvConfig.kDevEnv;
diff --git a/app/lib/main/env/main_dev.dart b/app/lib/main/env/main_dev.dart
index 09e7e38..af304b3 100644
--- a/app/lib/main/env/main_dev.dart
+++ b/app/lib/main/env/main_dev.dart
@@ -4,10 +4,7 @@ import 'package:app/main/init.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
-  FlavorConfig(
-    flavor: Flavor.dev,
-    values: FlavorValues(),
-  );
+  FlavorConfig(flavor: Flavor.dev, values: FlavorValues());
   //Add your firebase configuration here
   /*await Firebase.initializeApp(
     options: const FirebaseOptions(
diff --git a/app/lib/main/env/main_qa.dart b/app/lib/main/env/main_qa.dart
index ad041d7..a3c77c2 100644
--- a/app/lib/main/env/main_qa.dart
+++ b/app/lib/main/env/main_qa.dart
@@ -4,10 +4,7 @@ import 'package:app/main/init.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
-  FlavorConfig(
-    flavor: Flavor.qa,
-    values: FlavorValues(),
-  );
+  FlavorConfig(flavor: Flavor.qa, values: FlavorValues());
   //Add your firebase configuration here
   /*await Firebase.initializeApp(
     options: const FirebaseOptions(
diff --git a/app/lib/main/init.dart b/app/lib/main/init.dart
index f8b29f1..0074ef4 100644
--- a/app/lib/main/init.dart
+++ b/app/lib/main/init.dart
@@ -6,7 +6,7 @@ import 'package:data/init.dart';
 import 'package:domain/init.dart';
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
-import 'package:flutter_web_plugins/flutter_web_plugins.dart';
+import 'package:flutter_web_plugins/url_strategy.dart';
 
 void init() async {
   WidgetsFlutterBinding.ensureInitialized();
diff --git a/app/lib/presentation/navigation/routers.dart b/app/lib/presentation/navigation/routers.dart
index 44bd1a0..c302c20 100644
--- a/app/lib/presentation/navigation/routers.dart
+++ b/app/lib/presentation/navigation/routers.dart
@@ -26,10 +26,7 @@ enum Routes {
   String get subPath => name;
 
   void go(BuildContext context, {Object? extra}) {
-    context.router.goNamed(
-      name,
-      extra: extra,
-    );
+    context.router.goNamed(name, extra: extra);
   }
 
   static GoRouter init(BuildContext context, {String? initialLocation}) =>
@@ -46,106 +43,103 @@ class Routers {
   static GoRouter appRouter(
     BuildContext context, {
     String? initialLocation,
-  }) =>
-      GoRouter(
-        navigatorKey: rootNavigatorKey,
-        initialLocation: initialLocation ??
-            (getIt<AuthCubit>().isLoggedIn()
-                ? Routes.app.path
-                : Routes.onboarding.path),
-        routes: [
-          GoRoute(
-            path: '/',
-            builder: (context, state) {
-              return BlocListener<AuthCubit, Resource>(
-                listenWhen: (previous, current) => current is RSuccess,
-                listener: (_, appState) {
-                  if (appState is RSuccess) {
-                    switch (appState.data) {
-                      case AuthStateAuthenticated _:
-                        debugPrint('User is authenticated: ${state.fullPath}');
-                        if (state.fullPath?.startsWith(Routes.app.path) ??
-                            false) {
-                          // Already navigating to app, do nothing
-                          return;
-                        }
-                        debugPrint('Navigating to app route');
-                        Routes.app.go(context);
-                        break;
-                      case AuthStateUnauthenticated _:
-                        debugPrint(
-                            'User is unauthenticated: ${state.fullPath}');
-                        if (state.fullPath?.startsWith(Routes.auth.path) ??
-                            false) {
-                          // Already navigating to auth, do nothing
-                          return;
-                        }
-                        debugPrint('Navigating to auth route');
-                        Routes.onboarding.go(context);
-                        break;
-                      case _:
+  }) => GoRouter(
+    navigatorKey: rootNavigatorKey,
+    initialLocation:
+        initialLocation ??
+        (getIt<AuthCubit>().isLoggedIn()
+            ? Routes.app.path
+            : Routes.onboarding.path),
+    routes: [
+      GoRoute(
+        path: '/',
+        builder: (context, state) {
+          return BlocListener<AuthCubit, Resource>(
+            listenWhen: (previous, current) => current is RSuccess,
+            listener: (_, appState) {
+              if (appState is RSuccess) {
+                switch (appState.data) {
+                  case AuthStateAuthenticated _:
+                    debugPrint('User is authenticated: ${state.fullPath}');
+                    if (state.fullPath?.startsWith(Routes.app.path) ?? false) {
+                      // Already navigating to app, do nothing
+                      return;
                     }
-                  }
-                },
-                child: const SplashPage(),
-              );
+                    debugPrint('Navigating to app route');
+                    Routes.app.go(context);
+                    break;
+                  case AuthStateUnauthenticated _:
+                    debugPrint('User is unauthenticated: ${state.fullPath}');
+                    if (state.fullPath?.startsWith(Routes.auth.path) ?? false) {
+                      // Already navigating to auth, do nothing
+                      return;
+                    }
+                    debugPrint('Navigating to auth route');
+                    Routes.onboarding.go(context);
+                    break;
+                  case _:
+                }
+              }
             },
+            child: const SplashPage(),
+          );
+        },
+        routes: [
+          ShellRoute(
+            builder: (context, state, child) =>
+                kDebugMode ? DebugBanner(child: child) : child,
             routes: [
-              ShellRoute(
-                builder: (context, state, child) =>
-                    kDebugMode ? DebugBanner(child: child) : child,
+              GoRoute(
+                name: Routes.onboarding.name,
+                path: Routes.onboarding.path,
+                builder: (context, state) => const OnboardingPage(),
+              ),
+              GoRoute(
+                name: Routes.auth.name,
+                path: Routes.auth.path,
+                redirect: (context, state) {
+                  if (getIt<AuthCubit>().isLoggedIn()) {
+                    return Routes.app.path;
+                  }
+                  return null;
+                },
+                builder: (context, state) => const LoginPage(),
                 routes: [
                   GoRoute(
-                    name: Routes.onboarding.name,
-                    path: Routes.onboarding.path,
-                    builder: (context, state) => const OnboardingPage(),
-                  ),
-                  GoRoute(
-                    name: Routes.auth.name,
-                    path: Routes.auth.path,
-                    redirect: (context, state) {
-                      if (getIt<AuthCubit>().isLoggedIn()) {
-                        return Routes.app.path;
-                      }
-                      return null;
-                    },
-                    builder: (context, state) => const LoginPage(),
-                    routes: [
-                      GoRoute(
-                        name: Routes.signup.name,
-                        path: Routes.signup.subPath,
-                        builder: (context, state) => const SignUpPage(),
-                      ),
-                    ],
+                    name: Routes.signup.name,
+                    path: Routes.signup.subPath,
+                    builder: (context, state) => const SignUpPage(),
                   ),
                 ],
               ),
-              ShellRoute(
-                builder: (context, state, child) =>
-                    kDebugMode ? DebugBanner(child: child) : child,
+            ],
+          ),
+          ShellRoute(
+            builder: (context, state, child) =>
+                kDebugMode ? DebugBanner(child: child) : child,
+            routes: [
+              GoRoute(
+                name: Routes.app.name,
+                path: Routes.app.path,
+                redirect: (context, state) {
+                  if (!getIt<AuthCubit>().isLoggedIn()) {
+                    return Routes.auth.path;
+                  }
+                  return null;
+                },
+                builder: (context, state) => const HomePage(),
                 routes: [
                   GoRoute(
-                    name: Routes.app.name,
-                    path: Routes.app.path,
-                    redirect: (context, state) {
-                      if (!getIt<AuthCubit>().isLoggedIn()) {
-                        return Routes.auth.path;
-                      }
-                      return null;
-                    },
-                    builder: (context, state) => const HomePage(),
-                    routes: [
-                      GoRoute(
-                        name: Routes.placeholder.name,
-                        path: Routes.placeholder.subPath,
-                        builder: (context, state) => const Placeholder(),
-                      ),
-                    ],
+                    name: Routes.placeholder.name,
+                    path: Routes.placeholder.subPath,
+                    builder: (context, state) => const Placeholder(),
                   ),
                 ],
               ),
             ],
           ),
         ],
-      );
+      ),
+    ],
+  );
 }
diff --git a/app/lib/presentation/resources/custom_network_image.dart b/app/lib/presentation/resources/custom_network_image.dart
index 9b9afca..a58b9e0 100644
--- a/app/lib/presentation/resources/custom_network_image.dart
+++ b/app/lib/presentation/resources/custom_network_image.dart
@@ -43,15 +43,17 @@ class CustomNetworkImage extends StatelessWidget {
   Widget build(BuildContext context) {
     return isSvg(imageUrl)
         ? Container(
-            decoration: BoxDecoration(boxShadow: [
-              if ((shadow ?? false))
-                BoxShadow(
-                  color: Colors.black.shadow(_shadowOpacity),
-                  spreadRadius: 0,
-                  blurRadius: _blurRadius,
-                  offset: const Offset(5, 5),
-                ),
-            ]),
+            decoration: BoxDecoration(
+              boxShadow: [
+                if ((shadow ?? false))
+                  BoxShadow(
+                    color: Colors.black.shadow(_shadowOpacity),
+                    spreadRadius: 0,
+                    blurRadius: _blurRadius,
+                    offset: const Offset(5, 5),
+                  ),
+              ],
+            ),
             child: SvgPicture.network(
               imageUrl ?? "",
               width: width,
@@ -62,32 +64,35 @@ class CustomNetworkImage extends StatelessWidget {
             ),
           )
         : Container(
-            decoration: BoxDecoration(boxShadow: [
-              if ((shadow ?? false))
-                BoxShadow(
-                  color: Colors.black.shadow(_shadowOpacity),
-                  spreadRadius: 0,
-                  blurRadius: _blurRadius,
-                  offset: const Offset(5, 5),
-                ),
-            ]),
+            decoration: BoxDecoration(
+              boxShadow: [
+                if ((shadow ?? false))
+                  BoxShadow(
+                    color: Colors.black.shadow(_shadowOpacity),
+                    spreadRadius: 0,
+                    blurRadius: _blurRadius,
+                    offset: const Offset(5, 5),
+                  ),
+              ],
+            ),
             child: FadeInImage(
               width: width,
               height: height,
               fit: imageBoxFit,
               image: NetworkImage(imageUrl ?? ""),
               placeholder: NetworkImage(loaderImage ?? ""),
-              imageErrorBuilder: (
-                BuildContext context,
-                Object object,
-                StackTrace? stackTrace,
-              ) {
-                return CustomNetworkImage(
-                  imageUrl: imageUrlError,
-                  width: width,
-                  height: height,
-                );
-              },
+              imageErrorBuilder:
+                  (
+                    BuildContext context,
+                    Object object,
+                    StackTrace? stackTrace,
+                  ) {
+                    return CustomNetworkImage(
+                      imageUrl: imageUrlError,
+                      width: width,
+                      height: height,
+                    );
+                  },
             ),
           );
   }
diff --git a/app/lib/presentation/resources/images.dart b/app/lib/presentation/resources/images.dart
index 1ca7915..4181776 100644
--- a/app/lib/presentation/resources/images.dart
+++ b/app/lib/presentation/resources/images.dart
@@ -3,9 +3,7 @@ part of 'resources.dart';
 /// Add images references here
 /// call: Images.appLogo.get()
 /// **/
-enum Images {
-  appLogo,
-}
+enum Images { appLogo }
 
 extension LoadImage on Images {
   static const assetsFolder = "assets";
@@ -26,16 +24,15 @@ extension LoadImage on Images {
     Color? color,
     Alignment alignment = Alignment.center,
     String? semanticLabel,
-  }) =>
-      _SvgImage.asset(
-        value,
-        width: width,
-        height: height,
-        fit: fit,
-        color: color,
-        alignment: alignment,
-        semanticLabel: semanticLabel,
-      );
+  }) => _SvgImage.asset(
+    value,
+    width: width,
+    height: height,
+    fit: fit,
+    color: color,
+    alignment: alignment,
+    semanticLabel: semanticLabel,
+  );
 
   Widget get({
     Key? key,
@@ -75,16 +72,15 @@ extension LoadImage on Images {
     double? height,
     BoxFit fit = BoxFit.contain,
     Alignment alignment = Alignment.center,
-  }) =>
-      Image.asset(
-        value,
-        bundle: assetImage().bundle,
-        height: width,
-        width: width,
-        scale: scale,
-        fit: fit,
-        alignment: alignment,
-      );
+  }) => Image.asset(
+    value,
+    bundle: assetImage().bundle,
+    height: width,
+    width: width,
+    scale: scale,
+    fit: fit,
+    alignment: alignment,
+  );
 
   AssetImage assetImage() => AssetImage(value);
 }
@@ -106,8 +102,9 @@ class _SvgImage {
       width: width,
       height: height,
       fit: fit,
-      colorFilter:
-          color != null ? ColorFilter.mode(color, BlendMode.srcIn) : null,
+      colorFilter: color != null
+          ? ColorFilter.mode(color, BlendMode.srcIn)
+          : null,
       alignment: alignment,
       semanticsLabel: semanticLabel,
       package: package,
diff --git a/app/lib/presentation/resources/locale/generated/intl/messages_en.dart b/app/lib/presentation/resources/locale/generated/intl/messages_en.dart
index e307e61..2079055 100644
--- a/app/lib/presentation/resources/locale/generated/intl/messages_en.dart
+++ b/app/lib/presentation/resources/locale/generated/intl/messages_en.dart
@@ -25,95 +25,92 @@ class MessageLookup extends MessageLookupByLibrary {
 
   final messages = _notInlinedMessages(_notInlinedMessages);
   static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
-        "appName": MessageLookupByLibrary.simpleMessage("Flutter Target"),
-        "cookiesAcceptCTA": MessageLookupByLibrary.simpleMessage("Accept"),
-        "cookiesBody": MessageLookupByLibrary.simpleMessage(
-          "We use cookies to personalise content and ads, to provide social media features and to analyse our traffic. We also share information about your use of our site with our social media, advertising and analytics partners who may combine it with other information that you’ve provided to them or that they’ve collected from your use of their services.",
-        ),
-        "cookiesTitle": MessageLookupByLibrary.simpleMessage(
-          "This website uses cookies",
-        ),
-        "ctaLogin": MessageLookupByLibrary.simpleMessage("Login"),
-        "ctaSignUp": MessageLookupByLibrary.simpleMessage("Sign Up"),
-        "debugModeCancel": MessageLookupByLibrary.simpleMessage("Cancel"),
-        "debugModeConfirm": MessageLookupByLibrary.simpleMessage("Confirm"),
-        "debugModeLabel": MessageLookupByLibrary.simpleMessage("DEV"),
-        "debugModeResetApp": MessageLookupByLibrary.simpleMessage("RESET"),
-        "debugModeResetAppMessage": MessageLookupByLibrary.simpleMessage(
-          "Are you sure you want to reset the app?",
-        ),
-        "debugModeResetAppTitle":
-            MessageLookupByLibrary.simpleMessage("Reset App"),
-        "errorEmailInvalid": MessageLookupByLibrary.simpleMessage(
-          "Please enter a valid email address.",
-        ),
-        "errorEmailRequired": MessageLookupByLibrary.simpleMessage(
-          "Email is required.",
-        ),
-        "errorPasswordRequired": MessageLookupByLibrary.simpleMessage(
-          "Password is required.",
-        ),
-        "errorPasswordWeak": MessageLookupByLibrary.simpleMessage(
-          "Password is too weak.",
-        ),
-        "errorPasswordsDoNotMatch": MessageLookupByLibrary.simpleMessage(
-          "Passwords do not match.",
-        ),
-        "hintTermsAndConditions": MessageLookupByLibrary.simpleMessage(
-          "This should open the terms and conditions URL.",
-        ),
-        "labelAgreeToTerms": MessageLookupByLibrary.simpleMessage(
-          "I agree to the Terms and Conditions",
-        ),
-        "labelConfirmPassword": MessageLookupByLibrary.simpleMessage(
-          "Confirm Password",
-        ),
-        "labelEmail": MessageLookupByLibrary.simpleMessage("Email"),
-        "labelPassword": MessageLookupByLibrary.simpleMessage("Password"),
-        "loginErrorInvalidCredentials": MessageLookupByLibrary.simpleMessage(
-          "Invalid email or password.",
-        ),
-        "noConnection": MessageLookupByLibrary.simpleMessage("No connection"),
-        "onboardingBack": MessageLookupByLibrary.simpleMessage("Back"),
-        "onboardingNext": MessageLookupByLibrary.simpleMessage("Next"),
-        "onboardingPage1Description": MessageLookupByLibrary.simpleMessage(
-          "This is the first page of the onboarding flow",
-        ),
-        "onboardingPage1Title": MessageLookupByLibrary.simpleMessage("Welcome"),
-        "onboardingPage2Description": MessageLookupByLibrary.simpleMessage(
-          "This is the second page of the onboarding flow",
-        ),
-        "onboardingPage2Title":
-            MessageLookupByLibrary.simpleMessage("Discover"),
-        "onboardingPage3Description": MessageLookupByLibrary.simpleMessage(
-          "This is the third page of the onboarding flow",
-        ),
-        "onboardingPage3Title": MessageLookupByLibrary.simpleMessage("Connect"),
-        "onboardingPage4Description": MessageLookupByLibrary.simpleMessage(
-          "This is the fourth page of the onboarding flow",
-        ),
-        "onboardingPage4Title":
-            MessageLookupByLibrary.simpleMessage("Get Started"),
-        "onboardingPageIndicator": m0,
-        "onboardingStart": MessageLookupByLibrary.simpleMessage("Start"),
-        "passwordInstructions": MessageLookupByLibrary.simpleMessage(
-          "Min 8 characters long: 1 uppercase letter, 1 lowercase letter, 1 number, and 1 special character.",
-        ),
-        "pleaseTryAgainLaterWeArenworkingToFixTheIssue":
-            MessageLookupByLibrary.simpleMessage(
+    "appName": MessageLookupByLibrary.simpleMessage("RS Base"),
+    "cookiesAcceptCTA": MessageLookupByLibrary.simpleMessage("Accept"),
+    "cookiesBody": MessageLookupByLibrary.simpleMessage(
+      "We use cookies to personalise content and ads, to provide social media features and to analyse our traffic. We also share information about your use of our site with our social media, advertising and analytics partners who may combine it with other information that you’ve provided to them or that they’ve collected from your use of their services.",
+    ),
+    "cookiesTitle": MessageLookupByLibrary.simpleMessage(
+      "This website uses cookies",
+    ),
+    "ctaLogin": MessageLookupByLibrary.simpleMessage("Login"),
+    "ctaSignUp": MessageLookupByLibrary.simpleMessage("Sign Up"),
+    "debugModeCancel": MessageLookupByLibrary.simpleMessage("Cancel"),
+    "debugModeConfirm": MessageLookupByLibrary.simpleMessage("Confirm"),
+    "debugModeLabel": MessageLookupByLibrary.simpleMessage("DEV"),
+    "debugModeResetApp": MessageLookupByLibrary.simpleMessage("RESET"),
+    "debugModeResetAppMessage": MessageLookupByLibrary.simpleMessage(
+      "Are you sure you want to reset the app?",
+    ),
+    "debugModeResetAppTitle": MessageLookupByLibrary.simpleMessage("Reset App"),
+    "errorEmailInvalid": MessageLookupByLibrary.simpleMessage(
+      "Please enter a valid email address.",
+    ),
+    "errorEmailRequired": MessageLookupByLibrary.simpleMessage(
+      "Email is required.",
+    ),
+    "errorPasswordRequired": MessageLookupByLibrary.simpleMessage(
+      "Password is required.",
+    ),
+    "errorPasswordWeak": MessageLookupByLibrary.simpleMessage(
+      "Password is too weak.",
+    ),
+    "errorPasswordsDoNotMatch": MessageLookupByLibrary.simpleMessage(
+      "Passwords do not match.",
+    ),
+    "hintTermsAndConditions": MessageLookupByLibrary.simpleMessage(
+      "This should open the terms and conditions URL.",
+    ),
+    "labelAgreeToTerms": MessageLookupByLibrary.simpleMessage(
+      "I agree to the Terms and Conditions",
+    ),
+    "labelConfirmPassword": MessageLookupByLibrary.simpleMessage(
+      "Confirm Password",
+    ),
+    "labelEmail": MessageLookupByLibrary.simpleMessage("Email"),
+    "labelPassword": MessageLookupByLibrary.simpleMessage("Password"),
+    "loginErrorInvalidCredentials": MessageLookupByLibrary.simpleMessage(
+      "Invalid email or password.",
+    ),
+    "noConnection": MessageLookupByLibrary.simpleMessage("No connection"),
+    "onboardingBack": MessageLookupByLibrary.simpleMessage("Back"),
+    "onboardingNext": MessageLookupByLibrary.simpleMessage("Next"),
+    "onboardingPage1Description": MessageLookupByLibrary.simpleMessage(
+      "This is the first page of the onboarding flow",
+    ),
+    "onboardingPage1Title": MessageLookupByLibrary.simpleMessage("Welcome"),
+    "onboardingPage2Description": MessageLookupByLibrary.simpleMessage(
+      "This is the second page of the onboarding flow",
+    ),
+    "onboardingPage2Title": MessageLookupByLibrary.simpleMessage("Discover"),
+    "onboardingPage3Description": MessageLookupByLibrary.simpleMessage(
+      "This is the third page of the onboarding flow",
+    ),
+    "onboardingPage3Title": MessageLookupByLibrary.simpleMessage("Connect"),
+    "onboardingPage4Description": MessageLookupByLibrary.simpleMessage(
+      "This is the fourth page of the onboarding flow",
+    ),
+    "onboardingPage4Title": MessageLookupByLibrary.simpleMessage("Get Started"),
+    "onboardingPageIndicator": m0,
+    "onboardingStart": MessageLookupByLibrary.simpleMessage("Start"),
+    "passwordInstructions": MessageLookupByLibrary.simpleMessage(
+      "Min 8 characters long: 1 uppercase letter, 1 lowercase letter, 1 number, and 1 special character.",
+    ),
+    "pleaseTryAgainLaterWeArenworkingToFixTheIssue":
+        MessageLookupByLibrary.simpleMessage(
           "Please try again later, we are\nworking to fix the issue.",
         ),
-        "retry": MessageLookupByLibrary.simpleMessage("Retry"),
-        "sorryWeDidntFindAnyProduct": MessageLookupByLibrary.simpleMessage(
-          "Sorry we didn\'t find any product",
-        ),
-        "titleLogin": MessageLookupByLibrary.simpleMessage("Login"),
-        "titleLoginSubtitle": MessageLookupByLibrary.simpleMessage(
-          "Use your email and password to login to your account.",
-        ),
-        "titleSignUp": MessageLookupByLibrary.simpleMessage("Sign Up"),
-        "titleSignUpSubtitle": MessageLookupByLibrary.simpleMessage(
-          "Create an account using your email and password.",
-        ),
-      };
+    "retry": MessageLookupByLibrary.simpleMessage("Retry"),
+    "sorryWeDidntFindAnyProduct": MessageLookupByLibrary.simpleMessage(
+      "Sorry we didn\'t find any product",
+    ),
+    "titleLogin": MessageLookupByLibrary.simpleMessage("Login"),
+    "titleLoginSubtitle": MessageLookupByLibrary.simpleMessage(
+      "Use your email and password to login to your account.",
+    ),
+    "titleSignUp": MessageLookupByLibrary.simpleMessage("Sign Up"),
+    "titleSignUpSubtitle": MessageLookupByLibrary.simpleMessage(
+      "Create an account using your email and password.",
+    ),
+  };
 }
diff --git a/app/lib/presentation/resources/locale/generated/intl/messages_es.dart b/app/lib/presentation/resources/locale/generated/intl/messages_es.dart
index 88e7cbb..753d51a 100644
--- a/app/lib/presentation/resources/locale/generated/intl/messages_es.dart
+++ b/app/lib/presentation/resources/locale/generated/intl/messages_es.dart
@@ -25,99 +25,94 @@ class MessageLookup extends MessageLookupByLibrary {
 
   final messages = _notInlinedMessages(_notInlinedMessages);
   static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
-        "appName": MessageLookupByLibrary.simpleMessage("Flutter Target"),
-        "cookiesAcceptCTA": MessageLookupByLibrary.simpleMessage("Aceptar"),
-        "cookiesBody": MessageLookupByLibrary.simpleMessage(
-          "Usamos cookies para personalizar el contenido y los anuncios, proporcionar funciones de redes sociales y analizar nuestro tráfico. También compartimos información sobre el uso que haces de nuestro sitio con nuestros socios de redes sociales, publicidad y análisis, quienes pueden combinarla con otra información que les hayas proporcionado o que hayan recopilado a partir del uso que haces de sus servicios.",
-        ),
-        "cookiesTitle": MessageLookupByLibrary.simpleMessage(
-          "Este sitio web utiliza cookies",
-        ),
-        "ctaLogin": MessageLookupByLibrary.simpleMessage("Iniciar sesión"),
-        "ctaSignUp": MessageLookupByLibrary.simpleMessage("Registrarse"),
-        "debugModeCancel": MessageLookupByLibrary.simpleMessage("Cancelar"),
-        "debugModeConfirm": MessageLookupByLibrary.simpleMessage("Confirmar"),
-        "debugModeLabel": MessageLookupByLibrary.simpleMessage("DEV"),
-        "debugModeResetApp": MessageLookupByLibrary.simpleMessage("RESET"),
-        "debugModeResetAppMessage": MessageLookupByLibrary.simpleMessage(
-          "¿Estás seguro de que deseas resetear la aplicación?",
-        ),
-        "debugModeResetAppTitle": MessageLookupByLibrary.simpleMessage(
-          "Resetear App",
-        ),
-        "errorEmailInvalid": MessageLookupByLibrary.simpleMessage(
-          "Por favor ingresa un correo electrónico válido.",
-        ),
-        "errorEmailRequired": MessageLookupByLibrary.simpleMessage(
-          "El correo electrónico es obligatorio.",
-        ),
-        "errorPasswordRequired": MessageLookupByLibrary.simpleMessage(
-          "La contraseña es obligatoria.",
-        ),
-        "errorPasswordWeak": MessageLookupByLibrary.simpleMessage(
-          "La contraseña es demasiado débil.",
-        ),
-        "errorPasswordsDoNotMatch": MessageLookupByLibrary.simpleMessage(
-          "Las contraseñas no coinciden.",
-        ),
-        "hintTermsAndConditions": MessageLookupByLibrary.simpleMessage(
-          "Esto debería abrir la URL de términos y condiciones.",
-        ),
-        "labelAgreeToTerms": MessageLookupByLibrary.simpleMessage(
-          "Acepto los Términos y Condiciones",
-        ),
-        "labelConfirmPassword": MessageLookupByLibrary.simpleMessage(
-          "Confirmar contraseña",
-        ),
-        "labelEmail":
-            MessageLookupByLibrary.simpleMessage("Correo electrónico"),
-        "labelPassword": MessageLookupByLibrary.simpleMessage("Contraseña"),
-        "loginErrorInvalidCredentials": MessageLookupByLibrary.simpleMessage(
-          "Correo electrónico o contraseña incorrectos.",
-        ),
-        "noConnection": MessageLookupByLibrary.simpleMessage("Sin conexión"),
-        "onboardingBack": MessageLookupByLibrary.simpleMessage("Atrás"),
-        "onboardingNext": MessageLookupByLibrary.simpleMessage("Siguiente"),
-        "onboardingPage1Description": MessageLookupByLibrary.simpleMessage(
-          "Esta es la primera página del flujo de incorporación",
-        ),
-        "onboardingPage1Title":
-            MessageLookupByLibrary.simpleMessage("Bienvenido"),
-        "onboardingPage2Description": MessageLookupByLibrary.simpleMessage(
-          "Esta es la segunda página del flujo de incorporación",
-        ),
-        "onboardingPage2Title":
-            MessageLookupByLibrary.simpleMessage("Descubrir"),
-        "onboardingPage3Description": MessageLookupByLibrary.simpleMessage(
-          "Esta es la tercera página del flujo de incorporación",
-        ),
-        "onboardingPage3Title":
-            MessageLookupByLibrary.simpleMessage("Conectar"),
-        "onboardingPage4Description": MessageLookupByLibrary.simpleMessage(
-          "Esta es la cuarta página del flujo de incorporación",
-        ),
-        "onboardingPage4Title":
-            MessageLookupByLibrary.simpleMessage("Comenzar"),
-        "onboardingPageIndicator": m0,
-        "onboardingStart": MessageLookupByLibrary.simpleMessage("Comenzar"),
-        "passwordInstructions": MessageLookupByLibrary.simpleMessage(
-          "Mínimo 8 caracteres: 1 mayúscula, 1 minúscula, 1 número y 1 carácter especial.",
-        ),
-        "pleaseTryAgainLaterWeArenworkingToFixTheIssue":
-            MessageLookupByLibrary.simpleMessage(
+    "appName": MessageLookupByLibrary.simpleMessage("RS Base"),
+    "cookiesAcceptCTA": MessageLookupByLibrary.simpleMessage("Aceptar"),
+    "cookiesBody": MessageLookupByLibrary.simpleMessage(
+      "Usamos cookies para personalizar el contenido y los anuncios, proporcionar funciones de redes sociales y analizar nuestro tráfico. También compartimos información sobre el uso que haces de nuestro sitio con nuestros socios de redes sociales, publicidad y análisis, quienes pueden combinarla con otra información que les hayas proporcionado o que hayan recopilado a partir del uso que haces de sus servicios.",
+    ),
+    "cookiesTitle": MessageLookupByLibrary.simpleMessage(
+      "Este sitio web utiliza cookies",
+    ),
+    "ctaLogin": MessageLookupByLibrary.simpleMessage("Iniciar sesión"),
+    "ctaSignUp": MessageLookupByLibrary.simpleMessage("Registrarse"),
+    "debugModeCancel": MessageLookupByLibrary.simpleMessage("Cancelar"),
+    "debugModeConfirm": MessageLookupByLibrary.simpleMessage("Confirmar"),
+    "debugModeLabel": MessageLookupByLibrary.simpleMessage("DEV"),
+    "debugModeResetApp": MessageLookupByLibrary.simpleMessage("RESET"),
+    "debugModeResetAppMessage": MessageLookupByLibrary.simpleMessage(
+      "¿Estás seguro de que deseas resetear la aplicación?",
+    ),
+    "debugModeResetAppTitle": MessageLookupByLibrary.simpleMessage(
+      "Resetear App",
+    ),
+    "errorEmailInvalid": MessageLookupByLibrary.simpleMessage(
+      "Por favor ingresa un correo electrónico válido.",
+    ),
+    "errorEmailRequired": MessageLookupByLibrary.simpleMessage(
+      "El correo electrónico es obligatorio.",
+    ),
+    "errorPasswordRequired": MessageLookupByLibrary.simpleMessage(
+      "La contraseña es obligatoria.",
+    ),
+    "errorPasswordWeak": MessageLookupByLibrary.simpleMessage(
+      "La contraseña es demasiado débil.",
+    ),
+    "errorPasswordsDoNotMatch": MessageLookupByLibrary.simpleMessage(
+      "Las contraseñas no coinciden.",
+    ),
+    "hintTermsAndConditions": MessageLookupByLibrary.simpleMessage(
+      "Esto debería abrir la URL de términos y condiciones.",
+    ),
+    "labelAgreeToTerms": MessageLookupByLibrary.simpleMessage(
+      "Acepto los Términos y Condiciones",
+    ),
+    "labelConfirmPassword": MessageLookupByLibrary.simpleMessage(
+      "Confirmar contraseña",
+    ),
+    "labelEmail": MessageLookupByLibrary.simpleMessage("Correo electrónico"),
+    "labelPassword": MessageLookupByLibrary.simpleMessage("Contraseña"),
+    "loginErrorInvalidCredentials": MessageLookupByLibrary.simpleMessage(
+      "Correo electrónico o contraseña incorrectos.",
+    ),
+    "noConnection": MessageLookupByLibrary.simpleMessage("Sin conexión"),
+    "onboardingBack": MessageLookupByLibrary.simpleMessage("Atrás"),
+    "onboardingNext": MessageLookupByLibrary.simpleMessage("Siguiente"),
+    "onboardingPage1Description": MessageLookupByLibrary.simpleMessage(
+      "Esta es la primera página del flujo de incorporación",
+    ),
+    "onboardingPage1Title": MessageLookupByLibrary.simpleMessage("Bienvenido"),
+    "onboardingPage2Description": MessageLookupByLibrary.simpleMessage(
+      "Esta es la segunda página del flujo de incorporación",
+    ),
+    "onboardingPage2Title": MessageLookupByLibrary.simpleMessage("Descubrir"),
+    "onboardingPage3Description": MessageLookupByLibrary.simpleMessage(
+      "Esta es la tercera página del flujo de incorporación",
+    ),
+    "onboardingPage3Title": MessageLookupByLibrary.simpleMessage("Conectar"),
+    "onboardingPage4Description": MessageLookupByLibrary.simpleMessage(
+      "Esta es la cuarta página del flujo de incorporación",
+    ),
+    "onboardingPage4Title": MessageLookupByLibrary.simpleMessage("Comenzar"),
+    "onboardingPageIndicator": m0,
+    "onboardingStart": MessageLookupByLibrary.simpleMessage("Comenzar"),
+    "passwordInstructions": MessageLookupByLibrary.simpleMessage(
+      "Mínimo 8 caracteres: 1 mayúscula, 1 minúscula, 1 número y 1 carácter especial.",
+    ),
+    "pleaseTryAgainLaterWeArenworkingToFixTheIssue":
+        MessageLookupByLibrary.simpleMessage(
           "Por favor intenta nuevamente más tarde,\nestamos trabajando para solucionar el problema.",
         ),
-        "retry": MessageLookupByLibrary.simpleMessage("Reintentar"),
-        "sorryWeDidntFindAnyProduct": MessageLookupByLibrary.simpleMessage(
-          "Lo sentimos, no encontramos ningún producto",
-        ),
-        "titleLogin": MessageLookupByLibrary.simpleMessage("Iniciar sesión"),
-        "titleLoginSubtitle": MessageLookupByLibrary.simpleMessage(
-          "Usa tu correo electrónico y contraseña para iniciar sesión en tu cuenta.",
-        ),
-        "titleSignUp": MessageLookupByLibrary.simpleMessage("Registrarse"),
-        "titleSignUpSubtitle": MessageLookupByLibrary.simpleMessage(
-          "Crea una cuenta usando tu correo electrónico y contraseña.",
-        ),
-      };
+    "retry": MessageLookupByLibrary.simpleMessage("Reintentar"),
+    "sorryWeDidntFindAnyProduct": MessageLookupByLibrary.simpleMessage(
+      "Lo sentimos, no encontramos ningún producto",
+    ),
+    "titleLogin": MessageLookupByLibrary.simpleMessage("Iniciar sesión"),
+    "titleLoginSubtitle": MessageLookupByLibrary.simpleMessage(
+      "Usa tu correo electrónico y contraseña para iniciar sesión en tu cuenta.",
+    ),
+    "titleSignUp": MessageLookupByLibrary.simpleMessage("Registrarse"),
+    "titleSignUpSubtitle": MessageLookupByLibrary.simpleMessage(
+      "Crea una cuenta usando tu correo electrónico y contraseña.",
+    ),
+  };
 }
diff --git a/app/lib/presentation/resources/locale/generated/l10n.dart b/app/lib/presentation/resources/locale/generated/l10n.dart
index 6b038cc..8fcda18 100644
--- a/app/lib/presentation/resources/locale/generated/l10n.dart
+++ b/app/lib/presentation/resources/locale/generated/l10n.dart
@@ -1,6 +1,7 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
+
 import 'intl/messages_all.dart';
 
 // **************************************************************************
@@ -54,9 +55,9 @@ class S {
     return Localizations.of<S>(context, S);
   }
 
-  /// `Flutter Target`
+  /// `RS Base`
   String get appName {
-    return Intl.message('Flutter Target', name: 'appName', desc: '', args: []);
+    return Intl.message('RS Base', name: 'appName', desc: '', args: []);
   }
 
   /// `This website uses cookies`
diff --git a/app/lib/presentation/resources/locale/intl_en.arb b/app/lib/presentation/resources/locale/intl_en.arb
index 0a541e4..5d65c26 100644
--- a/app/lib/presentation/resources/locale/intl_en.arb
+++ b/app/lib/presentation/resources/locale/intl_en.arb
@@ -1,5 +1,5 @@
 {
-  "appName": "Flutter Target",
+  "appName": "RS Base",
   "cookiesTitle": "This website uses cookies",
   "cookiesAcceptCTA": "Accept",
   "cookiesBody": "We use cookies to personalise content and ads, to provide social media features and to analyse our traffic. We also share information about your use of our site with our social media, advertising and analytics partners who may combine it with other information that you’ve provided to them or that they’ve collected from your use of their services.",
diff --git a/app/lib/presentation/resources/locale/intl_es.arb b/app/lib/presentation/resources/locale/intl_es.arb
index cd3eea8..372308d 100644
--- a/app/lib/presentation/resources/locale/intl_es.arb
+++ b/app/lib/presentation/resources/locale/intl_es.arb
@@ -1,5 +1,5 @@
 {
-  "appName": "Flutter Target",
+  "appName": "RS Base",
   "cookiesTitle": "Este sitio web utiliza cookies",
   "cookiesAcceptCTA": "Aceptar",
   "cookiesBody": "Usamos cookies para personalizar el contenido y los anuncios, proporcionar funciones de redes sociales y analizar nuestro tráfico. También compartimos información sobre el uso que haces de nuestro sitio con nuestros socios de redes sociales, publicidad y análisis, quienes pueden combinarla con otra información que les hayas proporcionado o que hayan recopilado a partir del uso que haces de sus servicios.",
diff --git a/app/lib/presentation/themes/app_themes.dart b/app/lib/presentation/themes/app_themes.dart
index 835e4b9..d38773a 100644
--- a/app/lib/presentation/themes/app_themes.dart
+++ b/app/lib/presentation/themes/app_themes.dart
@@ -22,24 +22,12 @@ class AppThemes {
 
 class LightTheme extends LocalTheme {
   LightTheme()
-      : super(
-          themeData: AppThemeData(
-            Brightness.light,
-            LightThemeColors(),
-            8.0,
-          ),
-        );
+    : super(themeData: AppThemeData(Brightness.light, LightThemeColors(), 8.0));
 }
 
 class DarkTheme extends LocalTheme {
   DarkTheme()
-      : super(
-          themeData: AppThemeData(
-            Brightness.dark,
-            DarkThemeColors(),
-            8.0,
-          ),
-        );
+    : super(themeData: AppThemeData(Brightness.dark, DarkThemeColors(), 8.0));
 }
 
 /// For projects where the design is custom and use more colors than the ones definded for Material Design,
@@ -60,10 +48,8 @@ class DarkTheme extends LocalTheme {
 /// https://m3.material.io/styles/color/the-color-system/color-roles
 extension AppLocalTheme on BuildContext {
   LocalTheme get localTheme => AppThemes.getAppTheme(
-        select<AppCubit, ThemeType>(
-          (value) => value.state.themeType,
-        ),
-      );
+    select<AppCubit, ThemeType>((value) => value.state.themeType),
+  );
 
   ThemeData get theme => Theme.of(this);
 
diff --git a/app/lib/presentation/themes/local_theme.dart b/app/lib/presentation/themes/local_theme.dart
index 750b95a..d8737b7 100644
--- a/app/lib/presentation/themes/local_theme.dart
+++ b/app/lib/presentation/themes/local_theme.dart
@@ -12,28 +12,29 @@ abstract class LocalTheme {
   }
 
   CupertinoThemeData get cupertinoThemeData => CupertinoThemeData.raw(
-        colors.brightness,
-        colors.primary,
-        colors.inversePrimary,
-        CupertinoTextThemeData(
-          textStyle: bodyS,
-          actionTextStyle: buttonText,
-          tabLabelTextStyle: overLine,
-          navTitleTextStyle: titleL,
-          navLargeTitleTextStyle: titleXL,
-          navActionTextStyle: titleM,
-          pickerTextStyle: bodyS,
-          dateTimePickerTextStyle: bodyS,
-        ),
-        colors.surface,
-        colors.secondaryContainer,
-        CupertinoColors.systemBlue,
-        true,
-      );
+    colors.brightness,
+    colors.primary,
+    colors.inversePrimary,
+    CupertinoTextThemeData(
+      textStyle: bodyS,
+      actionTextStyle: buttonText,
+      tabLabelTextStyle: overLine,
+      navTitleTextStyle: titleL,
+      navLargeTitleTextStyle: titleXL,
+      navActionTextStyle: titleM,
+      pickerTextStyle: bodyS,
+      dateTimePickerTextStyle: bodyS,
+    ),
+    colors.surface,
+    colors.secondaryContainer,
+    CupertinoColors.systemBlue,
+    true,
+  );
 
   // By using this configuration you should have this output for each material widget:
   // https://flutter.github.io/samples/web/material_3_demo
-  ThemeData get data => ThemeData.from(
+  ThemeData get data =>
+      ThemeData.from(
         useMaterial3: true,
         colorScheme: colors,
         textTheme: Typography.blackCupertino.copyWith(
@@ -70,8 +71,9 @@ abstract class LocalTheme {
             tapTargetSize: MaterialTapTargetSize.shrinkWrap,
             alignment: Alignment.center,
             shape: RoundedRectangleBorder(
-              borderRadius:
-                  BorderRadius.all(Radius.circular(themeData.borderRadius)),
+              borderRadius: BorderRadius.all(
+                Radius.circular(themeData.borderRadius),
+              ),
             ),
           ),
         ),
@@ -122,154 +124,154 @@ abstract class LocalTheme {
   final double labelSFontSize = 8;
   final double captionFontSize = 12;
 
-  get titleXLHeight => 32.4 / titleXLFontSize;
-
-  get titleLHeight => 26.4 / titleLFontSize;
-
-  get titleMHeight => 24 / titleMFontSize;
-
-  get titleSHeight => 19.2 / titleSFontSize;
-
-  get titleXSHeight => 16.8 / titleXSFontSize;
-
-  get buttonHeight => 19.6 / buttonFontSize;
-
-  get bodyHeight => 16.41 / bodyFontSize;
-
-  get bodySHeight => 14 / bodyFontSize;
-
-  get subtitleMHeight => 16.41 / subtitleMFontSize;
-
-  get subtitleSHeight => 12.89 / subtitleSFontSize;
-
-  get inputTextHeight => 13 / inputTextFontSize;
+  double get titleXLHeight => 32.4 / titleXLFontSize;
 
-  get labelHeight => 9 / labelFontSize;
-
-  get inputFieldLabelHeight => 7 / labelFontSize;
-
-  get captionHeight => 14 / captionFontSize;
-
-  get titleXL => TextStyle(
-        fontFamily: primaryFontBlack,
-        fontSize: titleXLFontSize,
-        height: titleXLHeight,
-        letterSpacing: -0.07,
-        color: colors.primary,
-      );
-
-  get titleL => TextStyle(
-        fontFamily: primaryFontBlack,
-        fontSize: titleLFontSize,
-        height: titleLHeight,
-        letterSpacing: -0.22,
-      );
-
-  get titleM => TextStyle(
-        fontFamily: primaryFontBlack,
-        fontSize: titleMFontSize,
-        height: titleMHeight,
-        letterSpacing: -0.2,
-      );
-
-  get titleS => TextStyle(
-        fontFamily: primaryFontBlack,
-        fontSize: titleSFontSize,
-        height: titleSHeight,
-        letterSpacing: -0.16,
-      );
-
-  get titleXS => TextStyle(
-        fontFamily: primaryFontHeavy,
-        fontSize: titleXSFontSize,
-        height: titleXSHeight,
-        letterSpacing: -0.14,
-      );
-
-  get titleXSS => TextStyle(
-        fontFamily: primaryFontHeavy,
-        fontSize: titleXSSFontSize,
-        height: titleXSHeight,
-        letterSpacing: -0.14,
-      );
-
-  get subtitleL => TextStyle(
-        fontFamily: primaryFontMedium,
-        fontSize: subtitleLFontSize,
-        height: subtitleMHeight,
-        letterSpacing: 1.2,
-      );
-
-  get subtitleM => TextStyle(
-        fontFamily: primaryFontMedium,
-        fontSize: subtitleMFontSize,
-        height: subtitleMHeight,
-        letterSpacing: 1.2,
-      );
-
-  get subtitleS => TextStyle(
-        fontFamily: primaryFontMedium,
-        fontSize: subtitleSFontSize,
-        height: subtitleSHeight,
-        letterSpacing: 1.65,
-      );
-
-  get buttonText => TextStyle(
-        fontFamily: primaryFontBlack,
-        fontSize: buttonFontSize,
-        height: buttonHeight,
-        letterSpacing: 1.4,
-      );
-
-  get body => TextStyle(
-        fontFamily: primaryFontLight,
-        fontSize: bodyFontSize,
-        height: bodyHeight,
-        fontWeight: FontWeight.normal,
-        letterSpacing: -0.14,
-      );
+  double get titleLHeight => 26.4 / titleLFontSize;
+
+  double get titleMHeight => 24 / titleMFontSize;
+
+  double get titleSHeight => 19.2 / titleSFontSize;
+
+  double get titleXSHeight => 16.8 / titleXSFontSize;
+
+  double get buttonHeight => 19.6 / buttonFontSize;
+
+  double get bodyHeight => 16.41 / bodyFontSize;
+
+  double get bodySHeight => 14 / bodyFontSize;
+
+  double get subtitleMHeight => 16.41 / subtitleMFontSize;
+
+  double get subtitleSHeight => 12.89 / subtitleSFontSize;
+
+  double get inputTextHeight => 13 / inputTextFontSize;
+
+  double get labelHeight => 9 / labelFontSize;
+
+  double get inputFieldLabelHeight => 7 / labelFontSize;
+
+  double get captionHeight => 14 / captionFontSize;
+
+  TextStyle get titleXL => TextStyle(
+    fontFamily: primaryFontBlack,
+    fontSize: titleXLFontSize,
+    height: titleXLHeight,
+    letterSpacing: -0.07,
+    color: colors.primary,
+  );
+
+  TextStyle get titleL => TextStyle(
+    fontFamily: primaryFontBlack,
+    fontSize: titleLFontSize,
+    height: titleLHeight,
+    letterSpacing: -0.22,
+  );
+
+  TextStyle get titleM => TextStyle(
+    fontFamily: primaryFontBlack,
+    fontSize: titleMFontSize,
+    height: titleMHeight,
+    letterSpacing: -0.2,
+  );
+
+  TextStyle get titleS => TextStyle(
+    fontFamily: primaryFontBlack,
+    fontSize: titleSFontSize,
+    height: titleSHeight,
+    letterSpacing: -0.16,
+  );
+
+  TextStyle get titleXS => TextStyle(
+    fontFamily: primaryFontHeavy,
+    fontSize: titleXSFontSize,
+    height: titleXSHeight,
+    letterSpacing: -0.14,
+  );
+
+  TextStyle get titleXSS => TextStyle(
+    fontFamily: primaryFontHeavy,
+    fontSize: titleXSSFontSize,
+    height: titleXSHeight,
+    letterSpacing: -0.14,
+  );
+
+  TextStyle get subtitleL => TextStyle(
+    fontFamily: primaryFontMedium,
+    fontSize: subtitleLFontSize,
+    height: subtitleMHeight,
+    letterSpacing: 1.2,
+  );
+
+  TextStyle get subtitleM => TextStyle(
+    fontFamily: primaryFontMedium,
+    fontSize: subtitleMFontSize,
+    height: subtitleMHeight,
+    letterSpacing: 1.2,
+  );
+
+  TextStyle get subtitleS => TextStyle(
+    fontFamily: primaryFontMedium,
+    fontSize: subtitleSFontSize,
+    height: subtitleSHeight,
+    letterSpacing: 1.65,
+  );
+
+  TextStyle get buttonText => TextStyle(
+    fontFamily: primaryFontBlack,
+    fontSize: buttonFontSize,
+    height: buttonHeight,
+    letterSpacing: 1.4,
+  );
+
+  TextStyle get body => TextStyle(
+    fontFamily: primaryFontLight,
+    fontSize: bodyFontSize,
+    height: bodyHeight,
+    fontWeight: FontWeight.normal,
+    letterSpacing: -0.14,
+  );
 
   TextStyle get bodyS => TextStyle(
-        fontFamily: primaryFontMedium,
-        fontSize: bodySFontSize,
-        height: bodySHeight,
-        fontWeight: FontWeight.normal,
-        letterSpacing: -0.14,
-      );
-
-  get inputText => TextStyle(
-        fontFamily: primaryFontMedium,
-        fontSize: titleXSFontSize,
-        height: inputTextHeight,
-        letterSpacing: 0.1,
-      );
-
-  get overLine => TextStyle(
-        fontFamily: primaryFontLight,
-        fontSize: titleXSFontSize,
-        height: inputTextHeight,
-        letterSpacing: 0.1,
-      );
-
-  get caption => TextStyle(
-        fontFamily: primaryFontHeavy,
-        fontSize: captionFontSize,
-        height: captionHeight,
-      );
-
-  get label => TextStyle(
-        fontFamily: primaryFontBlack,
-        fontSize: labelFontSize,
-        height: labelHeight,
-        letterSpacing: 1,
-      );
-
-  get labelS => TextStyle(
-        fontFamily: primaryFontBlack,
-        fontSize: labelSFontSize,
-        height: labelHeight,
-        letterSpacing: 1,
-      );
+    fontFamily: primaryFontMedium,
+    fontSize: bodySFontSize,
+    height: bodySHeight,
+    fontWeight: FontWeight.normal,
+    letterSpacing: -0.14,
+  );
+
+  TextStyle get inputText => TextStyle(
+    fontFamily: primaryFontMedium,
+    fontSize: titleXSFontSize,
+    height: inputTextHeight,
+    letterSpacing: 0.1,
+  );
+
+  TextStyle get overLine => TextStyle(
+    fontFamily: primaryFontLight,
+    fontSize: titleXSFontSize,
+    height: inputTextHeight,
+    letterSpacing: 0.1,
+  );
+
+  TextStyle get caption => TextStyle(
+    fontFamily: primaryFontHeavy,
+    fontSize: captionFontSize,
+    height: captionHeight,
+  );
+
+  TextStyle get label => TextStyle(
+    fontFamily: primaryFontBlack,
+    fontSize: labelFontSize,
+    height: labelHeight,
+    letterSpacing: 1,
+  );
+
+  TextStyle get labelS => TextStyle(
+    fontFamily: primaryFontBlack,
+    fontSize: labelSFontSize,
+    height: labelHeight,
+    letterSpacing: 1,
+  );
 }
 
 extension ColorShadow on Color {
diff --git a/app/lib/presentation/themes/resources/app_theme_data.dart b/app/lib/presentation/themes/resources/app_theme_data.dart
index 1cda14f..9550224 100644
--- a/app/lib/presentation/themes/resources/app_theme_data.dart
+++ b/app/lib/presentation/themes/resources/app_theme_data.dart
@@ -11,34 +11,34 @@ class AppThemeData {
   AppThemeData(this.brightness, this.palette, this.borderRadius);
 
   ColorScheme get colorScheme => ColorScheme(
-        brightness: brightness,
-        primary: palette.primary.v40,
-        secondary: palette.secondary.v40,
-        error: palette.error.v40,
-        tertiary: palette.tertiary.v40,
-        onPrimary: palette.primary.v100,
-        primaryContainer: palette.primary.v90,
-        onPrimaryContainer: palette.primary.v10,
-        onSecondary: palette.secondary.v100,
-        secondaryContainer: palette.secondary.v90,
-        onSecondaryContainer: palette.secondary.v10,
-        onTertiary: palette.tertiary.v100,
-        tertiaryContainer: palette.tertiary.v90,
-        onTertiaryContainer: palette.tertiary.v10,
-        onError: palette.error.v100,
-        errorContainer: palette.error.v90,
-        onErrorContainer: palette.error.v10,
-        surface: palette.neutral.v99,
-        onSurface: palette.neutral.v10,
-        onSurfaceVariant: palette.neutralVariant.v30,
-        surfaceContainerHighest: palette.neutralVariant.v90,
-        outline: palette.neutralVariant.v50,
-        outlineVariant: palette.neutralVariant.v80,
-        shadow: palette.neutral.v0,
-        scrim: palette.neutral.v0,
-        inverseSurface: palette.neutral.v20,
-        inversePrimary: palette.primary.v80,
-      );
+    brightness: brightness,
+    primary: palette.primary.v40,
+    secondary: palette.secondary.v40,
+    error: palette.error.v40,
+    tertiary: palette.tertiary.v40,
+    onPrimary: palette.primary.v100,
+    primaryContainer: palette.primary.v90,
+    onPrimaryContainer: palette.primary.v10,
+    onSecondary: palette.secondary.v100,
+    secondaryContainer: palette.secondary.v90,
+    onSecondaryContainer: palette.secondary.v10,
+    onTertiary: palette.tertiary.v100,
+    tertiaryContainer: palette.tertiary.v90,
+    onTertiaryContainer: palette.tertiary.v10,
+    onError: palette.error.v100,
+    errorContainer: palette.error.v90,
+    onErrorContainer: palette.error.v10,
+    surface: palette.neutral.v99,
+    onSurface: palette.neutral.v10,
+    onSurfaceVariant: palette.neutralVariant.v30,
+    surfaceContainerHighest: palette.neutralVariant.v90,
+    outline: palette.neutralVariant.v50,
+    outlineVariant: palette.neutralVariant.v80,
+    shadow: palette.neutral.v0,
+    scrim: palette.neutral.v0,
+    inverseSurface: palette.neutral.v20,
+    inversePrimary: palette.primary.v80,
+  );
 }
 
 abstract class ThemeColors {
diff --git a/app/lib/presentation/themes/resources/dark_theme_colors.dart b/app/lib/presentation/themes/resources/dark_theme_colors.dart
index 94d2f0f..bf3fc8e 100644
--- a/app/lib/presentation/themes/resources/dark_theme_colors.dart
+++ b/app/lib/presentation/themes/resources/dark_theme_colors.dart
@@ -10,20 +10,20 @@ class DarkThemeColors implements ThemeColors {
   /// 100: onPrimary
   @override
   MaterialColor get primary => const MaterialColor(0xFFD0BCFF, {
-        0: Color(0xFF000000),
-        10: Color(0xFF21005D), // onPrimaryContainer
-        20: Color(0xFF381E72),
-        30: Color(0xFF4F378B),
-        40: Color(0xFF6750A4), // inversePrimary (light mode primary)
-        50: Color(0xFF7F67BE),
-        60: Color(0xFF9A82DB),
-        70: Color(0xFFB69DF8),
-        80: Color(0xFFD0BCFF), // primary - Main brand color in dark
-        90: Color(0xFFEADDFF), // primaryContainer
-        95: Color(0xFFF6EDFF),
-        99: Color(0xFFFFFBFE),
-        100: Color(0xFFFFFFFF), // onPrimary
-      });
+    0: Color(0xFF000000),
+    10: Color(0xFF21005D), // onPrimaryContainer
+    20: Color(0xFF381E72),
+    30: Color(0xFF4F378B),
+    40: Color(0xFF6750A4), // inversePrimary (light mode primary)
+    50: Color(0xFF7F67BE),
+    60: Color(0xFF9A82DB),
+    70: Color(0xFFB69DF8),
+    80: Color(0xFFD0BCFF), // primary - Main brand color in dark
+    90: Color(0xFFEADDFF), // primaryContainer
+    95: Color(0xFFF6EDFF),
+    99: Color(0xFFFFFBFE),
+    100: Color(0xFFFFFFFF), // onPrimary
+  });
 
   /// 10: onSecondaryContainer
   /// 40: secondary
@@ -31,20 +31,20 @@ class DarkThemeColors implements ThemeColors {
   /// 100: onSecondary
   @override
   MaterialColor get secondary => const MaterialColor(0xFFCCC2DC, {
-        0: Color(0xFF000000),
-        10: Color(0xFF1D192B), // onSecondaryContainer
-        20: Color(0xFF332D41),
-        30: Color(0xFF4A4458),
-        40: Color(0xFF625B71),
-        50: Color(0xFF7A7289),
-        60: Color(0xFF958DA5),
-        70: Color(0xFFB0A7C0),
-        80: Color(0xFFCCC2DC), // secondary
-        90: Color(0xFFE8DEF8), // secondaryContainer
-        95: Color(0xFFF6EDFF),
-        99: Color(0xFFFFFBFE),
-        100: Color(0xFFFFFFFF), // onSecondary
-      });
+    0: Color(0xFF000000),
+    10: Color(0xFF1D192B), // onSecondaryContainer
+    20: Color(0xFF332D41),
+    30: Color(0xFF4A4458),
+    40: Color(0xFF625B71),
+    50: Color(0xFF7A7289),
+    60: Color(0xFF958DA5),
+    70: Color(0xFFB0A7C0),
+    80: Color(0xFFCCC2DC), // secondary
+    90: Color(0xFFE8DEF8), // secondaryContainer
+    95: Color(0xFFF6EDFF),
+    99: Color(0xFFFFFBFE),
+    100: Color(0xFFFFFFFF), // onSecondary
+  });
 
   /// 10: onTertiaryContainer
   /// 40: tertiary
@@ -52,20 +52,20 @@ class DarkThemeColors implements ThemeColors {
   /// 100: onTertiary
   @override
   MaterialColor get tertiary => const MaterialColor(0xFFEFB8C8, {
-        0: Color(0xFF000000),
-        10: Color(0xFF31111D), // onTertiaryContainer
-        20: Color(0xFF492532),
-        30: Color(0xFF633B48),
-        40: Color(0xFF7D5260),
-        50: Color(0xFF986977),
-        60: Color(0xFFB58392),
-        70: Color(0xFFD29DAC),
-        80: Color(0xFFEFB8C8), // tertiary
-        90: Color(0xFFFFD8E4), // tertiaryContainer
-        95: Color(0xFFFFECF1),
-        99: Color(0xFFFFFBFA),
-        100: Color(0xFFFFFFFF), // onTertiary
-      });
+    0: Color(0xFF000000),
+    10: Color(0xFF31111D), // onTertiaryContainer
+    20: Color(0xFF492532),
+    30: Color(0xFF633B48),
+    40: Color(0xFF7D5260),
+    50: Color(0xFF986977),
+    60: Color(0xFFB58392),
+    70: Color(0xFFD29DAC),
+    80: Color(0xFFEFB8C8), // tertiary
+    90: Color(0xFFFFD8E4), // tertiaryContainer
+    95: Color(0xFFFFECF1),
+    99: Color(0xFFFFFBFA),
+    100: Color(0xFFFFFFFF), // onTertiary
+  });
 
   /// 10: onErrorContainer
   /// 40: error
@@ -73,20 +73,20 @@ class DarkThemeColors implements ThemeColors {
   /// 100: onError
   @override
   MaterialColor get error => const MaterialColor(0xFFF2B8B5, {
-        0: Color(0xFF000000),
-        10: Color(0xFF410E0B), // onErrorContainer
-        20: Color(0xFF601410),
-        30: Color(0xFF8C1D18),
-        40: Color(0xFFB3261E),
-        50: Color(0xFFDC362E),
-        60: Color(0xFFE46962),
-        70: Color(0xFFEC928E),
-        80: Color(0xFFF2B8B5), // error
-        90: Color(0xFFF9DEDC), // errorContainer
-        95: Color(0xFFFCEEEE),
-        99: Color(0xFFFFFBF9),
-        100: Color(0xFFFFFFFF), // onError
-      });
+    0: Color(0xFF000000),
+    10: Color(0xFF410E0B), // onErrorContainer
+    20: Color(0xFF601410),
+    30: Color(0xFF8C1D18),
+    40: Color(0xFFB3261E),
+    50: Color(0xFFDC362E),
+    60: Color(0xFFE46962),
+    70: Color(0xFFEC928E),
+    80: Color(0xFFF2B8B5), // error
+    90: Color(0xFFF9DEDC), // errorContainer
+    95: Color(0xFFFCEEEE),
+    99: Color(0xFFFFFBF9),
+    100: Color(0xFFFFFFFF), // onError
+  });
 
   /// 0: shadow / scrim
   /// 10: onSurface
@@ -94,21 +94,20 @@ class DarkThemeColors implements ThemeColors {
   /// 99: surface
   @override
   MaterialColor get neutral => const MaterialColor(0xFF1C1B1F, {
-        0: Color(0xFF000000), // shadow / scrim
-        10: Color(
-            0xFFE6E1E5), // onSurface - Main text color in dark (light color)
-        20: Color(0xFFF4EFF4), // inverseSurface (light color)
-        30: Color(0xFFAEAAAE),
-        40: Color(0xFF939094),
-        50: Color(0xFF787579),
-        60: Color(0xFF605D62),
-        70: Color(0xFF484649),
-        80: Color(0xFF313033),
-        90: Color(0xFF1C1B1F),
-        95: Color(0xFF141316),
-        99: Color(0xFF141316), // surface - Main background in dark (dark color)
-        100: Color(0xFF000000),
-      });
+    0: Color(0xFF000000), // shadow / scrim
+    10: Color(0xFFE6E1E5), // onSurface - Main text color in dark (light color)
+    20: Color(0xFFF4EFF4), // inverseSurface (light color)
+    30: Color(0xFFAEAAAE),
+    40: Color(0xFF939094),
+    50: Color(0xFF787579),
+    60: Color(0xFF605D62),
+    70: Color(0xFF484649),
+    80: Color(0xFF313033),
+    90: Color(0xFF1C1B1F),
+    95: Color(0xFF141316),
+    99: Color(0xFF141316), // surface - Main background in dark (dark color)
+    100: Color(0xFF000000),
+  });
 
   /// 30: onSurfaceVariant
   /// 50: outline
@@ -116,19 +115,20 @@ class DarkThemeColors implements ThemeColors {
   /// 90: surfaceContainerHighest
   @override
   MaterialColor get neutralVariant => const MaterialColor(0xFF49454F, {
-        0: Color(0xFF000000),
-        10: Color(0xFFF5EEFA),
-        20: Color(0xFFE7E0EC),
-        30: Color(
-            0xFFC9C5D0), // onSurfaceVariant - Secondary text (lighter in dark)
-        40: Color(0xFFAEA9B4),
-        50: Color(0xFF938F99), // outline - Borders, dividers
-        60: Color(0xFF79747E),
-        70: Color(0xFF605D66),
-        80: Color(0xFF49454F), // outlineVariant - Subtle borders
-        90: Color(0xFF322F37), // surfaceContainerHighest
-        95: Color(0xFF1D1A22),
-        99: Color(0xFF000000),
-        100: Color(0xFF000000),
-      });
+    0: Color(0xFF000000),
+    10: Color(0xFFF5EEFA),
+    20: Color(0xFFE7E0EC),
+    30: Color(
+      0xFFC9C5D0,
+    ), // onSurfaceVariant - Secondary text (lighter in dark)
+    40: Color(0xFFAEA9B4),
+    50: Color(0xFF938F99), // outline - Borders, dividers
+    60: Color(0xFF79747E),
+    70: Color(0xFF605D66),
+    80: Color(0xFF49454F), // outlineVariant - Subtle borders
+    90: Color(0xFF322F37), // surfaceContainerHighest
+    95: Color(0xFF1D1A22),
+    99: Color(0xFF000000),
+    100: Color(0xFF000000),
+  });
 }
diff --git a/app/lib/presentation/themes/resources/light_theme_colors.dart b/app/lib/presentation/themes/resources/light_theme_colors.dart
index 8713f3f..e11721b 100644
--- a/app/lib/presentation/themes/resources/light_theme_colors.dart
+++ b/app/lib/presentation/themes/resources/light_theme_colors.dart
@@ -9,20 +9,20 @@ class LightThemeColors implements ThemeColors {
   /// 100: onPrimary
   @override
   MaterialColor get primary => const MaterialColor(0xFF6750A4, {
-        0: Color(0xFF000000),
-        10: Color(0xFF21005D), // onPrimaryContainer
-        20: Color(0xFF381E72),
-        30: Color(0xFF4F378B),
-        40: Color(0xFF6750A4), // primary - Main brand color
-        50: Color(0xFF7F67BE),
-        60: Color(0xFF9A82DB),
-        70: Color(0xFFB69DF8),
-        80: Color(0xFFD0BCFF), // inversePrimary
-        90: Color(0xFFEADDFF), // primaryContainer
-        95: Color(0xFFF6EDFF),
-        99: Color(0xFFFFFBFE),
-        100: Color(0xFFFFFFFF), // onPrimary
-      });
+    0: Color(0xFF000000),
+    10: Color(0xFF21005D), // onPrimaryContainer
+    20: Color(0xFF381E72),
+    30: Color(0xFF4F378B),
+    40: Color(0xFF6750A4), // primary - Main brand color
+    50: Color(0xFF7F67BE),
+    60: Color(0xFF9A82DB),
+    70: Color(0xFFB69DF8),
+    80: Color(0xFFD0BCFF), // inversePrimary
+    90: Color(0xFFEADDFF), // primaryContainer
+    95: Color(0xFFF6EDFF),
+    99: Color(0xFFFFFBFE),
+    100: Color(0xFFFFFFFF), // onPrimary
+  });
 
   /// 10: onSecondaryContainer
   /// 40: secondary
@@ -30,20 +30,20 @@ class LightThemeColors implements ThemeColors {
   /// 100: onSecondary
   @override
   MaterialColor get secondary => const MaterialColor(0xFF625B71, {
-        0: Color(0xFF000000),
-        10: Color(0xFF1D192B), // onSecondaryContainer
-        20: Color(0xFF332D41),
-        30: Color(0xFF4A4458),
-        40: Color(0xFF625B71), // secondary
-        50: Color(0xFF7A7289),
-        60: Color(0xFF958DA5),
-        70: Color(0xFFB0A7C0),
-        80: Color(0xFFCCC2DC),
-        90: Color(0xFFE8DEF8), // secondaryContainer
-        95: Color(0xFFF6EDFF),
-        99: Color(0xFFFFFBFE),
-        100: Color(0xFFFFFFFF), // onSecondary
-      });
+    0: Color(0xFF000000),
+    10: Color(0xFF1D192B), // onSecondaryContainer
+    20: Color(0xFF332D41),
+    30: Color(0xFF4A4458),
+    40: Color(0xFF625B71), // secondary
+    50: Color(0xFF7A7289),
+    60: Color(0xFF958DA5),
+    70: Color(0xFFB0A7C0),
+    80: Color(0xFFCCC2DC),
+    90: Color(0xFFE8DEF8), // secondaryContainer
+    95: Color(0xFFF6EDFF),
+    99: Color(0xFFFFFBFE),
+    100: Color(0xFFFFFFFF), // onSecondary
+  });
 
   /// 10: onTertiaryContainer
   /// 40: tertiary
@@ -51,20 +51,20 @@ class LightThemeColors implements ThemeColors {
   /// 100: onTertiary
   @override
   MaterialColor get tertiary => const MaterialColor(0xFF7D5260, {
-        0: Color(0xFF000000),
-        10: Color(0xFF31111D), // onTertiaryContainer
-        20: Color(0xFF492532),
-        30: Color(0xFF633B48),
-        40: Color(0xFF7D5260), // tertiary
-        50: Color(0xFF986977),
-        60: Color(0xFFB58392),
-        70: Color(0xFFD29DAC),
-        80: Color(0xFFEFB8C8),
-        90: Color(0xFFFFD8E4), // tertiaryContainer
-        95: Color(0xFFFFECF1),
-        99: Color(0xFFFFFBFA),
-        100: Color(0xFFFFFFFF), // onTertiary
-      });
+    0: Color(0xFF000000),
+    10: Color(0xFF31111D), // onTertiaryContainer
+    20: Color(0xFF492532),
+    30: Color(0xFF633B48),
+    40: Color(0xFF7D5260), // tertiary
+    50: Color(0xFF986977),
+    60: Color(0xFFB58392),
+    70: Color(0xFFD29DAC),
+    80: Color(0xFFEFB8C8),
+    90: Color(0xFFFFD8E4), // tertiaryContainer
+    95: Color(0xFFFFECF1),
+    99: Color(0xFFFFFBFA),
+    100: Color(0xFFFFFFFF), // onTertiary
+  });
 
   /// 10: onErrorContainer
   /// 40: error
@@ -72,20 +72,20 @@ class LightThemeColors implements ThemeColors {
   /// 100: onError
   @override
   MaterialColor get error => const MaterialColor(0xFFB3261E, {
-        0: Color(0xFF000000),
-        10: Color(0xFF410E0B), // onErrorContainer
-        20: Color(0xFF601410),
-        30: Color(0xFF8C1D18),
-        40: Color(0xFFB3261E), // error
-        50: Color(0xFFDC362E),
-        60: Color(0xFFE46962),
-        70: Color(0xFFEC928E),
-        80: Color(0xFFF2B8B5),
-        90: Color(0xFFF9DEDC), // errorContainer
-        95: Color(0xFFFCEEEE),
-        99: Color(0xFFFFFBF9),
-        100: Color(0xFFFFFFFF), // onError
-      });
+    0: Color(0xFF000000),
+    10: Color(0xFF410E0B), // onErrorContainer
+    20: Color(0xFF601410),
+    30: Color(0xFF8C1D18),
+    40: Color(0xFFB3261E), // error
+    50: Color(0xFFDC362E),
+    60: Color(0xFFE46962),
+    70: Color(0xFFEC928E),
+    80: Color(0xFFF2B8B5),
+    90: Color(0xFFF9DEDC), // errorContainer
+    95: Color(0xFFFCEEEE),
+    99: Color(0xFFFFFBF9),
+    100: Color(0xFFFFFFFF), // onError
+  });
 
   /// 0: shadow / scrim
   /// 10: onSurface
@@ -93,20 +93,20 @@ class LightThemeColors implements ThemeColors {
   /// 99: surface
   @override
   MaterialColor get neutral => const MaterialColor(0xFF1C1B1F, {
-        0: Color(0xFF000000), // shadow / scrim
-        10: Color(0xFF1C1B1F), // onSurface - Main text color
-        20: Color(0xFF313033), // inverseSurface
-        30: Color(0xFF484649),
-        40: Color(0xFF605D62),
-        50: Color(0xFF787579),
-        60: Color(0xFF939094),
-        70: Color(0xFFAEAAAE),
-        80: Color(0xFFC9C5CA),
-        90: Color(0xFFE6E1E5),
-        95: Color(0xFFF4EFF4),
-        99: Color(0xFFFFFBFE), // surface - Main background
-        100: Color(0xFFFFFFFF),
-      });
+    0: Color(0xFF000000), // shadow / scrim
+    10: Color(0xFF1C1B1F), // onSurface - Main text color
+    20: Color(0xFF313033), // inverseSurface
+    30: Color(0xFF484649),
+    40: Color(0xFF605D62),
+    50: Color(0xFF787579),
+    60: Color(0xFF939094),
+    70: Color(0xFFAEAAAE),
+    80: Color(0xFFC9C5CA),
+    90: Color(0xFFE6E1E5),
+    95: Color(0xFFF4EFF4),
+    99: Color(0xFFFFFBFE), // surface - Main background
+    100: Color(0xFFFFFFFF),
+  });
 
   /// 30: onSurfaceVariant
   /// 50: outline
@@ -114,18 +114,18 @@ class LightThemeColors implements ThemeColors {
   /// 90: surfaceContainerHighest
   @override
   MaterialColor get neutralVariant => const MaterialColor(0xFF49454F, {
-        0: Color(0xFF000000),
-        10: Color(0xFF1D1A22),
-        20: Color(0xFF322F37),
-        30: Color(0xFF49454F), // onSurfaceVariant - Secondary text, icons
-        40: Color(0xFF605D66),
-        50: Color(0xFF79747E), // outline - Borders, dividers
-        60: Color(0xFF938F99),
-        70: Color(0xFFAEA9B4),
-        80: Color(0xFFC9C5D0), // outlineVariant - Subtle borders
-        90: Color(0xFFE7E0EC), // surfaceContainerHighest
-        95: Color(0xFFF5EEFA),
-        99: Color(0xFFFFFBFE),
-        100: Color(0xFFFFFFFF),
-      });
+    0: Color(0xFF000000),
+    10: Color(0xFF1D1A22),
+    20: Color(0xFF322F37),
+    30: Color(0xFF49454F), // onSurfaceVariant - Secondary text, icons
+    40: Color(0xFF605D66),
+    50: Color(0xFF79747E), // outline - Borders, dividers
+    60: Color(0xFF938F99),
+    70: Color(0xFFAEA9B4),
+    80: Color(0xFFC9C5D0), // outlineVariant - Subtle borders
+    90: Color(0xFFE7E0EC), // surfaceContainerHighest
+    95: Color(0xFFF5EEFA),
+    99: Color(0xFFFFFBFE),
+    100: Color(0xFFFFFFFF),
+  });
 }
diff --git a/app/lib/presentation/ui/base/tracked_page.dart b/app/lib/presentation/ui/base/tracked_page.dart
index e677dc4..18c0506 100644
--- a/app/lib/presentation/ui/base/tracked_page.dart
+++ b/app/lib/presentation/ui/base/tracked_page.dart
@@ -55,8 +55,10 @@ class _TrackedPageState extends State<TrackedPage> with RouteAware {
   AnalyticsClient get analytics => getIt<AnalyticsClient>();
 
   void _track(String phase) {
-    analytics.trackEvent('${widget.trackingName}_$phase',
-        properties: widget.trackingProperties);
+    analytics.trackEvent(
+      '${widget.trackingName}_$phase',
+      properties: widget.trackingProperties,
+    );
   }
 
   @override
diff --git a/app/lib/presentation/ui/components/primary_button.dart b/app/lib/presentation/ui/components/primary_button.dart
index b8a2eb8..401d54f 100644
--- a/app/lib/presentation/ui/components/primary_button.dart
+++ b/app/lib/presentation/ui/components/primary_button.dart
@@ -18,28 +18,25 @@ class PrimaryButton extends StatelessWidget {
     this.leadingIcon,
     this.trailingIcon,
   }) : assert(
-          leadingIcon == null || trailingIcon == null,
-          'Only one of leadingIcon or trailingIcon can be provided',
-        );
+         leadingIcon == null || trailingIcon == null,
+         'Only one of leadingIcon or trailingIcon can be provided',
+       );
 
   @override
   Widget build(BuildContext context) {
     return ElevatedButton.icon(
       style: Theme.of(context).elevatedButtonTheme.style?.copyWith(
-            minimumSize: WidgetStateProperty.all<Size>(
-              const Size(
-                double.infinity,
-                Dimen.buttonHeightM,
-              ),
-            ),
-          ),
+        minimumSize: WidgetStateProperty.all<Size>(
+          const Size(double.infinity, Dimen.buttonHeightM),
+        ),
+      ),
       onPressed: isLoading || !isEnabled ? null : onPressed,
       icon: leadingIcon ?? trailingIcon ?? const SizedBox.shrink(),
       iconAlignment: leadingIcon != null
           ? IconAlignment.start
           : trailingIcon != null
-              ? IconAlignment.end
-              : null,
+          ? IconAlignment.end
+          : null,
       label: isLoading
           ? SizedBox(
               width: Dimen.loadingSpinnerSizeS,
diff --git a/app/lib/presentation/ui/custom/app_theme_switch.dart b/app/lib/presentation/ui/custom/app_theme_switch.dart
index 8aecf72..7246530 100644
--- a/app/lib/presentation/ui/custom/app_theme_switch.dart
+++ b/app/lib/presentation/ui/custom/app_theme_switch.dart
@@ -16,9 +16,9 @@ class AppThemeSwitch extends StatelessWidget {
       value: theme == ThemeType.dark,
       thumbIcon: const WidgetStatePropertyAll(Icon(Icons.brightness_6)),
       onChanged: (value) {
-        context
-            .read<AppCubit>()
-            .updateTheme(value ? ThemeType.dark : ThemeType.light);
+        context.read<AppCubit>().updateTheme(
+          value ? ThemeType.dark : ThemeType.light,
+        );
       },
     );
   }
diff --git a/app/lib/presentation/ui/custom/cookies.dart b/app/lib/presentation/ui/custom/cookies.dart
index ffc0ecb..072353c 100644
--- a/app/lib/presentation/ui/custom/cookies.dart
+++ b/app/lib/presentation/ui/custom/cookies.dart
@@ -51,7 +51,8 @@ class _CookiesState extends State<Cookies> {
               widget.child,
               Align(
                 alignment: widget.alignment,
-                child: widget.cookiesChild ??
+                child:
+                    widget.cookiesChild ??
                     Container(
                       constraints: BoxConstraints(
                         maxWidth: MediaQuery.of(context).size.width,
@@ -66,14 +67,16 @@ class _CookiesState extends State<Cookies> {
                             children: [
                               Text(
                                 S.of(context).cookiesTitle,
-                                style:
-                                    Theme.of(context).textTheme.headlineMedium,
+                                style: Theme.of(context)
+                                    .textTheme
+                                    .headlineMedium,
                               ),
                               const Gap(Dimen.spacingS),
                               SelectableText(
                                 S.of(context).cookiesBody,
-                                style:
-                                    Theme.of(context).textTheme.headlineMedium,
+                                style: Theme.of(context)
+                                    .textTheme
+                                    .headlineMedium,
                               ),
                               const Gap(Dimen.spacingS),
                               Align(
diff --git a/app/lib/presentation/ui/custom/debug_banner.dart b/app/lib/presentation/ui/custom/debug_banner.dart
index 96d26b5..baef312 100644
--- a/app/lib/presentation/ui/custom/debug_banner.dart
+++ b/app/lib/presentation/ui/custom/debug_banner.dart
@@ -11,10 +11,7 @@ import 'package:gap/gap.dart';
 
 class DebugBanner extends StatelessWidget {
   final Widget child;
-  const DebugBanner({
-    super.key,
-    required this.child,
-  });
+  const DebugBanner({super.key, required this.child});
 
   @override
   Widget build(BuildContext context) {
@@ -32,8 +29,9 @@ class DebugBanner extends StatelessWidget {
                 const Gap(Dimen.spacingS),
                 Text(
                   S.of(context).debugModeLabel,
-                  style:
-                      textTheme.bodyLarge?.copyWith(color: colorScheme.onError),
+                  style: textTheme.bodyLarge?.copyWith(
+                    color: colorScheme.onError,
+                  ),
                 ),
                 const Spacer(),
                 BlocBuilder<AppCubit, AppState>(
diff --git a/app/lib/presentation/ui/custom/environment_selector.dart b/app/lib/presentation/ui/custom/environment_selector.dart
index 728a24b..eebf4c6 100644
--- a/app/lib/presentation/ui/custom/environment_selector.dart
+++ b/app/lib/presentation/ui/custom/environment_selector.dart
@@ -7,27 +7,25 @@ import 'package:flutter/material.dart';
 import '../../../main/init.dart';
 
 class EnvironmentSelector extends StatelessWidget {
-  EnvironmentSelector({
-    super.key,
-  });
+  EnvironmentSelector({super.key});
 
   final EnvironmentService environmentService = getIt<EnvironmentService>();
 
   DropdownMenuItem<String> _item(
-          String value, String label, TextStyle textStyle) =>
-      DropdownMenuItem<String>(
-        value: value,
-        child: Padding(
-          padding: const EdgeInsets.symmetric(horizontal: Dimen.spacingXs),
-          child: Text(label, style: textStyle),
-        ),
-      );
+    String value,
+    String label,
+    TextStyle textStyle,
+  ) => DropdownMenuItem<String>(
+    value: value,
+    child: Padding(
+      padding: const EdgeInsets.symmetric(horizontal: Dimen.spacingXs),
+      child: Text(label, style: textStyle),
+    ),
+  );
 
   @override
   Widget build(BuildContext context) {
-    final textStyle = Theme.of(context)
-        .textTheme
-        .bodyLarge
+    final textStyle = Theme.of(context).textTheme.bodyLarge
         ?.copyWith(color: Theme.of(context).colorScheme.primary.v0);
 
     final items = <DropdownMenuItem<String>>[
diff --git a/app/lib/presentation/ui/custom/failure_widget.dart b/app/lib/presentation/ui/custom/failure_widget.dart
index c34efb7..c53d27c 100644
--- a/app/lib/presentation/ui/custom/failure_widget.dart
+++ b/app/lib/presentation/ui/custom/failure_widget.dart
@@ -8,8 +8,11 @@ class FailureWidget extends StatelessWidget {
   final Failure? failure;
   final VoidCallback onRetry;
 
-  const FailureWidget(
-      {super.key, required this.failure, required this.onRetry});
+  const FailureWidget({
+    super.key,
+    required this.failure,
+    required this.onRetry,
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/app/lib/presentation/ui/custom/loading_screen.dart b/app/lib/presentation/ui/custom/loading_screen.dart
index 1883dad..6e34759 100644
--- a/app/lib/presentation/ui/custom/loading_screen.dart
+++ b/app/lib/presentation/ui/custom/loading_screen.dart
@@ -3,10 +3,7 @@ import 'package:flutter/material.dart';
 class LoadingScreen extends StatelessWidget {
   final Color? color;
 
-  const LoadingScreen({
-    super.key,
-    this.color,
-  });
+  const LoadingScreen({super.key, this.color});
 
   @override
   Widget build(BuildContext context) {
@@ -16,9 +13,7 @@ class LoadingScreen extends StatelessWidget {
         child: SizedBox(
           width: 24,
           height: 24,
-          child: CircularProgressIndicator(
-            color: color,
-          ),
+          child: CircularProgressIndicator(color: color),
         ),
       ),
     );
diff --git a/app/lib/presentation/ui/custom/terms_services_check.dart b/app/lib/presentation/ui/custom/terms_services_check.dart
index ca75294..23d6b25 100644
--- a/app/lib/presentation/ui/custom/terms_services_check.dart
+++ b/app/lib/presentation/ui/custom/terms_services_check.dart
@@ -19,11 +19,11 @@ class TermsServicesCheck extends StatelessWidget {
       width: double.infinity,
       child: TextButton(
         style: Theme.of(context).textButtonTheme.style?.copyWith(
-              alignment: Alignment.centerLeft, // <-- important
-              padding: WidgetStateProperty.all(
-                EdgeInsets.zero,
-              ), // optional, but helps
-            ),
+          alignment: Alignment.centerLeft, // <-- important
+          padding: WidgetStateProperty.all(
+            EdgeInsets.zero,
+          ), // optional, but helps
+        ),
         onPressed: () => onChanged?.call(!agreeToTerms),
         child: Row(
           crossAxisAlignment: CrossAxisAlignment.center,
@@ -45,9 +45,7 @@ class TermsServicesCheck extends StatelessWidget {
             IconButton(
               onPressed: () {
                 ScaffoldMessenger.of(context).showSnackBar(
-                  SnackBar(
-                    content: Text(S.of(context).hintTermsAndConditions),
-                  ),
+                  SnackBar(content: Text(S.of(context).hintTermsAndConditions)),
                 );
               },
               icon: const Icon(Icons.info),
diff --git a/app/lib/presentation/ui/pages/auth/login/login_form.dart b/app/lib/presentation/ui/pages/auth/login/login_form.dart
index 25be1bd..497b547 100644
--- a/app/lib/presentation/ui/pages/auth/login/login_form.dart
+++ b/app/lib/presentation/ui/pages/auth/login/login_form.dart
@@ -50,9 +50,7 @@ class _LoginFormState extends State<LoginForm> {
           ),
           const Gap(Dimen.spacingL),
           TextFormField(
-            decoration: InputDecoration(
-              labelText: S.of(context).labelEmail,
-            ),
+            decoration: InputDecoration(labelText: S.of(context).labelEmail),
             keyboardType: TextInputType.emailAddress,
             autofillHints: const [AutofillHints.username, AutofillHints.email],
             controller: emailController,
@@ -66,9 +64,7 @@ class _LoginFormState extends State<LoginForm> {
           ),
           const Gap(Dimen.spacingM),
           TextFormField(
-            decoration: InputDecoration(
-              labelText: S.of(context).labelPassword,
-            ),
+            decoration: InputDecoration(labelText: S.of(context).labelPassword),
             obscureText: true,
             controller: passwordController,
             validator: (value) {
@@ -96,10 +92,10 @@ class _LoginFormState extends State<LoginForm> {
                   if (state is RError) ...[
                     Text(
                       S.of(context).loginErrorInvalidCredentials,
-                      style:
-                          Theme.of(context).textTheme.headlineMedium?.copyWith(
-                                color: Theme.of(context).colorScheme.error,
-                              ),
+                      style: Theme.of(context).textTheme.headlineMedium
+                          ?.copyWith(
+                            color: Theme.of(context).colorScheme.error,
+                          ),
                     ),
                     const Gap(Dimen.spacingM),
                   ],
@@ -109,15 +105,15 @@ class _LoginFormState extends State<LoginForm> {
                       if ((_formKey.currentState?.validate() ?? false) &&
                           agreeToTerms) {
                         context.read<AuthCubit>().login(
-                              email: emailController.text,
-                              password: passwordController.text,
-                            );
+                          email: emailController.text,
+                          password: passwordController.text,
+                        );
                       }
                     },
                     isEnabled: agreeToTerms,
                     isLoading: state is RLoading,
                     trailingIcon: const Icon(Icons.login),
-                  )
+                  ),
                 ],
               );
             },
diff --git a/app/lib/presentation/ui/pages/auth/sign_up/sign_up_form.dart b/app/lib/presentation/ui/pages/auth/sign_up/sign_up_form.dart
index 162ac91..8a26bf3 100644
--- a/app/lib/presentation/ui/pages/auth/sign_up/sign_up_form.dart
+++ b/app/lib/presentation/ui/pages/auth/sign_up/sign_up_form.dart
@@ -51,9 +51,7 @@ class _SignUpFormState extends State<SignUpForm> {
           ),
           const Gap(Dimen.spacingL),
           TextFormField(
-            decoration: InputDecoration(
-              labelText: S.of(context).labelEmail,
-            ),
+            decoration: InputDecoration(labelText: S.of(context).labelEmail),
             keyboardType: TextInputType.emailAddress,
             autofillHints: const [AutofillHints.username, AutofillHints.email],
             controller: emailController,
@@ -67,9 +65,7 @@ class _SignUpFormState extends State<SignUpForm> {
           ),
           const Gap(Dimen.spacingM),
           TextFormField(
-            decoration: InputDecoration(
-              labelText: S.of(context).labelPassword,
-            ),
+            decoration: InputDecoration(labelText: S.of(context).labelPassword),
             obscureText: true,
             controller: passwordController,
             validator: (value) {
@@ -116,10 +112,10 @@ class _SignUpFormState extends State<SignUpForm> {
                   if (state is RError) ...[
                     Text(
                       S.of(context).loginErrorInvalidCredentials,
-                      style:
-                          Theme.of(context).textTheme.headlineMedium?.copyWith(
-                                color: Theme.of(context).colorScheme.error,
-                              ),
+                      style: Theme.of(context).textTheme.headlineMedium
+                          ?.copyWith(
+                            color: Theme.of(context).colorScheme.error,
+                          ),
                     ),
                     const Gap(Dimen.spacingM),
                   ],
@@ -129,15 +125,15 @@ class _SignUpFormState extends State<SignUpForm> {
                       if ((_formKey.currentState?.validate() ?? false) &&
                           agreeToTerms) {
                         context.read<AuthCubit>().signUp(
-                              email: emailController.text,
-                              password: passwordController.text,
-                            );
+                          email: emailController.text,
+                          password: passwordController.text,
+                        );
                       }
                     },
                     isEnabled: agreeToTerms,
                     isLoading: state is RLoading,
                     trailingIcon: const Icon(Icons.login),
-                  )
+                  ),
                 ],
               );
             },
diff --git a/app/lib/presentation/ui/pages/onboarding/onboarding_page.dart b/app/lib/presentation/ui/pages/onboarding/onboarding_page.dart
index 7bac335..b963c1f 100644
--- a/app/lib/presentation/ui/pages/onboarding/onboarding_page.dart
+++ b/app/lib/presentation/ui/pages/onboarding/onboarding_page.dart
@@ -80,17 +80,17 @@ class _OnboardingPageState extends State<OnboardingPage> {
               Padding(
                 padding: const EdgeInsets.all(Dimen.spacingM),
                 child: Semantics(
-                  label: S.of(context).onboardingPageIndicator(
-                        _currentPage + 1,
-                        _totalPages,
-                      ),
+                  label: S
+                      .of(context)
+                      .onboardingPageIndicator(_currentPage + 1, _totalPages),
                   child: Row(
                     mainAxisAlignment: MainAxisAlignment.center,
                     children: List.generate(
                       _totalPages,
                       (index) => Container(
                         margin: const EdgeInsets.symmetric(
-                            horizontal: Dimen.spacingXs),
+                          horizontal: Dimen.spacingXs,
+                        ),
                         width: _currentPage == index
                             ? Dimen.spacingL
                             : Dimen.spacingS,
@@ -183,28 +183,21 @@ class _OnboardingPageState extends State<OnboardingPage> {
       child: Column(
         mainAxisAlignment: MainAxisAlignment.center,
         children: [
-          Icon(
-            icon,
-            size: Dimen.onboardingIconSize,
-            color: color,
-          ),
+          Icon(icon, size: Dimen.onboardingIconSize, color: color),
           const SizedBox(height: Dimen.spacingXl),
           Text(
             title,
-            style: Theme.of(context).textTheme.headlineMedium?.copyWith(
-                  fontWeight: FontWeight.bold,
-                ),
+            style: Theme.of(context).textTheme.headlineMedium
+                ?.copyWith(fontWeight: FontWeight.bold),
             textAlign: TextAlign.center,
           ),
           const SizedBox(height: Dimen.spacingM),
           Text(
             description,
             style: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                  color: Theme.of(context)
-                      .colorScheme
-                      .onSurface
-                      .withValues(alpha: 0.6),
-                ),
+              color: Theme.of(context).colorScheme.onSurface
+                  .withValues(alpha: 0.6),
+            ),
             textAlign: TextAlign.center,
           ),
         ],
diff --git a/app/lib/presentation/ui/pages/splash/splash_page.dart b/app/lib/presentation/ui/pages/splash/splash_page.dart
index 95ba5fd..1f75512 100644
--- a/app/lib/presentation/ui/pages/splash/splash_page.dart
+++ b/app/lib/presentation/ui/pages/splash/splash_page.dart
@@ -28,10 +28,6 @@ class _SplashPageState extends State<SplashPage> {
 
   @override
   Widget build(BuildContext context) {
-    return const Material(
-      child: Center(
-        child: CircularProgressIndicator(),
-      ),
-    );
+    return const Material(child: Center(child: CircularProgressIndicator()));
   }
 }
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index 9d2b9bd..1c8bb29 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -20,27 +20,27 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 version: 1.0.0+1
 
 environment:
-  sdk: ">=3.6.0 <4.0.0"
-  flutter: ">=3.41.0"
+  sdk: ^3.13.0
+  flutter: ">=3.47.0"
 
 dependencies:
   flutter:
     sdk: flutter
-  flutter_svg: ^2.2.0
-  shared_preferences: ^2.5.3
-  intl: ^0.20.2
-  intl_utils: ^2.8.14
-  cupertino_icons: ^1.0.5
-  dio: ^5.8.0
-  async: ^2.11.0
-  flutter_bloc: ^9.0.0
-  get_it: ^8.0.0
-  package_info_plus: ^8.3.0
-  permission_handler: ^12.0.0
-  universal_html: ^2.2.4
-  go_router: ^17.2.3
-  equatable: ^2.0.7
-  firebase_core: ^3.15.0
+  flutter_svg: ^2.3.0
+  shared_preferences: ^2.5.5
+  intl: ^0.20.3
+  intl_utils: ^2.8.16
+  cupertino_icons: ^1.0.9
+  dio: ^5.11.1
+  async: ^2.13.1
+  flutter_bloc: ^9.1.1
+  get_it: ^9.3.0
+  package_info_plus: ^10.2.1
+  permission_handler: ^13.0.2
+  universal_html: ^2.3.0
+  go_router: ^18.0.1
+  equatable: ^3.0.0
+  firebase_core: ^4.15.0
   flutter_localizations:
     sdk: flutter
   domain:
@@ -50,20 +50,20 @@ dependencies:
   data:
     path: ../modules/data
 
-  flutter_dotenv: ^5.2.1
+  flutter_dotenv: ^6.0.1
   flutter_web_plugins:
     sdk: flutter
-  app_links: ^6.4.1
+  app_links: ^7.2.1
   gap: ^3.0.1
 
 dev_dependencies:
   bloc_test: ^10.0.0
-  build_runner: ^2.15.0
-  flutter_gen:
+  build_runner: ^2.16.1
+  flutter_gen: ^5.15.0
   flutter_test:
     sdk: flutter
-  mocktail: ^1.0.4
-  flutter_lints: ^5.0.0
+  mocktail: ^1.0.5
+  flutter_lints: ^6.0.0
 
 flutter_intl:
   enabled: true # Required. Must be set to true to activate the package. Default: false
diff --git a/app/web/index.html b/app/web/index.html
index 7191736..4c29690 100644
--- a/app/web/index.html
+++ b/app/web/index.html
@@ -23,13 +23,13 @@
   <!-- iOS meta tags & icons -->
   <meta name="apple-mobile-web-app-capable" content="yes">
   <meta name="apple-mobile-web-app-status-bar-style" content="black">
-  <meta name="apple-mobile-web-app-title" content="flutter_base_rootstrap">
+  <meta name="apple-mobile-web-app-title" content="RS Base">
   <link rel="apple-touch-icon" href="icons/Icon-192.png">
 
   <!-- Favicon -->
   <link rel="icon" type="image/png" href="favicon.png"/>
 
-  <title>flutter_base_rootstrap</title>
+  <title>RS Base</title>
   <link rel="manifest" href="manifest.json">
 
   <script>
diff --git a/app/web/manifest.json b/app/web/manifest.json
index 90ecfce..c78c035 100644
--- a/app/web/manifest.json
+++ b/app/web/manifest.json
@@ -1,6 +1,6 @@
 {
-    "name": "flutter_base_rootstrap",
-    "short_name": "flutter_base_rootstrap",
+    "name": "RS Base",
+    "short_name": "RS Base",
     "start_url": ".",
     "display": "standalone",
     "background_color": "#0175C2",
diff --git a/docs/architecture/known-issues.md b/docs/architecture/known-issues.md
index 96a3891..2a2b78b 100644
--- a/docs/architecture/known-issues.md
+++ b/docs/architecture/known-issues.md
@@ -15,24 +15,23 @@ because other docs reference them.
   but the template still needs to settle on one layout.
 - `FlavorConfig.getEnvFilePath()` and `EnvConfig.envConfigFile` both return `env/.env.example` and are unused.
 - The doc comments tell you to create `env/.env` and add it to assets, but the code never loads `.env`.
-- `melos run run:web` runs the **prod** entrypoint (`lib/main.dart`) with `env/.dev`, so the flavor is PROD with dev values.
 - `app/pubspec.yaml` bundles all of `env/` as assets, so any secret placed there ships in the binary.
 - `Environment.clientSecret` / `portalUrl` read unsuffixed keys and are unused.
 
-**#3 Almost no tests, and CI fails before it checks anything.**
-The only tests are `modules/common/test` (`ResultType`) and `modules/domain/test` (`EnvConfig`). `app` and `data` have none. `.github/workflows/sonar-qube-scann.yml` is enabled for PRs and pushes to `main`,
-but its first step (`webfactory/ssh-agent`) fails because the `SSH_PRIVATE_KEY` secret isn't configured, so analyze,
-tests and SonarQube are skipped. No pub dependency is git-based, so the step isn't needed. The workflow also has no
-format-check or build step. `sonar.tests` lists `app/test`, which doesn't exist.
+**#3 Test coverage is thin, and iOS isn't built in CI.**
+The only app-code tests are `modules/common/test` (`ResultType`) and `modules/domain/test` (`EnvConfig`). `app` and
+`data` have none. (`tool/project_init` has its own suite.) CI (`ci.yml`) runs format, analyze, test and an Android debug
+build on every PR. The SonarQube workflow is project-only and needs the `SONAR_TOKEN`/`SONAR_URL` secrets. iOS builds
+are only validated locally.
 
 **#4 The analytics scaffolding isn't wired.**
 No `AnalyticsClient` is registered in GetIt, so any `TrackedPage` throws on first track. `routeObserver` isn't passed
 to `GoRouter(observers:)`, so the enter/exit events never fire. `FirebaseAnalytics` throws `UnimplementedError`, and
 `SetupAnalytics.initialize()` is never called. `firebase_core` is a dependency, but `Firebase.initializeApp` is commented out.
 
-**#5 Resolved (#120).** The iOS Release and QA xcconfigs and the README build commands now point at existing entrypoints.
-Still unverified with a real iOS build: the xcconfigs set `FLUTTER_TARGET` after including `Generated.xcconfig`, so they
-may override the target passed with `flutter build -t`.
+**#5 Resolved (#120, verified by iOS builds of every scheme).** The iOS xcconfigs point at existing entrypoints.
+Design note: they set `FLUTTER_TARGET` after including `Generated.xcconfig`, so a flavor always builds its own
+entrypoint, even if `flutter build -t` names another one.
 
 **#6 `addModule.py` copies from the wrong path.**
 It clones `rootstrap/flutter-modules` into `/Users/Shared` (a hardcoded macOS path) but copies from
@@ -63,25 +62,45 @@ That's acceptable, but it means "where business rules go" is by convention only
 
 ## Tooling and template hygiene
 
-**#12 Melos scripts.**
-`pub:runner` runs `dart run build_runner` in every package, but only `app` declares `build_runner` and no generators are
-configured, so it has nothing to do (and fails in packages without the dependency). `run:web` uses the prod entrypoint (see #2).
+**#12 Resolved.** `pub:runner` now only runs in packages that depend on `build_runner`, and `run:web` uses the dev
+entrypoint.
 
 **#13 Dependency hygiene.**
 - `intl_utils` (a code generator) is a runtime dependency of `app` and `common`, and `flutter_gen` is an unversioned
   `app` dev dependency that nothing uses.
-- Most test dependencies (`bloc_test`, `mocktail`, `build_runner`) are still unused (#3).
+- Most test dependencies (`bloc_test`, `mocktail`, `build_runner`) are still unused (#3). `equatable` is declared in
+  `app`, `data` and `domain` but not imported anywhere.
 
 **#14 Repository hygiene.**
-There are empty `.github/instructions/*.md.new` files. A stray `ios/Podfile` sits at the repo root: a default Flutter-generated
-Podfile that references a nonexistent `RunnerTests` target. The one the app uses is `app/ios/Podfile`. `app/linux/` contains only generated plugin registrant files (a partial platform). The template
-`README.md`/`CHANGELOG.md` are still in each module.
+There are empty `.github/instructions/*.md.new` files. `app/linux/` contains only generated plugin registrant files (a
+partial platform). The template `README.md`/`CHANGELOG.md` are still in each module.
 
 **#15 Documentation drift.**
-The root `README.md` advertises "Chat with Gemini and Vertex AI" and an "RS-GPT-Review" GitHub Action. Neither exists in
-this repo. It describes Bitrise CI, but there's no config for it, and its license badge points at `rootstrap/ios-base`.
+The root `README.md` was rewritten to match the code (it used to advertise a Gemini chat, an "RS-GPT-Review" action
+and Bitrise CI, none of which exist). The repository has no `LICENSE` file, so projects must add their own.
 `.cursor/rules/*.mdc` and `.github/instructions/*.instructions.md` prescribe conventions the code doesn't follow
 (PascalCase `AuthService.dart` file names, `ALL_CAPS` constants, "avoid global cubits", entity classes with a
 `parseFlexibleNumber` helper that doesn't exist). `CLAUDE.md` and `docs/` describe the actual code.
 
-**#16 Version sources disagree.** Pubspec `1.0.0+1`, iOS xcconfig `2.0.0`, and Android `build.properties` `1.0.0` (not read by Gradle).
+**#16 Resolved.** `app/pubspec.yaml` `version:` is the single source: the iOS xcconfigs no longer override
+`FLUTTER_BUILD_NAME/NUMBER`, and the unused version keys were removed from `android/build.properties`.
+
+## Toolchain (found during the Flutter 3.47 / Melos 8 upgrade)
+
+**#17 `melos run` re-splits forwarded arguments.** `melos run init -- --name "My App"` passes `My` and `App` separately.
+That is why `melos run init` prompts for its values, and why the documented non-interactive form calls
+`dart tool/project_init/bin/init.dart` directly.
+
+**#18 `firebase_core` is heavy and unused.** Under Swift Package Manager it pulls the whole `firebase-ios-sdk` package
+graph (including Firestore, gRPC and Analytics binaries, hundreds of MB) into every iOS build, and on Android it is the
+last plugin that applies the Kotlin Gradle Plugin itself (a build warning ahead of AGP's built-in Kotlin). Yet Firebase is
+never initialized (#4). Consider making it opt-in per project.
+
+**#19 Lock files are not committed.** `pubspec.lock` and SPM's `Package.resolved` are git-ignored (`*.lock` in the root
+`.gitignore`), so two checkouts can resolve different versions. Committing them is the usual choice for an application.
+
+**#20 compileSdk 37 is ahead of Flutter's default.** `permission_handler` 13 requires it, while Flutter 3.47 defaults to
+36, so machines and CI must install `platforms;android-37.0` (`ci.yml` does). `targetSdk` stays 36.
+
+**#21 AGP 9 compatibility flags.** `android/gradle.properties` sets `android.newDsl=false` and `android.builtInKotlin=false`,
+as the Flutter 3.47 template does. Both are transitional; revisit them when Flutter moves to the new DSL and built-in Kotlin.
diff --git a/docs/architecture/modules.md b/docs/architecture/modules.md
index 7486fa6..3757913 100644
--- a/docs/architecture/modules.md
+++ b/docs/architecture/modules.md
@@ -3,9 +3,12 @@
 A **module** is a local Dart/Flutter package under `modules/<name>/` with its own `pubspec.yaml`,
 `analysis_options.yaml`, and `lib/`. It is consumed through a `path:` dependency. The repo is a **Dart pub
 workspace**: the root `pubspec.yaml` lists every member under `workspace:`, each member sets
-`resolution: workspace`, and one shared `pubspec.lock` sits at the root. Melos 7 reads the same workspace, with
+`resolution: workspace`, and one shared `pubspec.lock` sits at the root. Melos 8 reads the same workspace, with
 its scripts under the root pubspec's `melos:` key. `melos bootstrap` resolves everything.
 
+`tool/project_init` is also a workspace member. It is tooling, not an architecture layer: it depends on no
+workspace package, and no package may depend on it.
+
 ## Packages
 
 | Package | pubspec `name` | Depends on (workspace) | Responsibility | Must NOT contain |
@@ -87,11 +90,11 @@ wrapper or a chat feature). Most features should **not** become modules. They go
 1. `cd modules && flutter create --template=package <name>`. The existing modules were generated this way and
    still carry the template README and CHANGELOG. Replace those.
 2. In `modules/<name>/pubspec.yaml`: set `publish_to: none` and `resolution: workspace`, match the environment
-   constraints of the other members (`sdk: ">=3.6.0 <4.0.0"`, `flutter: ">=3.41.0"`), and add only the workspace
+   constraints of the other members (`sdk: ^3.13.0`, `flutter: ">=3.47.0"`), and add only the workspace
    dependencies its layer allows (usually `common`, and `domain` if it implements domain interfaces).
 3. Add `modules/<name>` to the `workspace:` list in the root `pubspec.yaml`. Without it, `resolution: workspace` fails.
 4. Copy `analysis_options.yaml` from a sibling module (`include: package:flutter_lints/flutter.yaml`) and add
-   `flutter_lints: ^5.0.0` to its dev dependencies.
+   `flutter_lints: ^6.0.0` to its dev dependencies.
 5. Add `lib/init.dart` with `class <Name>Init { static Future<void> initialize(GetIt getIt) async { … } }`.
 6. Wire it: add a `path: ../modules/<name>` dependency in `app/pubspec.yaml` and call `<Name>Init.initialize(getIt)`
    in `app/lib/main/init.dart` at the right point in the order.
diff --git a/docs/architecture/overview.md b/docs/architecture/overview.md
index 613e1e5..1cb5724 100644
--- a/docs/architecture/overview.md
+++ b/docs/architecture/overview.md
@@ -162,10 +162,14 @@ naming in comments vs. `.dev` on disk, and the fact that bundled env files are r
 
 Platform flavor support:
 - **iOS:** build configurations `Debug/Release/Profile` × (`dev`, `qa`, and default), and schemes `Dev`, `QA`,
-  `Runner`. `ios/dev.xcconfig` / `ios/qa.xcconfig` / `ios/Flutter/*.xcconfig` set `FLUTTER_APP_ID`,
-  `FLUTTER_APP_NAME`, and `FLUTTER_TARGET`. Bundle ID = `com.rs.$(FLUTTER_APP_ID)` (+ `.debug.dev` / `.debug.qa`).
-- **Android:** no product flavors. `applicationId = "com.rs." + flutter.appId` from `android/build.properties`,
-  and the debug build type adds `.debug`. Environment selection is by `-t` entrypoint only.
+  `Runner`. `ios/Flutter/AppIdentity.xcconfig` holds `APP_BUNDLE_ID` and `APP_DISPLAY_NAME`. `ios/Flutter/Debug.xcconfig`,
+  `Release.xcconfig`, `ios/dev.xcconfig` and `ios/qa.xcconfig` include it and set `FLUTTER_TARGET` and `FLUTTER_APP_NAME`.
+  Bundle ID = `$(APP_BUNDLE_ID)` plus `.debug`, `.dev` or `.qa` suffixes; the full table is in
+  [project-initialization.md](../development/project-initialization.md#what-init-changes). Plugins are integrated
+  with Swift Package Manager (no CocoaPods), and the app uses the UIScene lifecycle (`FlutterSceneDelegate`).
+- **Android:** no product flavors. `android/build.properties` holds `flutter.applicationId`, `flutter.namespace` and
+  `flutter.appName` (the launcher label, via the `appLabel` manifest placeholder) plus the SDK levels. The debug build type
+  adds `.debug`. Environment selection is by `-t` entrypoint only.
 
 ## Error handling
 
diff --git a/docs/development/bootstrap-customization.md b/docs/development/bootstrap-customization.md
index 7ebe73c..78e82be 100644
--- a/docs/development/bootstrap-customization.md
+++ b/docs/development/bootstrap-customization.md
@@ -1,7 +1,8 @@
 # Bootstrap customization guide
 
 What to keep, what to change, and what to delete when starting a new project from this template.
-This complements the step-by-step setup in the root `README.md`.
+Start with `melos run init` ([project-initialization.md](project-initialization.md)): it applies the project identity
+everywhere. This page covers what comes after.
 
 ## What each part of the template is
 
@@ -11,26 +12,17 @@ This complements the step-by-step setup in the root `README.md`.
 | **Extension points** (customize) | `ThemeColors` palettes (`light_theme_colors.dart`, `dark_theme_colors.dart`); `LocalTheme` text styles + fonts; `Dimen`; `Images` enum; `.arb` files; `AnalyticsClient` implementation; `PermissionManager` methods; `Preferences` keys; `NetworkConstants`; `AuthTokenInterceptor` header/clear policy; `FlavorValues` (empty, for per-flavor values); `TrackedPage` | Designed to be filled in per project. |
 | **Example / reference** (replace) | Auth flow (`AuthRepositoryImpl` is a fake that sleeps and stores `'new-token'`), login/sign-up pages, onboarding (4 placeholder pages), home, splash, `/app/placeholder` route, `User` model, cookies banner, `EnvironmentSelector`, `DebugBanner` | They show the patterns. Rewrite them against your real backend and design, keeping the same shape. |
 | **Placeholders** (must replace) | See the checklist below | Leaving any of these in production is a defect. |
-| **Generated** (never hand-edit) | `app/lib/presentation/resources/locale/generated/**`; Flutter plugin registrants; `ios/Flutter/Generated.xcconfig` | Regenerate them instead. |
+| **Generated** (never hand-edit) | `app/lib/presentation/resources/locale/generated/**`; Flutter plugin registrants; `ios/Flutter/Generated.xcconfig`; `flutter_base.json` (the initializer's) | Regenerate them instead. |
 | **Protected boundaries** | Dependency rules in [modules.md](../architecture/modules.md#dependency-rules); interfaces in domain / impls in data; Common → Data → Domain init order | Changing these needs an explicit decision. |
 
 ## New-project checklist
 
 ### Identity
-- [ ] `android/build.properties`: `flutter.appId`, versions, SDK levels. The applicationId becomes `com.rs.<appId>`.
-  Change the `"com.rs."` prefix in `android/app/build.gradle` if you aren't using Rootstrap's namespace.
-- [ ] Android `namespace` and Kotlin package `com.rootstrap.base.flutter_base_rootstrap` (`android/app/build.gradle`,
-  `AndroidManifest.xml` `package`, `src/main/kotlin/.../MainActivity.kt`).
-- [ ] `android:label="flutter_base_rootstrap"` in `AndroidManifest.xml`.
-- [ ] iOS `FLUTTER_APP_ID` / `FLUTTER_APP_NAME` in `ios/Flutter/Debug.xcconfig`, `ios/Flutter/Release.xcconfig`,
-  `ios/dev.xcconfig`, and `ios/qa.xcconfig` ("RS Base …"). The bundle ID becomes `com.rs.$(FLUTTER_APP_ID)`, and the `com.rs.` prefix is
-  in `project.pbxproj` `PRODUCT_BUNDLE_IDENTIFIER`.
-- [ ] `CFBundleName` `flutter_base_rootstrap` in `ios/Runner/Info.plist`.
-- [ ] Web: `<title>` / `apple-mobile-web-app-title` in `web/index.html`, and `web/manifest.json` name, description, and colors.
-- [ ] `appName` ("Flutter Target") in the `.arb` files.
+- [ ] Run `melos run init`. It sets the app name, Dart package name, Android application ID and namespace (and moves
+  `MainActivity.kt`), the iOS bundle ID and display names, web titles, `appName`, and the Sonar project key and name.
+  Don't edit those by hand. The full list is in [project-initialization.md](project-initialization.md#what-init-changes).
 - [ ] Package descriptions ("A new Flutter project." / "A new Flutter package project.") and the template `README.md` /
   `CHANGELOG.md` in each `modules/*`.
-- [ ] Root `pubspec.yaml` `name: flutter_base_workspace` / `description`, if you want the workspace named after the project.
 - [ ] License: `app/LICENSE.md`, `modules/*/LICENSE` (MIT). Replace or remove them for private projects (the README says so).
 
 ### Environments
@@ -63,20 +55,16 @@ This complements the step-by-step setup in the root `README.md`.
 - [ ] Android: create a keystore and `android/key.properties` (git-ignored). `build.gradle` reads `storeFile`, `storePassword`,
   `keyAlias`, and `keyPassword`.
 - [ ] iOS: signing team and provisioning profiles in Xcode. None are committed, and the README marks this as TODO.
-- [ ] Versioning: `version:` in `app/pubspec.yaml` (1.0.0+1), which Flutter writes into `android/local.properties`, and that's what
-  `build.gradle` reads. The `flutter.versionName/Code` in `build.properties` are **not** read by Gradle. The iOS xcconfigs
-  also set `FLUTTER_BUILD_NAME/NUMBER` (2.0.0). These disagree today. Pick one source.
+- [ ] Versioning: `version:` in `app/pubspec.yaml` is the single source for Android and iOS. Bump it there, or pass
+  `--build-name` / `--build-number` to `flutter build`.
 
 ### CI/CD and quality
-- [ ] `.github/workflows/sonar-qube-scann.yml` runs on every PR and push to `main` (analyze, tests, coverage + SonarQube),
-  using the Flutter version from `.fvmrc`. Set the secrets `SONAR_TOKEN` and `SONAR_URL`. It also requires
-  `SSH_PRIVATE_KEY`, which is only needed for git-based pub dependencies (there are none), so either set it or drop the
-  `ssh-agent` step. Without it, the job fails at that step (known-issues #3).
+- [ ] `ci.yml` (format, analyze, test, Android build) needs no setup.
+- [ ] SonarQube starts running once the project is initialized. Add the repository secrets `SONAR_TOKEN` and `SONAR_URL`
+  (and `SSH_PRIVATE_KEY` only if you add git-based pub dependencies). `sonar-project.properties` gets its key and name
+  from `init`.
 - [ ] Bump the Flutter version with `fvm use <version>` and commit `.fvmrc`. CI follows it.
-- [ ] `sonar-project.properties`: `projectKey`, `projectName`, `host.url`. `sonar.tests` lists `app/test`, which doesn't
-  exist yet.
-- [ ] Add `melos run format` and a `flutter build` to CI. The current workflow runs neither (the README also mentions Bitrise
-  and an RS-GPT-Review action, but neither is configured in this repo).
+- [ ] iOS isn't built in CI. Add a macOS job if the project needs it.
 - [ ] `.github/pull_request_template.md`: adjust the issue-tracker link.
 
 ### Clean-up of examples
diff --git a/docs/development/project-initialization.md b/docs/development/project-initialization.md
new file mode 100644
index 0000000..9d5b142
--- /dev/null
+++ b/docs/development/project-initialization.md
@@ -0,0 +1,183 @@
+# Project initialization
+
+The Flutter Base is committed in a **template state**. A team turns a copy of it into a real project with one
+command, `melos run init`. This page describes that lifecycle, what the command changes, and what stays manual.
+
+```mermaid
+flowchart TD
+  A[Clone or "Use this template"] --> B[Template state<br/>flutter_base.json: state = template]
+  B --> C[melos run init]
+  C --> D[Provide identity<br/>name, package name, bundle ID]
+  D --> E[Validate everything, plan every edit]
+  E -->|any error| B
+  E --> F[Write Dart + Android + iOS + web + l10n + Sonar config<br/>state = initialized]
+  F --> G[Project-only automation enabled<br/>SonarQube workflow]
+  G --> H[melos bootstrap]
+  H --> I[melos run verify + builds]
+  I --> J[Ready for development]
+```
+
+## Template state vs initialized state
+
+`flutter_base.json` at the repository root is the single source of truth:
+
+```json
+{
+  "state": "template",
+  "identity": {
+    "displayName": "RS Base",
+    "packageName": "app",
+    "androidApplicationId": "com.rs.base",
+    "androidNamespace": "com.rootstrap.base.flutter_base_rootstrap",
+    "iosBundleId": "com.rs.base"
+  }
+}
+```
+
+- `state` is `template` in the Flutter Base repository and `initialized` in every project created from it.
+- `identity` records the values currently written into the repository. The initializer reads it to know what to
+  replace, so the template's own identifiers are never hardcoded in the tool.
+- The app has no runtime knowledge of the state. It is repository metadata for tooling and CI only.
+
+Scripts and CI read it with `jq -r '.state' flutter_base.json`. The SonarQube workflow does exactly that in its
+`gate` job and skips the scan unless the state is `initialized`. Dart tooling can use
+`ProjectState.read(root)` from `tool/project_init`.
+
+The template state is a real, buildable app: it analyzes, tests and builds on Android and iOS, and `ci.yml` runs in
+both states. Only project-specific automation is off.
+
+## Initialize a project
+
+```bash
+git clone <your new repository> && cd <your new repository>
+dart pub global activate fvm && fvm install      # Flutter 3.47.5 from .fvmrc
+dart pub global activate melos                   # Melos 8.9
+melos run init                                   # prompts for the values below
+melos bootstrap
+melos run verify
+```
+
+`melos run init` prompts for each value, suggests a package name derived from the app name, re-asks on invalid
+input, shows the full list of changes, and asks for confirmation. To run it non-interactively (scripts, CI, agents),
+call the script directly:
+
+```bash
+dart tool/project_init/bin/init.dart \
+  --name "My App" \
+  --package-name my_app \
+  --bundle-id com.company.myapp
+```
+
+Use the direct `dart` form whenever a value contains spaces: `melos run init -- --name "My App"` does **not** work,
+because Melos re-splits forwarded arguments on spaces. The initializer uses only `dart:` libraries, so it runs before
+`melos bootstrap`.
+
+### Parameters
+
+| Option | Required | Meaning | Rules |
+|---|---|---|---|
+| `--name` | yes | Display name: Android launcher label, iOS display name, web title, `appName` string | 1–50 characters, one line, no leading/trailing spaces. Must not contain `$`, `//` or `\`, or start with `@` or `?`, because those break xcconfig, `.properties` or Android resources. |
+| `--package-name` | yes | Dart package name of `app/`, and the workspace root name (`<name>_workspace`) | Lowercase letters, digits and `_`, starting with a letter. Not a Dart reserved word, not a workspace package (`common`, `data`, `domain`, `project_init`), and not the name of any package in the dependency graph, direct or indirect (for example `bloc`, which `flutter_bloc` pulls in). |
+| `--bundle-id` | yes, unless both platform IDs are given | Android `applicationId` + namespace and iOS bundle ID | At least two dot-separated segments. It must also satisfy the Android rules unless `--android-application-id` is given. |
+| `--android-application-id` | no | Android ID when it must differ (for example, iOS uses `-`) | Segments start with a letter, contain only letters, digits and `_`, and aren't Java/Kotlin keywords. It is also the namespace and the Kotlin package. |
+| `--ios-bundle-id` | no | iOS ID when it must differ | Segments contain only letters, digits and `-`. |
+| `--dry-run` | no | Validate and list the changes without writing | |
+
+Exit codes: `0` success, `1` invalid input or error, `2` usage error, `3` already initialized.
+
+### Safety
+
+- Every value is validated before anything is planned, and every edit is computed in memory first. Each one is an
+  exact replacement of the value recorded in `flutter_base.json`. If any expected value is missing (the template
+  drifted), the run stops and **no file is written**.
+- The files are then written together. If a write fails, every file is restored, and moved files are put back.
+- **Running it again is refused** (exit code 3) with a message naming the current identity. Nothing is re-applied.
+  After initialization, change identifiers by hand, or start again from a fresh copy of the base.
+
+## What `init` changes
+
+| Area | File(s) | Change |
+|---|---|---|
+| State | `flutter_base.json` | `state` → `initialized`, and `identity` → the new values |
+| Workspace | `pubspec.yaml` | `name: <package>_workspace` |
+| Dart package | `app/pubspec.yaml`, `app/lib/**`, `app/test/**` | `name: <package>`, and every `package:app/` import |
+| Android | `app/android/build.properties` | `flutter.applicationId`, `flutter.namespace`, `flutter.appName` (the launcher label, via a manifest placeholder) |
+| Android sources | `app/android/app/src/main/kotlin/<package path>/` | `MainActivity.kt` moves to the new package directory, its `package` line is updated, and empty old directories are removed |
+| iOS | `app/ios/Flutter/AppIdentity.xcconfig` | `APP_BUNDLE_ID` and `APP_DISPLAY_NAME`. Every build configuration derives from them (see below) |
+| Web | `app/web/index.html`, `app/web/manifest.json` | Title and app names |
+| Localization | `intl_*.arb`, `locale/generated/**` | `appName`, written with intl_utils' escaping and then formatted |
+| SonarQube | `sonar-project.properties` | `sonar.projectKey=<package>`, `sonar.projectName=<name>` |
+
+iOS configurations derive from `AppIdentity.xcconfig`:
+
+| Configuration | Bundle ID | Display name |
+|---|---|---|
+| Release / Profile (`Runner` scheme) | `<id>` | `<name>` |
+| Debug (`Runner` scheme) | `<id>.debug` | `<name> Debug <version>` |
+| Release/Profile dev, Debug dev (`Dev` scheme) | `<id>.dev`, `<id>.debug.dev` | `<name> Dev` |
+| Release/Profile qa, Debug qa (`QA` scheme) | `<id>.qa`, `<id>.debug.qa` | `<name> QA`, `<name> QA <version>` |
+
+Android debug builds add `.debug` to the application ID. Android has no product flavors.
+
+What the initializer deliberately does **not** rename: the shared modules (`common`, `data`, `domain`), their
+package names and imports, the `Runner` target and schemes, folder names (`app/`, `modules/`), and the
+documentation, which describes the template.
+
+## What remains manual
+
+These need values the initializer cannot know, and it never invents them:
+
+- **Environments:** real API URLs and secrets in `app/env/` (one file per flavor; `ENV=<flavor>` selects
+  `env/.<flavor>`). Everything in `app/env/` is bundled into the app. See
+  [overview.md § Environments](../architecture/overview.md#environments-and-flavors).
+- **Android release signing:** `app/android/key.properties` (`storeFile`, `storePassword`, `keyAlias`, `keyPassword`).
+  Without it, release builds are signed with the debug key.
+- **iOS signing:** the development team and provisioning, in Xcode.
+- **Firebase** (optional): uncomment `Firebase.initializeApp` in the entrypoints and add the platform config files.
+- **SonarQube:** the repository secrets `SONAR_TOKEN` and `SONAR_URL`. `SSH_PRIVATE_KEY` is only needed for git
+  dependencies.
+- **Branding:** icons, launch screens, colors and fonts. See [bootstrap-customization.md](bootstrap-customization.md).
+- **LICENSE and README** for the new project.
+
+## Verify an initialization
+
+```bash
+jq -r .state flutter_base.json                    # initialized
+melos bootstrap && melos run verify               # format, analyze, test
+cd app
+flutter build apk --debug -t lib/main/env/main_dev.dart --dart-define-from-file=env/.dev
+"$ANDROID_HOME"/build-tools/<version>/aapt2 dump badging build/app/outputs/flutter-apk/app-debug.apk | head -3
+flutter build ios --simulator --debug -t lib/main/env/main_dev.dart --dart-define-from-file=env/.dev
+/usr/libexec/PlistBuddy -c 'Print CFBundleIdentifier' build/ios/iphonesimulator/Runner.app/Info.plist
+```
+
+The APK should report `<android id>.debug` and your app name, and the simulator build `<ios id>.debug`.
+
+## Toolchain requirements
+
+| Tool | Version | Notes |
+|---|---|---|
+| Flutter / Dart | 3.47.5 / 3.13.4 | Pinned in `.fvmrc`. Packages require `sdk: ^3.13.0`, `flutter: >=3.47.0`. Update with `fvm use <version>` |
+| Melos | 8.9 | `dart pub global activate melos`. The workspace pins `melos: ^8.9.0`, and the global CLI delegates to it |
+| JDK | 17 | Gradle 9.3.1, Android Gradle Plugin 9.1.0, Kotlin 2.4.0 |
+| Android SDK | platform 37 (compileSdk), target 36, min 24 | `sdkmanager "platforms;android-37.0"`. compileSdk 37 is required by `permission_handler` 13. NDK 28.2 is installed by Gradle on first build |
+| Xcode | with the iOS 15.0+ SDK (validated with Xcode 27) | Deployment target iOS 15.0 |
+| CocoaPods | not needed | iOS uses Swift Package Manager, Flutter's default. If you add a plugin without SPM support, Flutter recreates a Podfile; see the note below |
+
+If a future plugin needs CocoaPods, Flutter adds `#include?` lines for the Pods xcconfigs to `ios/Flutter/Debug.xcconfig`
+and `Release.xcconfig`. The flavor files `ios/dev.xcconfig` and `ios/qa.xcconfig` serve three configurations each,
+so they would need one xcconfig per configuration to include the matching `Pods-Runner.<config>.xcconfig`.
+
+## Maintaining the initializer
+
+The initializer lives in `tool/project_init/`. It is a pure-Dart workspace member, so `melos run verify` analyzes and
+tests it. Its tests copy this repository (the files git tracks) into a temporary directory, initialize it, and check
+every location above, including re-runs, invalid input and drift.
+
+When you change a template file the initializer edits (or add a new place that holds project identity), update
+`lib/src/plan.dart` and the tests in the same change. If you don't, `melos run test` fails with a
+`TemplateDriftException` naming the file.
+
+The initializer runs before `melos bootstrap`, when there is no `pubspec.lock`, so the names the app package can't
+take are listed in `lib/src/resolved_packages.dart` (every package in the resolved dependency graph). When you add or
+upgrade a dependency that brings in a new package, `melos run test` fails and lists the names to add to that file.
diff --git a/docs/development/testing.md b/docs/development/testing.md
index bc172b5..aa7c34a 100644
--- a/docs/development/testing.md
+++ b/docs/development/testing.md
@@ -8,23 +8,23 @@
 - The test dependencies are declared but unused:
   - `app`: `flutter_test`, `bloc_test`, `mocktail`, `build_runner`
   - `domain`, `data`: `flutter_test`, `mocktail`
+  - `tool/project_init` (pure Dart): `test`. Its suite initializes a temporary copy of the repository
   - `common`: `flutter_test` only
 - There's no coverage threshold. Coverage is collected and uploaded to SonarQube by `coverage/full_coverage.py`.
-- CI (`.github/workflows/sonar-qube-scann.yml`) runs the command in the first row below, but it currently fails before
-  reaching the tests (known-issues #3).
+- CI (`.github/workflows/ci.yml`) runs `melos run verify` (format, analyze, test) on every PR.
 
 ## Commands
 
 | What | Command |
 |---|---|
-| All packages (what CI runs) | `melos exec --dir-exists=test -- flutter test` (from the repo root) |
-| One package | `cd <pkg> && flutter test` |
+| All packages (what CI runs) | `melos run test` (from the repo root; `flutter test` in Flutter packages, `dart test` in pure-Dart ones) |
+| One package | `cd <pkg> && flutter test` (`dart test` in `tool/project_init`) |
 | One file | `flutter test test/path/to/file_test.dart` (from the package dir) |
 | Coverage for one package | `flutter test --coverage` → `<pkg>/coverage/lcov.info` |
 | Merged coverage + Sonar | `python3 coverage/full_coverage.py` (interactive), `--ci`, or `--dry-run` |
 
 Use `fvm flutter` if `flutter` isn't aliased to the pinned SDK. A package's tests only run once it has a `test/`
-directory: `melos exec --dir-exists=test` and `full_coverage.py` (which iterates the packages listed in
+directory: `melos run test` and `full_coverage.py` (which iterates the packages listed in
 `sonar.sources`) both skip packages without one.
 
 ## Expected conventions for new tests
@@ -46,8 +46,11 @@ These follow from the declared dev dependencies and the architecture. Keep new s
   Anything that reads `getIt` needs registrations in `setUp`. Call `GetIt.instance.reset()` in `tearDown`.
 - **Mocks**: use `mocktail` (no codegen). It's the only mocking library declared. Don't add `mockito`, which needs
   build_runner and produces generated `*.mocks.dart` files.
-- When you add a package's first tests, make sure `<pkg>/test` is in `sonar.tests` in `sonar-project.properties`. It
-  currently lists `app/test` (not created yet), `modules/domain/test` and `modules/common/test`.
+- When you add a package's first tests, add `<pkg>/test` to `sonar.tests` in `sonar-project.properties`. It
+  currently lists `modules/common/test` and `modules/domain/test`, which are the directories that exist.
+- Changing a template file the initializer edits? Run `cd tool/project_init && dart test`; it fails on drift.
+- Added or upgraded a dependency? The same tests fail if it brings in a package missing from
+  `tool/project_init/lib/src/resolved_packages.dart`; add the names they report.
 
 ## What a change must test
 
diff --git a/flutter_base.json b/flutter_base.json
new file mode 100644
index 0000000..3a1cbe2
--- /dev/null
+++ b/flutter_base.json
@@ -0,0 +1,11 @@
+{
+  "$comment": "Managed by the project initializer (melos run init). \"template\" means this is the Flutter Base itself; \"initialized\" means it is a project created from it. CI reads \"state\" to decide whether project-only automation runs. See docs/development/project-initialization.md.",
+  "state": "template",
+  "identity": {
+    "displayName": "RS Base",
+    "packageName": "app",
+    "androidApplicationId": "com.rs.base",
+    "androidNamespace": "com.rootstrap.base.flutter_base_rootstrap",
+    "iosBundleId": "com.rs.base"
+  }
+}
diff --git a/ios/Podfile b/ios/Podfile
deleted file mode 100644
index 620e46e..0000000
--- a/ios/Podfile
+++ /dev/null
@@ -1,43 +0,0 @@
-# Uncomment this line to define a global platform for your project
-# platform :ios, '13.0'
-
-# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
-ENV['COCOAPODS_DISABLE_STATS'] = 'true'
-
-project 'Runner', {
-  'Debug' => :debug,
-  'Profile' => :release,
-  'Release' => :release,
-}
-
-def flutter_root
-  generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
-  unless File.exist?(generated_xcode_build_settings_path)
-    raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
-  end
-
-  File.foreach(generated_xcode_build_settings_path) do |line|
-    matches = line.match(/FLUTTER_ROOT\=(.*)/)
-    return matches[1].strip if matches
-  end
-  raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
-end
-
-require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
-
-flutter_ios_podfile_setup
-
-target 'Runner' do
-  use_frameworks!
-
-  flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
-  target 'RunnerTests' do
-    inherit! :search_paths
-  end
-end
-
-post_install do |installer|
-  installer.pods_project.targets.each do |target|
-    flutter_additional_ios_build_settings(target)
-  end
-end
diff --git a/modules/common/analysis_options.yaml b/modules/common/analysis_options.yaml
index a5744c1..e46654b 100644
--- a/modules/common/analysis_options.yaml
+++ b/modules/common/analysis_options.yaml
@@ -1,3 +1,6 @@
+analyzer:
+  exclude:
+    - build/**
 include: package:flutter_lints/flutter.yaml
 
 # Additional information about this file can be found at
diff --git a/modules/common/lib/core/failure/failure_mapper.dart b/modules/common/lib/core/failure/failure_mapper.dart
index 71001f2..2dd28ae 100644
--- a/modules/common/lib/core/failure/failure_mapper.dart
+++ b/modules/common/lib/core/failure/failure_mapper.dart
@@ -8,6 +8,7 @@ extension FailureMapper on DioException {
       case DioExceptionType.connectionTimeout:
       case DioExceptionType.sendTimeout:
       case DioExceptionType.receiveTimeout:
+      case DioExceptionType.transformTimeout:
         return SocketTimeOutFailure(message);
       case DioExceptionType.badResponse:
         return HttpFailure(response?.statusCode, name: message);
diff --git a/modules/common/lib/core/resource.dart b/modules/common/lib/core/resource.dart
index b97ef96..8cea132 100644
--- a/modules/common/lib/core/resource.dart
+++ b/modules/common/lib/core/resource.dart
@@ -10,10 +10,8 @@ class Resource<T> {
 
   RLoading<T> isLoading() => RLoading<T>(data: data);
 
-  RError<T> isError({Exception? exception}) => RError<T>(
-        exception: exception,
-        data: data,
-      );
+  RError<T> isError({Exception? exception}) =>
+      RError<T>(exception: exception, data: data);
 }
 
 class RLoading<T> extends Resource<T> {
@@ -27,11 +25,7 @@ class RSuccess<T> extends Resource<T> {
 class RError<T> extends Resource<T> {
   RError({super.state = RState.error, super.data, required super.exception});
 
-  get message => exception?.toString();
+  String? get message => exception?.toString();
 }
 
-enum RState {
-  loading,
-  success,
-  error;
-}
+enum RState { loading, success, error }
diff --git a/modules/common/lib/devices/permissions/abstract/permission_manager.dart b/modules/common/lib/devices/permissions/abstract/permission_manager.dart
index 24e1b5d..6c784c2 100644
--- a/modules/common/lib/devices/permissions/abstract/permission_manager.dart
+++ b/modules/common/lib/devices/permissions/abstract/permission_manager.dart
@@ -17,5 +17,5 @@ enum AppPermissionStatus {
   deniedPermanently,
 
   /// i.e when location permission is granted only when the app is in use
-  limited
+  limited,
 }
diff --git a/modules/common/lib/devices/permissions/concrete/web/_permissions_web.dart b/modules/common/lib/devices/permissions/concrete/web/_permissions_web.dart
index 7d74c8e..b71fb2a 100644
--- a/modules/common/lib/devices/permissions/concrete/web/_permissions_web.dart
+++ b/modules/common/lib/devices/permissions/concrete/web/_permissions_web.dart
@@ -4,12 +4,15 @@ import 'package:universal_html/html.dart' as html;
 class AppPermissions extends PermissionManager {
   @override
   Future<AppPermissionStatus> requestCameraPermission() async {
-    final permission =
-        await html.window.navigator.permissions?.query({"name": "camera"});
+    final permission = await html.window.navigator.permissions?.query({
+      "name": "camera",
+    });
     if (_permissionStatus(permission) != AppPermissionStatus.granted) {
       await html.window.navigator.getUserMedia(video: true);
-      final check = await html.window.navigator.permissions
-          ?.query({"request": "", "name": "camera"});
+      final check = await html.window.navigator.permissions?.query({
+        "request": "",
+        "name": "camera",
+      });
       return _permissionStatus(check);
     }
     return AppPermissionStatus.granted;
diff --git a/modules/common/lib/devices/platform/abstract/app_platform.dart b/modules/common/lib/devices/platform/abstract/app_platform.dart
index 92fdacf..39abf81 100644
--- a/modules/common/lib/devices/platform/abstract/app_platform.dart
+++ b/modules/common/lib/devices/platform/abstract/app_platform.dart
@@ -1,19 +1,19 @@
 import 'package:common/devices/platform/abstract/platform_info.dart';
 
 abstract class AppPlatform {
-  get isWeb => false;
+  bool get isWeb => false;
 
-  get isMacOS => false;
+  bool get isMacOS => false;
 
-  get isFuchsia => false;
+  bool get isFuchsia => false;
 
-  get isLinux => false;
+  bool get isLinux => false;
 
-  get isWindows => false;
+  bool get isWindows => false;
 
-  get isIOS => false;
+  bool get isIOS => false;
 
-  get isAndroid => false;
+  bool get isAndroid => false;
 
   PlatformType get currentPlatform {
     if (isWeb) return PlatformType.web;
diff --git a/modules/common/lib/ui/responsive.dart b/modules/common/lib/ui/responsive.dart
index a614312..2cae3f1 100644
--- a/modules/common/lib/ui/responsive.dart
+++ b/modules/common/lib/ui/responsive.dart
@@ -33,11 +33,7 @@ class ResponsiveBuilder extends StatelessWidget {
       builder = medium ?? big;
     }
 
-    return builder.call(
-      context,
-      orientation,
-      platform,
-    );
+    return builder.call(context, orientation, platform);
   }
 }
 
diff --git a/modules/common/lib/validators/form_validator.dart b/modules/common/lib/validators/form_validator.dart
index 31dedc4..b8a7e5f 100644
--- a/modules/common/lib/validators/form_validator.dart
+++ b/modules/common/lib/validators/form_validator.dart
@@ -4,7 +4,8 @@ class FormValidator {
       return false;
     }
     final emailRegex = RegExp(
-        r"^[a-zA-Z0-9.a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9]+\.[a-zA-Z]+");
+      r"^[a-zA-Z0-9.a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9]+\.[a-zA-Z]+",
+    );
     return emailRegex.hasMatch(value);
   }
 
@@ -15,7 +16,8 @@ class FormValidator {
     }
     // At least 8 characters, one uppercase, one lowercase, one number and one special character
     final passwordRegex = RegExp(
-        r'^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{8,}$');
+      r'^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{8,}$',
+    );
     return passwordRegex.hasMatch(value);
   }
 }
diff --git a/modules/common/pubspec.yaml b/modules/common/pubspec.yaml
index 1564241..6269466 100644
--- a/modules/common/pubspec.yaml
+++ b/modules/common/pubspec.yaml
@@ -5,29 +5,29 @@ version: 0.0.1
 resolution: workspace
 
 environment:
-  sdk: ">=3.6.0 <4.0.0"
-  flutter: ">=3.41.0"
+  sdk: ^3.13.0
+  flutter: ">=3.47.0"
 
 dependencies:
   flutter:
     sdk: flutter
-  intl: ^0.20.2
-  intl_utils: ^2.8.14
-  cupertino_icons: ^1.0.5
-  async: ^2.11.0
-  flutter_bloc: ^9.0.0
-  get_it: ^8.0.0
-  package_info_plus: ^8.3.0
-  permission_handler: ^12.0.0
-  universal_html: ^2.2.4
-  dio: ^5.8.0
+  intl: ^0.20.3
+  intl_utils: ^2.8.16
+  cupertino_icons: ^1.0.9
+  async: ^2.13.1
+  flutter_bloc: ^9.1.1
+  get_it: ^9.3.0
+  package_info_plus: ^10.2.1
+  permission_handler: ^13.0.2
+  universal_html: ^2.3.0
+  dio: ^5.11.1
   flutter_localizations:
     sdk: flutter
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^5.0.0
+  flutter_lints: ^6.0.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
diff --git a/modules/common/test/core/result_type_test.dart b/modules/common/test/core/result_type_test.dart
index daa644f..522dfbf 100644
--- a/modules/common/test/core/result_type_test.dart
+++ b/modules/common/test/core/result_type_test.dart
@@ -13,8 +13,7 @@ void main() {
       expect(received, same(failure));
     });
 
-    test('keeps the original error when the callback returns no Exception',
-        () {
+    test('keeps the original error when the callback returns no Exception', () {
       final failure = UnexpectedFailure('boom');
 
       final result = TError<int>(failure).mapError((_) {});
diff --git a/modules/data/analysis_options.yaml b/modules/data/analysis_options.yaml
index a5744c1..e46654b 100644
--- a/modules/data/analysis_options.yaml
+++ b/modules/data/analysis_options.yaml
@@ -1,3 +1,6 @@
+analyzer:
+  exclude:
+    - build/**
 include: package:flutter_lints/flutter.yaml
 
 # Additional information about this file can be found at
diff --git a/modules/data/lib/init.dart b/modules/data/lib/init.dart
index af0612e..f3eb005 100644
--- a/modules/data/lib/init.dart
+++ b/modules/data/lib/init.dart
@@ -22,18 +22,18 @@ class DataInit {
 
     // Network
     getIt.registerLazySingleton<AuthTokenInterceptor>(
-        () => AuthTokenInterceptor(getIt()));
+      () => AuthTokenInterceptor(getIt()),
+    );
     getIt.registerLazySingleton<Dio>(() => NetworkConfig.provideDio(getIt()));
     getIt.registerLazySingleton<EnvironmentService>(
-        () => EnvironmentServiceImpl(getIt()));
+      () => EnvironmentServiceImpl(getIt()),
+    );
 
     // Data Sources
 
     // Repositories
     getIt.registerLazySingleton<AuthRepository>(
-      () => AuthRepositoryImpl(
-        getIt(),
-      ),
+      () => AuthRepositoryImpl(getIt()),
     );
     getIt.registerLazySingleton<CommonRepository>(
       () => CommonRepositoryImpl(getIt()),
diff --git a/modules/data/lib/network/config/network_config.dart b/modules/data/lib/network/config/network_config.dart
index c130d50..4cc6bce 100644
--- a/modules/data/lib/network/config/network_config.dart
+++ b/modules/data/lib/network/config/network_config.dart
@@ -9,26 +9,24 @@ class NetworkConfig {
   static Dio provideDio(AuthTokenInterceptor? authTokenInterceptor) {
     final options = BaseOptions(
       baseUrl: EnvConfig.apiUrl,
-      connectTimeout: const Duration(
-        seconds: NetworkConstants.connectTimeout,
-      ),
-      receiveTimeout: const Duration(
-        seconds: NetworkConstants.receiveTimeout,
-      ),
+      connectTimeout: const Duration(seconds: NetworkConstants.connectTimeout),
+      receiveTimeout: const Duration(seconds: NetworkConstants.receiveTimeout),
     );
 
     final dio = Dio(options);
 
     // Add debug logging only in debug mode
     if (kDebugMode) {
-      dio.interceptors.add(LogInterceptor(
-        requestBody: true,
-        responseBody: true,
-        requestHeader: true,
-        responseHeader: true,
-        error: true,
-        logPrint: (object) => debugPrint(object.toString()),
-      ));
+      dio.interceptors.add(
+        LogInterceptor(
+          requestBody: true,
+          responseBody: true,
+          requestHeader: true,
+          responseHeader: true,
+          error: true,
+          logPrint: (object) => debugPrint(object.toString()),
+        ),
+      );
     }
 
     if (authTokenInterceptor != null) {
diff --git a/modules/data/lib/network/config/network_constants.dart b/modules/data/lib/network/config/network_constants.dart
index 16ec30d..a0ba2c5 100644
--- a/modules/data/lib/network/config/network_constants.dart
+++ b/modules/data/lib/network/config/network_constants.dart
@@ -3,8 +3,7 @@ class NetworkConstants {
   static const receiveTimeout = 2;
   //static const baseUrl =  String.fromEnvironment('API_URL', defaultValue: "NA");
   static const productsPath = "/products";
-  static const baseUrl =
-      "http://www.example.com"; // To get started: comment this and uncomment line 4
+  static const baseUrl = "http://www.example.com"; // To get started: comment this and uncomment line 4
   static const tokenHeader = "token";
   static const unauthorizedStatusCode = 401;
   static const forbiddenStatusCode = 403;
diff --git a/modules/data/lib/network/interceptors/auth_token_interceptor.dart b/modules/data/lib/network/interceptors/auth_token_interceptor.dart
index e073576..37ffe18 100644
--- a/modules/data/lib/network/interceptors/auth_token_interceptor.dart
+++ b/modules/data/lib/network/interceptors/auth_token_interceptor.dart
@@ -16,13 +16,11 @@ class AuthTokenInterceptor extends Interceptor {
     try {
       final token = _preferences.getToken();
       if (token != null && token.isNotEmpty) {
-        options.headers.addAll(
-          {
-            NetworkConstants.tokenHeader: token,
-            NetworkConstants.contentTypeHeader:
-                NetworkConstants.applicationJsonContentType,
-          },
-        );
+        options.headers.addAll({
+          NetworkConstants.tokenHeader: token,
+          NetworkConstants.contentTypeHeader:
+              NetworkConstants.applicationJsonContentType,
+        });
       } else {
         await _clearCredentials();
       }
diff --git a/modules/data/lib/repositories/auth_repository_impl.dart b/modules/data/lib/repositories/auth_repository_impl.dart
index 9c3d51a..2f351f3 100644
--- a/modules/data/lib/repositories/auth_repository_impl.dart
+++ b/modules/data/lib/repositories/auth_repository_impl.dart
@@ -16,10 +16,7 @@ class AuthRepositoryImpl implements AuthRepository {
   }
 
   @override
-  Future<ResultType<void>> login(
-    String username,
-    String password,
-  ) async {
+  Future<ResultType<void>> login(String username, String password) async {
     await Future.delayed(const Duration(seconds: 1));
     _preferences.setToken('new-token');
     return TSuccess(null);
@@ -31,10 +28,7 @@ class AuthRepositoryImpl implements AuthRepository {
   }
 
   @override
-  Future<ResultType<void>> signUp(
-    String username,
-    String password,
-  ) async {
+  Future<ResultType<void>> signUp(String username, String password) async {
     await Future.delayed(const Duration(seconds: 1));
     _preferences.setToken('new-token');
     return TSuccess(null);
diff --git a/modules/data/pubspec.yaml b/modules/data/pubspec.yaml
index 1ab3654..a336114 100644
--- a/modules/data/pubspec.yaml
+++ b/modules/data/pubspec.yaml
@@ -6,18 +6,18 @@ publish_to: none
 resolution: workspace
 
 environment:
-  sdk: ">=3.6.0 <4.0.0"
-  flutter: ">=3.41.0"
+  sdk: ^3.13.0
+  flutter: ">=3.47.0"
 
 dependencies:
   flutter:
     sdk: flutter
-  shared_preferences: ^2.5.3
-  dio: ^5.8.0
-  async: ^2.11.0
-  flutter_bloc: ^9.0.0
-  get_it: ^8.0.0
-  equatable: ^2.0.7
+  shared_preferences: ^2.5.5
+  dio: ^5.11.1
+  async: ^2.13.1
+  flutter_bloc: ^9.1.1
+  get_it: ^9.3.0
+  equatable: ^3.0.0
   flutter_localizations:
     sdk: flutter
   domain:
@@ -28,8 +28,8 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^5.0.0
-  mocktail: ^1.0.4
+  flutter_lints: ^6.0.0
+  mocktail: ^1.0.5
 
 #connectivity_plus: ^5.0.2. Steps to add connectivity plus:
 #Add platform :ios, '12.0' in ios/Podfile and check no new crashings are in ios 16
diff --git a/modules/domain/analysis_options.yaml b/modules/domain/analysis_options.yaml
index a5744c1..e46654b 100644
--- a/modules/domain/analysis_options.yaml
+++ b/modules/domain/analysis_options.yaml
@@ -1,3 +1,6 @@
+analyzer:
+  exclude:
+    - build/**
 include: package:flutter_lints/flutter.yaml
 
 # Additional information about this file can be found at
diff --git a/modules/domain/lib/bloc/app/app_cubit.dart b/modules/domain/lib/bloc/app/app_cubit.dart
index 0f07fcd..2ad5aae 100644
--- a/modules/domain/lib/bloc/app/app_cubit.dart
+++ b/modules/domain/lib/bloc/app/app_cubit.dart
@@ -8,10 +8,12 @@ class AppCubit extends Cubit<AppState> {
   final CommonRepository _commonRepository;
 
   AppCubit(this._commonRepository)
-      : super(AppState(
+    : super(
+        AppState(
           themeType: _commonRepository.getTheme(),
           appLang: _commonRepository.getAppLang(),
-        ));
+        ),
+      );
 
   void updateTheme(ThemeType theme) {
     _commonRepository.setTheme(theme);
@@ -25,9 +27,6 @@ class AppCubit extends Cubit<AppState> {
 
   Future<void> resetApp() async {
     await _commonRepository.deepClean();
-    emit(AppState(
-      themeType: ThemeType.light,
-      appLang: AppLang.en,
-    ));
+    emit(AppState(themeType: ThemeType.light, appLang: AppLang.en));
   }
 }
diff --git a/modules/domain/lib/bloc/app/app_state.dart b/modules/domain/lib/bloc/app/app_state.dart
index 3488442..da410c4 100644
--- a/modules/domain/lib/bloc/app/app_state.dart
+++ b/modules/domain/lib/bloc/app/app_state.dart
@@ -5,15 +5,9 @@ class AppState {
   final ThemeType themeType;
   final AppLang appLang;
 
-  AppState({
-    required this.themeType,
-    required this.appLang,
-  });
+  AppState({required this.themeType, required this.appLang});
 
-  AppState copyWith({
-    ThemeType? themeType,
-    AppLang? appLang,
-  }) {
+  AppState copyWith({ThemeType? themeType, AppLang? appLang}) {
     return AppState(
       themeType: themeType ?? this.themeType,
       appLang: appLang ?? this.appLang,
diff --git a/modules/domain/lib/bloc/auth/auth_cubit.dart b/modules/domain/lib/bloc/auth/auth_cubit.dart
index b4cdda7..c5452eb 100644
--- a/modules/domain/lib/bloc/auth/auth_cubit.dart
+++ b/modules/domain/lib/bloc/auth/auth_cubit.dart
@@ -8,25 +8,16 @@ class AuthCubit extends BaseCubit<AuthState> {
   final AuthService _authService;
   AuthCubit(this._authService) : super(RSuccess(data: AuthStateUnknown()));
 
-  Future<void> login({
-    required String email,
-    required String password,
-  }) async {
+  Future<void> login({required String email, required String password}) async {
     isLoading();
-    final authResult = await _authService.logInWithCredentials(
-      email,
-      password,
-    );
+    final authResult = await _authService.logInWithCredentials(email, password);
 
     authResult
       ..mapSuccess((_) => isLogin())
       ..mapError((failure) => isError(failure));
   }
 
-  Future<void> signUp({
-    required String email,
-    required String password,
-  }) async {
+  Future<void> signUp({required String email, required String password}) async {
     isLoading();
     final signUpResult = await _authService.signUpWithCredentials(
       email,
diff --git a/modules/domain/lib/models/user.dart b/modules/domain/lib/models/user.dart
index 1a6e761..63e6e7c 100644
--- a/modules/domain/lib/models/user.dart
+++ b/modules/domain/lib/models/user.dart
@@ -2,8 +2,5 @@ class User {
   final String name;
   final String lastName;
 
-  const User({
-    required this.name,
-    required this.lastName,
-  });
+  const User({required this.name, required this.lastName});
 }
diff --git a/modules/domain/lib/services/auth_service.dart b/modules/domain/lib/services/auth_service.dart
index 2b8dddd..963e06a 100644
--- a/modules/domain/lib/services/auth_service.dart
+++ b/modules/domain/lib/services/auth_service.dart
@@ -9,14 +9,12 @@ class AuthService {
   Future<ResultType<void>> logInWithCredentials(
     String username,
     String password,
-  ) =>
-      _authRepository.login(username, password);
+  ) => _authRepository.login(username, password);
 
   Future<ResultType<void>> signUpWithCredentials(
     String username,
     String password,
-  ) =>
-      _authRepository.signUp(username, password);
+  ) => _authRepository.signUp(username, password);
 
   bool isLoggedIn() => _authRepository.isLoggedIn();
 
diff --git a/modules/domain/pubspec.yaml b/modules/domain/pubspec.yaml
index bb89432..9f1c2dd 100644
--- a/modules/domain/pubspec.yaml
+++ b/modules/domain/pubspec.yaml
@@ -6,17 +6,17 @@ publish_to: none
 resolution: workspace
 
 environment:
-  sdk: ">=3.6.0 <4.0.0"
-  flutter: ">=3.41.0"
+  sdk: ^3.13.0
+  flutter: ">=3.47.0"
 
 dependencies:
   flutter:
     sdk: flutter
-  async: ^2.11.0
-  flutter_bloc: ^9.0.0
-  get_it: ^8.0.0
-  equatable: ^2.0.7
-  flutter_dotenv: ^5.2.1
+  async: ^2.13.1
+  flutter_bloc: ^9.1.1
+  get_it: ^9.3.0
+  equatable: ^3.0.0
+  flutter_dotenv: ^6.0.1
   flutter_localizations:
     sdk: flutter
   common:
@@ -25,8 +25,8 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^5.0.0
-  mocktail: ^1.0.4
+  flutter_lints: ^6.0.0
+  mocktail: ^1.0.5
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
 
diff --git a/modules/domain/test/env/env_config_test.dart b/modules/domain/test/env/env_config_test.dart
index 4506480..27ff07a 100644
--- a/modules/domain/test/env/env_config_test.dart
+++ b/modules/domain/test/env/env_config_test.dart
@@ -7,15 +7,16 @@ void main() {
 
   group('EnvConfig.apiUrl', () {
     test('reads the unsuffixed API_URL of a per-flavor file', () {
-      dotenv.testLoad(fileInput: 'API_URL=https://dev.example.com');
+      dotenv.loadFromString(envString: 'API_URL=https://dev.example.com');
       EnvConfig.env = EnvConfig.kDevEnv;
 
       expect(EnvConfig.apiUrl, 'https://dev.example.com');
     });
 
     test('reads the key suffixed with the active flavor', () {
-      dotenv.testLoad(
-        fileInput: 'API_URL_DEV=https://dev.example.com\n'
+      dotenv.loadFromString(
+        envString:
+            'API_URL_DEV=https://dev.example.com\n'
             'API_URL_QA=https://qa.example.com',
       );
       EnvConfig.env = EnvConfig.kQaEnv;
@@ -24,8 +25,9 @@ void main() {
     });
 
     test('prefers the suffixed key over the unsuffixed one', () {
-      dotenv.testLoad(
-        fileInput: 'API_URL=https://fallback.example.com\n'
+      dotenv.loadFromString(
+        envString:
+            'API_URL=https://fallback.example.com\n'
             'API_URL_PROD=https://prod.example.com',
       );
       EnvConfig.env = EnvConfig.kProdEnv;
@@ -34,7 +36,7 @@ void main() {
     });
 
     test('is empty when no API_URL key is defined', () {
-      dotenv.testLoad(fileInput: 'ENV=dev');
+      dotenv.loadFromString(envString: 'ENV=dev');
 
       expect(EnvConfig.apiUrl, isEmpty);
     });
diff --git a/pubspec.yaml b/pubspec.yaml
index 1db00ac..cce606c 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,46 +1,103 @@
 name: flutter_base_workspace
-description: Melos workspace root. Real packages live under app/ and modules/*.
+description: Workspace root (pub workspace + Melos). Packages live in app/, modules/* and tool/*.
 
 publish_to: "none"
 version: 0.0.1+1
 
 environment:
-  sdk: ">=3.6.0 <4.0.0"
-  flutter: ">=3.41.0"
+  sdk: ^3.13.0
+  flutter: ">=3.47.0"
 
 workspace:
   - app
   - modules/common
   - modules/data
   - modules/domain
+  - tool/project_init
 
 dev_dependencies:
-  melos: ^7.0.0
+  melos: ^8.9.0
 
 melos:
+  # FVM links the SDK pinned in .fvmrc here. CI sets MELOS_SDK_PATH=auto to use
+  # the SDK installed by the workflow instead.
   sdkPath: .fvm/flutter_sdk
+
+  command:
+    run:
+      # Scripts with packageFilters run in every matching package without
+      # prompting for a selection.
+      noSelect: true
+
+  # Scripts named after built-in commands (analyze, format, test) shadow them,
+  # so `melos analyze` and `melos run analyze` run the same script. They call
+  # dart/flutter directly: delegating to the built-in would recurse.
   scripts:
-    run:web:
-      description: Run the app in development mode for web.
-      run: melos exec --scope="app" -- flutter run -t lib/main.dart --dart-define-from-file=env/.dev -d chrome
-    lint:all:
-      run: melos run analyze && melos run format
-      description: Run all static analysis checks.
+    init:
+      description: Turn this template into a project. Prompts for the app name, package name and bundle ID.
+      run: dart tool/project_init/bin/init.dart
+      stdio: inherit
+
     analyze:
-      description: Run `dart analyze` in all packages.
-      run: melos exec -c 1 -- dart analyze . --fatal-infos
+      description: Static analysis of every package; infos are fatal.
+      exec: dart analyze . --fatal-infos
+
     format:
-      description: Run `dart format` in all packages.
-      run: melos exec -c 1 -- dart format --set-exit-if-changed .
+      description: Format every package and fail if any file changed (the CI check).
+      exec: dart format --set-exit-if-changed .
+
+    test:
+      description: Run the tests of every package that has a test/ directory.
+      dependsOn:
+        - test:flutter
+        - test:dart
+
+    test:flutter:
+      private: true
+      exec: flutter test
+      packageFilters:
+        flutter: true
+        dirExists: test
+
+    test:dart:
+      private: true
+      exec: dart test
+      packageFilters:
+        flutter: false
+        dirExists: test
+
+    verify:
+      description: Everything CI checks - format, analyze and test.
+      dependsOn:
+        - format
+        - analyze
+        - test
+
+    lint:all:
+      description: Format and analyze. Kept for existing workflows; prefer verify.
+      dependsOn:
+        - format
+        - analyze
+
+    gen:l10n:
+      description: Regenerate the localization code from the .arb files.
+      exec: dart run intl_utils:generate && dart format lib/presentation/resources/locale/generated
+      packageFilters:
+        fileExists: lib/presentation/resources/locale/intl_en.arb
+
     pub:runner:
-      description: Run `pub run build_runner` in selected or all packages.
-      run: melos exec -- dart run build_runner build --delete-conflicting-outputs
+      description: Run build_runner in the packages that depend on it.
+      exec:
+        command: dart run build_runner build --delete-conflicting-outputs
+        orderDependents: true
       packageFilters:
-        dirExists:
-          - lib
+        dependsOn: build_runner
+
+    run:web:
+      description: Run the app (dev flavor) in Chrome.
+      run: cd app && flutter run -t lib/main/env/main_dev.dart --dart-define-from-file=env/.dev -d chrome
+      stdio: inherit
+
     doctor:
-      description: Run `flutter doctor`.
-      run: melos exec -- flutter doctor
-      packageFilters:
-        dirExists:
-          - lib
+      description: Run flutter doctor.
+      run: flutter doctor
diff --git a/sonar-project.properties b/sonar-project.properties
index 7e07bdc..79f70e3 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -1,6 +1,7 @@
 sonar.projectKey=your-project-key
 sonar.projectName=your-project-name
-sonar.host.url=https://your-sonarqube-server.net
+# The server URL comes from the SONAR_HOST_URL environment variable (the SONAR_URL
+# secret in CI), so it is not set here.
 sonar.projectVersion=1.0
 sonar.sourceEncoding=UTF-8
 # Main source directories
@@ -11,8 +12,8 @@ sonar.dart.analyzer.report.mode=LEGACY
 sonar.exclusions=**/*.g.dart,**/generated/**,**/*.freezed.dart, pubspec.yaml, coverage/**
 sonar.coverage.exclusions=**/*.g.dart,**/generated/**,**/*.freezed.dart, pubspec.yaml, coverage/**
 
-# domain & data have no tests yet
-sonar.tests=app/test,modules/domain/test,modules/common/test
+# Test directories that exist. Add app/test and modules/data/test when they are created.
+sonar.tests=modules/common/test,modules/domain/test
 
 #  Coverage report – property understood by the **sonar-flutter** plugin
 sonar.flutter.coverage.reportPath=coverage/lcov.info
diff --git a/tool/project_init/analysis_options.yaml b/tool/project_init/analysis_options.yaml
new file mode 100644
index 0000000..572dd23
--- /dev/null
+++ b/tool/project_init/analysis_options.yaml
@@ -0,0 +1 @@
+include: package:lints/recommended.yaml
diff --git a/tool/project_init/bin/init.dart b/tool/project_init/bin/init.dart
new file mode 100644
index 0000000..99246bc
--- /dev/null
+++ b/tool/project_init/bin/init.dart
@@ -0,0 +1,277 @@
+// Turns a copy of the Flutter Base template into a project.
+//
+//   melos run init                       # interactive
+//   dart tool/project_init/bin/init.dart --name "My App" \
+//     --package-name my_app --bundle-id com.company.myapp
+//
+// Uses only dart: libraries and relative imports so it runs in a fresh clone,
+// before `melos bootstrap` has resolved any packages.
+import 'dart:io';
+
+// ignore: avoid_relative_lib_imports
+import '../lib/project_init.dart';
+
+const _usage = '''
+Initialize a project from the Flutter Base template.
+
+Usage:
+  melos run init                    Prompts for every value.
+  dart tool/project_init/bin/init.dart [options]
+
+Required (prompted when missing and running in a terminal):
+  --name                    App display name, e.g. "My App".
+  --package-name            Dart package name of the app, e.g. my_app.
+  --bundle-id               Android application ID and iOS bundle identifier,
+                            e.g. com.company.myapp.
+
+Optional:
+  --android-application-id  Android application ID, when it must differ from
+                            --bundle-id (Android IDs cannot contain "-").
+  --ios-bundle-id           iOS bundle identifier, when it must differ.
+  --dry-run                 Validate and list the changes without writing.
+  -h, --help                Show this help.
+
+Exit codes: 0 success, 1 invalid input or error, 2 usage error,
+3 already initialized.
+
+Values containing spaces cannot be passed through `melos run init --`, because
+Melos re-splits arguments; use the prompts or call the script with dart.
+''';
+
+const _valueOptions = {
+  'name',
+  'package-name',
+  'bundle-id',
+  'android-application-id',
+  'ios-bundle-id',
+};
+
+Future<void> main(List<String> arguments) async {
+  exitCode = await _run(arguments);
+}
+
+Future<int> _run(List<String> arguments) async {
+  final Map<String, String> options;
+  final Set<String> flags;
+  try {
+    (options, flags) = _parse(arguments);
+  } on FormatException catch (e) {
+    stderr.writeln('${e.message}\n\n$_usage');
+    return 2;
+  }
+  if (flags.contains('help')) {
+    stdout.write(_usage);
+    return 0;
+  }
+
+  final root = _findRoot();
+  if (root == null) {
+    stderr.writeln(
+      'Could not find $stateFileName. Run this from inside a Flutter Base checkout.',
+    );
+    return 1;
+  }
+  final initializer = ProjectInitializer(root);
+
+  try {
+    final state = initializer.readState();
+    if (state.state == RepositoryState.initialized) {
+      // Reuse the initializer's message so the wording lives in one place.
+      initializer.run(state.identity, dryRun: true);
+    }
+
+    final interactive = stdin.hasTerminal;
+    final validator = initializer.validator();
+    final prompted = <String>{};
+
+    String value(
+      String option,
+      String label,
+      String? Function(String) validate, {
+      String? suggestion,
+    }) {
+      final given = options[option];
+      if (given != null) return given;
+      if (!interactive) {
+        throw InitException(
+          'Missing --$option. Pass every required option, or run '
+          'in a terminal to be prompted.\n\n$_usage',
+          exitCode: 2,
+        );
+      }
+      prompted.add(option);
+      while (true) {
+        stdout.write(
+          suggestion == null ? '$label: ' : '$label [$suggestion]: ',
+        );
+        final input = stdin.readLineSync()?.trim() ?? '';
+        final answer = input.isEmpty && suggestion != null ? suggestion : input;
+        final error = validate(answer);
+        if (error == null) return answer;
+        stdout.writeln('  $error');
+      }
+    }
+
+    final name = value('name', 'App name', validator.displayName);
+    final packageName = value(
+      'package-name',
+      'Dart package name',
+      validator.packageName,
+      suggestion: _suggestPackageName(name),
+    );
+    final hasAndroidId = options.containsKey('android-application-id');
+    final hasIosId = options.containsKey('ios-bundle-id');
+    // The shared bundle ID must satisfy the rules of every platform it is
+    // used for, so an invalid value is re-asked instead of failing later.
+    String? validateBundleId(String id) =>
+        (hasAndroidId ? null : validator.androidApplicationId(id)) ??
+        (hasIosId ? null : validator.iosBundleId(id));
+    final bundleId = hasAndroidId && hasIosId
+        ? options['ios-bundle-id']!
+        : value('bundle-id', 'Bundle ID (Android + iOS)', validateBundleId);
+    final androidId = options['android-application-id'] ?? bundleId;
+    final iosId = options['ios-bundle-id'] ?? bundleId;
+
+    final target = ProjectIdentity(
+      displayName: name,
+      packageName: packageName,
+      androidApplicationId: androidId,
+      androidNamespace: androidId,
+      iosBundleId: iosId,
+    );
+
+    final dryRun = flags.contains('dry-run');
+    final preview = initializer.run(target, dryRun: true);
+    _printPlan(preview, root);
+    if (dryRun) {
+      stdout.writeln('\nDry run: nothing was written.');
+      return 0;
+    }
+    if (prompted.isNotEmpty && !_confirm('\nApply these changes?')) {
+      stdout.writeln('Cancelled. Nothing was written.');
+      return 1;
+    }
+
+    initializer.run(target);
+    _printNextSteps(target);
+    return 0;
+  } on InitException catch (e) {
+    stderr.writeln(e.message);
+    return e.exitCode;
+  } on TemplateDriftException catch (e) {
+    stderr.writeln(e);
+    return 1;
+  } on FormatException catch (e) {
+    stderr.writeln('Could not read $stateFileName: ${e.message}');
+    return 1;
+  }
+}
+
+(Map<String, String>, Set<String>) _parse(List<String> arguments) {
+  final options = <String, String>{};
+  final flags = <String>{};
+  for (var i = 0; i < arguments.length; i++) {
+    final argument = arguments[i];
+    if (argument == '-h' || argument == '--help') {
+      flags.add('help');
+      continue;
+    }
+    if (argument == '--dry-run') {
+      flags.add('dry-run');
+      continue;
+    }
+    if (!argument.startsWith('--')) {
+      throw FormatException('Unexpected argument "$argument".');
+    }
+    final separator = argument.indexOf('=');
+    final key = argument.substring(2, separator == -1 ? null : separator);
+    if (!_valueOptions.contains(key)) {
+      throw FormatException('Unknown option "--$key".');
+    }
+    if (separator != -1) {
+      options[key] = argument.substring(separator + 1);
+    } else if (i + 1 < arguments.length && !arguments[i + 1].startsWith('--')) {
+      options[key] = arguments[++i];
+    } else {
+      throw FormatException('Option "--$key" needs a value.');
+    }
+  }
+  return (options, flags);
+}
+
+/// Walks up from the current directory to the checkout that holds the state
+/// file, so the script works from the root and from `tool/project_init`.
+Directory? _findRoot() {
+  var dir = Directory.current.absolute;
+  while (true) {
+    if (File('${dir.path}/$stateFileName').existsSync()) return dir;
+    final parent = dir.parent;
+    if (parent.path == dir.path) return null;
+    dir = parent;
+  }
+}
+
+String? _suggestPackageName(String name) {
+  final suggestion = name
+      .toLowerCase()
+      .replaceAll(RegExp(r'[^a-z0-9]+'), '_')
+      .replaceAll(RegExp(r'^_+|_+$'), '');
+  return RegExp(r'^[a-z]').hasMatch(suggestion) ? suggestion : null;
+}
+
+bool _confirm(String question) {
+  stdout.write('$question [y/N]: ');
+  final answer = stdin.readLineSync()?.trim().toLowerCase();
+  return answer == 'y' || answer == 'yes';
+}
+
+void _printPlan(InitResult result, Directory root) {
+  final from = result.previous;
+  final to = result.identity;
+  stdout
+    ..writeln('Project identity')
+    ..writeln(
+      '  App name              ${from.displayName}  ->  ${to.displayName}',
+    )
+    ..writeln(
+      '  Dart package          ${from.packageName}  ->  ${to.packageName}',
+    )
+    ..writeln(
+      '  Android applicationId ${from.androidApplicationId}  ->  ${to.androidApplicationId}',
+    )
+    ..writeln(
+      '  Android namespace     ${from.androidNamespace}  ->  ${to.androidNamespace}',
+    )
+    ..writeln(
+      '  iOS bundle identifier ${from.iosBundleId}  ->  ${to.iosBundleId}',
+    )
+    ..writeln('\nFiles (${result.files.length}):');
+  for (final file in result.files) {
+    stdout.writeln(
+      file.isMove
+          ? '  move  ${file.from}\n     -> ${file.path}'
+          : '  edit  ${file.path}',
+    );
+  }
+}
+
+void _printNextSteps(ProjectIdentity identity) {
+  stdout.writeln('''
+
+Initialized "${identity.displayName}". $stateFileName now reports "initialized",
+so the project-only CI workflow (SonarQube) is enabled.
+
+Next steps:
+  melos bootstrap
+  melos run verify          # format, analyze, test
+  cd app && flutter run -t lib/main/env/main_dev.dart --dart-define-from-file=env/.dev
+
+Still manual (the initializer never invents these values):
+  - API URLs and secrets in app/env/ (one file per flavor)
+  - Android release signing: app/android/key.properties
+  - iOS signing team and provisioning in Xcode
+  - Firebase configuration, if you use Firebase
+  - SonarQube: the SONAR_TOKEN and SONAR_URL repository secrets
+  - LICENSE and README for the new project
+See docs/development/project-initialization.md.''');
+}
diff --git a/tool/project_init/lib/project_init.dart b/tool/project_init/lib/project_init.dart
new file mode 100644
index 0000000..135a15c
--- /dev/null
+++ b/tool/project_init/lib/project_init.dart
@@ -0,0 +1,8 @@
+/// Converts a copy of the Flutter Base template into a project.
+library;
+
+export 'src/identity.dart';
+export 'src/initializer.dart';
+export 'src/plan.dart';
+export 'src/resolved_packages.dart';
+export 'src/state.dart';
diff --git a/tool/project_init/lib/src/identity.dart b/tool/project_init/lib/src/identity.dart
new file mode 100644
index 0000000..609dac7
--- /dev/null
+++ b/tool/project_init/lib/src/identity.dart
@@ -0,0 +1,300 @@
+/// The values that make a copy of the Flutter Base a specific project.
+class ProjectIdentity {
+  const ProjectIdentity({
+    required this.displayName,
+    required this.packageName,
+    required this.androidApplicationId,
+    required this.androidNamespace,
+    required this.iosBundleId,
+  });
+
+  factory ProjectIdentity.fromJson(Map<String, Object?> json) {
+    String read(String key) {
+      final value = json[key];
+      if (value is! String || value.isEmpty) {
+        throw FormatException('Missing "identity.$key" in the state file.');
+      }
+      return value;
+    }
+
+    return ProjectIdentity(
+      displayName: read('displayName'),
+      packageName: read('packageName'),
+      androidApplicationId: read('androidApplicationId'),
+      androidNamespace: read('androidNamespace'),
+      iosBundleId: read('iosBundleId'),
+    );
+  }
+
+  /// Human-readable app name (launcher label, iOS display name, web title).
+  final String displayName;
+
+  /// Dart package name of the Flutter application package (`app/`).
+  final String packageName;
+
+  /// Android `applicationId`.
+  final String androidApplicationId;
+
+  /// Android `namespace`, which is also the Kotlin package of `MainActivity`.
+  final String androidNamespace;
+
+  /// iOS `PRODUCT_BUNDLE_IDENTIFIER` of release builds. Other build
+  /// configurations append suffixes such as `.debug` or `.dev`.
+  final String iosBundleId;
+
+  Map<String, String> toJson() => {
+    'displayName': displayName,
+    'packageName': packageName,
+    'androidApplicationId': androidApplicationId,
+    'androidNamespace': androidNamespace,
+    'iosBundleId': iosBundleId,
+  };
+}
+
+/// Validates the values a developer provides. Every method returns an error
+/// message, or `null` when the value is valid.
+class IdentityValidator {
+  IdentityValidator({this.reservedPackageNames = const {}});
+
+  /// Package names the application package must not take.
+  final Set<String> reservedPackageNames;
+
+  static final _packageNamePattern = RegExp(r'^[a-z][a-z0-9_]*$');
+  static final _androidSegmentPattern = RegExp(r'^[a-zA-Z][a-zA-Z0-9_]*$');
+  static final _iosSegmentPattern = RegExp(r'^[a-zA-Z0-9-]+$');
+
+  String? displayName(String value) {
+    if (value.trim().isEmpty) return 'The app name is required.';
+    if (value != value.trim()) {
+      return 'The app name must not start or end with whitespace.';
+    }
+    if (value.length > 50) {
+      return 'The app name must be 50 characters or fewer.';
+    }
+    if (value.contains(RegExp(r'[\r\n\t]'))) {
+      return 'The app name must be a single line.';
+    }
+    // `$` would be expanded by Xcode, `//` starts an xcconfig comment, `\` is
+    // an escape character in .properties files, and a leading `@` or `?` makes
+    // Android treat the label as a resource reference.
+    if (value.contains(r'$') || value.contains('//') || value.contains(r'\')) {
+      return r'The app name must not contain "$", "//" or "\".';
+    }
+    if (value.startsWith('@') || value.startsWith('?')) {
+      return 'The app name must not start with "@" or "?".';
+    }
+    return null;
+  }
+
+  String? packageName(String value) {
+    if (value.isEmpty) return 'The package name is required.';
+    if (!_packageNamePattern.hasMatch(value)) {
+      return 'The package name must use lowercase letters, digits and '
+          'underscores, and start with a letter (for example "my_app").';
+    }
+    if (value.length > 64) {
+      return 'The package name must be 64 characters or fewer.';
+    }
+    if (dartReservedWords.contains(value)) {
+      return '"$value" is a reserved word in Dart.';
+    }
+    if (reservedPackageNames.contains(value)) {
+      return '"$value" is already used by a workspace package or a dependency '
+          '(direct or indirect).';
+    }
+    return null;
+  }
+
+  String? androidApplicationId(String value) {
+    final error = _dotted(value, 'Android application ID');
+    if (error != null) return error;
+    for (final segment in value.split('.')) {
+      if (!_androidSegmentPattern.hasMatch(segment)) {
+        return 'Each segment of the Android application ID must start with a '
+            'letter and contain only letters, digits and underscores '
+            '("$segment" does not). Use --android-application-id to give '
+            'Android a different ID than iOS.';
+      }
+      if (javaKotlinKeywords.contains(segment)) {
+        return '"$segment" is a Java/Kotlin keyword and cannot be a segment '
+            'of the Android application ID (it is also the Kotlin package).';
+      }
+    }
+    return null;
+  }
+
+  String? iosBundleId(String value) {
+    final error = _dotted(value, 'iOS bundle identifier');
+    if (error != null) return error;
+    for (final segment in value.split('.')) {
+      if (!_iosSegmentPattern.hasMatch(segment)) {
+        return 'Each segment of the iOS bundle identifier may contain only '
+            'letters, digits and hyphens ("$segment" does not).';
+      }
+    }
+    return null;
+  }
+
+  String? _dotted(String value, String label) {
+    if (value.isEmpty) return 'The $label is required.';
+    if (value.length > 155) return 'The $label is too long.';
+    final segments = value.split('.');
+    if (segments.length < 2) {
+      return 'The $label needs at least two segments (for example '
+          '"com.company.app").';
+    }
+    if (segments.any((s) => s.isEmpty)) {
+      return 'The $label must not contain empty segments.';
+    }
+    return null;
+  }
+
+  /// Validates a complete identity and returns every error found.
+  List<String> validate(ProjectIdentity identity) => [
+    displayName(identity.displayName),
+    packageName(identity.packageName),
+    androidApplicationId(identity.androidApplicationId),
+    androidApplicationId(identity.androidNamespace),
+    iosBundleId(identity.iosBundleId),
+  ].whereType<String>().toSet().toList();
+}
+
+/// Dart reserved words and built-in identifiers, which pub rejects as
+/// package names.
+const dartReservedWords = {
+  'abstract',
+  'as',
+  'assert',
+  'async',
+  'await',
+  'base',
+  'break',
+  'case',
+  'catch',
+  'class',
+  'const',
+  'continue',
+  'covariant',
+  'default',
+  'deferred',
+  'do',
+  'dynamic',
+  'else',
+  'enum',
+  'export',
+  'extends',
+  'extension',
+  'external',
+  'factory',
+  'false',
+  'final',
+  'finally',
+  'for',
+  'function',
+  'get',
+  'hide',
+  'if',
+  'implements',
+  'import',
+  'in',
+  'interface',
+  'is',
+  'late',
+  'library',
+  'mixin',
+  'new',
+  'null',
+  'of',
+  'on',
+  'operator',
+  'part',
+  'required',
+  'rethrow',
+  'return',
+  'sealed',
+  'set',
+  'show',
+  'static',
+  'super',
+  'switch',
+  'sync',
+  'this',
+  'throw',
+  'true',
+  'try',
+  'type',
+  'typedef',
+  'var',
+  'void',
+  'when',
+  'while',
+  'with',
+  'yield',
+};
+
+/// Keywords that cannot appear as a segment of a Java or Kotlin package name.
+const javaKotlinKeywords = {
+  'abstract',
+  'as',
+  'assert',
+  'boolean',
+  'break',
+  'byte',
+  'case',
+  'catch',
+  'char',
+  'class',
+  'const',
+  'continue',
+  'default',
+  'do',
+  'double',
+  'else',
+  'enum',
+  'extends',
+  'false',
+  'final',
+  'finally',
+  'float',
+  'for',
+  'fun',
+  'goto',
+  'if',
+  'implements',
+  'import',
+  'in',
+  'instanceof',
+  'int',
+  'interface',
+  'is',
+  'long',
+  'native',
+  'new',
+  'null',
+  'object',
+  'package',
+  'private',
+  'protected',
+  'public',
+  'return',
+  'short',
+  'static',
+  'strictfp',
+  'super',
+  'switch',
+  'synchronized',
+  'this',
+  'throw',
+  'throws',
+  'transient',
+  'true',
+  'try',
+  'typealias',
+  'typeof',
+  'val',
+  'var',
+  'void',
+  'volatile',
+  'when',
+  'while',
+};
diff --git a/tool/project_init/lib/src/initializer.dart b/tool/project_init/lib/src/initializer.dart
new file mode 100644
index 0000000..187d804
--- /dev/null
+++ b/tool/project_init/lib/src/initializer.dart
@@ -0,0 +1,196 @@
+import 'dart:io';
+
+import 'identity.dart';
+import 'plan.dart';
+import 'resolved_packages.dart';
+import 'state.dart';
+
+/// Raised for problems the developer can fix (invalid input, wrong state).
+class InitException implements Exception {
+  InitException(this.message, {this.exitCode = 1});
+
+  final String message;
+  final int exitCode;
+
+  @override
+  String toString() => message;
+}
+
+/// Exit code used when the repository is already initialized.
+const alreadyInitializedExitCode = 3;
+
+class InitResult {
+  InitResult({
+    required this.files,
+    required this.previous,
+    required this.identity,
+  });
+
+  final List<PlannedFile> files;
+  final ProjectIdentity previous;
+  final ProjectIdentity identity;
+}
+
+/// Turns a Flutter Base checkout at [root] into a project.
+class ProjectInitializer {
+  ProjectInitializer(this.root, {this.formatGeneratedCode = true});
+
+  final Directory root;
+
+  /// Runs `dart format` on the generated localization files after writing
+  /// them, so a longer app name does not leave them unformatted.
+  final bool formatGeneratedCode;
+
+  ProjectState readState() => ProjectState.read(root);
+
+  IdentityValidator validator() =>
+      IdentityValidator(reservedPackageNames: reservedPackageNames());
+
+  /// Names the application package must not take: the other workspace
+  /// packages and every package in the dependency graph, direct or indirect.
+  Set<String> reservedPackageNames() {
+    final names = <String>{
+      'flutter',
+      'flutter_test',
+      'flutter_driver',
+      'test',
+      ...resolvedPackageNames,
+    };
+    // After `melos bootstrap`, the lock also covers dependencies added since
+    // resolvedPackageNames was last updated.
+    final lock = File('${root.path}/pubspec.lock');
+    if (lock.existsSync()) {
+      names.addAll(lockedPackageNames(lock.readAsStringSync()));
+    }
+    final pubspecs = [
+      File('${root.path}/pubspec.yaml'),
+      ...['modules', 'tool']
+          .map((d) => Directory('${root.path}/$d'))
+          .where((d) => d.existsSync())
+          .expand((d) => d.listSync())
+          .whereType<Directory>()
+          .map((d) => File('${d.path}/pubspec.yaml')),
+      File('${root.path}/app/pubspec.yaml'),
+    ].where((f) => f.existsSync());
+    const dependencySections = {
+      'dependencies',
+      'dev_dependencies',
+      'dependency_overrides',
+    };
+    final topLevelKey = RegExp(r'^([a-z_]+):');
+    final dependencyKey = RegExp(r'^  ([a-z][a-z0-9_]*):');
+    for (final pubspec in pubspecs) {
+      final isApp = pubspec.parent.path == Directory('${root.path}/app').path;
+      String? section;
+      for (final line in pubspec.readAsLinesSync()) {
+        final topLevel = topLevelKey.firstMatch(line);
+        if (topLevel != null) {
+          section = topLevel.group(1);
+          if (section == 'name' && !isApp) names.add(line.substring(5).trim());
+          continue;
+        }
+        final dependency = dependencyKey.firstMatch(line);
+        if (dependency != null && dependencySections.contains(section)) {
+          names.add(dependency.group(1)!);
+        }
+      }
+    }
+    return names;
+  }
+
+  /// Validates [target], computes the plan and, unless [dryRun], applies it.
+  InitResult run(ProjectIdentity target, {bool dryRun = false}) {
+    final state = readState();
+    if (state.state == RepositoryState.initialized) {
+      throw InitException(
+        'This repository is already initialized as "${state.identity.displayName}" '
+        '(${state.identity.packageName}, Android ${state.identity.androidApplicationId}, '
+        'iOS ${state.identity.iosBundleId}). The initializer only runs once on a '
+        'template; change identifiers by hand from here, or start again from a '
+        'fresh copy of the Flutter Base.',
+        exitCode: alreadyInitializedExitCode,
+      );
+    }
+
+    final errors = validator().validate(target);
+    if (errors.isNotEmpty) {
+      throw InitException(
+        'Invalid project identity:\n${errors.map((e) => '  - $e').join('\n')}',
+      );
+    }
+
+    final files = InitPlanner(
+      root,
+      current: state.identity,
+      target: target,
+    ).plan();
+    if (!dryRun) {
+      _apply(files);
+      if (formatGeneratedCode) _formatGenerated(files);
+    }
+    return InitResult(files: files, previous: state.identity, identity: target);
+  }
+
+  /// Writes every planned file. If any write fails, all files are restored.
+  void _apply(List<PlannedFile> files) {
+    final originals = <String, String?>{};
+    for (final file in files) {
+      for (final path in [file.path, if (file.isMove) file.from!]) {
+        final existing = _file(path);
+        originals.putIfAbsent(
+          path,
+          () => existing.existsSync() ? existing.readAsStringSync() : null,
+        );
+      }
+    }
+    try {
+      for (final file in files) {
+        final target = _file(file.path);
+        target.parent.createSync(recursive: true);
+        target.writeAsStringSync(file.content);
+      }
+      for (final file in files.where((f) => f.isMove)) {
+        _file(file.from!).deleteSync();
+        _deleteEmptyParents(_file(file.from!).parent);
+      }
+    } catch (_) {
+      for (final entry in originals.entries) {
+        final file = _file(entry.key);
+        if (entry.value == null) {
+          if (file.existsSync()) file.deleteSync();
+        } else {
+          file.parent.createSync(recursive: true);
+          file.writeAsStringSync(entry.value!);
+        }
+      }
+      rethrow;
+    }
+  }
+
+  void _formatGenerated(List<PlannedFile> files) {
+    final generated = files
+        .map((f) => f.path)
+        .where((p) => p.contains('/generated/') && p.endsWith('.dart'))
+        .map((p) => _file(p).path)
+        .toList();
+    if (generated.isEmpty) return;
+    try {
+      Process.runSync(Platform.resolvedExecutable, ['format', ...generated]);
+    } on ProcessException {
+      // Formatting is cosmetic; `melos run format` reports anything left over.
+    }
+  }
+
+  /// Removes directories left empty by a move, stopping at the Kotlin root.
+  void _deleteEmptyParents(Directory dir) {
+    var current = dir;
+    while (!current.path.endsWith('kotlin') &&
+        current.existsSync() &&
+        current.listSync().isEmpty) {
+      current.deleteSync();
+      current = current.parent;
+    }
+  }
+
+  File _file(String relativePath) => File('${root.path}/$relativePath');
+}
diff --git a/tool/project_init/lib/src/plan.dart b/tool/project_init/lib/src/plan.dart
new file mode 100644
index 0000000..9e8fce3
--- /dev/null
+++ b/tool/project_init/lib/src/plan.dart
@@ -0,0 +1,397 @@
+import 'dart:convert';
+import 'dart:io';
+
+import 'identity.dart';
+import 'state.dart';
+
+/// Thrown when a file does not contain the value the initializer expects.
+/// The repository has drifted from what the initializer knows how to change,
+/// so nothing is written.
+class TemplateDriftException implements Exception {
+  TemplateDriftException(this.path, this.expected);
+
+  final String path;
+  final String expected;
+
+  @override
+  String toString() =>
+      'Expected $path to contain $expected. The repository no longer matches '
+      'what the initializer knows how to change, so nothing was modified. '
+      'Update tool/project_init/lib/src/plan.dart to match the template.';
+}
+
+/// One file the initializer writes. [from] is set when the file moves.
+class PlannedFile {
+  PlannedFile({required this.path, required this.content, this.from});
+
+  /// Path relative to the repository root, with `/` separators.
+  final String path;
+  final String content;
+  final String? from;
+
+  bool get isMove => from != null;
+}
+
+/// Computes every change needed to turn [current] into [target], without
+/// touching the file system. The result is only written if the whole plan
+/// could be computed.
+class InitPlanner {
+  InitPlanner(this.root, {required this.current, required this.target});
+
+  final Directory root;
+  final ProjectIdentity current;
+  final ProjectIdentity target;
+
+  final _changes = <String, PlannedFile>{};
+
+  static const _appDir = 'app';
+  static const _dartSourceDirs = [
+    'lib',
+    'test',
+    'integration_test',
+    'test_driver',
+  ];
+
+  List<PlannedFile> plan() {
+    _workspacePubspec();
+    _appPackage();
+    _android();
+    _ios();
+    _web();
+    _localizations();
+    _sonar();
+    _stateFile();
+    return _changes.values.toList();
+  }
+
+  // --- Dart / workspace ----------------------------------------------------
+
+  void _workspacePubspec() {
+    _edit(
+      'pubspec.yaml',
+      (content) => _replacePattern(
+        'pubspec.yaml',
+        content,
+        RegExp(r'^name: .+$', multiLine: true),
+        'name: ${target.packageName}_workspace',
+        'a top-level "name:" field',
+      ),
+    );
+  }
+
+  void _appPackage() {
+    _edit(
+      '$_appDir/pubspec.yaml',
+      (content) => _replaceExact(
+        '$_appDir/pubspec.yaml',
+        content,
+        'name: ${current.packageName}\n',
+        'name: ${target.packageName}\n',
+      ),
+    );
+
+    final oldImport = 'package:${current.packageName}/';
+    final newImport = 'package:${target.packageName}/';
+    var rewritten = 0;
+    for (final dir in _dartSourceDirs) {
+      for (final file in _dartFiles('$_appDir/$dir')) {
+        final content = _read(file);
+        if (!content.contains(oldImport)) continue;
+        _changes[file] = PlannedFile(
+          path: file,
+          content: content.replaceAll(oldImport, newImport),
+        );
+        rewritten++;
+      }
+    }
+    if (rewritten == 0 && oldImport != newImport) {
+      throw TemplateDriftException('$_appDir/lib', 'imports of "$oldImport"');
+    }
+  }
+
+  // --- Android -------------------------------------------------------------
+
+  void _android() {
+    const properties = '$_appDir/android/build.properties';
+    _edit(properties, (content) {
+      var result = _replaceProperty(
+        properties,
+        content,
+        'flutter.applicationId',
+        current.androidApplicationId,
+        target.androidApplicationId,
+      );
+      result = _replaceProperty(
+        properties,
+        result,
+        'flutter.namespace',
+        current.androidNamespace,
+        target.androidNamespace,
+      );
+      return _replaceProperty(
+        properties,
+        result,
+        'flutter.appName',
+        _propertyValue(current.displayName),
+        _propertyValue(target.displayName),
+      );
+    });
+
+    if (current.androidNamespace == target.androidNamespace) return;
+    const sourceRoot = '$_appDir/android/app/src/main/kotlin';
+    final oldDir =
+        '$sourceRoot/${current.androidNamespace.replaceAll('.', '/')}';
+    final newDir =
+        '$sourceRoot/${target.androidNamespace.replaceAll('.', '/')}';
+    final sources = _files(
+      oldDir,
+      recursive: false,
+    ).where((f) => f.endsWith('.kt') || f.endsWith('.java')).toList();
+    if (sources.isEmpty) {
+      throw TemplateDriftException(
+        oldDir,
+        'the Kotlin sources of package ${current.androidNamespace}',
+      );
+    }
+    for (final source in sources) {
+      final name = source.substring(oldDir.length + 1);
+      _changes['$newDir/$name'] = PlannedFile(
+        path: '$newDir/$name',
+        from: source,
+        content: _replaceExact(
+          source,
+          _read(source),
+          'package ${current.androidNamespace}\n',
+          'package ${target.androidNamespace}\n',
+        ),
+      );
+    }
+  }
+
+  // --- iOS -----------------------------------------------------------------
+
+  void _ios() {
+    const identity = '$_appDir/ios/Flutter/AppIdentity.xcconfig';
+    _edit(identity, (content) {
+      final result = _replaceExact(
+        identity,
+        content,
+        'APP_BUNDLE_ID=${current.iosBundleId}\n',
+        'APP_BUNDLE_ID=${target.iosBundleId}\n',
+      );
+      return _replaceExact(
+        identity,
+        result,
+        'APP_DISPLAY_NAME=${current.displayName}\n',
+        'APP_DISPLAY_NAME=${target.displayName}\n',
+      );
+    });
+  }
+
+  // --- Web -----------------------------------------------------------------
+
+  void _web() {
+    const index = '$_appDir/web/index.html';
+    _edit(index, (content) {
+      final oldName = _html(current.displayName);
+      final newName = _html(target.displayName);
+      final result = _replaceExact(
+        index,
+        content,
+        '<meta name="apple-mobile-web-app-title" content="$oldName">',
+        '<meta name="apple-mobile-web-app-title" content="$newName">',
+      );
+      return _replaceExact(
+        index,
+        result,
+        '<title>$oldName</title>',
+        '<title>$newName</title>',
+      );
+    });
+
+    const manifest = '$_appDir/web/manifest.json';
+    _edit(manifest, (content) {
+      final oldName = jsonEncode(current.displayName);
+      final newName = jsonEncode(target.displayName);
+      final result = _replaceExact(
+        manifest,
+        content,
+        '"name": $oldName,',
+        '"name": $newName,',
+      );
+      return _replaceExact(
+        manifest,
+        result,
+        '"short_name": $oldName,',
+        '"short_name": $newName,',
+      );
+    });
+  }
+
+  // --- Localization ----------------------------------------------------------
+
+  /// Updates the `appName` string in the .arb sources and in the generated
+  /// intl_utils output, using the same escaping intl_utils produces, so the
+  /// generated code stays consistent without running the generator.
+  void _localizations() {
+    const locale = '$_appDir/lib/presentation/resources/locale';
+    for (final arb in _files(
+      locale,
+      recursive: false,
+    ).where((f) => f.endsWith('.arb'))) {
+      _edit(
+        arb,
+        (content) => _replaceExact(
+          arb,
+          content,
+          '"appName": ${jsonEncode(current.displayName)},',
+          '"appName": ${jsonEncode(target.displayName)},',
+        ),
+      );
+    }
+
+    for (final messages
+        in _files('$locale/generated/intl', recursive: false).where(
+          (f) => f.contains('messages_') && !f.endsWith('messages_all.dart'),
+        )) {
+      _edit(
+        messages,
+        (content) => _replaceExact(
+          messages,
+          content,
+          '"appName": MessageLookupByLibrary.simpleMessage("${_dartString(current.displayName)}"),',
+          '"appName": MessageLookupByLibrary.simpleMessage("${_dartString(target.displayName)}"),',
+        ),
+      );
+    }
+
+    const l10n = '$locale/generated/l10n.dart';
+    _edit(l10n, (content) {
+      final result = _replaceExact(
+        l10n,
+        content,
+        '/// `${current.displayName}`\n  String get appName',
+        '/// `${target.displayName}`\n  String get appName',
+      );
+      return _replaceExact(
+        l10n,
+        result,
+        "Intl.message('${_dartString(current.displayName)}', name: 'appName'",
+        "Intl.message('${_dartString(target.displayName)}', name: 'appName'",
+      );
+    });
+  }
+
+  // --- Project-only automation ---------------------------------------------
+
+  void _sonar() {
+    const properties = 'sonar-project.properties';
+    _edit(properties, (content) {
+      final result = _replacePattern(
+        properties,
+        content,
+        RegExp(r'^sonar\.projectKey=.*$', multiLine: true),
+        'sonar.projectKey=${target.packageName}',
+        'a sonar.projectKey line',
+      );
+      return _replacePattern(
+        properties,
+        result,
+        RegExp(r'^sonar\.projectName=.*$', multiLine: true),
+        'sonar.projectName=${_propertyValue(target.displayName)}',
+        'a sonar.projectName line',
+      );
+    });
+  }
+
+  void _stateFile() {
+    _changes[stateFileName] = PlannedFile(
+      path: stateFileName,
+      content: ProjectState(
+        state: RepositoryState.initialized,
+        identity: target,
+      ).encode(),
+    );
+  }
+
+  // --- Helpers ---------------------------------------------------------------
+
+  void _edit(String path, String Function(String content) transform) {
+    final existing = _changes[path];
+    final content = existing?.content ?? _read(path);
+    _changes[path] = PlannedFile(
+      path: path,
+      content: transform(content),
+      from: existing?.from,
+    );
+  }
+
+  String _read(String path) {
+    final file = File('${root.path}/$path');
+    if (!file.existsSync()) {
+      throw TemplateDriftException(path, 'the file itself (it is missing)');
+    }
+    return file.readAsStringSync();
+  }
+
+  Iterable<String> _files(String dir, {required bool recursive}) {
+    final directory = Directory('${root.path}/$dir');
+    if (!directory.existsSync()) return const [];
+    final prefix = directory.absolute.path.length + 1;
+    String relative(File file) =>
+        file.absolute.path.substring(prefix).replaceAll(r'\', '/');
+    return directory
+        .listSync(recursive: recursive, followLinks: false)
+        .whereType<File>()
+        .map((file) => '$dir/${relative(file)}')
+        .toList()
+      ..sort();
+  }
+
+  Iterable<String> _dartFiles(String dir) =>
+      _files(dir, recursive: true).where((f) => f.endsWith('.dart'));
+
+  static String _replaceExact(
+    String path,
+    String content,
+    String from,
+    String to,
+  ) {
+    if (!content.contains(from)) {
+      throw TemplateDriftException(path, jsonEncode(from));
+    }
+    return content.replaceAll(from, to);
+  }
+
+  static String _replacePattern(
+    String path,
+    String content,
+    RegExp pattern,
+    String to,
+    String description,
+  ) {
+    if (!pattern.hasMatch(content)) {
+      throw TemplateDriftException(path, description);
+    }
+    return content.replaceFirst(pattern, to);
+  }
+
+  static String _replaceProperty(
+    String path,
+    String content,
+    String key,
+    String from,
+    String to,
+  ) => _replaceExact(path, content, '$key=$from\n', '$key=$to\n');
+
+  /// Escapes a value for a Java .properties file (read as UTF-8 by Gradle).
+  static String _propertyValue(String value) =>
+      value.startsWith(' ') ? '\\$value' : value;
+
+  static String _html(String value) =>
+      const HtmlEscape(HtmlEscapeMode.unknown).convert(value);
+
+  /// Escapes a value the way intl_utils writes it inside a Dart string literal.
+  static String _dartString(String value) =>
+      value.replaceAll("'", r"\'").replaceAll('"', r'\"');
+}
diff --git a/tool/project_init/lib/src/resolved_packages.dart b/tool/project_init/lib/src/resolved_packages.dart
new file mode 100644
index 0000000..7f96d58
--- /dev/null
+++ b/tool/project_init/lib/src/resolved_packages.dart
@@ -0,0 +1,187 @@
+/// Every package in the template's resolved dependency graph, including the
+/// ones the workspace only depends on indirectly (for example `bloc`, through
+/// `flutter_bloc`). The app package cannot take any of these names: pub would
+/// fail to resolve the workspace, after the initializer already ran.
+///
+/// The initializer runs before `melos bootstrap`, when there is no
+/// `pubspec.lock` to read (it is git-ignored), so the names are listed here.
+/// A test fails when a dependency change adds a package that is missing; add
+/// the names it reports.
+const resolvedPackageNames = <String>{
+  '_fe_analyzer_shared',
+  'analyzer',
+  'ansi_styles',
+  'app_links',
+  'app_links_linux',
+  'app_links_platform_interface',
+  'app_links_web',
+  'archive',
+  'args',
+  'async',
+  'bloc',
+  'bloc_test',
+  'boolean_selector',
+  'build',
+  'build_config',
+  'build_daemon',
+  'build_runner',
+  'built_collection',
+  'built_value',
+  'characters',
+  'charcode',
+  'checked_yaml',
+  'cli_config',
+  'cli_launcher',
+  'cli_util',
+  'clock',
+  'collection',
+  'color',
+  'conventional_commit',
+  'convert',
+  'coverage',
+  'crypto',
+  'csslib',
+  'cupertino_icons',
+  'cupertino_ui',
+  'dart_style',
+  'dartx',
+  'diff_match_patch',
+  'dio',
+  'dio_web_adapter',
+  'equatable',
+  'fake_async',
+  'ffi',
+  'ffi_leak_tracker',
+  'file',
+  'firebase_core',
+  'firebase_core_platform_interface',
+  'firebase_core_web',
+  'fixnum',
+  'flutter',
+  'flutter_bloc',
+  'flutter_dotenv',
+  'flutter_gen',
+  'flutter_gen_core',
+  'flutter_lints',
+  'flutter_localizations',
+  'flutter_svg',
+  'flutter_test',
+  'flutter_web_plugins',
+  'frontend_server_client',
+  'gap',
+  'get_it',
+  'glob',
+  'go_router',
+  'graphs',
+  'gtk',
+  'hashcodes',
+  'html',
+  'http',
+  'http_multi_server',
+  'http_parser',
+  'image',
+  'image_size_getter',
+  'intl',
+  'intl_utils',
+  'io',
+  'json_annotation',
+  'leak_tracker',
+  'leak_tracker_flutter_testing',
+  'leak_tracker_testing',
+  'lints',
+  'logging',
+  'matcher',
+  'material_color_utilities',
+  'material_ui',
+  'melos',
+  'meta',
+  'mime',
+  'mocktail',
+  'mustache_template',
+  'nested',
+  'node_preamble',
+  'package_config',
+  'package_info_plus',
+  'package_info_plus_platform_interface',
+  'path',
+  'path_parsing',
+  'path_provider_linux',
+  'path_provider_platform_interface',
+  'path_provider_windows',
+  'permission_handler',
+  'permission_handler_android',
+  'permission_handler_apple',
+  'permission_handler_html',
+  'permission_handler_platform_interface',
+  'permission_handler_windows',
+  'petitparser',
+  'platform',
+  'plugin_platform_interface',
+  'pool',
+  'posix',
+  'process',
+  'prompts',
+  'provider',
+  'pub_semver',
+  'pub_updater',
+  'pubspec_parse',
+  'shared_preferences',
+  'shared_preferences_android',
+  'shared_preferences_foundation',
+  'shared_preferences_linux',
+  'shared_preferences_platform_interface',
+  'shared_preferences_web',
+  'shared_preferences_windows',
+  'shelf',
+  'shelf_packages_handler',
+  'shelf_static',
+  'shelf_web_socket',
+  'sky_engine',
+  'source_map_stack_trace',
+  'source_maps',
+  'source_span',
+  'stack_trace',
+  'stream_channel',
+  'stream_transform',
+  'string_scanner',
+  'term_glyph',
+  'test',
+  'test_api',
+  'test_core',
+  'time',
+  'typed_data',
+  'universal_html',
+  'universal_io',
+  'vector_graphics',
+  'vector_graphics_codec',
+  'vector_graphics_compiler',
+  'vector_math',
+  'vm_service',
+  'watcher',
+  'web',
+  'web_socket',
+  'web_socket_channel',
+  'webkit_inspection_protocol',
+  'win32',
+  'xdg_directories',
+  'xml',
+  'yaml',
+  'yaml_edit',
+};
+
+/// Reads the package names from the contents of a `pubspec.lock`.
+Set<String> lockedPackageNames(String lock) {
+  final names = <String>{};
+  final topLevelKey = RegExp(r'^[a-z_]+:');
+  final packageKey = RegExp(r'^  ([a-z0-9_]+):\s*$');
+  var inPackages = false;
+  for (final line in lock.split('\n')) {
+    if (topLevelKey.hasMatch(line)) {
+      inPackages = line.startsWith('packages:');
+      continue;
+    }
+    final package = packageKey.firstMatch(line.trimRight());
+    if (inPackages && package != null) names.add(package.group(1)!);
+  }
+  return names;
+}
diff --git a/tool/project_init/lib/src/state.dart b/tool/project_init/lib/src/state.dart
new file mode 100644
index 0000000..f9a4118
--- /dev/null
+++ b/tool/project_init/lib/src/state.dart
@@ -0,0 +1,73 @@
+import 'dart:convert';
+import 'dart:io';
+
+import 'identity.dart';
+
+/// Name of the repository metadata file, relative to the repository root.
+const stateFileName = 'flutter_base.json';
+
+/// Whether the repository is the Flutter Base template or a project created
+/// from it.
+enum RepositoryState {
+  template,
+  initialized;
+
+  static RepositoryState parse(Object? value) => switch (value) {
+    'template' => RepositoryState.template,
+    'initialized' => RepositoryState.initialized,
+    _ => throw FormatException(
+      'Unknown "state" in $stateFileName: $value. '
+      'Expected "template" or "initialized".',
+    ),
+  };
+}
+
+/// Contents of [stateFileName]: the repository state plus the identity that
+/// is currently written into the repository.
+class ProjectState {
+  const ProjectState({required this.state, required this.identity});
+
+  final RepositoryState state;
+  final ProjectIdentity identity;
+
+  static File file(Directory root) =>
+      File('${root.path}${Platform.pathSeparator}$stateFileName');
+
+  static ProjectState read(Directory root) {
+    final stateFile = file(root);
+    if (!stateFile.existsSync()) {
+      throw FileSystemException(
+        '$stateFileName not found. Run the initializer from the root of a '
+        'Flutter Base checkout.',
+        stateFile.path,
+      );
+    }
+    final json = jsonDecode(stateFile.readAsStringSync());
+    if (json is! Map<String, Object?>) {
+      throw const FormatException('$stateFileName must contain a JSON object.');
+    }
+    final identity = json['identity'];
+    if (identity is! Map<String, Object?>) {
+      throw const FormatException('Missing "identity" in $stateFileName.');
+    }
+    return ProjectState(
+      state: RepositoryState.parse(json['state']),
+      identity: ProjectIdentity.fromJson(identity),
+    );
+  }
+
+  String encode() {
+    final json = {
+      r'$comment': _comment,
+      'state': state.name,
+      'identity': identity.toJson(),
+    };
+    return '${const JsonEncoder.withIndent('  ').convert(json)}\n';
+  }
+
+  static const _comment =
+      'Managed by the project initializer (melos run init). "template" means '
+      'this is the Flutter Base itself; "initialized" means it is a project '
+      'created from it. CI reads "state" to decide whether project-only '
+      'automation runs. See docs/development/project-initialization.md.';
+}
diff --git a/tool/project_init/pubspec.yaml b/tool/project_init/pubspec.yaml
new file mode 100644
index 0000000..35d56d6
--- /dev/null
+++ b/tool/project_init/pubspec.yaml
@@ -0,0 +1,14 @@
+name: project_init
+description: Initializes a project from the Flutter Base template (melos run init).
+publish_to: none
+
+resolution: workspace
+
+environment:
+  sdk: ^3.13.0
+
+# The initializer must run before `melos bootstrap`, so it depends on dart:
+# libraries only. Test dependencies are fine: tests run after bootstrap.
+dev_dependencies:
+  lints: ^6.0.0
+  test: ^1.31.1
diff --git a/tool/project_init/test/identity_test.dart b/tool/project_init/test/identity_test.dart
new file mode 100644
index 0000000..320659b
--- /dev/null
+++ b/tool/project_init/test/identity_test.dart
@@ -0,0 +1,100 @@
+import 'package:project_init/project_init.dart';
+import 'package:test/test.dart';
+
+void main() {
+  final validator = IdentityValidator(reservedPackageNames: {'common', 'dio'});
+
+  group('displayName', () {
+    test('accepts names with spaces, accents and punctuation', () {
+      for (final name in ['My App', 'Café Délice', "Joe's App", 'A & B']) {
+        expect(validator.displayName(name), isNull, reason: name);
+      }
+    });
+
+    test('rejects values that would break a platform file', () {
+      for (final name in [
+        '',
+        '  ',
+        ' leading',
+        'trailing ',
+        'a\nb',
+        r'Pay$',
+        'a//b',
+        r'a\b',
+        '@string/app',
+        '?attr',
+      ]) {
+        expect(validator.displayName(name), isNotNull, reason: name);
+      }
+    });
+  });
+
+  group('packageName', () {
+    test('accepts valid Dart package names', () {
+      for (final name in ['my_app', 'app2', 'a']) {
+        expect(validator.packageName(name), isNull, reason: name);
+      }
+    });
+
+    test('rejects invalid, reserved and taken names', () {
+      for (final name in [
+        '',
+        'My_App',
+        '2app',
+        '_app',
+        'my-app',
+        'class',
+        'common',
+        'dio',
+      ]) {
+        expect(validator.packageName(name), isNotNull, reason: name);
+      }
+    });
+  });
+
+  group('androidApplicationId', () {
+    test('accepts valid IDs', () {
+      for (final id in ['com.company.app', 'io.rootstrap.my_app', 'a.b']) {
+        expect(validator.androidApplicationId(id), isNull, reason: id);
+      }
+    });
+
+    test('rejects invalid IDs', () {
+      for (final id in [
+        '',
+        'app',
+        'com..app',
+        'com.company.my-app',
+        'com.1company.app',
+        'com.company.new',
+        '.com.app',
+      ]) {
+        expect(validator.androidApplicationId(id), isNotNull, reason: id);
+      }
+    });
+  });
+
+  group('iosBundleId', () {
+    test('accepts valid identifiers, including hyphens', () {
+      for (final id in [
+        'com.company.app',
+        'com.company.my-app',
+        'io.rs.App1',
+      ]) {
+        expect(validator.iosBundleId(id), isNull, reason: id);
+      }
+    });
+
+    test('rejects invalid identifiers', () {
+      for (final id in [
+        '',
+        'app',
+        'com..app',
+        'com.company.my_app',
+        'com.company.my app',
+      ]) {
+        expect(validator.iosBundleId(id), isNotNull, reason: id);
+      }
+    });
+  });
+}
diff --git a/tool/project_init/test/initializer_test.dart b/tool/project_init/test/initializer_test.dart
new file mode 100644
index 0000000..35b8769
--- /dev/null
+++ b/tool/project_init/test/initializer_test.dart
@@ -0,0 +1,396 @@
+@TestOn('vm')
+library;
+
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:project_init/project_init.dart';
+import 'package:test/test.dart';
+
+/// These tests initialize a copy of the real repository, so they fail as soon
+/// as the template changes in a way the initializer does not handle.
+void main() {
+  final repositoryRoot = Directory.current.parent.parent;
+  final repositoryState = ProjectState.read(repositoryRoot).state;
+  late Directory copy;
+
+  test('flutter_base.json is readable', () {
+    expect(repositoryState, isA<RepositoryState>());
+  });
+
+  test('lockedPackageNames reads only the packages section', () {
+    const lock = """
+# Generated by pub
+packages:
+  bloc:
+    dependency: transitive
+    description:
+      name: bloc
+      url: "https://pub.dev"
+    source: hosted
+    version: "9.0.0"
+  sky_engine:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+sdks:
+  dart: ">=3.13.0 <4.0.0"
+  flutter: ">=3.47.0"
+""";
+    expect(lockedPackageNames(lock), {'bloc', 'sky_engine'});
+  });
+
+  // The initializer only runs on the template. In a project created from it,
+  // these tests would (correctly) be refused, so they are skipped.
+  group(
+    'on the template',
+    skip: repositoryState == RepositoryState.initialized
+        ? 'the repository is initialized; the initializer only runs on the template'
+        : false,
+    () {
+      const target = ProjectIdentity(
+        displayName: "Joe's Café",
+        packageName: 'joes_cafe',
+        androidApplicationId: 'com.example.joescafe',
+        androidNamespace: 'com.example.joescafe',
+        iosBundleId: 'com.example.joes-cafe',
+      );
+
+      setUp(() => copy = _copyRepository(repositoryRoot));
+      tearDown(() => copy.deleteSync(recursive: true));
+
+      String read(String path) => File('${copy.path}/$path').readAsStringSync();
+
+      test('initializes every project-specific location', () {
+        final template = ProjectState.read(copy).identity;
+        ProjectInitializer(copy, formatGeneratedCode: false).run(target);
+
+        final state = ProjectState.read(copy);
+        expect(state.state, RepositoryState.initialized);
+        expect(state.identity.toJson(), target.toJson());
+
+        expect(read('pubspec.yaml'), startsWith('name: joes_cafe_workspace\n'));
+        expect(read('app/pubspec.yaml'), startsWith('name: joes_cafe\n'));
+
+        final dartFiles = Directory('${copy.path}/app/lib')
+            .listSync(recursive: true)
+            .whereType<File>()
+            .where((f) => f.path.endsWith('.dart'))
+            .map((f) => f.readAsStringSync());
+        expect(dartFiles.any((c) => c.contains('package:joes_cafe/')), isTrue);
+        expect(
+          dartFiles.any((c) => c.contains('package:${template.packageName}/')),
+          isFalse,
+        );
+
+        final properties = read('app/android/build.properties');
+        expect(
+          properties,
+          contains('flutter.applicationId=com.example.joescafe\n'),
+        );
+        expect(
+          properties,
+          contains('flutter.namespace=com.example.joescafe\n'),
+        );
+        expect(properties, contains("flutter.appName=Joe's Café\n"));
+
+        const kotlin = 'app/android/app/src/main/kotlin';
+        expect(
+          read('$kotlin/com/example/joescafe/MainActivity.kt'),
+          startsWith('package com.example.joescafe\n'),
+        );
+        // com/rootstrap/... is removed; com/ stays because the new package uses it.
+        final oldSegments = template.androidNamespace.split('.');
+        for (final dir in [
+          oldSegments.join('/'),
+          oldSegments.take(2).join('/'),
+        ]) {
+          expect(
+            Directory('${copy.path}/$kotlin/$dir').existsSync(),
+            isFalse,
+            reason: 'empty package directory $dir is removed',
+          );
+        }
+
+        final xcconfig = read('app/ios/Flutter/AppIdentity.xcconfig');
+        expect(xcconfig, contains('APP_BUNDLE_ID=com.example.joes-cafe\n'));
+        expect(xcconfig, contains("APP_DISPLAY_NAME=Joe's Café\n"));
+
+        expect(
+          read('app/web/index.html'),
+          contains('<title>Joe&#39;s Café</title>'),
+        );
+        expect(
+          jsonDecode(read('app/web/manifest.json'))['short_name'],
+          "Joe's Café",
+        );
+
+        const locale = 'app/lib/presentation/resources/locale';
+        expect(
+          jsonDecode(read('$locale/intl_en.arb'))['appName'],
+          "Joe's Café",
+        );
+        expect(
+          read('$locale/generated/intl/messages_en.dart'),
+          contains(r'''simpleMessage("Joe\'s Café")'''),
+        );
+        expect(
+          read('$locale/generated/l10n.dart'),
+          contains(r"""Intl.message('Joe\'s Café', name: 'appName'"""),
+        );
+
+        final sonar = read('sonar-project.properties');
+        expect(sonar, contains('sonar.projectKey=joes_cafe\n'));
+        expect(sonar, contains("sonar.projectName=Joe's Café\n"));
+
+        // Documentation describes the template, so only project files are checked.
+        for (final file in _repositoryFiles(Directory('${copy.path}/app'))) {
+          if (!_isText(file)) continue;
+          final content = file.readAsStringSync();
+          expect(
+            content.contains(template.androidNamespace),
+            isFalse,
+            reason: file.path,
+          );
+          expect(
+            content.contains('APP_BUNDLE_ID=${template.iosBundleId}'),
+            isFalse,
+            reason: file.path,
+          );
+        }
+      });
+
+      test('refuses to run twice and leaves the project untouched', () {
+        final initializer = ProjectInitializer(copy, formatGeneratedCode: false)
+          ..run(target);
+        final before = _snapshot(copy);
+
+        expect(
+          () => initializer.run(target),
+          throwsA(
+            isA<InitException>().having(
+              (e) => e.exitCode,
+              'exitCode',
+              alreadyInitializedExitCode,
+            ),
+          ),
+        );
+        expect(_snapshot(copy), before);
+      });
+
+      test('writes nothing when the input is invalid', () {
+        final before = _snapshot(copy);
+        const invalid = ProjectIdentity(
+          displayName: 'Ok',
+          packageName: 'common',
+          androidApplicationId: 'com.example.my-app',
+          androidNamespace: 'com.example.my-app',
+          iosBundleId: 'app',
+        );
+
+        expect(
+          () =>
+              ProjectInitializer(copy, formatGeneratedCode: false).run(invalid),
+          throwsA(
+            isA<InitException>().having(
+              (e) => e.message,
+              'message',
+              allOf(
+                contains('already used'),
+                contains('application ID'),
+                contains('bundle identifier'),
+              ),
+            ),
+          ),
+        );
+        expect(_snapshot(copy), before);
+      });
+
+      test('rejects indirect dependencies and writes nothing', () {
+        // bloc is only reached through flutter_bloc; taking its name makes
+        // pub fail to resolve the workspace after init.
+        final before = _snapshot(copy);
+        const taken = ProjectIdentity(
+          displayName: 'Ok',
+          packageName: 'bloc',
+          androidApplicationId: 'com.example.ok',
+          androidNamespace: 'com.example.ok',
+          iosBundleId: 'com.example.ok',
+        );
+
+        expect(
+          () => ProjectInitializer(copy, formatGeneratedCode: false).run(taken),
+          throwsA(
+            isA<InitException>().having(
+              (e) => e.message,
+              'message',
+              contains('"bloc" is already used'),
+            ),
+          ),
+        );
+        expect(_snapshot(copy), before);
+      });
+
+      test(
+        'resolvedPackageNames lists every package in pubspec.lock',
+        skip: File('${repositoryRoot.path}/pubspec.lock').existsSync()
+            ? false
+            : 'no pubspec.lock; run melos bootstrap',
+        () {
+          final locked = lockedPackageNames(
+            File('${repositoryRoot.path}/pubspec.lock').readAsStringSync(),
+          );
+          expect(
+            locked.difference(resolvedPackageNames),
+            isEmpty,
+            reason:
+                'Add these names to tool/project_init/lib/src/'
+                'resolved_packages.dart.',
+          );
+        },
+      );
+
+      test('writes nothing when the template has drifted', () {
+        final xcconfig = File(
+          '${copy.path}/app/ios/Flutter/AppIdentity.xcconfig',
+        );
+        xcconfig.writeAsStringSync(
+          xcconfig.readAsStringSync().replaceAll('APP_BUNDLE_ID', 'BUNDLE'),
+        );
+        final before = _snapshot(copy);
+
+        expect(
+          () =>
+              ProjectInitializer(copy, formatGeneratedCode: false).run(target),
+          throwsA(isA<TemplateDriftException>()),
+        );
+        expect(_snapshot(copy), before);
+      });
+
+      test('dry run validates and plans without writing', () {
+        final before = _snapshot(copy);
+        final result = ProjectInitializer(copy).run(target, dryRun: true);
+
+        expect(result.files.map((f) => f.path), contains(stateFileName));
+        expect(result.files.where((f) => f.isMove), hasLength(1));
+        expect(_snapshot(copy), before);
+      });
+
+      test(
+        'the CLI initializes non-interactively and reports a re-run',
+        () async {
+          final script = '${copy.path}/tool/project_init/bin/init.dart';
+          final arguments = [
+            script,
+            '--name',
+            "Joe's Café",
+            '--package-name',
+            'joes_cafe',
+            '--bundle-id',
+            'com.example.joescafe',
+          ];
+
+          final first = await Process.run(
+            Platform.resolvedExecutable,
+            arguments,
+            workingDirectory: copy.path,
+          );
+          expect(first.exitCode, 0, reason: '${first.stdout}\n${first.stderr}');
+          expect(first.stdout, contains('melos bootstrap'));
+          expect(read(generatedMessages), contains('Joe'));
+
+          final second = await Process.run(
+            Platform.resolvedExecutable,
+            arguments,
+            workingDirectory: copy.path,
+          );
+          expect(second.exitCode, alreadyInitializedExitCode);
+          expect(second.stderr, contains('already initialized'));
+        },
+      );
+
+      test(
+        'the CLI requires an Android-safe bundle ID unless one is given',
+        () async {
+          final script = '${copy.path}/tool/project_init/bin/init.dart';
+          final shared = ['--name', 'App', '--package-name', 'my_app'];
+
+          final rejected = await Process.run(Platform.resolvedExecutable, [
+            script,
+            ...shared,
+            '--bundle-id',
+            'com.example.my-app',
+          ], workingDirectory: copy.path);
+          expect(rejected.exitCode, 1);
+          expect(rejected.stderr, contains('--android-application-id'));
+          expect(ProjectState.read(copy).state, RepositoryState.template);
+
+          final accepted = await Process.run(Platform.resolvedExecutable, [
+            script,
+            ...shared,
+            '--bundle-id',
+            'com.example.my-app',
+            '--android-application-id',
+            'com.example.my_app',
+          ], workingDirectory: copy.path);
+          expect(accepted.exitCode, 0, reason: '${accepted.stderr}');
+          final identity = ProjectState.read(copy).identity;
+          expect(identity.iosBundleId, 'com.example.my-app');
+          expect(identity.androidApplicationId, 'com.example.my_app');
+        },
+      );
+
+      test(
+        'the CLI rejects missing options when not running in a terminal',
+        () async {
+          final result = await Process.run(Platform.resolvedExecutable, [
+            '${copy.path}/tool/project_init/bin/init.dart',
+            '--name',
+            'App',
+          ], workingDirectory: copy.path);
+          expect(result.exitCode, 2);
+          expect(result.stderr, contains('Missing --package-name'));
+        },
+      );
+    },
+  );
+}
+
+const generatedMessages =
+    'app/lib/presentation/resources/locale/generated/intl/messages_en.dart';
+
+/// Copies the files git tracks (plus new, unignored ones) into a temp dir.
+Directory _copyRepository(Directory root) {
+  final copy = Directory.systemTemp.createTempSync('project_init_test_');
+  final listed = Process.runSync('git', [
+    'ls-files',
+    '--cached',
+    '--others',
+    '--exclude-standard',
+    '-z',
+  ], workingDirectory: root.path);
+  if (listed.exitCode != 0) {
+    throw StateError('git ls-files failed: ${listed.stderr}');
+  }
+  for (final path
+      in (listed.stdout as String).split('\x00').where((p) => p.isNotEmpty)) {
+    final source = File('${root.path}/$path');
+    if (!source.existsSync()) continue;
+    final destination = File('${copy.path}/$path')
+      ..parent.createSync(recursive: true);
+    source.copySync(destination.path);
+  }
+  return copy;
+}
+
+bool _isText(File file) =>
+    !const ['.png', '.jpg', '.ttf', '.jar', '.ico'].any(file.path.endsWith);
+
+Iterable<File> _repositoryFiles(Directory root) =>
+    root.listSync(recursive: true).whereType<File>();
+
+Map<String, String> _snapshot(Directory root) => {
+  for (final file in _repositoryFiles(root))
+    file.path.substring(root.path.length): base64Encode(file.readAsBytesSync()),
+};