diff --git a/docs/about/screenshots.md b/docs/about/screenshots.md
index ddf71b823f..dff7ea7594 100644
--- a/docs/about/screenshots.md
+++ b/docs/about/screenshots.md
@@ -2,19 +2,19 @@
## Log in
-
+
Install Coder in your cloud or air-gapped on-premises. Developers simply log in
via their browser to access their Workspaces.
## Templates
-
+
Developers provision their own ephemeral Workspaces in minutes using pre-defined
Templates that include approved tooling and infrastructure.
-
+
Template administrators can either create a new Template from scratch or choose
a Starter Template.
@@ -26,25 +26,25 @@ underlying infrastructure that Coder Workspaces run on.
## Workspaces
-
+
Developers create and delete their own workspaces. Coder administrators can
easily enforce Workspace scheduling and autostop policies to ensure idle
Workspaces don’t burn unnecessary cloud budget.
-
+
Developers launch their favorite web-based or desktop IDE, browse files, or
access their Workspace’s Terminal.
## Administration
-
+
Coder administrators can access Template usage insights to understand which
Templates are most popular and how well they perform for developers.
-
+
Coder administrators can control *every* aspect of their Coder deployment.
diff --git a/docs/images/platforms/docker/create-workspace.png b/docs/images/platforms/docker/create-workspace.png
deleted file mode 100644
index 9959244a96..0000000000
Binary files a/docs/images/platforms/docker/create-workspace.png and /dev/null differ
diff --git a/docs/images/platforms/docker/ides.png b/docs/images/platforms/docker/ides.png
deleted file mode 100755
index 2293b7af63..0000000000
Binary files a/docs/images/platforms/docker/ides.png and /dev/null differ
diff --git a/docs/images/platforms/docker/login.png b/docs/images/platforms/docker/login.png
deleted file mode 100755
index c5bad763e9..0000000000
Binary files a/docs/images/platforms/docker/login.png and /dev/null differ
diff --git a/docs/images/platforms/kubernetes/region-picker.png b/docs/images/platforms/kubernetes/region-picker.png
deleted file mode 100644
index f40a337901..0000000000
Binary files a/docs/images/platforms/kubernetes/region-picker.png and /dev/null differ
diff --git a/docs/images/platforms/kubernetes/starter-template.png b/docs/images/platforms/kubernetes/starter-template.png
deleted file mode 100644
index ff81645d73..0000000000
Binary files a/docs/images/platforms/kubernetes/starter-template.png and /dev/null differ
diff --git a/docs/images/platforms/kubernetes/template-variables.png b/docs/images/platforms/kubernetes/template-variables.png
deleted file mode 100644
index 2d0a9993e4..0000000000
Binary files a/docs/images/platforms/kubernetes/template-variables.png and /dev/null differ
diff --git a/docs/images/screenshots/admin-settings.png b/docs/images/screenshots/admin-settings.png
new file mode 100644
index 0000000000..0b5c249544
Binary files /dev/null and b/docs/images/screenshots/admin-settings.png differ
diff --git a/docs/images/screenshots/audit.png b/docs/images/screenshots/audit.png
index 5538c67afd..1340179ebc 100644
Binary files a/docs/images/screenshots/audit.png and b/docs/images/screenshots/audit.png differ
diff --git a/docs/images/screenshots/coder-login.png b/docs/images/screenshots/coder-login.png
new file mode 100644
index 0000000000..2757c225af
Binary files /dev/null and b/docs/images/screenshots/coder-login.png differ
diff --git a/docs/images/screenshots/create-template.png b/docs/images/screenshots/create-template.png
index e442a8557c..ef54f45d47 100644
Binary files a/docs/images/screenshots/create-template.png and b/docs/images/screenshots/create-template.png differ
diff --git a/docs/images/screenshots/healthcheck.png b/docs/images/screenshots/healthcheck.png
index 5b42f716ca..73143fbc9f 100644
Binary files a/docs/images/screenshots/healthcheck.png and b/docs/images/screenshots/healthcheck.png differ
diff --git a/docs/images/screenshots/login.png b/docs/images/screenshots/login.png
deleted file mode 100644
index 9bfe85e9f4..0000000000
Binary files a/docs/images/screenshots/login.png and /dev/null differ
diff --git a/docs/images/screenshots/settings.png b/docs/images/screenshots/settings.png
deleted file mode 100644
index cf3f19116f..0000000000
Binary files a/docs/images/screenshots/settings.png and /dev/null differ
diff --git a/docs/images/screenshots/starter-templates.png b/docs/images/screenshots/starter-templates.png
new file mode 100644
index 0000000000..51ac42c4bc
Binary files /dev/null and b/docs/images/screenshots/starter-templates.png differ
diff --git a/docs/images/screenshots/starter_templates.png b/docs/images/screenshots/starter_templates.png
deleted file mode 100644
index 1eab19f290..0000000000
Binary files a/docs/images/screenshots/starter_templates.png and /dev/null differ
diff --git a/docs/images/screenshots/template-insights.png b/docs/images/screenshots/template-insights.png
new file mode 100644
index 0000000000..605f49d780
Binary files /dev/null and b/docs/images/screenshots/template-insights.png differ
diff --git a/docs/images/screenshots/templates-listing.png b/docs/images/screenshots/templates-listing.png
new file mode 100644
index 0000000000..e70158a4d7
Binary files /dev/null and b/docs/images/screenshots/templates-listing.png differ
diff --git a/docs/images/screenshots/templates_insights.png b/docs/images/screenshots/templates_insights.png
deleted file mode 100644
index 8375661da2..0000000000
Binary files a/docs/images/screenshots/templates_insights.png and /dev/null differ
diff --git a/docs/images/screenshots/templates_listing.png b/docs/images/screenshots/templates_listing.png
deleted file mode 100644
index e887de4f4e..0000000000
Binary files a/docs/images/screenshots/templates_listing.png and /dev/null differ
diff --git a/docs/images/screenshots/terraform.png b/docs/images/screenshots/terraform.png
index d8780d650e..654acb936b 100644
Binary files a/docs/images/screenshots/terraform.png and b/docs/images/screenshots/terraform.png differ
diff --git a/docs/images/screenshots/welcome-create-admin-user.png b/docs/images/screenshots/welcome-create-admin-user.png
index fcb099bf88..c2fb24ebd9 100644
Binary files a/docs/images/screenshots/welcome-create-admin-user.png and b/docs/images/screenshots/welcome-create-admin-user.png differ
diff --git a/docs/images/screenshots/workspace-running-with-topbar.png b/docs/images/screenshots/workspace-running-with-topbar.png
index ab3f6a78a9..62b32d46bc 100644
Binary files a/docs/images/screenshots/workspace-running-with-topbar.png and b/docs/images/screenshots/workspace-running-with-topbar.png differ
diff --git a/docs/images/screenshots/workspace_launch.png b/docs/images/screenshots/workspace_launch.png
deleted file mode 100644
index ab2092e7f5..0000000000
Binary files a/docs/images/screenshots/workspace_launch.png and /dev/null differ
diff --git a/docs/images/screenshots/workspaces-listing.png b/docs/images/screenshots/workspaces-listing.png
new file mode 100644
index 0000000000..078dfbb4f6
Binary files /dev/null and b/docs/images/screenshots/workspaces-listing.png differ
diff --git a/docs/images/screenshots/workspaces_listing.png b/docs/images/screenshots/workspaces_listing.png
deleted file mode 100644
index ee206c100f..0000000000
Binary files a/docs/images/screenshots/workspaces_listing.png and /dev/null differ
diff --git a/docs/images/start/blank-workspaces.png b/docs/images/start/blank-workspaces.png
deleted file mode 100644
index 3dcc74020e..0000000000
Binary files a/docs/images/start/blank-workspaces.png and /dev/null differ
diff --git a/docs/images/templates/coder-login-web.png b/docs/images/templates/coder-login-web.png
deleted file mode 100644
index 854c305d1b..0000000000
Binary files a/docs/images/templates/coder-login-web.png and /dev/null differ
diff --git a/docs/tutorials/quickstart.md b/docs/tutorials/quickstart.md
index 595414fd63..7f684fd28c 100644
--- a/docs/tutorials/quickstart.md
+++ b/docs/tutorials/quickstart.md
@@ -116,7 +116,7 @@ is installed.
_Create
template_
-1. Select **Create template**.
+1. Select **Save**.
1. After the template is ready, select **Create Workspace**.
diff --git a/docs/tutorials/template-from-scratch.md b/docs/tutorials/template-from-scratch.md
index 22c4c53920..3abfdbf940 100644
--- a/docs/tutorials/template-from-scratch.md
+++ b/docs/tutorials/template-from-scratch.md
@@ -351,11 +351,11 @@ use the Coder CLI.
1. In your web browser, enter your credentials:
-
+ 
1. Copy the session token to the clipboard:
-
+ 
1. Paste it into the CLI: