diff --git a/packages/projects-docs/pages/learn/devboxes/templates.mdx b/packages/projects-docs/pages/learn/devboxes/templates.mdx
index aacc9c93..55669b6a 100644
--- a/packages/projects-docs/pages/learn/devboxes/templates.mdx
+++ b/packages/projects-docs/pages/learn/devboxes/templates.mdx
@@ -1,84 +1,86 @@
---
title: Templates
-authors: ['Saeris']
+authors: ['James']
description: Use templates to kickstart new projects with no setup.
---
+import { Callout } from 'nextra-theme-docs'
+
+---
+
# Templates
## What are Templates?
-Templates are starting points for Devboxes and Sandboxes. When you pick a template, you create a fork of the original project. Forked templates are already set up with the
-configuration, file structure, and dependencies installed, so you don't have to
+Templates are starting points for development environments that you create through CodeSandbox. When you pick a template, you create a fork of the original project. Forked templates are already set up with the
+configuration, file structure and installed dependencies. So you don't have to
spend time doing this each time you begin working on something new. They
-are easily accessible from your dashboard and the "Create" modal.
+are easily accessible from the ["Create" modal](https://codesandbox.io/s).
-CodeSandbox offers several official templates for several different programming languages. You can find templates in the ["Create" modal](https://codesandbox.io/s).
+From the modal, CodeSandbox offers several official templates for several different programming languages.
-You can also create your own custom templates. Turn any Sandbox and Devbox into a template
-that's customized for your particular use-case and preferences. Once a custom
-template has been created, you can then start new projects from the "Create" modal using one of your templates. Custom templates can also be added
-to workspaces, so workspace members can make use of them.
+You can also create your own custom templates from your projects. So you can fully customize your development start points for your particular use case and preferences. Once a custom
+template has been created, you can use it to start new projects through the ["Create" modal](https://codesandbox.io/s). Custom templates can also be added
+to workspaces so workspace members can use them. Any custom templates you can access can be found in the [Templates folder](https://codesandbox.io/dashboard/templates) on the Dashboard or under 'Workspace Templates' within the modal.
## How to make a custom template
There are a few ways to create a template, but the main way is from within the
-"Sandbox Info" panel inside the editor. When viewing one of your sandboxes,
-you'll see a button at the bottom of the "Sandbox Info" panel that says
-`Save as template`. Clicking this will convert the sandbox to a template, which
-will freeze it and make it available from the "Create" modal.
+"Devbox Info" panel inside the editor. When viewing one of your Devboxes,
+expand the "Devbox Info" panel on the left. You will then see an edit icon in line with the "Devbox Info" header. Click the icon and then check the 'Template' box in the settings pane that opens on the right of the interface.
-
+
+You can also rename and set a description for the template from this interface, as well as configure the template privacy options. Private and Unlisted Templates are only available for Pro subscribers.
+
-Optionally, from the dashboard, you can either drag and drop a sandbox from
-"Overview" or one of your folders under "My Sandboxes" to the new "My Templates"
-folder. There is also an option within the sandbox options menu to
-`Make Sandbox a Template`.
+
-import Image from 'next/image'
-import gif1 from '../images/template-2.gif'
-import gif2 from '../images/template-3.gif'
+You can also create templates from the Dashboard. You can do this by either dragging and dropping a Devbox from
+any folder into ["Templates"](https://codesandbox.io/dashboard/templates) or using the right-click menu and selecting
+_Make Devbox a Template_.
-
-
-
-
-
+
+The Templates folder will only appear once you have created your first custom template.
+
## Using Templates
-After you've made your first custom template, there's a few places from which
-you can access and use them. First, inside of the "Create New Sandbox" modal,
-you will see a list of your templates under `My Templates`. Clicking on one of
+After you've made your first custom template, there are a few places from which
+you can access and use them. First, inside the "Create a Devbox" modal,
+you will see a list of your templates under _Workspace Templates_. Clicking on one of
these will fork the template and open it in the editor.
-
+
-You can also find all of your templates under the `Templates` folder within the
-Dashboard. Clicking on any of the templates shown inside this folder will open
+You can also find all your templates under the [Templates folder](https://codesandbox.io/dashboard/templates) on the
+Dashboard. Clicking on any of the templates in this folder will open
it in the editor.
## Editing Templates
-Templates are frozen upon creation, preventing you from accidentally making
-changes to it. In order to make changes to a template, unfreeze it from the
-"Sandbox Info" panel. Any time you try to make a change to a frozen template, a
-modal will prompt you to fork the template or unfreeze it for the current
-session.
+When you first create a template it will be fully editable to allow you to quickly make any required changes.
+Once you're happy with the template, open up the 'Template Info' settings using the instructions above.
+Then, check 'Frozen' and reload the page to prevent further changes.
+In order to make further changes to a template, you just need to uncheck 'Frozen' and reload the page again.
+Any time you try to save a change to a frozen template, it will automatically fork into a new environment.
-Any changes you make to an unfrozen Template are saved immediately. You don't
-need to freeze it again as it is automatically frozen again when you navigate
-away from the editor or finish the current sandbox session.
+
+The 'Template Info' panel is in the same position as the 'Devbox Info' panel prior to conversion.
+
## Deleting Templates
-There are a few ways in which you can "delete" a template. From the "Sandbox
-Info" panel inside the editor, there is a `Delete Template` button at the bottom
-when viewing an existing template. Clicking this will convert the template back
-to a regular sandbox, removing it from the "Create New Sandbox" modal and moving
-back to the "Overview" and "My Sandboxes" folders inside the dashboard.
+There are a few ways in which you can "delete" a template. From the "Template
+Info" panel inside the editor you can uncheck 'Template'. Doing this will convert the template back
+to a regular Devbox and remove it from the ["Create" modal](https://codesandbox.io/s).
+
+You can then delete the Devbox from your dashboard as you would normally.
+
+Alternatively, you can use the 'right click' template's options menu inside the [Templates folder](https://codesandbox.io/dashboard/templates)
+folder to select _Convert to Devbox_.
-Alternatively, you can use a template's options menu inside the "My Templates"
-folder to select `Convert to Sandbox`.
+
-
+
+This menu is only available within the Templates folder.
+
diff --git a/packages/projects-docs/pages/learn/images/devbox-info-pane.png b/packages/projects-docs/pages/learn/images/devbox-info-pane.png
new file mode 100644
index 00000000..1e8cabfa
Binary files /dev/null and b/packages/projects-docs/pages/learn/images/devbox-info-pane.png differ
diff --git a/packages/projects-docs/pages/learn/images/devbox-template-menu.png b/packages/projects-docs/pages/learn/images/devbox-template-menu.png
new file mode 100644
index 00000000..c3c504fe
Binary files /dev/null and b/packages/projects-docs/pages/learn/images/devbox-template-menu.png differ
diff --git a/packages/projects-docs/pages/learn/images/devbox-template-modal.png b/packages/projects-docs/pages/learn/images/devbox-template-modal.png
new file mode 100644
index 00000000..492f47f9
Binary files /dev/null and b/packages/projects-docs/pages/learn/images/devbox-template-modal.png differ
diff --git a/packages/projects-docs/pages/learn/images/sandbox-info-pane.png b/packages/projects-docs/pages/learn/images/sandbox-info-pane.png
new file mode 100644
index 00000000..b72de0e4
Binary files /dev/null and b/packages/projects-docs/pages/learn/images/sandbox-info-pane.png differ
diff --git a/packages/projects-docs/pages/learn/images/sandbox-template-menu.png b/packages/projects-docs/pages/learn/images/sandbox-template-menu.png
new file mode 100644
index 00000000..8322a203
Binary files /dev/null and b/packages/projects-docs/pages/learn/images/sandbox-template-menu.png differ
diff --git a/packages/projects-docs/pages/learn/images/sandbox-template-modal.png b/packages/projects-docs/pages/learn/images/sandbox-template-modal.png
new file mode 100644
index 00000000..50c7e379
Binary files /dev/null and b/packages/projects-docs/pages/learn/images/sandbox-template-modal.png differ
diff --git a/packages/projects-docs/pages/learn/images/template-folder-menu.png b/packages/projects-docs/pages/learn/images/template-folder-menu.png
new file mode 100644
index 00000000..c3c504fe
Binary files /dev/null and b/packages/projects-docs/pages/learn/images/template-folder-menu.png differ
diff --git a/packages/projects-docs/pages/learn/sandboxes/templates.mdx b/packages/projects-docs/pages/learn/sandboxes/templates.mdx
index fd323f5b..ab59f4fe 100644
--- a/packages/projects-docs/pages/learn/sandboxes/templates.mdx
+++ b/packages/projects-docs/pages/learn/sandboxes/templates.mdx
@@ -1,14 +1,85 @@
---
title: Templates
-authors: ['necoline']
-description: About sandbox templates.
+authors: ['James']
+description: Use templates to kickstart new projects with no setup.
---
-# Sandbox Templates
+import { Callout } from 'nextra-theme-docs'
-In the sandbox template modal, you will find the official list of sandbox templates along with any templates that have been created or imported within the workspace.
+---
+
+# Templates
+
+## What are Templates?
+
+Templates are starting points for development environments that you create through CodeSandbox. When you pick a template, you create a fork of the original project. Forked templates are already set up with the
+configuration, file structure and installed dependencies. So you don't have to
+spend time doing this each time you begin working on something new. They
+are easily accessible from the ["Create" modal](https://codesandbox.io/s).
+
+From the modal, CodeSandbox offers several official templates for several different programming languages.
+
+You can also create your own custom templates from your projects. So you can fully customize your development start points for your particular use case and preferences. Once a custom
+template has been created, you can use it to start new projects through the ["Create" modal](https://codesandbox.io/s). Custom templates can also be added to workspaces so members can use them. Any custom templates you can access can be found in the [Templates folder](https://codesandbox.io/dashboard/templates) or under 'Workspace Templates' within the modal.
+
+## How to make a custom template
+
+There are a few ways to create a template, but the main way is from within the
+"Sandbox Info" panel inside the editor. When viewing one of your Sandboxes,
+expand the "Sandbox Info" panel on the left. You will then see an edit icon in line with the "Sandbox Info" header. Just click the icon and then check the 'Template' box in the settings pane that opens on the right of the editor.
+
+
+You can also rename and set a description for the template from this interface, as well as configure the template privacy options. Private and Unlisted Templates are only available for Pro subscribers.
+
+
+
+
+You can also create templates from the Dashboard. You can do this by either dragging and dropping a Sandbox from
+any folder into ["Templates"](https://codesandbox.io/dashboard/templates) or using the right-click menu and selecting
+_Make Sandbox a Template_.
+
+
+The Templates folder will only appear once you have created your first custom template.
+
+
+## Using Templates
+
+After you've made your first custom template, there are a few places from which
+you can access and use them. First, inside the "Create a Sandbox" modal,
+you will see a list of your templates under `Workspace Templates`. Clicking on one of
+these will fork the template and open it in the editor.
+
+
+
+You can also find all of your templates under the [Templates folder](https://codesandbox.io/dashboard/templates) on the
+Dashboard. Clicking on any of the templates in this folder will open
+it in the editor.
+
+## Editing Templates
+
+When you first create a template it will be fully editable to allow you to quickly make any required changes.
+Once you're happy with the template, just open up the 'Template Info' settings using the instructions above.
+Then, check 'Frozen' and reload the page to prevent further changes.
+In order to make further changes to a template, you just need to uncheck 'Frozen' and reload the page again.
+Any time you try to save a change to a frozen template, it will automatically fork into a new environment.
+
+
+The 'Template Info' panel is in the same position as the 'Sandbox Info' panel prior to conversion.
+
+
+## Deleting Templates
+
+There are a few ways in which you can "delete" a template. From the "Template
+Info" panel inside the editor, you can uncheck 'Template'. Doing this will convert the template back
+to a regular Sandbox and remove it from the ["Create" modal](https://codesandbox.io/s).
+
+You can then delete the Sandbox from your Dashboard as you would normally.
-
-If you are unable to find the template you are looking for, check out the devbox templates. There are many more languages and frameworks that devboxes support.
+Alternatively, you can use the 'right click' template's options menu inside the [Templates folder](https://codesandbox.io/dashboard/templates)
+folder to select _Convert to Sandbox_.
+
+
+This menu is only available within the Templates folder.
+