diff --git a/apps/documentation/src/routes/documentation/application-state.mdx b/apps/documentation/src/routes/documentation/application-state.mdx
index 311f5c1a..0fa6caa2 100644
--- a/apps/documentation/src/routes/documentation/application-state.mdx
+++ b/apps/documentation/src/routes/documentation/application-state.mdx
@@ -39,8 +39,8 @@ pub fn main() -> ApplicationState {
 }
 ```
 
-> For the sake of simplicity here we just enable a `String` but you can add Database connections or
-> HTTP clients (take a look [here](/documentation/tutorial/api-fetching) for an example with an HTTP client).
+> For simplicity, we’re using a `String` here, but you can add database connections or HTTP clients.
+> Check out the [API fetching tutorial](/documentation/tutorial/api-fetching) for an example with an HTTP client.
 
 Now the `ApplicationState` is available on all the handlers as following:
 
diff --git a/apps/documentation/src/routes/documentation/cli.mdx b/apps/documentation/src/routes/documentation/cli.mdx
index a3c16a34..b9c9251b 100644
--- a/apps/documentation/src/routes/documentation/cli.mdx
+++ b/apps/documentation/src/routes/documentation/cli.mdx
@@ -16,7 +16,7 @@ import Breadcrumbs from '@/components/Breadcrumbs'
 
 Tuono is the CLI that provides all the needed commands to handle the full-stack project.
 
-> ☝️ Check the [installation](/documentation/installation) page if you haven't installed the
+> ☝️ Check the [installation](/documentation/getting-started/installation) page if you haven't installed the
 > `tuono` CLI yet.
 
 To list all the available commands, run `tuono -h`.
diff --git a/apps/documentation/src/routes/documentation/tutorial/index.mdx b/apps/documentation/src/routes/documentation/tutorial/index.mdx
index 9c13fbf8..c4daeb26 100644
--- a/apps/documentation/src/routes/documentation/tutorial/index.mdx
+++ b/apps/documentation/src/routes/documentation/tutorial/index.mdx
@@ -15,7 +15,7 @@ import Breadcrumbs from '@/components/Breadcrumbs'
 ## Overview
 
 This tutorial is meant to give you a sneak peek at the framework and is intended to evolve during the
-development - be sure to have [installed](/documentation/installation) the [latest version](https://crates.io/crates/tuono).
+development - be sure to have [installed](/documentation/getting-started/installation) the [latest version](https://crates.io/crates/tuono).
 
 This tutorial is not meant for people who don't know React - in that case, I suggest you first read the
 [React Doc](https://react.dev/); Typescript and Rust knowledge is not a requirement though!
diff --git a/apps/documentation/src/routes/index.mdx b/apps/documentation/src/routes/index.mdx
index 1b643536..edb0efdc 100644
--- a/apps/documentation/src/routes/index.mdx
+++ b/apps/documentation/src/routes/index.mdx
@@ -38,7 +38,7 @@ Tuono addresses the following two limits:
 
 #### NodeJs/Deno/Bun are the only runtimes that allow a React app to be server-side rendered (SSR)? (no)
 
-Tuono is the first full-stack React framework with the server side written in Rust (check the [ssr-rs](https://github.com/tuono-labs/ssr-rs) crate).
+Tuono is the first full-stack React framework with the server side written in Rust (check the [ssr-rs](https://github.com/Valerioageno/ssr-rs) crate).
 Because of this, Tuono is extremely fast, and the requests are handled by a multithreaded Rust server.
 React is still React - it is just superpowered.