diff --git a/docs/components/subnets.md b/docs/components/subnets.md
index 2ff27bd7..b536768c 100644
--- a/docs/components/subnets.md
+++ b/docs/components/subnets.md
@@ -1,17 +1,17 @@
-| Subnet ID | Type | Canisters (Running/Stopped) | Nodes (Up/Total) |
-|-----------|----------------|---------------------|------------------|
-| 6pbhf-qzpdk-kuqbr-pklfa-5ehhf-jfjps-zsj6q-57nrl-kzhpd-mu7hc-vae | Juno's Subnet | 34757/68 | 13/13 |
-| pzp6e-ekpqk-3c5x7-2h6so-njoeq-mt45d-h3h6c-q3mxf-vpeq5-fk5o7-yae | Fiduciary | 708/7 | 34/34 |
-| bkfrj-6k62g-dycql-7h53p-atvkj-zg4to-gaogh-netha-ptybj-ntsgw-rqe | European | 23699/140 | 13/13 |
-| 4ecnw-byqwz-dtgss-ua2mh-pfvs7-c3lct-gtf4e-hnu75-j7eek-iifqm-sqe |  | 6846/113 | 13/13 |
-| 4zbus-z2bmt-ilreg-xakz4-6tyre-hsqj4-slb4g-zjwqo-snjcc-iqphi-3qe |  | 1001/1 | 13/13 |
-| brlsh-zidhj-3yy3e-6vqbz-7xnih-xeq2l-as5oc-g32c4-i5pdn-2wwof-oae |  | 33565/28 | 13/13 |
-| cv73p-6v7zi-u67oy-7jc3h-qspsz-g5lrj-4fn7k-xrax3-thek2-sl46v-jae |  | 50882/176 | 13/13 |
-| e66qm-3cydn-nkf4i-ml4rb-4ro6o-srm5s-x5hwq-hnprz-3meqp-s7vks-5qe |  | 35402/98 | 13/13 |
-| fuqsr-in2lc-zbcjj-ydmcw-pzq7h-4xm2z-pto4i-dcyee-5z4rz-x63ji-nae |  | 19881/0 | 13/13 |
-| gmq5v-hbozq-uui6y-o55wc-ihop3-562wb-3qspg-nnijg-npqp5-he3cj-3ae |  | 33600/51 | 13/13 |
-| io67a-2jmkw-zup3h-snbwi-g6a5n-rm5dn-b6png-lvdpl-nqnto-yih6l-gqe |  | 150/2 | 13/13 |
-| jtdsg-3h6gi-hs7o5-z2soi-43w3z-soyl3-ajnp3-ekni5-sw553-5kw67-nqe |  | 26846/3 | 13/13 |
-| lspz2-jx4pu-k3e7p-znm7j-q4yum-ork6e-6w4q6-pijwq-znehu-4jabe-kqe |  | 39397/92 | 13/13 |
-| pjljw-kztyl-46ud4-ofrj6-nzkhm-3n4nt-wi3jt-ypmav-ijqkt-gjf66-uae |  | 31714/62 | 13/13 |
-| qdvhd-os4o2-zzrdw-xrcv4-gljou-eztdp-bj326-e6jgr-tkhuc-ql6v2-yqe |  | 52456/16 | 13/13 |
+| Subnet ID                                                       | Type          | Canisters (Running/Stopped) | Nodes (Up/Total) |
+| --------------------------------------------------------------- | ------------- | --------------------------- | ---------------- |
+| 6pbhf-qzpdk-kuqbr-pklfa-5ehhf-jfjps-zsj6q-57nrl-kzhpd-mu7hc-vae | Juno's Subnet | 34757/68                    | 13/13            |
+| pzp6e-ekpqk-3c5x7-2h6so-njoeq-mt45d-h3h6c-q3mxf-vpeq5-fk5o7-yae | Fiduciary     | 708/7                       | 34/34            |
+| bkfrj-6k62g-dycql-7h53p-atvkj-zg4to-gaogh-netha-ptybj-ntsgw-rqe | European      | 23699/140                   | 13/13            |
+| 4ecnw-byqwz-dtgss-ua2mh-pfvs7-c3lct-gtf4e-hnu75-j7eek-iifqm-sqe |               | 6846/113                    | 13/13            |
+| 4zbus-z2bmt-ilreg-xakz4-6tyre-hsqj4-slb4g-zjwqo-snjcc-iqphi-3qe |               | 1001/1                      | 13/13            |
+| brlsh-zidhj-3yy3e-6vqbz-7xnih-xeq2l-as5oc-g32c4-i5pdn-2wwof-oae |               | 33565/28                    | 13/13            |
+| cv73p-6v7zi-u67oy-7jc3h-qspsz-g5lrj-4fn7k-xrax3-thek2-sl46v-jae |               | 50882/176                   | 13/13            |
+| e66qm-3cydn-nkf4i-ml4rb-4ro6o-srm5s-x5hwq-hnprz-3meqp-s7vks-5qe |               | 35402/98                    | 13/13            |
+| fuqsr-in2lc-zbcjj-ydmcw-pzq7h-4xm2z-pto4i-dcyee-5z4rz-x63ji-nae |               | 19881/0                     | 13/13            |
+| gmq5v-hbozq-uui6y-o55wc-ihop3-562wb-3qspg-nnijg-npqp5-he3cj-3ae |               | 33600/51                    | 13/13            |
+| io67a-2jmkw-zup3h-snbwi-g6a5n-rm5dn-b6png-lvdpl-nqnto-yih6l-gqe |               | 150/2                       | 13/13            |
+| jtdsg-3h6gi-hs7o5-z2soi-43w3z-soyl3-ajnp3-ekni5-sw553-5kw67-nqe |               | 26846/3                     | 13/13            |
+| lspz2-jx4pu-k3e7p-znm7j-q4yum-ork6e-6w4q6-pijwq-znehu-4jabe-kqe |               | 39397/92                    | 13/13            |
+| pjljw-kztyl-46ud4-ofrj6-nzkhm-3n4nt-wi3jt-ypmav-ijqkt-gjf66-uae |               | 31714/62                    | 13/13            |
+| qdvhd-os4o2-zzrdw-xrcv4-gljou-eztdp-bj326-e6jgr-tkhuc-ql6v2-yqe |               | 52456/16                    | 13/13            |
diff --git a/docs/miscellaneous/cli/backup.md b/docs/miscellaneous/cli/backup.md
index 12562251..174c17c1 100644
--- a/docs/miscellaneous/cli/backup.md
+++ b/docs/miscellaneous/cli/backup.md
@@ -1,19 +1,29 @@
-Handle backup-related tasks.
+Unknown command.
 
-```bash
-Usage: juno dev <subcommand> [options]
+---
 
-Subcommands:
-  create               Create a backup of your current state.
-  restore              Restore a previously created backup.
-  delete               Delete an existing backup
+**) || | || \| |/ \
+\_**/ \_**/ |\_|\_\_|\_\_**/ CLI v0.15.4
 
-Options:
-  -t, --target          Which module type should be backed up? Valid targets are satellite, mission-control or orbiter.
-  -m, --mode            Set env mode. For example production or a custom string. Default is production.
-  -h, --help            Output usage information.
+Usage: juno <command>
 
-Notes:
+Commands:
+config Manage your project configuration
+emulator Handle tasks related to the emulator like starting/stopping a local network.
+functions Build and upgrade your satellite's serverless functions.
+help Display help information.
+hosting Deploy or clear the frontend code of your app on your satellite.
+login Generate an authentication for use in non-interactive environments.
+logout Log out of the current device. ⚠️ This action does not remove the access keys from the module.
+open Open your satellite in your browser.
+run Run a custom script in the CLI context.
+snapshot Handle snapshot-related tasks.
+start Start a module.
+stop Stop a module.
+status Check the status of the modules.
+upgrade Upgrade a module to a new version.
+version Manage version related tasks.
+whoami Display your current profile, access key, and links to your satellite.
 
-- Targets can be shortened to s for satellite, m for mission-control and o for orbiter.
-```
+Options:
+--headless Run the CLI in non-interactive mode (enabled automatically if JUNO_TOKEN is set).
diff --git a/docs/miscellaneous/cli/clear.md b/docs/miscellaneous/cli/clear.md
index c72ad23c..c79f1bb6 100644
--- a/docs/miscellaneous/cli/clear.md
+++ b/docs/miscellaneous/cli/clear.md
@@ -1,10 +1,5 @@
-Clear existing dapp code by removing JavaScript, HTML, CSS, and other files from your satellite.
+Remove frontend files (JS, HTML, CSS, etc.) from your satellite.
 
-```bash
-Usage: juno clear [options]
-
-Options:
-  -f, --fullPath        Clear a particular file of your dapp.
-  -m, --mode            Set env mode. For example production or a custom string. Default is production.
-  -h, --help            Output usage information.
+```
+Alias for: juno hosting clear [options]
 ```
diff --git a/docs/miscellaneous/cli/config.md b/docs/miscellaneous/cli/config.md
index 575f65ee..8195ddc7 100644
--- a/docs/miscellaneous/cli/config.md
+++ b/docs/miscellaneous/cli/config.md
@@ -1,9 +1,9 @@
-Apply configuration to satellite.
+Manage your project configuration
 
-```bash
-Usage: juno config [options]
+```
+Usage: juno config <subcommand> [options]
 
-Options:
-  -m, --mode            Set env mode. For example production or a custom string. Default is production.
-  -h, --help            Output usage information.
+Subcommands:
+  apply               Apply configuration to satellite.
+  init                Set up your project by creating a config file.
 ```
diff --git a/docs/miscellaneous/cli/deploy.md b/docs/miscellaneous/cli/deploy.md
index 79d8d8ec..3f32ed03 100644
--- a/docs/miscellaneous/cli/deploy.md
+++ b/docs/miscellaneous/cli/deploy.md
@@ -1,10 +1,5 @@
-Deploy your dapp to your satellite.
+Deploy your app to your satellite.
 
-```bash
-Usage: juno deploy [options]
-
-Options:
-  -c, --clear           Clear existing dapp files before proceeding with deployment.
-  -m, --mode            Set env mode. For example production or a custom string. Default is production.
-  -h, --help            Output usage information.
+```
+Alias for: juno hosting deploy [options]
 ```
diff --git a/docs/miscellaneous/cli/dev.md b/docs/miscellaneous/cli/dev.md
index a32be3d9..3684f17e 100644
--- a/docs/miscellaneous/cli/dev.md
+++ b/docs/miscellaneous/cli/dev.md
@@ -1,11 +1,12 @@
-Handle development-related tasks such as building and deploying locally using Cargo and Docker.
+Handle tasks related to the emulator like starting/stopping a local network.
 
-```bash
-Usage: juno dev <subcommand>
+```
+Usage: juno dev <subcommand> [options]
 
 Subcommands:
-  build               Compile satellite features using Cargo.
-  eject               Create a Rust template for custom satellite feature hooks and extensions.
-  start               Start a local Internet Computer network, encapsulated in a Docker environment.
-  stop                Stop the Docker environment.
+  start               Alias for juno emulator start.
+  stop                Alias for juno emulator stop.
+  wait                Alias for juno emulator wait.
+  build               Alias for juno functions build.
+  init                Alias for juno functions init.
 ```
diff --git a/docs/miscellaneous/cli/init.md b/docs/miscellaneous/cli/init.md
index b6cbea42..8be55f40 100644
--- a/docs/miscellaneous/cli/init.md
+++ b/docs/miscellaneous/cli/init.md
@@ -1,8 +1,5 @@
-Set up your project.
+Set up your project by creating a config file.
 
-```bash
-Usage: juno init [options]
-
-Options:
-  -h, --help            Output usage information.
+```
+Alias for: juno config init [options]
 ```
diff --git a/docs/miscellaneous/cli/login.md b/docs/miscellaneous/cli/login.md
index 6d232803..e06bf655 100644
--- a/docs/miscellaneous/cli/login.md
+++ b/docs/miscellaneous/cli/login.md
@@ -1,9 +1,12 @@
 Generate an authentication for use in non-interactive environments.
 
-```bash
+```
 Usage: juno login [options]
 
 Options:
   -b, --browser         A particular browser to open. supported: chrome|firefox|edge.
+  -e, --emulator        Skips the Console UI and logs in your terminal with the emulator (⚠️  local development only).
+  -m, --mode            Choose which environment to use (production, staging, development). Defaults to production if omitted.
+  -p, --profile         Specify an optional profile to use (e.g. personal, team). Useful when managing multiple Mission Controls.
   -h, --help            Output usage information.
 ```
