diff --git a/.github/workflows/build-commit-subfolder.yaml b/.github/workflows/build-commit-subfolder.yaml
index d1d16509..487855fb 100644
--- a/.github/workflows/build-commit-subfolder.yaml
+++ b/.github/workflows/build-commit-subfolder.yaml
@@ -107,7 +107,7 @@ jobs:
       uses: actions/checkout@v3
       with:
         repository: 'quixio/quix-streams'
-        ref: 'main' # when a dev branch exists we can get the dev content
+        ref: 'release/v0.5' # when a dev branch exists we can get the dev content
         #ref: '{{ steps.extract_branch.outputs.branch }}'
         path: 'client-library'
 
diff --git a/.github/workflows/sync-build-deploy.yaml b/.github/workflows/sync-build-deploy.yaml
index 7de1245b..bbc1c314 100644
--- a/.github/workflows/sync-build-deploy.yaml
+++ b/.github/workflows/sync-build-deploy.yaml
@@ -102,7 +102,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: 'quixio/quix-streams'
-          ref: 'main' # when a dev branch exists we can get the dev content
+          ref: 'release/v0.5' # when a dev branch exists we can get the dev content
           #ref: '{{ steps.extract_branch.outputs.branch }}'
           path: 'client-library'
 
diff --git a/BEST-PRACTICE.md b/BEST-PRACTICE.md
index e56dcbd7..7eca213b 100644
--- a/BEST-PRACTICE.md
+++ b/BEST-PRACTICE.md
@@ -49,12 +49,14 @@ The Quix documentation search facility is incremental - you start typing your se
 
 Good navigation is **critical** to effective TBW. Once a reader finds themselves in the Quix documentation, they need to be able to quickly orientate themselves on the page and in the documentation set overall.
 
-The main left-hand navbar, or TOC, provides the main element of the information architecture, and is purposely organized into the following top-level hierarchy:
+The main left-hand navbar, or TOC, provides the main element of the information architecture, and is purposely organized into the following top-level hierarchy, based around the developer journey:
 
-1. **Landing page and Quickstart**. The idea here is to quickly orientate the reader. From the landing page they can jump to key pieces of documentation. The Quickstart provides an easy way to "dip a toe" into Quix, and try the product out. The Quickstart is divided into two parts: one aimed at all users, and one specifically targeting developers.
-2. **Quix Platform**. This is the main Quix product, and consists of the SaaS offering, UI, pipelines, deployments, and pre-built connectors and transforms. Concepts, How-Tos and Tutorials for Quix Platform are contained in here.
-3. **Client Library**. The Quix Streams client library provides a very effective way to write scalable real-time streaming applications. Using Quix Streams you can create solutions that work with Quix Platform, or with other services depending on your requirement. The `Client Library` section also includes API reference documentation generated from source code for both the Python and C# versions of Quix Streams.
-4. **APIs**. These are additional Quix APIs, other than those provided by Quix Streams. The documentation consists of general topics, as well as REST API references based on OAS3 documents.
+1. Get started - you're new to Quix and went to get up and running quickly.
+2. Create your project - you need to have a project to do anything in Quix.
+3. Develop your application - this is the job or service that will actually do the work.
+4. Deploy your application - you're now ready to deploy the application so it can be used.
+5. Manage your projects/pipelines - a typical event streaming app consists of a collections of services (or jobs) connected in a pipeline. 
+6. Quix Streams - the client library, as a stand-alone product it is displayed as a top level item.
 
 The longer topics can be navigated using the right-hand "on this page" TOC. This enables you to quickly navigate through the sections of a topic. It is important that topics are structured with the correct heading levels. There should only ever be one `h1` heading per topic, but there can be several `h2`s. Section headings below `h3` should be used sparingly, as they won't be displayed in the navigation, and could indicate the topic has become too convoluted. The solution can be to split the topic into multiple topics, or otherwise rethink the structure.
 
@@ -92,7 +94,7 @@ The key tooling used for the Quix documentation includes:
 
 Quix uses multiple (currently two) repositories to manage the Quix documentation, these are:
 
-1. [Quix Docs](https://github.com/quixio/quix-docs) - this is the repository for general docs, Quix Platform docs, and API docs.
+1. [Quix Docs](https://github.com/quixio/quix-docs) - this is the repository for general docs, Quix Cloud docs, and API docs.
 2. [Quix Streams](https://github.com/quixio/quix-streams) - a stand-alone repository for Quix Streams, including all Quix Streams documentation.
 
 Quix uses the MkDocs [multirepo plugin](https://github.com/jdoiro3/mkdocs-multirepo-plugin) to import a complete repo and make it part of a documentation set. Quix uses this to import the Quix Streams documentation stored in the Quix Streams repo.
diff --git a/WRITING-STYLE.md b/WRITING-STYLE.md
index ca096f63..eda3da37 100644
--- a/WRITING-STYLE.md
+++ b/WRITING-STYLE.md
@@ -33,11 +33,28 @@ Use the following guidelines regarding the company's name:
 * Possessive: Quix's technology
 * Plural: "multiple Quix deployments."
 * Quix is the name of our company
-    * Quix Portal is our product, which includes:
-        * Managed Kafka
-        * Serverless compute
-        * Quix data store
-        * APIs
+* Quix product:
+    * 'The whole thing" = Quix - one tool to build event streaming apps
+    * Components of Quix:
+        * Quix Cloud - Packaging of Quix SaaS that is fully managed and hosted on Quix owned and operated cloud infrastructure (the place where everything runs).
+        * Serverless - multi-tenant
+        * Dedicated - single-tenant
+        * Quix BYOC - Packaging of Quix SaaS designed for self-hosting on customer’s infrastructure
+        * Quix Event Streaming Application - (legacy: pipeline) a collection of applications and kafka topics that fulfill an event streaming component of an event-driven platform.
+        * Quix Kafka - Our specific installed version "flavour" of Kakfa vs Confluent Cloud (our "Confluent Integration"), Redpanda, Aiven.
+        * Quix Application: a service with a code project & a container
+        * Quix Connectors - Quix Applications that integrate data between external systems and Quix (sources, destinations)
+        * Quix Processors - Quix Applications that run code to transform data (transforms)
+        * Quix Containers - Quix Applications that act as auxiliary resources for an application
+        * Code Samples - Ready-to-run templates of code and service configuration to create your own Quix Services
+        * Quix Project - (legacy: workspace) one Git repository that contains all the code that you need to build and deploy an Event Streaming Application in multiple environments..
+
+    * CI/CD Features
+        * Quix Project Configuration - YAML files, they define workflow and setting and env variables as code. It describes your services, topics, and relations between them.
+        * Git Integration, Git (GitHub, Azure DevOps, GitLab) link to Quix Workspace.
+        * Quix Environments (staging, dev prod) - isolated infrastructure connected to a branch of your Git project
+        * Quix CLI (coming soon)
+        * Project Templates (legacy: blueprints) ungated experiences    
     * Quix Streams is our client library:
         * A client library is a collection of code specific to one programming language.
         * Quix currently offers Python and C# client libraries.
diff --git a/docs/apis/portal-api/setup.md b/docs/apis/portal-api/setup.md
index 9ca4f403..a5e92889 100644
--- a/docs/apis/portal-api/setup.md
+++ b/docs/apis/portal-api/setup.md
@@ -18,7 +18,7 @@ Each of these is described in the following sections.
 
 Useful information can also be found in the settings panels for your environment:
 
-1. Click `Settings` in the bottom left corner of the Quix portal.
+1. Click `Settings` in the bottom left corner of the UI.
 
 2. From `Project settings` select the environment you are working with.
 
@@ -34,7 +34,7 @@ Personal Access Tokens, or PATs, are bearer tokens that can be used to authentic
 
 To obtain a PAT, log in to Quix, and click on your profile icon in the top right corner, then click `Personal Access Tokens`. You can then generate a PAT with a lifetime suitable for your use case.
 
-Alternatively, log in to the Quix Portal, and click `Settings` in the main left-hand navigation. Then, for a specific environment, click `APIs and tokens`.
+Alternatively, log in to Quix, and click `Settings` in the main left-hand navigation. Then, for a specific environment, click `APIs and tokens`.
 
 In the `APIs and tokens` dialog, you can click `Personal Access Tokens` to generate PATs, or a Streaming Token for use with the Quix Streams client library.
 
diff --git a/docs/apis/query-api/raw-data.md b/docs/apis/query-api/raw-data.md
index 2fe72235..281884e3 100644
--- a/docs/apis/query-api/raw-data.md
+++ b/docs/apis/query-api/raw-data.md
@@ -60,7 +60,7 @@ In reality, you’ll have far more data in the stored data, so you’ll want to
 
   - `to`
 
-Each stream you create has a unique ID. You can view the ID of a persisted via the Data section of the Quix Portal. Supply a list of stream IDs to restrict fetched data to just those streams:
+Each stream you create has a unique ID. You can view the ID of a persisted via the Data section of the UI. Supply a list of stream IDs to restrict fetched data to just those streams:
 
 ```json
 {
diff --git a/docs/apis/query-api/setup.md b/docs/apis/query-api/setup.md
index f47cf86e..ed65c0c8 100644
--- a/docs/apis/query-api/setup.md
+++ b/docs/apis/query-api/setup.md
@@ -18,7 +18,7 @@ Each of these is described in the following sections.
 
 Useful information can also be found in the settings panels for your environment:
 
-1. Click `Settings` in the bottom left corner of the Quix portal.
+1. Click `Settings` in the bottom left corner of the UI.
 
 2. From `Project settings` select the environment you are working with.
 
@@ -34,7 +34,7 @@ Personal Access Tokens, or PATs, are bearer tokens that can be used to authentic
 
 To obtain a PAT, log in to Quix, and click on your profile icon in the top right corner, then click `Personal Access Tokens`. You can then generate a PAT with a lifetime suitable for your use case.
 
-Alternatively, log in to the Quix Portal, and click `Settings` in the main left-hand navigation. Then, for a specific environment, click `APIs and tokens`.
+Alternatively, log in to Quix, and click `Settings` in the main left-hand navigation. Then, for a specific environment, click `APIs and tokens`.
 
 In the `APIs and tokens` dialog, you can click `Personal Access Tokens` to generate PATs, or a Streaming Token for use with the Quix Streams client library.
 
diff --git a/docs/apis/streaming-reader-api/overview.md b/docs/apis/streaming-reader-api/overview.md
index 39ad7c58..35665368 100644
--- a/docs/apis/streaming-reader-api/overview.md
+++ b/docs/apis/streaming-reader-api/overview.md
@@ -1,6 +1,6 @@
 # Overview
 
-As an alternative to Quix Streams, the Quix platform supports real-time data streaming over WebSockets (or Long Polling depending on client support). 
+Quix supports real-time data streaming over WebSockets (or Long Polling depending on client support). 
 
 Clients can receive updates on data and definitions for parameters and events, as they happen. 
 
@@ -9,4 +9,3 @@ Streaming Reader API is typically used by clients written in languages not suppo
 !!! note
 
     The following examples use the Microsoft [SignalR](https://docs.microsoft.com/en-us/aspnet/core/signalr/javascript-client?view=aspnetcore-5.0){target=_blank} JavaScript client library.
-
diff --git a/docs/apis/streaming-reader-api/setup.md b/docs/apis/streaming-reader-api/setup.md
index 711f1204..b1ed4664 100644
--- a/docs/apis/streaming-reader-api/setup.md
+++ b/docs/apis/streaming-reader-api/setup.md
@@ -18,7 +18,7 @@ Each of these is described in the following sections.
 
 Useful information can also be found in the settings panels for your environment:
 
-1. Click `Settings` in the bottom left corner of the Quix portal.
+1. Click `Settings` in the bottom left corner of the UI.
 
 2. From `Project settings` select the environment you are working with.
 
@@ -34,7 +34,7 @@ Personal Access Tokens, or PATs, are bearer tokens that can be used to authentic
 
 To obtain a PAT, log in to Quix, and click on your profile icon in the top right corner, then click `Personal Access Tokens`. You can then generate a PAT with a lifetime suitable for your use case.
 
-Alternatively, log in to the Quix Portal, and click `Settings` in the main left-hand navigation. Then, for a specific environment, click `APIs and tokens`.
+Alternatively, log in to Quix, and click `Settings` in the main left-hand navigation. Then, for a specific environment, click `APIs and tokens`.
 
 In the `APIs and tokens` dialog, you can click `Personal Access Tokens` to generate PATs, or a Streaming Token for use with the Quix Streams client library.
 
diff --git a/docs/apis/streaming-writer-api/setup.md b/docs/apis/streaming-writer-api/setup.md
index 79eb526c..d2564135 100644
--- a/docs/apis/streaming-writer-api/setup.md
+++ b/docs/apis/streaming-writer-api/setup.md
@@ -18,7 +18,7 @@ Each of these is described in the following sections.
 
 Useful information can also be found in the settings panels for your environment:
 
-1. Click `Settings` in the bottom left corner of the Quix portal.
+1. Click `Settings` in the bottom left corner of the UI.
 
 2. From `Project settings` select the environment you are working with.
 
@@ -34,7 +34,7 @@ Personal Access Tokens, or PATs, are bearer tokens that can be used to authentic
 
 To obtain a PAT, log in to Quix, and click on your profile icon in the top right corner, then click `Personal Access Tokens`. You can then generate a PAT with a lifetime suitable for your use case.
 
-Alternatively, log in to the Quix Portal, and click `Settings` in the main left-hand navigation. Then, for a specific environment, click `APIs and tokens`.
+Alternatively, log in to Quix, and click `Settings` in the main left-hand navigation. Then, for a specific environment, click `APIs and tokens`.
 
 In the `APIs and tokens` dialog, you can click `Personal Access Tokens` to generate PATs, or a Streaming Token for use with the Quix Streams client library.
 
diff --git a/docs/connectors/index.md b/docs/connectors/index.md
index 382bf769..e5f6c5c2 100644
--- a/docs/connectors/index.md
+++ b/docs/connectors/index.md
@@ -4,6 +4,6 @@ Connectors are part of our [open source](https://github.com/quixio/quix-samples)
 
 Connectors help our users connect with other vendors such as AWS and Kafka.
 
-You can explore the connector README files here in Quix Docs. When you are ready to start using them, head over to the Quix Code Samples [GitHub](https://github.com/quixio/quix-samples){target="_blank"} repository, or [sign up](https://quix.io/signup){target="_blank"} and [login to the platform](https://portal.platform.quix.ai/){target="_blank"}.
+You can explore the connector README files here in Quix Docs. When you are ready to start using them, head over to the Quix Code Samples [GitHub](https://github.com/quixio/quix-samples){target="_blank"} repository, or [sign up](https://quix.io/signup){target="_blank"} and [log in to the platform](https://portal.platform.quix.ai/){target="_blank"}.
 
 [//]: <> (#connectors_tile_replacement)
\ No newline at end of file
diff --git a/docs/create/syncing-environment.md b/docs/create/syncing-environment.md
index f494391b..433b2aad 100644
--- a/docs/create/syncing-environment.md
+++ b/docs/create/syncing-environment.md
@@ -8,7 +8,7 @@ You can always review the changes that will be made to your `quix.yaml` file, be
 
 The rules around manual and automatic synchronization are:
 
-1. Operations performed in the Quix portal should not cause "out of sync", as those operations are automatically saved to the Git repository. This is the case for both Quix-managed and third-party hosted Git.
+1. Operations performed in Quix should not cause "out of sync", as those operations are automatically saved to the Git repository. This is the case for both Quix-managed and third-party hosted Git.
 2. The exception to this is the case of YAML variables. When variables are created, if those are included in the `quix.yaml`, you will need to perform manual synchronization. You are prompted if this is required.
 3. If you change the `quix.yaml` in the Git repository, then you may get "out of sync". The `quix.yaml` file currently only includes topics and deployments.
 
diff --git a/docs/deploy/deploy-public-page.md b/docs/deploy/deploy-public-page.md
index 492f2d44..59a65813 100644
--- a/docs/deploy/deploy-public-page.md
+++ b/docs/deploy/deploy-public-page.md
@@ -1,6 +1,6 @@
 # How to deploy a public service
 
-The Quix Platform enables you to deploy public-facing web pages and APIs.
+Quix enables you to deploy public-facing web pages and APIs.
 
 This how-to will help to explain the features and options and ensure projects containing public facing web pages and APIs are successful.
 
diff --git a/docs/deploy/environment-variables.md b/docs/deploy/environment-variables.md
index 373886ee..f54798ff 100644
--- a/docs/deploy/environment-variables.md
+++ b/docs/deploy/environment-variables.md
@@ -1,6 +1,6 @@
-# How to add environment variables in Quix Platform
+# How to add environment variables in Quix
 
-In Quix Platform, it is possible to create new environment variables that your code can then access. This is useful for things like API keys, secrets, and passwords for other services that your code may need to access.
+In Quix, it is possible to create new environment variables that your code can then access. This is useful for things like API keys, secrets, and passwords for other services that your code may need to access.
 
 ## To create an environment variable
 
diff --git a/docs/develop/apis-overview.md b/docs/develop/apis-overview.md
index 2d70d6a4..3e792748 100644
--- a/docs/develop/apis-overview.md
+++ b/docs/develop/apis-overview.md
@@ -1,6 +1,6 @@
 # Quix APIs Overview
 
-The Quix Platform provides several APIs. These are:
+Quix provides several APIs. These are:
 
 * Streaming Writer API
 * Streaming Reader API
@@ -15,7 +15,7 @@ While [Quix Streams](../client-library-intro.md) is the main client library for
 
 In these situations Streaming Reader and Writer APIs can provide an alternative solution - for example, they can easily be accommodated in a modern web browser, or using most modern programming languages with an HTTP or SignalR client. 
 
-Portal API is useful for automating processes normally carried out manually in the Quix Portal.
+Portal API is useful for automating processes normally carried out manually in Quix.
 
 Query API is useful for testing and examining data persisted into the Quix internal database.
 
@@ -50,13 +50,13 @@ Streaming Reader uses Microsoft's [SignalR](https://learn.microsoft.com/en-us/as
 
 ## Portal API
 
-The [Portal API](../apis/portal-api/overview.md) gives access to the Quix Portal interface enabling you to automate your project deployment, management and monitoring. For example, you could build command line tools in any language with an HTTP interface available, to create, deploy, and monitor services.
+The [Portal API](../apis/portal-api/overview.md) gives access to Quix, enabling you to automate your project deployment, management and monitoring. For example, you could build command line tools in any language with an HTTP interface available, to create, deploy, and monitor services.
 
 [Read more about Portal API](../apis/portal-api/overview.md)
 
 ## Query API
 
-The [Query API](../apis/query-api/overview.md) enables you to fetch persisted data from Quix. You can use it for exploring the platform, testing, prototyping applications, or working with persisted data in any language with HTTP capabilities.
+The [Query API](../apis/query-api/overview.md) enables you to fetch persisted data from Quix. You can use it for exploring Quix, testing, prototyping applications, or working with persisted data in any language with HTTP capabilities.
 
 !!! note
 
diff --git a/docs/develop/authentication/personal-access-token.md b/docs/develop/authentication/personal-access-token.md
index 1bbdac2b..3ddcf0a9 100644
--- a/docs/develop/authentication/personal-access-token.md
+++ b/docs/develop/authentication/personal-access-token.md
@@ -4,6 +4,6 @@ Personal Access Tokens, or PATs, are bearer tokens that can be used to authentic
 
 To obtain a PAT, log in to Quix, and click on your profile icon in the top right corner, then click `Personal Access Tokens`. You can then generate a PAT with a lifetime suitable for your use case.
 
-Alternatively, log in to the Quix Portal, and click `Settings` in the main left-hand navigation. Then, for a specific environment, click `APIs and tokens`.
+Alternatively, log in to Quix, and click `Settings` in the main left-hand navigation. Then, for a specific environment, click `APIs and tokens`.
 
 In the `APIs and tokens` dialog, you can click `Personal Access Tokens` to generate PATs, or a Streaming Token for use with the Quix Streams client library.
diff --git a/docs/develop/authentication/streaming-token.md b/docs/develop/authentication/streaming-token.md
index fe6f3e49..45a0a1de 100644
--- a/docs/develop/authentication/streaming-token.md
+++ b/docs/develop/authentication/streaming-token.md
@@ -1,12 +1,12 @@
 # Streaming token
 
-A streaming token is a type of bearer token that can be used to authenticate your client library (Quix Streams) to access functionality necessary for streaming actions. Think of streaming tokens as a token you use to access the Quix Portal but with limited scope.
+A streaming token is a type of bearer token that can be used to authenticate your client library (Quix Streams) to access functionality necessary for streaming actions. Think of streaming tokens as a token you use to access Quix, but with limited scope.
 
 Each environment comes with one of these tokens, limited in use for that specific environment.
 
 ## How to find
 
-You can access these tokens by logging into the Quix Portal and clicking on `Settings` in the main left-hand navigation. Select your environment, and then click on `APIs and tokens` and then click on `Streaming Tokens`.
+You can access these tokens by logging into Quix and clicking on `Settings` in the main left-hand navigation. Select your environment, and then click on `APIs and tokens` and then click on `Streaming Tokens`.
 
 If you are looking for a bearer token to access the Quix APIs, such as the Portal API, you can select `Personal Access Tokens`. These are custom JWTs.
 
@@ -28,7 +28,7 @@ Having two keys lets you update your services without interruption, as both `Tok
 
 You have two main options regarding how you rotate:
 
-1. The easiest way to rotate comes with some service downtime. This assumes you do not directly set the token for your `QuixStreamingClient`, instead you let the platform take care of it for you by using the default environment variable. In this scenario all you have to do is rotate keys, stop and start all your deployments. Until a service is restarted it’ll try to communicate with the platform using the deactivated token. If you’re using local environments, those need to be updated manually.
+1. The easiest way to rotate comes with some service downtime. This assumes you do not directly set the token for your `QuixStreamingClient`, instead you let Quix take care of it for you by using the default environment variable. In this scenario all you have to do is rotate keys, stop and start all your deployments. Until a service is restarted it’ll try to communicate with Quix using the deactivated token. If you’re using local environments, those need to be updated manually.
 
 2. The alternative option is more complicated, but you can achieve no downtime. This requires you to set a new environment variable you control. This should point to the token to be used. Provide the value of this environment variable to `QuixStreamingClient` by passing it as an argument. Once you have that, set the value of this environment variable to `Token 2` and start your services. When you’re sure you replaced the tokens for all services, rotate your keys.
 
diff --git a/docs/develop/code-samples.md b/docs/develop/code-samples.md
index 758b2ec4..347c19c3 100644
--- a/docs/develop/code-samples.md
+++ b/docs/develop/code-samples.md
@@ -22,4 +22,4 @@ You can become a contributor of our Code Samples by generating new samples or up
 
 !!! important
 
-    Note that when you use a public code sample in the Quix Portal, it is added to your private repository, so any changes you make can be kept private if you so wish. Of course, if you are working in a public repository, then any code samples you add or modify will also be public.
+    Note that when you use a public code sample in Quix, it is added to your private repository, so any changes you make can be kept private if you so wish. Of course, if you are working in a public repository, then any code samples you add or modify will also be public.
diff --git a/docs/develop/integrate-data/external-destination.md b/docs/develop/integrate-data/external-destination.md
index 019f6e0b..6925c717 100644
--- a/docs/develop/integrate-data/external-destination.md
+++ b/docs/develop/integrate-data/external-destination.md
@@ -4,7 +4,7 @@ One simple way to read data out of a Quix topic, is to use the prebuilt connecto
 
 To use the `External destination` connector, step through the following procedure:
 
-1. In the Quix Portal click on `Code Samples` in the left-hand sidebar. 
+1. In the UI click on `Code Samples` in the left-hand sidebar. 
 
 2. Search for `External destination`. 
 
diff --git a/docs/develop/integrate-data/external-source.md b/docs/develop/integrate-data/external-source.md
index a772ddf9..9345edb4 100644
--- a/docs/develop/integrate-data/external-source.md
+++ b/docs/develop/integrate-data/external-source.md
@@ -4,7 +4,7 @@ One simple way to write data into a Quix topic, is to use the prebuilt connector
 
 To use the `External source` connector, step through the following procedure:
 
-1. In the Quix Portal click on `Code Samples` in the left-hand sidebar. 
+1. In the UI click on `Code Samples` in the left-hand sidebar. 
 
 2. Search for `External source`. 
 
diff --git a/docs/develop/integrate-data/jupyter-nb.md b/docs/develop/integrate-data/jupyter-nb.md
index c8ba4792..78b3dff4 100644
--- a/docs/develop/integrate-data/jupyter-nb.md
+++ b/docs/develop/integrate-data/jupyter-nb.md
@@ -1,6 +1,6 @@
 # Use Jupyter Notebook
 
-In this documentation, you learn how to use Jupyter Notebook to analyze data persisted in the Quix platform.
+In this documentation, you learn how to use Jupyter Notebook to analyze data persisted in Quix.
 
 ## Why this is important
 
@@ -8,7 +8,7 @@ Although Quix is a real-time platform, to build real-time in-memory models and d
 
 ## Prerequisites
 
-You'll need some data stored in the Quix platform. You can use any of the Quix [data sources](../../connectors/index.md) available in the Quix Code Samples. 
+You'll need some data stored in Quix. You can use any of the Quix [data sources](../../connectors/index.md) available in the Quix Code Samples. 
 
 You can also follow the onboarding process when you [sign-up to Quix](https://portal.platform.quix.ai/self-sign-up?xlink=docs){target=_blank}. This process helps you create a source.
 
@@ -32,7 +32,7 @@ Then create a new Python 3 notebook:
 
 The Quix web application has a Python code generator to help you connect your Jupyter notebook with Quix.
 
-You need to be logged into the platform for this. To import persisted data:
+You need to be logged into Quix for this. To import persisted data:
 
 1. Select an environment.
 
diff --git a/docs/develop/integrate-data/quix-streams.md b/docs/develop/integrate-data/quix-streams.md
index 590d2d71..63fd19bd 100644
--- a/docs/develop/integrate-data/quix-streams.md
+++ b/docs/develop/integrate-data/quix-streams.md
@@ -2,7 +2,7 @@
 
 You can use Quix Streams to push and pull data to and from Quix, as well as use it to transform data. 
 
-Some example code showing Quix Streams pushing data inot the platform is shown here:
+Some example code showing Quix Streams pushing data into Quix is shown here:
 
 ```python
 import psutil
diff --git a/docs/develop/integrate-data/read-csv.md b/docs/develop/integrate-data/read-csv.md
index 63d317f9..aa41c667 100644
--- a/docs/develop/integrate-data/read-csv.md
+++ b/docs/develop/integrate-data/read-csv.md
@@ -30,7 +30,7 @@ Note, the data is loaded into a pandas dataframe, and then published to the outp
 
 If you're not using pandas, you can write your own code to load data from a CSV file.
 
-The following code demonstrates loading data from a CSV file and adding the timestamp column, and only adding other data columns of interest. In addition, this code is designed to be run on the command line. This code reads a CSV file on, for example, your laptop, and pushes the data into Quix Platform, using the Quix Streams client library:
+The following code demonstrates loading data from a CSV file and adding the timestamp column, and only adding other data columns of interest. In addition, this code is designed to be run on the command line. This code reads a CSV file on, for example, your laptop, and pushes the data into Quix, using the Quix Streams client library:
 
 ``` python 
 # pip install quixstreams
diff --git a/docs/develop/integrate-data/streaming-apis.md b/docs/develop/integrate-data/streaming-apis.md
index 0c4ea6c5..49f58d91 100644
--- a/docs/develop/integrate-data/streaming-apis.md
+++ b/docs/develop/integrate-data/streaming-apis.md
@@ -44,7 +44,7 @@ Some example code that shows how to connect to Quix and write data into a Quix s
     <hr />
 
     <script>
-      const token = "<your_pat_token>"; // Obtain your PAT token from the Quix portal
+      const token = "<your_pat_token>"; // Obtain your PAT token from Quix
       const environmentId = "<your_environment>";
       const topic = "websocket-topic";
       const streamId = "mouse-pos";
@@ -134,7 +134,7 @@ Code that could read mouse cursor position from a Quix stream is as follows:
     <button onclick="clearCanvas()">Clear canvas</button>
 
     <script>
-      const token = "<your_pat_token>"; // Obtain your PAT token from the Quix portal
+      const token = "<your_pat_token>"; // Obtain your PAT token from Quix
 
       // Set the environment and Topic
       const environmentId = "<your_environment>";
diff --git a/docs/get-started/glossary.md b/docs/get-started/glossary.md
index 5e320d8c..067addec 100644
--- a/docs/get-started/glossary.md
+++ b/docs/get-started/glossary.md
@@ -8,9 +8,9 @@ In addition to the Quix Streams client library, there are several APIs that you
 
 ## Application
 
-A set of code in Quix Platform that can be edited, compiled, run, and deployed as one Docker image (configured using a `dockerfile`). 
+A set of code in Quix that can be edited, compiled, run, and deployed as one Docker image (configured using a `dockerfile`). 
 
-Applications in Quix Platform exist inside the Git branch associated with an [environment](#environment), and are therefore fully version controlled. You can also tag your code as an easy way to manage deployments.
+Applications in Quix exist inside the Git branch associated with an [environment](#environment), and are therefore fully version controlled. You can also tag your code as an easy way to manage deployments.
 
 Read more about [applications](../create/overview.md).
 
@@ -22,13 +22,13 @@ With this data you can stream, process and store any type of audio, image, video
 
 ## Code Samples
 
-Quix Platform contains a large number of [open source](https://github.com/quixio/quix-samples){target=_blank} Code Samples. You can use these to quickly build out your stream processing pipeline. Generally the code samples are divided into three main categories: source, transform, destination. You can access the Code Samples from within the Quix Portal by using the navigation menu as show here:
+Quix contains a large number of [open source](https://github.com/quixio/quix-samples){target=_blank} Code Samples. You can use these to quickly build out your stream processing pipeline. Generally the code samples are divided into three main categories: source, transform, destination. You can access the Code Samples from within the UI by using the navigation menu as show here:
 
 ![Code Samples](../images/code-samples.png){height=30%}
 
 ## Connectors
 
-There are [many ways](../develop/integrate-data/overview.md) to get data into Quix Platform. One option is to use the many connectors already provided by Quix. These can be viewed in Quix Platform by clicking Code Samples and then selecting Source and Destination filters. Alternatively, you can see a useful page in our documentation, that lists the [available connectors](../connectors/index.md).
+There are [many ways](../develop/integrate-data/overview.md) to get data into Quix. One option is to use the many connectors already provided by Quix. These can be viewed in Quix by clicking Code Samples and then selecting Source and Destination filters. Alternatively, you can see a useful page in our documentation, that lists the [available connectors](../connectors/index.md).
 
 ## Consumer
 
@@ -136,9 +136,9 @@ A monorepo is a single repository that contains all code and configuration for a
 
 In Quix, the monorepo is known as a [project](#project).
 
-## Online IDE (Quix Portal)
+## Online IDE (Quix UI)
 
-See [Quix Portal](#quix-portal).
+See [Quix UI](#quix-ui).
 
 ## Partitions
 
@@ -176,9 +176,9 @@ A project contains one or more [environments](#environment), so typically you cr
 
 The [Query API](../apis/query-api/overview.md) is used to query persisted data. Most commonly used for dashboards, analytics and training ML models. Also useful to call historical data when running an ML model, or to call historical data from an external application. This API is primarily iused for testing and debugging purposes.
 
-## Quix Portal
+## Quix UI
 
-Quix provides an online Integrated Development Environment (IDE) for Python and C# projects. When you open any project, you will see the **Run** button, and a console during runtime, in addition to the IntelliSense.
+Quix provides an online Integrated Development Environment (IDE) for Python and C# projects. When you open any project, you will see the **Run** button, and a console during runtime, in addition to the IntelliSense. It also provides general UI for deploying your code, and managing your projects and environments.
 
 Sign up for a [free account](https://portal.platform.quix.ai/self-sign-up).
 
@@ -206,11 +206,11 @@ Read more about [streams](../quix-streams/features/streaming-context.md).
 
 ## Streaming Reader API
 
-A [WebSockets API](../apis/streaming-reader-api/overview.md) used to stream any data directly from a topic to an external application. Most commonly used to read the results of a model or service to a real-time web application. Your application **reads** data from Quix Platform.
+A [WebSockets API](../apis/streaming-reader-api/overview.md) used to stream any data directly from a topic to an external application. Most commonly used to read the results of a model or service to a real-time web application. Your application **reads** data from Quix.
 
 ## Streaming Writer API
 
-An [HTTP API](../apis/streaming-writer-api/overview.md) used to send telemetry data from any source to a topic in the Quix platform. It should be used when it is not possible to use [Quix Streams](../client-library-intro.md). Your application **writes** data into Quix Platform.
+An [HTTP API](../apis/streaming-writer-api/overview.md) used to send telemetry data from any source to a topic in Quix. It should be used when it is not possible to use [Quix Streams](../client-library-intro.md). Your application **writes** data into Quix.
 
 ## Template project
 
diff --git a/docs/get-started/project-templates.md b/docs/get-started/project-templates.md
new file mode 100644
index 00000000..6edc7a0b
--- /dev/null
+++ b/docs/get-started/project-templates.md
@@ -0,0 +1,29 @@
+# Project templates
+
+Project templates provide a way for you to examine your use case running in Quix. You don't need to sign up to see these projects running in Quix.
+
+Project templates also provide a starting point for your own projects - our project templates are hosted as open source in the [Quix GitHub repository](https://github.com/quixio), so you can fork them and import them into Quix, and use them to build out your own solution. 
+
+<div class="grid cards" markdown>
+
+- __Computer Vision__
+
+    ---
+
+    ![Computer vision pipeline](../images/project-templates/computer-vision-pipeline.png)
+
+    A project template that implements a real-time computer vision application.
+
+    [Explore :octicons-arrow-right-24:](../tutorials/computer-vision/overview.md)
+
+- __Chat sentiment analysis__
+
+    ---
+
+    ![Chat sentiment analysis pipeline](../images/project-templates/chat-sentiment-pipeline.png)
+
+    A project template that implements a chat application with sentiment analysis.
+
+    [Explore :octicons-arrow-right-24:](../tutorials/sentiment-analysis/overview.md)
+
+</div>
diff --git a/docs/get-started/quickstart.md b/docs/get-started/quickstart.md
index e61dfc29..126585f3 100644
--- a/docs/get-started/quickstart.md
+++ b/docs/get-started/quickstart.md
@@ -21,7 +21,7 @@ Get data into Quix and display it:
 
 If you're just curious, click the box to see the complete code.
 
-??? example "Push CPU load data to Quix Platform"
+??? example "Push CPU load data to Quix"
 
     Click the (+) symbols to see the code annotations.
 
@@ -75,7 +75,7 @@ If you're just curious, click the box to see the complete code.
     2. Make sure you `pip install quixstreams`.
     3. Make sure you `pip install python-dotenv`.
     4. The function to return CPU load.
-    5. You can connect to Quix Platform using the token you can find in your Quix account.
+    5. You can connect to Quix using the token you can find in your Quix account.
     6. Get the topic you are going to publish data to. If the topic does not exist, it is created.
     7. Create a Quix stream to write to. You can think of a stream as a channel within a topic.
     8. Publish your data to the stream.
@@ -105,7 +105,7 @@ pip install python-dotenv
 
     If you're on Mac and using Homebrew, you may have multiple Python versions installed. In this case you may have to use the command `pip3` to install your modules. 
 
-You're going to use the [Quix Streams](../client-library-intro.md) library to push data into Quix Platform. This is just one of [many ways](../develop/integrate-data/overview.md) to get your data into Quix. You could for example simply log into Quix and use one of our already available [connectors](../connectors/index.md), but where's the fun in that!
+You're going to use the [Quix Streams](../client-library-intro.md) library to push data into Quix. This is just one of [many ways](../develop/integrate-data/overview.md) to get your data into Quix. You could for example simply log into Quix and use one of our already available [connectors](../connectors/index.md), but where's the fun in that!
 
 You use the `psutil` module to retrieve the CPU load on your laptop.
 
@@ -123,7 +123,7 @@ You'll need to create a project and an environment. You can watch a video on how
 
 You'll need a streaming token to connect your client code to your Quix environment:
 
-1. Log in to the Quix Portal and enter the `Develop` environment.
+1. Log in to Quix and enter the `Develop` environment.
 2. Click `Settings` and then click `Develop` again to display the environment settings.
 3. Click `APIs and tokens`.
 4. Click `Streaming Token`.
@@ -208,7 +208,7 @@ The code runs and, after creating the `cpu-load` topic, displays your CPU load.
 
 ## 7. See the data in Quix
 
-1. Switch back to the Quix Portal and enter your `Develop` environment.
+1. Switch back to Quix and enter your `Develop` environment.
 2. Click on `Topics` in the main left-hand navigation.
 3. You see the `cpu-load` topic. Note the vertical green bars representing inbound data.
 4. Hover the mouse over the `Data` column. You see the tool tip text `View live data`.
diff --git a/docs/get-started/quixtour/ingest-push.md b/docs/get-started/quixtour/ingest-push.md
index e866c1b3..2cd3c3b7 100644
--- a/docs/get-started/quixtour/ingest-push.md
+++ b/docs/get-started/quixtour/ingest-push.md
@@ -2,7 +2,7 @@
 
 There are [many ways](../../develop/integrate-data/overview.md) to get your data into Quix, a process usually known as ingestion or data integration. Data can be loaded using CSV files, by polling external web services, WebSockets and so on. The option you use depends on your use case.
 
-In this part of the Quix Tour, you'll learn how to send data into Quix using Quix Streams to publish data into a topic hosted in the Quix Platform. 
+In this part of the Quix Tour, you'll learn how to send data into Quix using Quix Streams to publish data into a topic hosted in Quix. 
 
 You'll write a short Python program to retrieve your CPU load and publish that data into a Quix topic in real time. 
 
@@ -24,7 +24,7 @@ pip install python-dotenv
 
     If you're on Mac and using Homebrew, you may have multiple Python versions installed. In this case you may have to use the command `pip3` to install your modules. 
 
-You're going to use the [Quix Streams](../../client-library-intro.md) library to publish data into Quix Platform. This is just one of many ways to get your data into Quix. You could for example simply log into Quix and use one of our already available [connectors](../../connectors/index.md).
+You're going to use the [Quix Streams](../../client-library-intro.md) library to publish data into Quix. This is just one of many ways to get your data into Quix. You could for example simply log into Quix and use one of our already available [connectors](../../connectors/index.md).
 
 You use the `psutil` module to retrieve the CPU load on your laptop.
 
@@ -42,7 +42,7 @@ You'll need to create a project and an environment. You can watch a video on how
 
 You'll need a streaming token to connect your client code to your Quix environment:
 
-1. Log in to the Quix Portal and enter the `Develop` environment.
+1. Log in to Quix and enter the `Develop` environment.
 2. Click `Settings` and then click `Develop` again to display the environment settings.
 3. Click `APIs and tokens`.
 4. Click `Streaming Token`.
@@ -127,7 +127,7 @@ The code runs and, after creating the `cpu-load` topic, displays your CPU load.
 
 ## 7. Create an external source
 
-At this point you have an external program sending data into the Quix Platform, and it is writing into a topic. However, you can't currently see this in the Pipeline view. To help you visualize what you've created, you can add an external source component, to provide a visual entity in the pipeline view. To do this:
+At this point you have an external program sending data into Quix, and it is writing into a topic. However, you can't currently see this in the Pipeline view. To help you visualize what you've created, you can add an external source component, to provide a visual entity in the pipeline view. To do this:
 
 1. Click on `Code Samples`.
 2. Select the `Python`, `Source`, and `Basic templates` filters.
diff --git a/docs/get-started/quixtour/overview.md b/docs/get-started/quixtour/overview.md
index 3fd1e9f7..6988e5bd 100644
--- a/docs/get-started/quixtour/overview.md
+++ b/docs/get-started/quixtour/overview.md
@@ -18,9 +18,9 @@ The complete code for the Quix Tour can be found in the [Quix Tutorials GitHub r
 
 The Quix Tour is split into three parts. These parts represent the typical stream processing **pipeline**:
 
-1. **Ingest** - this is where you get your data into Quix using one of [many methods](../../develop/integrate-data/overview.md). In Quix Platform this is typically implemented using a **Source**.
-2. **Process** - here you process your data in a manner depending on your use case. In Quix Platform this is implemented using a **Transform**.
-3. **Serve** - typically you display information, such as on real-time charts, or perhaps persist your data in a database. In Quix Platform this is implemented using a **Destination**.
+1. **Ingest** - this is where you get your data into Quix using one of [many methods](../../develop/integrate-data/overview.md). In Quix this is typically implemented using a **Source**.
+2. **Process** - here you process your data in a manner depending on your use case. In Quix this is implemented using a **Transform**.
+3. **Serve** - typically you display information, such as on real-time charts, or perhaps persist your data in a database. In Quix this is implemented using a **Destination**.
 
 This general stream processing architecture is illustrated in the following diagram:
 
@@ -30,7 +30,7 @@ This general stream processing architecture is illustrated in the following diag
 
 The pipeline you will implement:
 
-1. **Ingest** - you publish data from your laptop into Quix Platform using the Quix client library, Quix Streams. You're going to publish your real-time CPU load. You could alternatively publish data from a CSV file, or any other source required for your use case. If you needed to connect to an external service, you could alternatively use one of Quix's many [connectors](../../connectors/index.md).
+1. **Ingest** - you publish data from your laptop into Quix using the Quix client library, Quix Streams. You're going to publish your real-time CPU load. You could alternatively publish data from a CSV file, or any other source required for your use case. If you needed to connect to an external service, you could alternatively use one of Quix's many [connectors](../../connectors/index.md).
 2. **Process** - in this step, you process your data. There are many [types of processing](../../develop/process/types-of-processing.md), one of which is the transform. There are many possible [types of transform](../../develop/process/types-of-transform.md). Here you create a transform that performs threshold detection. You publish a message to the transform's output topic. 
 3. **Serve** - when you receive a message indicating CPU load has exceeded the threshold you (optionally) send an SMS to the system administrator.
 
@@ -48,6 +48,6 @@ To complete the Quix Tour you'll need the following:
 
 ## 🏃‍♀️ Next step
 
-Get your data into Quix Platform!
+Get your data into Quix!
 
 [Ingest your data :material-arrow-right-circle:{ align=right }](./ingest-push.md)
diff --git a/docs/get-started/welcome.md b/docs/get-started/welcome.md
index d389b5b2..319c4be6 100644
--- a/docs/get-started/welcome.md
+++ b/docs/get-started/welcome.md
@@ -5,7 +5,7 @@
 <div>
 <a class="md-button md-button--primary" href="./quickstart.html" style="margin-right:.5rem;">Quickstart</a>
 
-<a class="md-button md-button" href="https://quix.io/templates" target="_blank" style="margin-right:.5rem;">View project templates</a>
+<a class="md-button md-button" href="./project-templates.html" style="margin-right:.5rem;">View project templates</a>
 <br/>
 </div>
 
@@ -43,9 +43,9 @@ If you're new to Quix, here are some resources to help get you started quickly.
 
     ---
     
-    Deploy a real-time computer vision application fast, using a project template.
+    Dig deep into Quix using one of our project templates.
 
-    [Computer vision :octicons-arrow-right-24:](../tutorials/computer-vision/overview.md)
+    [Project templates :octicons-arrow-right-24:](../get-started/project-templates.md)
 
 </div>
 
diff --git a/docs/get-started/what-is-quix.md b/docs/get-started/what-is-quix.md
index 3dbb8ee6..2839cde4 100644
--- a/docs/get-started/what-is-quix.md
+++ b/docs/get-started/what-is-quix.md
@@ -29,11 +29,11 @@ The following sections take a look at the key components of creating your stream
 
 While this short introduction to Quix is intentionally brief, there are abundant links for more detailed information you can follow to increase your knowledge of Quix. Alternatively, simply drop into our [Community](https://forum.quix.io/){target=_blank} and ask any question you may have.
 
-## The Quix Platform
+## Quix Cloud
 
-The Quix Platform provides everything a developer needs to build industrial-strength event streaming applications. 
+Quix Cloud provides everything a developer needs to build industrial-strength event streaming applications. 
 
-The components that make up the Quix Platform enable developers to:
+The components that make up the Quix Cloud enable developers to:
 
 * Use a full web-based IDE with version control and logging, to build, deploy, and monitor their event streaming applications. 
 * Have abstracted access to underlying broker infrastructure, including fully-managed Kafka topics.
@@ -50,15 +50,15 @@ This section describes the main technical components and architecture of Quix.
 
 ![Quix Technical Architecture](../images/quix-technical-architecture.png)
 
-### Quix Portal
+### Quix UI
 
-**Quix Portal** strives to present an intuitive software experience that facilitates DevOps/MLOps best practices for development teams. The goals of Quix Portal are to:
+**Quix UI** strives to present an intuitive software experience that facilitates DevOps/MLOps best practices for development teams. The goals of the Quix UI are to:
 
 * Help a broad spectrum of developers access live data.
 * Help developers create and manage complex infrastructure and write application code without support from expert engineering teams.
 * Help to accelerate the development lifecycle by enabling developers to test and iterate code in an always-live environment.
 
-To achieve these goals, Quix Portal includes the following features:
+To achieve these goals, the Quix UI includes the following features:
 
 * **Online IDE**: Develop and run your streaming applications directly in the browser without setting up a local environment.
 
@@ -68,14 +68,12 @@ To achieve these goals, Quix Portal includes the following features:
  
 * **Monitoring tools**: Monitor the status and data flow of your streaming applications in real time.
 
-* **Broker management**: Create, delete, explore and configure your self-hosted message broker infrastructure from the Quix Portal.
+* **Broker management**: Create, delete, explore and configure your self-hosted message broker infrastructure from the UI.
 
 * **Pipeline view**: Visualize your pipeline architecture with the information provided from the deployment variables. You can also monitor your pipeline in real time.
 
 * **Data Explorer**: Explore live and historical data of your applications to test that your code is working as expected.
 
-**Watch the video to see the Quix web-based IDE**
-
 ### Git integration
 
 Quix has the ability to create projects where all code and configuration is contained in a Git repository. This Git repository can be hosted by Quix (using Gitea), or on any third-party Git provider, such as GitHub, or Bitbucket, where you can configure the Quix SSH public key provided to you for Git provider authentication. This helps integrate Quix with your existing workflows.
@@ -104,7 +102,7 @@ When you create an application from a template in Quix, a Dockerfile is provided
 
 ### Infrastructure as code
 
-When you develop your event streaming solution, you will build a pipeline of services that can be viewed in the Quix Portal. Each service in the pipeline is individually coded, using a standard component, a modified template, or even completely from scratch. Depending on the use case, pipelines can be quite complex, and in the past, this has made them time consuming to recreate. Now Quix supports infrastructure as code. Your entire pipeline can be defined by a single `quix.yaml` file, and this file can be used to completely and easily reconstruct a pipeline from its corresponding repository.
+When you develop your event streaming solution, you will build a pipeline of services that can be viewed in Quix. Each service in the pipeline is individually coded, using a standard component, a modified template, or even completely from scratch. Depending on the use case, pipelines can be quite complex, and in the past, this has made them time consuming to recreate. Now Quix supports infrastructure as code. Your entire pipeline can be defined by a single `quix.yaml` file, and this file can be used to completely and easily reconstruct a pipeline from its corresponding repository.
 
 ## Interfacing with Quix
 
@@ -125,7 +123,7 @@ Quix provides several APIs to help you work with streaming data. These include:
 * [**Stream Writer API**](../apis/streaming-writer-api/overview.md): enables you to send any data to a Kafka topic in Quix using HTTP. This API handles encryption, serialization, and conversion to the Quix Streams format, ensuring efficiency and performance of down-stream processing regardless of the data source.
 * [**Stream Reader API**](../apis/streaming-reader-api/overview.md): enables you to push live data from a Quix topic to your application, ensuring low latency by avoiding any disk operations.
 * [**Query API**](../apis/query-api/overview.md): enables you to query persisted data streams. This is provided primarily for testing purposes. 
-* [**Portal API**](../apis/portal-api/overview.md): enables you to automate Quix Portal tasks such as creating environments, topics, and deployments.
+* [**Portal API**](../apis/portal-api/overview.md): enables you to automate Quix tasks such as creating environments, topics, and deployments.
 
 ### Quix Streams
 
diff --git a/docs/images/project-templates/chat-sentiment-pipeline.png b/docs/images/project-templates/chat-sentiment-pipeline.png
new file mode 100644
index 00000000..abf9f4bb
Binary files /dev/null and b/docs/images/project-templates/chat-sentiment-pipeline.png differ
diff --git a/docs/images/project-templates/computer-vision-pipeline.png b/docs/images/project-templates/computer-vision-pipeline.png
new file mode 100644
index 00000000..25485d5c
Binary files /dev/null and b/docs/images/project-templates/computer-vision-pipeline.png differ
diff --git a/docs/manage/MLOps.md b/docs/manage/MLOps.md
index 026d59ea..0988ffc2 100644
--- a/docs/manage/MLOps.md
+++ b/docs/manage/MLOps.md
@@ -6,7 +6,7 @@ There are a number of barriers that prevent companies from successfully implemen
 
 Solving these challenges is a new field of expertise called [MLOps](https://en.wikipedia.org/wiki/MLOps){target=_blank}
 
-Quix have incorporated MLOps into the Quix Platform so that your data team has a seamless journey from concept to production. The key steps in the MLOps process are:
+Quix have incorporated MLOps into the Quix so that your data team has a seamless journey from concept to production. The key steps in the MLOps process are:
 
 1. Build and train models on historical data
 2. Test models on live data
@@ -18,7 +18,7 @@ Each of these is described in the following sections.
 
 ## Build and train models on historical data
 
-In the Quix Portal you can:
+In Quix you can:
 
 * Write model code in Python using the Quix IDE, or download code and work on it in your own development environment.
 * Train models on historical data.
@@ -27,11 +27,11 @@ In the Quix Portal you can:
 
 ## Test models on live data
 
-In the Quix Portal you can connect models to live input topics to test them against live data sources. You can then review the results in the Data Explorer.
+In Quix you can connect models to live input topics to test them against live data sources. You can then review the results in the Data Explorer.
 
 ## Build a production pipeline
 
-In the Quix Portal you can:
+In Quix you can:
 
 * Connect validated models to live output topics.
 * Connect models using the UI to form a pipeline. Pipelines consist of transforms connected together using input and output topics.
@@ -39,11 +39,11 @@ In the Quix Portal you can:
 
 ## Deploy production models
 
-in the Quix Portal, with one click of the application's `Deploy` button, and tweaking of the default configuration if required, data engineers can deploy their Python models to production, without support from software engineering or DevOps teams.
+In Quix, with one click of the application's `Deploy` button, and tweaking of the default configuration if required, data engineers can deploy their Python models to production, without support from software engineering or DevOps teams.
 
 ## Monitor production models
 
-In the Quix Portal, data teams can:
+In Quix, data teams can:
 
 * Ensure that components in a production pipeline operate correctly through the product lifecycle.
 * Build and deploy services that detect data drift or unexpected results.
@@ -52,6 +52,6 @@ In the Quix Portal, data teams can:
 
 Here are some suggested next steps to find out more about MLOps in Quix:
 
-* [Platform Quickstart](../get-started/quickstart.md) - get data into Quix and displayed in real time in under 10 minutes.
+* [Quickstart](../get-started/quickstart.md) - get data into Quix and displayed in real time in under 10 minutes.
 * [Building real-time ML pipelines tutorial](../tutorials/train-and-deploy-ml/overview.md) - train and run an ML model in Quix.
 * [Building real-time ML predictions](../tutorials/data-science/overview.md) - use data science and ML to predict bicycle availability in New York.
diff --git a/docs/manage/overview.md b/docs/manage/overview.md
index 336c6c53..2803e1de 100644
--- a/docs/manage/overview.md
+++ b/docs/manage/overview.md
@@ -66,7 +66,7 @@ You can read more about the [Query API](../apis/query-api/overview.md) in the do
 
 ## Portal API
 
-The Portal API enables you to programmatically control your Quix Portal, and most objects in it. Using the Portal API you can manage entities including:
+The Portal API enables you to programmatically control Quix, and most objects in it. Using the Portal API you can manage entities including:
 
 * Billing
 * Deployments
diff --git a/docs/manage/replay.md b/docs/manage/replay.md
index 6686dd2f..e4b46daa 100644
--- a/docs/manage/replay.md
+++ b/docs/manage/replay.md
@@ -1,6 +1,6 @@
 # How to replay data
 
-Quix Platform features a **replay service**. This service enables you to replay persisted data into a topic, as if it were live data. This is very useful for the following use cases:
+Quix features a **replay service**. This service enables you to replay persisted data into a topic, as if it were live data. This is very useful for the following use cases:
 
 * Testing and debugging connectors and transforms
 * [Stream reprocessing](https://quix.io/blog/intro-stream-reprocessing-python/?x-craft-preview=VDVjwJTquq&token=7oGSdC9yxYk0zECNUz2RtzJLtGqG-aZB){target=_blank}
diff --git a/docs/manage/security.md b/docs/manage/security.md
index c24dc25f..5ab58199 100644
--- a/docs/manage/security.md
+++ b/docs/manage/security.md
@@ -12,7 +12,7 @@ This document outlines how Quix helps customers configure, deploy and use the cl
 
 Securing your information starts with identity controls, no matter where your users are located. Quix enables you to manage users, streamline authentication using your identity provider, and assign roles. We give you the solutions to ensure that only the right people can access your company's information in Quix.
 
-OAuth is the protocol Quix uses when you auth against our platform using Google or your preferred Identity provider. Customers are responsible for integrating and managing their identity provider (for single sign-on and provisioning) as well as assigning roles in Quix.
+OAuth is the protocol Quix uses when you authenticate against our servers using Google or your preferred Identity provider. Customers are responsible for integrating and managing their identity provider (for single sign-on and provisioning) as well as assigning roles in Quix.
 
 Data in flight is protected with Authentication (OAuth 2.0 tokens, SASL, SSL Certificates), Authorisation (RBAC) and Encryption (TLS 1.2).
 
@@ -28,7 +28,7 @@ By default, Quix encrypts data at rest and data in transit as part of our founda
 
 ### Encryption
 
-Our preferred encryption is TLS 1.3, with 1.2 allowed as a fallback. We don't support TLS 1.1 or older in any part of our platform.
+Our preferred encryption is TLS 1.3, with 1.2 allowed as a fallback. We don't support TLS 1.1 or older in any part of Quix.
 
 Older cyphers are cryptographically unsafe. We do not serve or support unsafe and weak cyphers, ensuring that our posture is in line with your standards and expectations.
 
@@ -52,7 +52,7 @@ To give you even further protection and control, we architected Quix on independ
 
 Environments at Quix are hermetically sealed with no reused components between them. Development and Production environments are distinct entities with no cross-talk.
 
-The separation of these concerns enables us to deliver a Quix platform experience in a way that minimizes the chance of errors and mistakes and is a well-supported industry standard of software delivery.
+The separation of these concerns enables us to deliver a Quix experience in a way that minimizes the chance of errors and mistakes and is a well-supported industry standard of software delivery.
 
 In case you choose to host Quix on your platform, we recommend that you follow the same practices.
 
@@ -60,24 +60,26 @@ In case you choose to host Quix on your platform, we recommend that you follow t
 
 Firewalls in cloud-native infrastructure and applications work differently from how they used to in the days of monolithic apps running on bare metal servers stacked neatly in a server room.
 
-All networking technologies utilised during the delivery of the Quix Platform follow the principle of least privilege; we configure our security groups to only allow the minimum necessary traffic, and we configure our access lists to do the same. We follow industry best practices in architecting these safeguards and constantly monitor and audit them.
+All networking technologies utilised during the delivery of Quix follow the principle of least privilege; we configure our security groups to only allow the minimum necessary traffic, and we configure our access lists to do the same. We follow industry best practices in architecting these safeguards and constantly monitor and audit them.
 
 ## Employee access policies
 
 Quix employees access our key systems with multi-factor authentication enforced. This helps us verify the identity of the person accessing these services and reduce the chance of unauthorised access by way of compromised channels or devices.
 
-At Quix, systems that make up the Quix platform are only ever accessed when necessary and only by authorised personnel. We take our commitment to security and confidentiality seriously.
+At Quix, systems that make up Quix are only ever accessed when necessary and only by authorised personnel. We take our commitment to security and confidentiality seriously.
 
 Restricted access ensures only colleagues in the necessary roles can work on the underlying software and infrastructure stack. This, combined with audit trails built right into our processes and tooling helps us maintain the principle of least privilege, an important security practice.
 
 ## Compliance
 
-Quix is aiming to meet and exceed one of the most broadly recognised security standards.
+Quix is ISO-27001 certified, a widely recognised standard that sets forth the criteria for an information security management system (ISMS).
 
 ### ISO-27001
 
-ISO-27001 details IT security management systems and procedures. We are currently pursuing certification under this rigorous standard while actively working towards standardising our written policies and procedures.
+This standard provides a structured approach for implementing, operating, monitoring, and improving an ISMS.
 
-An ISO-27001 certification is a quick and easy way to judge the general security posture of an organisation. By obtaining this certification soon, we aim to demonstrate our commitment to information security.
+Quix adheres to ISO 27001, ensuring that the company applies systematic methodologies and a solid framework to identify, manage, and reduce information security risks. Certification in this standard indicates Quix's commitment to establishing international best practices in information security.
 
-We are aiming to complete the internal audit by October 2023 and obtain the certification by the end of the calendar year 2023.
+For Quix's clients, the ISO 27001 certification assures a dependable security framework. This certification signals our dedication to data protection and the strength of our risk management practices, aiming to secure client data against potential threats.
+
+You can verify the validity of our ISO certificate by entering the certificate number 251068 using the [certification verification link](https://www.british-assessment.co.uk/verify-certification/){target=_blank}.
diff --git a/docs/manage/troubleshooting.md b/docs/manage/troubleshooting.md
index 4ca6c991..1c57c9c8 100644
--- a/docs/manage/troubleshooting.md
+++ b/docs/manage/troubleshooting.md
@@ -6,7 +6,7 @@ This section contains solutions, fixes, hints and tips to help you solve the mos
 
 If data is not being received in a topic:
 
-* Ensure the Topic Name or Id is correct in Topics option of Quix Portal.
+* Ensure the Topic Name or Id is correct in Topics option of the Quix UI.
 
 * You can check the data in / out rates on the Topics tab.
 
@@ -28,7 +28,7 @@ The following must be correct:
 
   - Sdk Token
 
-These can all be found in Topics option of Quix Portal.
+These can all be found in Topics option of the Quix UI.
 
 ## Broker Transport Failure
 
diff --git a/docs/tutorials/computer-vision/get-project.md b/docs/tutorials/computer-vision/get-project.md
index aa026c0c..1bb843bd 100644
--- a/docs/tutorials/computer-vision/get-project.md
+++ b/docs/tutorials/computer-vision/get-project.md
@@ -9,7 +9,7 @@ In the following sections you learn how to:
 1. Fork an existing project repository, in this case the computer vision template project.
 2. Create a new project (and environment) in Quix linked to your forked repository.
 
-In later parts of the tutorial you explore the project pipeline using the Quix data explorer and other tools, viewing code, examining data structures, and getting a practical feel for the Quix Portal.
+In later parts of the tutorial you explore the project pipeline using the Quix data explorer and other tools, viewing code, examining data structures, and getting a practical feel for Quix.
 
 ## 💡 Key ideas
 
diff --git a/docs/tutorials/computer-vision/overview.md b/docs/tutorials/computer-vision/overview.md
index 28e130ae..b7a13fb9 100644
--- a/docs/tutorials/computer-vision/overview.md
+++ b/docs/tutorials/computer-vision/overview.md
@@ -1,15 +1,18 @@
 # Computer vision
 
-In this tutorial you learn about a real-time computer vision application, using a [Quix template project](https://github.com/quixio/computer-vision-demo){target=_blank}. 
+In this tutorial you learn about a real-time computer vision application, using a [Quix template project](https://github.com/quixio/computer-vision-demo){target=_blank}.
+
+![Computer vision pipeline](../../images/project-templates/computer-vision-pipeline.png)
 
 The project uses the Transport for London (TfL) traffic cameras, known as Jam Cams, as the video input. The [YOLO v8](https://docs.ultralytics.com/) machine learning model is used to identify various objects such as types of vehicles. Additional services count the vehicles and finally the data is displayed on a map which is part of the web UI that has been created for this project. 
 
-You'll fork the complete project from GitHub, and then create a Quix project from the forked repo, so you have a copy of the full application code running in your Quix account. You then examine the data flow through the project's pipeline, using tools provided by the Quix Portal.
+You'll fork the complete project from GitHub, and then create a Quix project from the forked repo, so you have a copy of the full application code running in your Quix account. You then examine the data flow through the project's pipeline, using tools provided by Quix.
 
 <div>
-<a class="md-button md-button--primary" href="https://app-demo-computervisiondemo-prod.deployments.quix.ai/" target="_blank" style="margin-right:.5rem;">See the deployed project</a>
+<a class="md-button md-button--primary" href="https://portal.platform.quix.ai/pipeline?workspace=demo-computervisiondemo-prod&token=eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6Ik1qVTBRVE01TmtJNVJqSTNOVEpFUlVSRFF6WXdRVFF4TjBSRk56SkNNekpFUWpBNFFqazBSUSJ9.eyJodHRwczovL3F1aXguYWkvb3JnX2lkIjoiZGVtbyIsImh0dHBzOi8vcXVpeC5haS9vd25lcl9pZCI6ImF1dGgwfDI4YWQ4NWE4LWY1YjctNGFjNC1hZTVkLTVjYjY3OGIxYjA1MiIsImh0dHBzOi8vcXVpeC5haS90b2tlbl9pZCI6ImMzNzljNmVlLWNkMmYtNDExZC1iOGYyLTMyMDU0ZDc5MTY2YSIsImh0dHBzOi8vcXVpeC5haS9leHAiOiIxNzM3ODI5NDc5LjIyMyIsImlzcyI6Imh0dHBzOi8vYXV0aC5xdWl4LmFpLyIsInN1YiI6ImtyMXU4MGRqRllvUUZlb01nMGhqcXZia29lRkxFRDVBQGNsaWVudHMiLCJhdWQiOiJxdWl4IiwiaWF0IjoxNjk1NzE2MDI4LCJleHAiOjE2OTgzMDgwMjgsImF6cCI6ImtyMXU4MGRqRllvUUZlb01nMGhqcXZia29lRkxFRDVBIiwiZ3R5IjoiY2xpZW50LWNyZWRlbnRpYWxzIiwicGVybWlzc2lvbnMiOltdfQ.Ndm0K2iNHPxDq1ohF-yb-6LzIqx_UY8Ptcq0kAwSNye12S3deX_eDkC4XqZqW2NoSLd3GsmWV9PZGetGGp2IlqshQFZtUMp6WP6hq917ZC1i8JFx93PAbY7NT_88nFDovVlaRcoTpWvI-03KbryLkAoB28c6qb3EFwjCWFBuy_yA4yjQ8uF0-AZ0R9Qi4IBaekXWqcgO0a91gVRg0oA_hnzJFoR-EnZ2G1ZSxtuVgnyyPuQTMUvzJuUT_IJTLzEB_kejX0pcXRZBIwHP8MWLB4mE5DtIdz4jm8WIA4eZJZ7ZCG4dk-adQwZ2BdkNknV5eEwRgRJL4ybaplkaDlR-dg" target="_blank" style="margin-right:.5rem;">See the project running in Quix</a>
+
+<a class="md-button md-button" href="https://app-demo-computervisiondemo-prod.deployments.quix.ai/" target="_blank" style="margin-right:.5rem;">See the deployed project</a>
 
-<a class="md-button md-button" href="https://portal.platform.quix.ai/pipeline?workspace=demo-computervisiondemo-prod&token=eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6Ik1qVTBRVE01TmtJNVJqSTNOVEpFUlVSRFF6WXdRVFF4TjBSRk56SkNNekpFUWpBNFFqazBSUSJ9.eyJodHRwczovL3F1aXguYWkvb3JnX2lkIjoiZGVtbyIsImh0dHBzOi8vcXVpeC5haS9vd25lcl9pZCI6ImF1dGgwfDI4YWQ4NWE4LWY1YjctNGFjNC1hZTVkLTVjYjY3OGIxYjA1MiIsImh0dHBzOi8vcXVpeC5haS90b2tlbl9pZCI6ImMzNzljNmVlLWNkMmYtNDExZC1iOGYyLTMyMDU0ZDc5MTY2YSIsImh0dHBzOi8vcXVpeC5haS9leHAiOiIxNzM3ODI5NDc5LjIyMyIsImlzcyI6Imh0dHBzOi8vYXV0aC5xdWl4LmFpLyIsInN1YiI6ImtyMXU4MGRqRllvUUZlb01nMGhqcXZia29lRkxFRDVBQGNsaWVudHMiLCJhdWQiOiJxdWl4IiwiaWF0IjoxNjk1NzE2MDI4LCJleHAiOjE2OTgzMDgwMjgsImF6cCI6ImtyMXU4MGRqRllvUUZlb01nMGhqcXZia29lRkxFRDVBIiwiZ3R5IjoiY2xpZW50LWNyZWRlbnRpYWxzIiwicGVybWlzc2lvbnMiOltdfQ.Ndm0K2iNHPxDq1ohF-yb-6LzIqx_UY8Ptcq0kAwSNye12S3deX_eDkC4XqZqW2NoSLd3GsmWV9PZGetGGp2IlqshQFZtUMp6WP6hq917ZC1i8JFx93PAbY7NT_88nFDovVlaRcoTpWvI-03KbryLkAoB28c6qb3EFwjCWFBuy_yA4yjQ8uF0-AZ0R9Qi4IBaekXWqcgO0a91gVRg0oA_hnzJFoR-EnZ2G1ZSxtuVgnyyPuQTMUvzJuUT_IJTLzEB_kejX0pcXRZBIwHP8MWLB4mE5DtIdz4jm8WIA4eZJZ7ZCG4dk-adQwZ2BdkNknV5eEwRgRJL4ybaplkaDlR-dg" target="_blank" style="margin-right:.5rem;">See the project running in Quix</a>
 <br/>
 </div>
 
@@ -141,7 +144,7 @@ This tutorial is divided up into several parts, to make it a more manageable lea
 
 7. [Add new service](add-service.md). You add a new service to a feature branch, test it, and then merge to the tutorial branch.
 
-8. [Summary](summary.md). In this concluding part you are presented with a summary of the work you have completed, and also some next steps for more advanced learning about the Quix Platform.
+8. [Summary](summary.md). In this concluding part you are presented with a summary of the work you have completed, and also some next steps for more advanced learning about Quix.
 
 ## 🏃‍♀️ Next step
 
diff --git a/docs/tutorials/computer-vision/summary.md b/docs/tutorials/computer-vision/summary.md
index 2e26f629..9470ebdb 100644
--- a/docs/tutorials/computer-vision/summary.md
+++ b/docs/tutorials/computer-vision/summary.md
@@ -2,7 +2,7 @@
 
 In this tutorial you have learned that it is possible to quickly fork a complete Quix project and get it up and running in your Quix account very quickly. This enables you to start your own project by using one of our templates. You can then modify our code, keeping your project in a public or private Git repository as required. Alternatively, you can build your own custom pipeline from a mix of our code samples, and your own custom sources, transforms, and destinations.
 
-In addition, you have see how in the Quix portal you can:
+In addition, you have seen how in Quix you can:
 
 * See the power of navigating your pipeline visually
 * View the logs of a service as an aid to debugging
diff --git a/docs/tutorials/computer-vision/tfl-camera-feed.md b/docs/tutorials/computer-vision/tfl-camera-feed.md
index b99fba1c..3c696e98 100644
--- a/docs/tutorials/computer-vision/tfl-camera-feed.md
+++ b/docs/tutorials/computer-vision/tfl-camera-feed.md
@@ -124,7 +124,7 @@ This message is passed on to the next service in the pipeline, the frame grabber
 
 ## 👩‍🔬 Lab - Examine the data 
 
-In this section, you learn how to use the Quix Portal to examine the message data format. There are various ways of doing this, and several ways are shown in later parts of this tutorial. Having clarity on the message format enables better undertanding of the data flow in the pipeline.
+In this section, you learn how to use Quix to examine the message data format. There are various ways of doing this, and several ways are shown in later parts of this tutorial. Having clarity on the message format enables better undertanding of the data flow in the pipeline.
 
 To see the message format on the output topic of the service:
 
diff --git a/docs/tutorials/currency-alerting/currency-alerting.md b/docs/tutorials/currency-alerting/currency-alerting.md
index eb60a316..812974ab 100644
--- a/docs/tutorials/currency-alerting/currency-alerting.md
+++ b/docs/tutorials/currency-alerting/currency-alerting.md
@@ -30,7 +30,7 @@ The objective of this tutorial is to create a pipeline that resembles the follow
 
 The colors describe the role of the microservice that is being deployed. The possible roles are as follows:
 
-<div class="sq sq-blue"><span></span>Source — enables streaming of data into the Quix platform from any external source, such as an API or WebSocket.</div>
+<div class="sq sq-blue"><span></span>Source — enables streaming of data into Quix from any external source, such as an API or WebSocket.</div>
 <div class="sq sq-violet"><span></span>Transformation — implements the processing of data, for example, cleaning data or implementing a Machine Learning (ML) model.</div>
 <div class="sq sq-orange"><span></span> Destination — enables streaming of processed data to an external destination, such as a database or dashboard.</div>
 
@@ -47,7 +47,7 @@ To summarize this functionality:
 
 To set up the CoinAPI source, follow these steps:
 
-1. In the [Quix Portal](https://portal.platform.quix.ai/){target=_blank}, click the `Code Samples` icon in the main left-hand navigation.
+1. In [Quix](https://portal.platform.quix.ai/){target=_blank}, click the `Code Samples` icon in the main left-hand navigation.
 
 2. In the search box on the Code Samples page, enter "CoinAPI - Exchange Rate Feed".
    
@@ -193,7 +193,7 @@ Here's what you accomplished in this tutorial:
 
 ✅ You deployed three real-time serverless microservices: the CoinAPI source to read data from another platform, the Threshold Alert transformation to make decisions based on that data, and the Pushover destination to send push notifications to your phone.
 
-✅ You gained some experience in navigating the Quix platform, and learned how to deploy microservices without needing to write any code.
+✅ You gained some experience in navigating Quix, and learned how to deploy microservices without needing to write any code.
 
 ## Next steps
 
@@ -203,7 +203,6 @@ To learn more, try one of these tutorials:
 * [Perform chat sentiment analysis](../sentiment-analysis/overview.md)
 * [Gather and processes data from an RSS feed and get an alert when specific criteria are met](../rss-tutorial/rss-processing-pipeline.md)
 
-
 !!! tip "Getting Help"
 
       If you need any help, please sign up to the [Quix community forum](https://forum.quix.io/){target=_blank}.
\ No newline at end of file
diff --git a/docs/tutorials/data-science/3-data.md b/docs/tutorials/data-science/3-data.md
index 7f58de23..81a87684 100644
--- a/docs/tutorials/data-science/3-data.md
+++ b/docs/tutorials/data-science/3-data.md
@@ -1,8 +1,8 @@
 # View and store the data
 
-With the Quix Platform it's easy to visualize your data in a powerful and flexible way, you can see the data in real time, as well as viewing historical data.
+With Quix it's easy to visualize your data in a powerful and flexible way, you can see the data in real time, as well as viewing historical data.
 
-The Quix Platform was designed for real-time data, so if you want to see data-at-rest for any topic you must turn on data persistence for that specific topic. You'll do this in the [historical data](#historical-data) section.
+Quix was designed for real-time data, so if you want to see data-at-rest for any topic you must turn on data persistence for that specific topic. You'll do this in the [historical data](#historical-data) section.
 
 ## Real-time data
 
diff --git a/docs/tutorials/data-science/4-train.md b/docs/tutorials/data-science/4-train.md
index 360e0bb8..4fea0a8b 100644
--- a/docs/tutorials/data-science/4-train.md
+++ b/docs/tutorials/data-science/4-train.md
@@ -1,6 +1,6 @@
 # Training data
 
-Quix gives you the freedom to train the ML model your own way. If you already have tools and processes for doing that then you can train the model and use it in the Quix Platform where you can run it in real-time. 
+Quix gives you the freedom to train the ML model your own way. If you already have tools and processes for doing that then you can train the model and use it in Quix where you can run it in real-time. 
 
 Follow along and learn how to retrieve historical data from your topics, so you can train your model.
 
@@ -87,7 +87,7 @@ To access historical data:
 
 ## Train the model
 
-At this point, you are collecting historical data and you know how to query it for use outside the Quix Platform to train your ML models.
+At this point, you are collecting historical data and you know how to query it for use outside Quix to train your ML models.
 
 ???- example "Need help training a model?"
 
diff --git a/docs/tutorials/data-science/6-conclusion.md b/docs/tutorials/data-science/6-conclusion.md
index 734f094d..68614f20 100644
--- a/docs/tutorials/data-science/6-conclusion.md
+++ b/docs/tutorials/data-science/6-conclusion.md
@@ -22,4 +22,4 @@ What will you build? Let us know! Quix would like to feature your application or
 
 ## Getting help
 
-If you need any assistance, we're here to help in [The Quix Forum](https://forum.quix.io/){target=_blank}. Introduce yourself and then ask any questions in [Quix Platform](https://forum.quix.io/c/quix-saas-platform/6){target=_blank}.
+If you need any assistance, we're here to help in [The Quix Forum](https://forum.quix.io/){target=_blank}. Introduce yourself and then ask any questions in [Quix](https://forum.quix.io/c/quix-saas-platform/6){target=_blank}.
diff --git a/docs/tutorials/data-science/overview.md b/docs/tutorials/data-science/overview.md
index 2d79874a..a5d18a53 100644
--- a/docs/tutorials/data-science/overview.md
+++ b/docs/tutorials/data-science/overview.md
@@ -4,7 +4,7 @@ In this tutorial you will learn how to deploy a real-time **data science** appli
 
 ## Aim
 
-The Quix Platform enables you to harness complex, efficient real-time infrastructure in a quick and simple way. You are going to build an application that uses real-time New York bicycle data and weather data to predict the future availability of bikes in New York.
+Quix enables you to harness complex, efficient real-time infrastructure in a quick and simple way. You are going to build an application that uses real-time New York bicycle data and weather data to predict the future availability of bikes in New York.
 
 You will complete all the typical phases of a data science application:
 
@@ -16,7 +16,7 @@ You will complete all the typical phases of a data science application:
 
  - Deploy the ML models into production and create predictions in real time.
 
-This would traditionally take several people with a wide set of different skills (Data Engineers, Data Scientists and Developers) and weeks of work. However, you will complete this tutorial on your own in a fraction of the time using the Quix Platform.
+This would traditionally take several people with a wide set of different skills (Data Engineers, Data Scientists and Developers) and weeks of work. However, you will complete this tutorial on your own in a fraction of the time using Quix.
 
 ## Prerequisites
 
@@ -28,10 +28,10 @@ This tutorial has the following prerequisites:
 
 		If you don't already know how to train an ML model, follow our "How to train an ML model" tutorial [here](../../tutorials/train-and-deploy-ml/overview.md).
 
-		We take you through the process of getting the code to access the data, running the code in a Jupyter notebook, training the model and uploading your pickle file to the Quix Platform.
+		We take you through the process of getting the code to access the data, running the code in a Jupyter notebook, training the model and uploading your pickle file to Quix.
 
 
-2. You will need a Quix account and be logged into the [Quix Portal](https://portal.platform.quix.ai/workspaces){target=_blank}. 
+2. You will need a Quix account and be logged into [Quix](https://portal.platform.quix.ai/workspaces){target=_blank}. 
 
 	!!! tip 
 
@@ -51,6 +51,6 @@ This tutorial is divided up into several parts, to make it a more manageable lea
 
 5. **Deploy pre-trained ML models and produce predictions in real time**. Use our pre-trained models to get CitiBike predictions based on historical bicycle availability and weather forecasts. You also use the built-in visualization tools to view the models prediction.
 
-6. **Conclusion**. In this [concluding](6-conclusion.md) part you are presented with a summary of the work you have completed, and also some next steps for more advanced learning about the Quix Platform.
+6. **Conclusion**. In this [concluding](6-conclusion.md) part you are presented with a summary of the work you have completed, and also some next steps for more advanced learning about Quix.
 
 [Part 1 - CitiBike data stream :material-arrow-right-circle:{ align=right }](1-bikedata.md)
diff --git a/docs/tutorials/data-stream-processing/data-stream-processing.md b/docs/tutorials/data-stream-processing/data-stream-processing.md
index 34b872cc..46083b57 100644
--- a/docs/tutorials/data-stream-processing/data-stream-processing.md
+++ b/docs/tutorials/data-stream-processing/data-stream-processing.md
@@ -59,7 +59,7 @@ This walk through covers the following:
 
 ## Getting Started
 
-Login to Quix and open your project, you get one project on the free tier, more on higher tiers. A Quix project is a container to help you manage all the data, topics, models and services related to a single solution so we advise using a new, clean one for this tutorial.
+Log in to Quix and open your project, you get one project on the free tier, more on higher tiers. A Quix project is a container to help you manage all the data, topics, models and services related to a single solution so we advise using a new, clean one for this tutorial.
 
 ### Code Samples
 
diff --git a/docs/tutorials/event-detection/data-acquisition.md b/docs/tutorials/event-detection/data-acquisition.md
index 44914eda..3d6e7947 100644
--- a/docs/tutorials/event-detection/data-acquisition.md
+++ b/docs/tutorials/event-detection/data-acquisition.md
@@ -46,7 +46,7 @@ Follow these steps:
 
 3. Click the `SCAN QR CODE` button at the top of the settings page. Now continue to follow these steps. When directed, in step #17, you will scan the QR code using the Quix Companion app.
 
-4. In the Quix Portal, click the user icon in the top right of the browser.
+4. In the Quix UI, click the user icon in the top right of the browser.
 
 	![Portal token menu](./images/token-menu.png){width=150px}
 
@@ -104,7 +104,7 @@ Follow these steps:
 
 Follow these steps to ensure that everything is working as expected:
 
-1. In the Quix Portal, navigate to `Data Explorer`.
+1. In the UI, navigate to `Data Explorer`.
 
 2. Ensure you are on the `Live data` tab.
 
@@ -268,7 +268,7 @@ Follow these instructions to deploy the data source:
 
 7. Stop the code by clicking the same button you clicked to run it.
 
-8. You now deploy the code as a service, so it stays running when you navigate around the platform.
+8. You now deploy the code as a service, so it stays running when you navigate around in the UI.
 
 9. Click `Deploy`.
 
diff --git a/docs/tutorials/matlab/matlab-and-simulink.md b/docs/tutorials/matlab/matlab-and-simulink.md
index a9477dcc..0193a316 100644
--- a/docs/tutorials/matlab/matlab-and-simulink.md
+++ b/docs/tutorials/matlab/matlab-and-simulink.md
@@ -18,7 +18,7 @@ This tutorial uses MATLAB R2023a. Please refer to the [Working with different MA
 
 ### Preparing a MATLAB function for deployment
 
-This section describes the process for packaging MATLAB functions for deployment. The application templates in the Quix Portal have pre-built MATLAB packages. To deploy the default packages without compiling them, go to [deploying a MATLAB function](#deploying-a-matlab-function) section.
+This section describes the process for packaging MATLAB functions for deployment. The application templates in Quix have pre-built MATLAB packages. To deploy the default packages without compiling them, go to [deploying a MATLAB function](#deploying-a-matlab-function) section.
 
  1. In MATLAB, create a new `*.m` file with the following function and save it as `rot.m`:
 	
@@ -48,7 +48,7 @@ This section describes the process for packaging MATLAB functions for deployment
 
 ### Deploying a MATLAB function
 
- 1. Sign in to your environment in the [Quix Portal](https://portal.platform.quix.ai/){target=_blank}.
+ 1. Sign in to your environment in [Quix](https://portal.platform.quix.ai/){target=_blank}.
 
  2. Click on the `Code Samples` in the left navigation panel, and search for `matlab` in the search box on the top left to filter code samples.
 
@@ -173,7 +173,7 @@ This tutorial uses MATLAB R2023a. Please refer to the [Working with different MA
 
 ### Deploying a Simulink model
 
- 1. Sign in to the environment on the [Quix Portal](https://portal.platform.quix.ai/){target=_blank}.
+ 1. Sign in to the environment in [Quix](https://portal.platform.quix.ai/){target=_blank}.
 
  2. Click on the `Code Samples` on the left navigation panel and search for `simulink` in the search bar on the top left to filter code samples (templates for MATLAB and Simulink are the same):
 
diff --git a/docs/tutorials/overview.md b/docs/tutorials/overview.md
index b3925fd9..232418b9 100644
--- a/docs/tutorials/overview.md
+++ b/docs/tutorials/overview.md
@@ -4,24 +4,41 @@ The Quix tutorials provide you with experience of using Quix. They guide you in
 
 Each tutorial is divided into parts, so that you can leave a tutorial at a convenient point, come back to it later, and continue where you left off.
 
+Some tutorials use [project templates](../get-started/project-templates.md) - these are marked accordingly.
+
 <div class="grid cards" markdown>
 
 -   __Computer vision__
 
     ---
     
-    Use ML in real-time computer vision using London's 'Jam Cams'.
+    ![Computer vision pipeline](../images/project-templates/computer-vision-pipeline.png)
+
+    `Project template`
 
-    [:octicons-arrow-right-24: Computer vision](./computer-vision/overview.md)
+    Real-time computer vision using TfL's JamCams.
 
+    [Explore :octicons-arrow-right-24:](../tutorials/computer-vision/overview.md)
 
 -   __Chat sentiment analysis__
 
     ---
     
-    Build a chat sentiment analysis application from a project template.
+    ![Chat sentiment analysis pipeline](../images/project-templates/chat-sentiment-pipeline.png)
+
+    `Project template`
+
+    Chat application with sentiment analysis and typing indicator.
+
+    [Explore :octicons-arrow-right-24:](../tutorials/sentiment-analysis/overview.md)
+
+-   __Train and deploy machine learning (ML)__
+
+    ---
+
+    Extract data from Quix to train your Machine Learning (ML) model in Jupyter Notebook, then deploy your solution in Quix.     
 
-    [:octicons-arrow-right-24: Chat sentiment analysis](./sentiment-analysis/overview.md)
+    [Explore :octicons-arrow-right-24:](../tutorials/train-and-deploy-ml/overview.md)
 
 -   __MATLAB and Simulink__
 
@@ -29,7 +46,7 @@ Each tutorial is divided into parts, so that you can leave a tutorial at a conve
     
     Deploy real-time MATLAB transformations and Simulink models to Quix.
 
-    [:octicons-arrow-right-24: MATLAB and Simulink](./matlab/matlab-and-simulink.md)
+    [Explore :octicons-arrow-right-24:](../tutorials/matlab/matlab-and-simulink.md)
 
 </div>
 
diff --git a/docs/tutorials/rss-tutorial/rss-processing-pipeline.md b/docs/tutorials/rss-tutorial/rss-processing-pipeline.md
index 21417c17..210b2c78 100644
--- a/docs/tutorials/rss-tutorial/rss-processing-pipeline.md
+++ b/docs/tutorials/rss-tutorial/rss-processing-pipeline.md
@@ -120,7 +120,7 @@ The code picks out several field values from the parameter data and
 combines them to form the desired Slack alert.
 
 Copy the code and paste it over the quix_function.py file in your
-application in the Quix portal.
+application in Quix.
 
 Save it by clicking `CTRL+S` or `Command + S` or click the tick in the
 top right.
diff --git a/docs/tutorials/sentiment-analysis/get-project.md b/docs/tutorials/sentiment-analysis/get-project.md
index f08c1a98..a8171872 100644
--- a/docs/tutorials/sentiment-analysis/get-project.md
+++ b/docs/tutorials/sentiment-analysis/get-project.md
@@ -9,7 +9,7 @@ In the following sections you learn how to:
 1. Fork an existing project repository, in this case the computer vision template project.
 2. Create a new project (and environment) in Quix linked to your forked repository.
 
-In later parts of the tutorial you explore the project pipeline using the Quix data explorer and other tools, viewing code, examining data structures, and getting a practical feel for the Quix Portal.
+In later parts of the tutorial you explore the project pipeline using the Quix data explorer and other tools, viewing code, examining data structures, and getting a practical feel for Quix.
 
 ## 💡 Key ideas
 
diff --git a/docs/tutorials/sentiment-analysis/overview.md b/docs/tutorials/sentiment-analysis/overview.md
index 204f0d14..9a2114d1 100644
--- a/docs/tutorials/sentiment-analysis/overview.md
+++ b/docs/tutorials/sentiment-analysis/overview.md
@@ -2,14 +2,17 @@
 
 In this tutorial you learn about a real-time chat sentiment analysis application, using a [Quix template project](https://github.com/quixio/chat-demo-app){target=_blank}. 
 
+![Sentiment analysis pipeline](../../images/project-templates/chat-sentiment-pipeline.png)
+
 Sentiment analysis is performed on chat messages. The project includes a chat UI, where you can type chat messages. You can also connect to Twitch and perform sentiment analysis on large volumes of messages.
 
 You learn how to get the project, try out the UI, look more deeply into the UI and the sentiment analysis service, and then customize the UI.
 
 <div>
-<a class="md-button md-button--primary" href="https://sentimentdemoui-demo-chatappdemo-prod.deployments.quix.ai/chat" target="_blank" style="margin-right:.5rem;">See the deployed project</a>
+<a class="md-button md-button--primary" href="https://portal.platform.quix.ai/pipeline?workspace=demo-chatappdemo-prod&token=eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6Ik1qVTBRVE01TmtJNVJqSTNOVEpFUlVSRFF6WXdRVFF4TjBSRk56SkNNekpFUWpBNFFqazBSUSJ9.eyJodHRwczovL3F1aXguYWkvb3JnX2lkIjoiZGVtbyIsImh0dHBzOi8vcXVpeC5haS9vd25lcl9pZCI6ImF1dGgwfDI4YWQ4NWE4LWY1YjctNGFjNC1hZTVkLTVjYjY3OGIxYjA1MiIsImh0dHBzOi8vcXVpeC5haS90b2tlbl9pZCI6ImMzNzljNmVlLWNkMmYtNDExZC1iOGYyLTMyMDU0ZDc5MTY2YSIsImh0dHBzOi8vcXVpeC5haS9leHAiOiIxNzM3ODI5NDc5LjIyMyIsImlzcyI6Imh0dHBzOi8vYXV0aC5xdWl4LmFpLyIsInN1YiI6ImtyMXU4MGRqRllvUUZlb01nMGhqcXZia29lRkxFRDVBQGNsaWVudHMiLCJhdWQiOiJxdWl4IiwiaWF0IjoxNjk1NzE2MDI4LCJleHAiOjE2OTgzMDgwMjgsImF6cCI6ImtyMXU4MGRqRllvUUZlb01nMGhqcXZia29lRkxFRDVBIiwiZ3R5IjoiY2xpZW50LWNyZWRlbnRpYWxzIiwicGVybWlzc2lvbnMiOltdfQ.Ndm0K2iNHPxDq1ohF-yb-6LzIqx_UY8Ptcq0kAwSNye12S3deX_eDkC4XqZqW2NoSLd3GsmWV9PZGetGGp2IlqshQFZtUMp6WP6hq917ZC1i8JFx93PAbY7NT_88nFDovVlaRcoTpWvI-03KbryLkAoB28c6qb3EFwjCWFBuy_yA4yjQ8uF0-AZ0R9Qi4IBaekXWqcgO0a91gVRg0oA_hnzJFoR-EnZ2G1ZSxtuVgnyyPuQTMUvzJuUT_IJTLzEB_kejX0pcXRZBIwHP8MWLB4mE5DtIdz4jm8WIA4eZJZ7ZCG4dk-adQwZ2BdkNknV5eEwRgRJL4ybaplkaDlR-dg" target="_blank" style="margin-right:.5rem;">See the project running in Quix</a>
+
+<a class="md-button md-button" href="https://sentimentdemoui-demo-chatappdemo-prod.deployments.quix.ai/chat" target="_blank" style="margin-right:.5rem;">See the deployed project</a>
 
-<a class="md-button md-button" href="https://portal.platform.quix.ai/pipeline?workspace=demo-chatappdemo-prod&token=eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6Ik1qVTBRVE01TmtJNVJqSTNOVEpFUlVSRFF6WXdRVFF4TjBSRk56SkNNekpFUWpBNFFqazBSUSJ9.eyJodHRwczovL3F1aXguYWkvb3JnX2lkIjoiZGVtbyIsImh0dHBzOi8vcXVpeC5haS9vd25lcl9pZCI6ImF1dGgwfDI4YWQ4NWE4LWY1YjctNGFjNC1hZTVkLTVjYjY3OGIxYjA1MiIsImh0dHBzOi8vcXVpeC5haS90b2tlbl9pZCI6ImMzNzljNmVlLWNkMmYtNDExZC1iOGYyLTMyMDU0ZDc5MTY2YSIsImh0dHBzOi8vcXVpeC5haS9leHAiOiIxNzM3ODI5NDc5LjIyMyIsImlzcyI6Imh0dHBzOi8vYXV0aC5xdWl4LmFpLyIsInN1YiI6ImtyMXU4MGRqRllvUUZlb01nMGhqcXZia29lRkxFRDVBQGNsaWVudHMiLCJhdWQiOiJxdWl4IiwiaWF0IjoxNjk1NzE2MDI4LCJleHAiOjE2OTgzMDgwMjgsImF6cCI6ImtyMXU4MGRqRllvUUZlb01nMGhqcXZia29lRkxFRDVBIiwiZ3R5IjoiY2xpZW50LWNyZWRlbnRpYWxzIiwicGVybWlzc2lvbnMiOltdfQ.Ndm0K2iNHPxDq1ohF-yb-6LzIqx_UY8Ptcq0kAwSNye12S3deX_eDkC4XqZqW2NoSLd3GsmWV9PZGetGGp2IlqshQFZtUMp6WP6hq917ZC1i8JFx93PAbY7NT_88nFDovVlaRcoTpWvI-03KbryLkAoB28c6qb3EFwjCWFBuy_yA4yjQ8uF0-AZ0R9Qi4IBaekXWqcgO0a91gVRg0oA_hnzJFoR-EnZ2G1ZSxtuVgnyyPuQTMUvzJuUT_IJTLzEB_kejX0pcXRZBIwHP8MWLB4mE5DtIdz4jm8WIA4eZJZ7ZCG4dk-adQwZ2BdkNknV5eEwRgRJL4ybaplkaDlR-dg" target="_blank" style="margin-right:.5rem;">See the project running in Quix</a>
 <br/>
 </div>
 
diff --git a/docs/tutorials/slack-alerting/slack-alerting.md b/docs/tutorials/slack-alerting/slack-alerting.md
index 0d82888e..6da9f36f 100644
--- a/docs/tutorials/slack-alerting/slack-alerting.md
+++ b/docs/tutorials/slack-alerting/slack-alerting.md
@@ -34,7 +34,7 @@ A Quix Service receives data from the Transport For London BikePoint API and str
 
 To proceed with this tutorial you need:
 
- - Quix portal login. (You'll need an account for this, go to [here](https://portal.platform.quix.ai/self-sign-up/){target=_blank} and create one).
+ - [Free Quix account](https://portal.platform.quix.ai/self-sign-up/){target=_blank}.
 
  - Access to Slack, you’ll need to be an admin.
 
diff --git a/docs/tutorials/train-and-deploy-ml/conclusion.md b/docs/tutorials/train-and-deploy-ml/conclusion.md
index 30fd2510..fd98a4a9 100644
--- a/docs/tutorials/train-and-deploy-ml/conclusion.md
+++ b/docs/tutorials/train-and-deploy-ml/conclusion.md
@@ -1,6 +1,6 @@
 # Conclusion
 
-In this tutorial you've learned how to use Quix to generate real-time data. You've also learned how to import that data into Jupyter Notebook using the Quix code generator. You then saw how to deploy your ML model to the Quix Platform, and visualize its output in real time.
+In this tutorial you've learned how to use Quix to generate real-time data. You've also learned how to import that data into Jupyter Notebook using the Quix code generator. You then saw how to deploy your ML model to Quix, and visualize its output in real time.
 
 ![Data explorer](./images/visualize-result.png)
 
diff --git a/docs/tutorials/train-and-deploy-ml/create-data.md b/docs/tutorials/train-and-deploy-ml/create-data.md
index cffbb328..585f0f0e 100644
--- a/docs/tutorials/train-and-deploy-ml/create-data.md
+++ b/docs/tutorials/train-and-deploy-ml/create-data.md
@@ -6,7 +6,7 @@ In this part of the tutorial you learn how to obtain some real-time data to work
 
 To make things a little easier, first create a **persisted topic** to receive the generated data. 
 
-1. Login to the Quix Portal. 
+1. Log in to Quix. 
 
 2. Click `Topics` on the left-hand menu.
 
diff --git a/docs/tutorials/train-and-deploy-ml/deploy-ml.md b/docs/tutorials/train-and-deploy-ml/deploy-ml.md
index 212817b2..e7f1ffb4 100644
--- a/docs/tutorials/train-and-deploy-ml/deploy-ml.md
+++ b/docs/tutorials/train-and-deploy-ml/deploy-ml.md
@@ -1,6 +1,6 @@
 # Deploy your ML model
 
-In this part of the tutorial, you deploy the Pickle file [containing your ML model](./train-ml.md) to the Quix Platform. Your ML code then uses this model to predict braking in real time. 
+In this part of the tutorial, you deploy the Pickle file [containing your ML model](./train-ml.md) to Quix. Your ML code then uses this model to predict braking in real time. 
 
 ![What you'll build](./images/run-live.png)
 
@@ -8,7 +8,7 @@ You'll also use the Quix Data Explorer to visualize the braking prediction in re
 
 ## Create a transform
 
-Ensure you are logged into the Quix Portal, then follow these steps to create a transform that uses your model:
+Ensure you are logged into Quix, then follow these steps to create a transform that uses your model:
 
 1. Click `Code Samples` in the left-hand sidebar.
 
@@ -181,6 +181,6 @@ You now see a graphical output for the prediction being output by the model as w
 
 !!! note
 
-	Don't forget the purpose of this tutorial was to show you how to deploy an ML model in Quix Platform, rather than to train an accurate model. So the prediction may not always match the actual brake value.
+	Don't forget the purpose of this tutorial was to show you how to deploy an ML model in Quix, rather than to train an accurate model. So the prediction may not always match the actual brake value.
 
 [Conclusion and next steps :material-arrow-right-circle:{ align=right }](conclusion.md)
diff --git a/docs/tutorials/train-and-deploy-ml/import-data.md b/docs/tutorials/train-and-deploy-ml/import-data.md
index e66b36cb..fb801465 100644
--- a/docs/tutorials/train-and-deploy-ml/import-data.md
+++ b/docs/tutorials/train-and-deploy-ml/import-data.md
@@ -29,11 +29,11 @@ jupyter notebook
 
 ## Obtain the training data
 
-In the [previous part](./create-data.md) you generated some real-time data in the Quix Portal. 
+In the [previous part](./create-data.md) you generated some real-time data in Quix. 
 
-The Quix Portal has a code generator that can generate code to connect your Jupyter Notebook to Quix. To use the code generator to retrieve data from Quix and import it into your Notebook:
+Quix has a code generator that can generate code to connect your Jupyter Notebook to Quix. To use the code generator to retrieve data from Quix and import it into your Notebook:
 
-1. Make sure you are logged into the Quix Portal.
+1. Make sure you are logged into Quix.
 
 2. Select your Workspace (you probably only have one currently).
 
diff --git a/docs/tutorials/train-and-deploy-ml/overview.md b/docs/tutorials/train-and-deploy-ml/overview.md
index 39a3a387..8a47253f 100644
--- a/docs/tutorials/train-and-deploy-ml/overview.md
+++ b/docs/tutorials/train-and-deploy-ml/overview.md
@@ -1,6 +1,6 @@
 # Real-time Machine Learning (ML) pipelines
 
-In this tutorial, you learn how to extract data from Quix to train your Machine Learning (ML) model in Jupyter Notebook. You then learn how to deploy this model to the Quix Platform, so ML can be used to process your data in real time.
+In this tutorial, you learn how to extract data from Quix to train your Machine Learning (ML) model in Jupyter Notebook. You then learn how to deploy this model to Quix, so ML can be used to process your data in real time.
 
 ## Video
 
@@ -28,8 +28,8 @@ This tutorial is divided up into several parts, to make the learning experience
 
 3. **Train your ML model** - You learn how to train an ML model. For this tutorial, this is done in Jupyter, but could also be done in Quix.
 
-4. **Deploy your ML model** - You learn how to deploy your ML model to the Quix Platform.
+4. **Deploy your ML model** - You learn how to deploy your ML model to Quix.
 
-5. **Summary** - In this [concluding](conclusion.md) part you are presented with a summary of the work you have completed, and also some next steps for more advanced learning about the Quix Platform.
+5. **Summary** - In this [concluding](conclusion.md) part you are presented with a summary of the work you have completed, and also some next steps for more advanced learning about Quix.
 
 [Get some data :material-arrow-right-circle:{ align=right }](./create-data.md)
diff --git a/mkdocs.yml b/mkdocs.yml
index 2576f071..186f5ba3 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1,5 +1,5 @@
 site_name: 'Quix Docs'
-site_description: 'Quix Developer Documentation. Includes documentation (tutorials, reference guides, how-tos, concepts) for Quix Platform, Quix Streams client library, and REST and websocket APIs.'
+site_description: 'Quix Developer Documentation. Includes documentation (guides, tutorials, references) for Quix Cloud, Quix Streams client library, and REST and websocket APIs.'
 site_author: 'Quix.io'
 site_url: 'https://quix.io/docs'
 
@@ -21,6 +21,7 @@ nav:
       - '1. Ingest': 'get-started/quixtour/ingest-push.md'
       - '2. Process': 'get-started/quixtour/process-threshold.md'
       - '3. Serve': 'get-started/quixtour/serve-sms.md'
+    - 'Project templates': 'get-started/project-templates.md'
     - 'What is Quix?': 'get-started/what-is-quix.md'
     - 'Glossary': 'get-started/glossary.md'
     - 'Contribute': 'get-started/contribute.md'
@@ -149,7 +150,7 @@ nav:
     - 'Data Stream Processing': 'tutorials/data-stream-processing/data-stream-processing.md'
     - 'Slack Alerting': 'tutorials/slack-alerting/slack-alerting.md'
     - 'MATLAB and Simulink': 'tutorials/matlab/matlab-and-simulink.md'
-  - 'Quix Streams': '!import https://github.com/quixio/quix-streams?branch=main'
+  - 'Quix Streams': '!import https://github.com/quixio/quix-streams?branch=release/v0.5'
 
 plugins:
   - multirepo:
@@ -164,12 +165,23 @@ plugins:
       redirect_maps:
         'index.md': 'get-started/welcome.md'
         'contribute.md': 'get-started/contribute.md'
+        'platform/changes.md': 'get-started/welcome.md'
+        'platform/changes.md#environment': 'create/create-environment.md'
         'platform/ingest-data.md': 'develop/overview.md'
         'platform/quickstart.md': 'get-started/quickstart.md'
         'platform/what-is-quix.md': 'get-started/what-is-quix.md'
         'platform/glossary.md': 'get-started/glossary.md'
         'platform/quixtour/overview.md': 'get-started/quixtour/overview.md'
+        'platform/tutorials/index.md': 'tutorials/overview.md'
         'platform/tutorials/computer-vision/index.md': 'tutorials/computer-vision/overview.md'
+        'platform/tutorials/computer-vision/get-project.md': 'tutorials/computer-vision/get-project.md'
+        'platform/tutorials/computer-vision/tfl-camera-feed.md': 'tutorials/computer-vision/tfl-camera-feed.md'
+        'platform/tutorials/computer-vision/tfl-frame-grabber.md': 'tutorials/computer-vision/tfl-frame-grabber.md'
+        'platform/tutorials/computer-vision/object-detection.md': 'tutorials/computer-vision/object-detection.md'
+        'platform/tutorials/computer-vision/web-ui.md': 'tutorials/computer-vision/web-ui.md'
+        'platform/tutorials/computer-vision/other-services.md': 'tutorials/computer-vision/other-services.md'
+        'platform/tutorials/computer-vision/add-service.md': 'tutorials/computer-vision/add-service.md'
+        'platform/tutorials/computer-vision/summary.md': 'tutorials/computer-vision/summary.md'
         'platform/tutorials/currency-alerting/currency-alerting.md': 'tutorials/currency-alerting/currency-alerting.md'
         'platform/tutorials/data-science/index.md': 'tutorials/data-science/overview.md'
         'platform/tutorials/data-stream-processing/data-stream-processing.md': 'tutorials/data-stream-processing/data-stream-processing.md'
@@ -178,19 +190,25 @@ plugins:
         'platform/tutorials/nocode-sentiment/nocode-sentiment-analysis.md': 'tutorials/sentiment-analysis/overview.md'
         'platform/tutorials/rss-tutorial/rss-processing-pipeline.md': 'tutorials/rss-tutorial/rss-processing-pipeline.md'
         'platform/tutorials/sentiment-analysis/index.md': 'tutorials/sentiment-analysis/overview.md'
+        'platform/tutorials/sentiment-analysis/get-project.md': 'tutorials/sentiment-analysis/get-project.md'
+        'platform/tutorials/sentiment-analysis/try-the-ui.md': 'tutorials/sentiment-analysis/try-the-ui.md'
+        'platform/tutorials/sentiment-analysis/sentiment-analysis-service.md': 'tutorials/sentiment-analysis/sentiment-analysis-service.md'
+        'platform/tutorials/sentiment-analysis/twitch-service.md': 'tutorials/sentiment-analysis/twitch-service.md'
+        'platform/tutorials/sentiment-analysis/customize-the-ui.md': 'tutorials/sentiment-analysis/customize-the-ui.md'
+        'platform/tutorials/sentiment-analysis/summary.md': 'tutorials/sentiment-analysis/summary.md'
         'platform/tutorials/slack-alerting/slack-alerting.md': 'tutorials/slack-alerting/slack-alerting.md'
         'platform/tutorials/train-and-deploy-ml/index.md': 'tutorials/train-and-deploy-ml/overview.md'
         'apis/streaming-writer-api/index.md': 'apis/streaming-writer-api/overview.md'
         'apis/streaming-reader-api/index.md': 'apis/streaming-reader-api/overview.md'
         'apis/portal-api/index.md': 'apis/portal-api/overview.md'
         'apis/query-api/index.md': 'apis/query-api/overview.md'
+        'platform/connectors/index.md': 'connectors/index.md'
         'platform/how-to/personal-access-token-pat.md': 'develop/authentication/personal-access-token.md'
+        'platform/how-to/replay.md': 'manage/replay.md'
+        'platform/how-to/create-project.md': 'create/create-project.md'
         'client-library/quickstart.md': 'quix-streams/quickstart.md'
-        'platform/connectors/index.md': 'connectors/index.md'
-        'platform/howto/replay.md': 'manage/replay.md'
         'client-library/connect.md': 'quix-streams/connect.md'
 
-
 theme:
   name: 'material'
   custom_dir: overrides