diff --git a/docs/miscellaneous/cli/logout.md b/docs/miscellaneous/cli/logout.md
index 9cf2869c..eccb004f 100644
--- a/docs/miscellaneous/cli/logout.md
+++ b/docs/miscellaneous/cli/logout.md
@@ -1,6 +1,6 @@
-Log out of the current device. ⚠️ This action does not remove controllers from the module.
+Log out of the current device. ⚠️ This action does not remove the access keys from the module.
 
-```bash
+```
 Usage: juno logout [options]
 
 Options:
diff --git a/docs/miscellaneous/cli/open.md b/docs/miscellaneous/cli/open.md
index 3bb50eb1..66253f6b 100644
--- a/docs/miscellaneous/cli/open.md
+++ b/docs/miscellaneous/cli/open.md
@@ -1,11 +1,14 @@
 Open your satellite in your browser.
 
-```bash
+```
 Usage: juno open [options]
 
 Options:
   -b, --browser         A particular browser to open. supported: chrome|firefox|edge.
   -c, --console         Open satellite in the console.
-  -m, --mode            Set env mode. For example production or a custom string. Default is production.
+  -m, --mode            Choose which environment to use (production, staging, development). Defaults to production if omitted.
+  -p, --profile         Specify an optional profile to use (e.g. personal, team). Useful when managing multiple Mission Controls.
+  --container-url       Override a custom container URL. If not provided, defaults to production or the local container in development mode.
+  --console-url         Specify a custom URL to access the developer Console.
   -h, --help            Output usage information.
 ```
diff --git a/docs/miscellaneous/cli/upgrade.md b/docs/miscellaneous/cli/upgrade.md
index a28a0bfc..ae712d07 100644
--- a/docs/miscellaneous/cli/upgrade.md
+++ b/docs/miscellaneous/cli/upgrade.md
@@ -1,15 +1,18 @@
 Upgrade a module to a new version.
 
-```bash
+```
 Usage: juno upgrade [options]
 
 Options:
   -t, --target          Which module type should be upgraded? Valid targets are satellite, mission-control or orbiter.
-  -s, --src             An optional local gzipped WASM file for the upgrade. By default, the CDN will be used.
+  -s, --src             A path to a specific local gzipped WASM file to publish.
+  --clear-chunks        Clear any previously uploaded WASM chunks (applies if the WASM size is greater than 2MB).
+  --no-snapshot         Skip creating a snapshot before upgrading.
   -r, --reset           Reset to the initial state.
-  -cc, --clear-chunks   Clear any previously uploaded WASM chunks (applies if the WASM size is greater than 2MB).
-  -nb, --no-backup      Skip creating a backup before upgrading.
-  -m, --mode            Set env mode. For example production or a custom string. Default is production.
+  -m, --mode            Choose which environment to use (production, staging, development). Defaults to production if omitted.
+  -p, --profile         Specify an optional profile to use (e.g. personal, team). Useful when managing multiple Mission Controls.
+  --container-url       Override a custom container URL. If not provided, defaults to production or the local container in development mode.
+  --console-url         Specify a custom URL to access the developer Console.
   -h, --help            Output usage information.
 
 Notes:
diff --git a/docs/miscellaneous/cli/use.md b/docs/miscellaneous/cli/use.md
index b504df7e..174c17c1 100644
--- a/docs/miscellaneous/cli/use.md
+++ b/docs/miscellaneous/cli/use.md
@@ -1,10 +1,29 @@
-Switch between multiple profiles.
+Unknown command.
 
-```bash
-Usage: juno use [options]
+---
+
+**) || | || \| |/ \
+\_**/ \_**/ |\_|\_\_|\_\_**/ CLI v0.15.4
+
+Usage: juno <command>
+
+Commands:
+config Manage your project configuration
+emulator Handle tasks related to the emulator like starting/stopping a local network.
+functions Build and upgrade your satellite's serverless functions.
+help Display help information.
+hosting Deploy or clear the frontend code of your app on your satellite.
+login Generate an authentication for use in non-interactive environments.
+logout Log out of the current device. ⚠️ This action does not remove the access keys from the module.
+open Open your satellite in your browser.
+run Run a custom script in the CLI context.
+snapshot Handle snapshot-related tasks.
+start Start a module.
+stop Stop a module.
+status Check the status of the modules.
+upgrade Upgrade a module to a new version.
+version Manage version related tasks.
+whoami Display your current profile, access key, and links to your satellite.
 
 Options:
-  -p, --profile         The profile that should be use.
-  -l, --list            What are the available profiles.
-  -h, --help            Output usage information.
-```
+--headless Run the CLI in non-interactive mode (enabled automatically if JUNO_TOKEN is set).
diff --git a/docs/miscellaneous/cli/version.md b/docs/miscellaneous/cli/version.md
index ce973ef2..b8482275 100644
--- a/docs/miscellaneous/cli/version.md
+++ b/docs/miscellaneous/cli/version.md
@@ -1,9 +1,11 @@
-Check the version of the modules and cli.
+Manage version related tasks.
 
-```bash
-Usage: juno version [options]
+```
+Usage: juno version <subcommand>
+
+Subcommands:
+  check                 Configure the weekly version check.
 
 Options:
   -h, --help            Output usage information.
-  -m, --mode            Set env mode. For example production or a custom string. Default is production.
 ```
diff --git a/docs/miscellaneous/cli/whoami.md b/docs/miscellaneous/cli/whoami.md
index 3769d0a6..d7265fdb 100644
--- a/docs/miscellaneous/cli/whoami.md
+++ b/docs/miscellaneous/cli/whoami.md
@@ -1,9 +1,12 @@
-Display your current profile, controller, and links to your satellite.
+Display your current profile, access key, and links to your satellite.
 
-```bash
+```
 Usage: juno whoami [options]
 
 Options:
   -h, --help            Output usage information.
-  -m, --mode            Set env mode. For example production or a custom string. Default is production.
+  -m, --mode            Choose which environment to use (production, staging, development). Defaults to production if omitted.
+  -p, --profile         Specify an optional profile to use (e.g. personal, team). Useful when managing multiple Mission Controls.
+  --container-url       Override a custom container URL. If not provided, defaults to production or the local container in development mode.
+  --console-url         Specify a custom URL to access the developer Console.
 ```
diff --git a/showcase.json b/showcase.json
index 665080f9..59be025d 100644
--- a/showcase.json
+++ b/showcase.json
@@ -35,7 +35,7 @@
     "url": "https://m5rwi-daaaa-aaaal-acrpq-cai.icp0.io",
     "description": "An adventure around the world to meet great souls and promote good stuff.",
     "img": "/showcase/aegir.jpg",
-    "github":"https://github.com/Kyliux/Icloud"
+    "github": "https://github.com/Kyliux/Icloud"
   },
   {
     "title": "ICPFA",
diff --git a/src/components/Spotlight/index.tsx b/src/components/Spotlight/index.tsx
index 650dbb7a..82f76d94 100644
--- a/src/components/Spotlight/index.tsx
+++ b/src/components/Spotlight/index.tsx
@@ -23,14 +23,23 @@ export default function Spotlight({
         </div>
 
         <div className={styles.content}>
-        <h4>
-        {title}
-        {github && (
-          <Link href={github} target="_blank" rel="noreferrer noopener nofollow" className={styles.githubLink}>
-            <img src="https://upload.wikimedia.org/wikipedia/commons/thumb/a/ae/Github-desktop-logo-symbol.svg/640px-Github-desktop-logo-symbol.svg.png" alt="GitHub Logo" className={styles.githubLogo} />
-          </Link>
-        )}
-      </h4>
+          <h4>
+            {title}
+            {github && (
+              <Link
+                href={github}
+                target="_blank"
+                rel="noreferrer noopener nofollow"
+                className={styles.githubLink}
+              >
+                <img
+                  src="https://upload.wikimedia.org/wikipedia/commons/thumb/a/ae/Github-desktop-logo-symbol.svg/640px-Github-desktop-logo-symbol.svg.png"
+                  alt="GitHub Logo"
+                  className={styles.githubLogo}
+                />
+              </Link>
+            )}
+          </h4>
           <p>{description}</p>
         </div>
       </article>