diff --git a/config.yml b/config.yml
index 7fdbcaa..e8fc937 100644
--- a/config.yml
+++ b/config.yml
@@ -18,11 +18,16 @@ steps:
     event: page_build
     link: '{{ repoUrl }}/issues/1'
     actions:
+      - type: octokit
+        method: repos.getPages
+        owner: '%payload.repository.owner.login%'
+        repo: '%payload.repository.name%'
+        action_id: pagesUrl
       - type: respond
         issue: 1
         with: 01_update-index.md
         data:
-          url: 'https://%user.username%.github.io/%payload.repository.name%'
+          deploymentUrl: '%actions.pagesUrl.data.html_url%'
       - type: updateBranchProtection
 
   - title: Customize your homepage
@@ -59,10 +64,17 @@ steps:
         operator: ===
         right: 'master'
       - type: updateBranchProtection
+      - type: octokit
+        method: repos.getPages
+        owner: '%payload.repository.owner.login%'
+        repo: '%payload.repository.name%'
+        action_id: pagesUrl
       - type: createIssue
         action_id: issue
         title: Getting ready to blog
         body: 03_change-theme.md
+        data:
+          deploymentUrl: '%actions.pagesUrl.data.html_url%'      
       - type: respond
         with: 03_merged-pr.md
         data:
@@ -232,9 +244,14 @@ steps:
     event: pull_request.closed
     link: '{{ repoUrl }}/pulls'
     actions:
+      - type: octokit
+        method: repos.getPages
+        owner: '%payload.repository.owner.login%'
+        repo: '%payload.repository.name%'
+        action_id: pagesUrl
       - type: gate
         left: '%payload.pull_request.merged%'
       - type: respond
         with: 07_next-steps.md
         data:
-          url: 'https://%user.username%.github.io/%payload.repository.name%'
+          deploymentUrl: '%actions.pagesUrl.data.html_url%'
diff --git a/responses/00_class-introduction-issue.md b/responses/00_class-introduction-issue.md
index 0cf2f78..9b5ccc4 100644
--- a/responses/00_class-introduction-issue.md
+++ b/responses/00_class-introduction-issue.md
@@ -2,7 +2,7 @@
 
 Welcome to GitHub Pages and Jekyll :tada:!
 
-If you're new to GitHub Pages, or you want to learn how to build and host a [GitHub Pages](https://pages.github.com) site, you're in the right place. With GitHub Pages, you can host content like [documentation](https://flight-manual.atom.io/), [resumes](https://github.com/jglovier/resume-template), or any other static content you’d like.
+If you're new to GitHub Pages, or you want to learn how to build and host a [GitHub Pages](https://pages.github.com) site, you're in the right place. With GitHub Pages, you can host content like [documentation](https://flight-manual.atom.io/), [resumes](https://github.com/jglovier/resume-template), or any other static content that you’d like.
 
 In this course, you'll create a blog hosted on GitHub Pages and learn how to:
 
@@ -18,23 +18,8 @@ For this course, you'll need to know how to create a branch on GitHub, commit ch
 
 The first step to publishing your blog to the web is to enable GitHub Pages on this repository <sup>[:book:](https://help.github.com/articles/github-glossary/#repository)</sup>. When you enable GitHub Pages on a repository, GitHub takes the content that's on the master branch and publishes a website based on its contents.
 
-{% if GHE_HOST %}
-
-1. Under your repository name, click [**Settings**]({{ repoUrl }}/settings).
-1. In the "GitHub Pages" section, click **Launch automatic page generator**.
-1. Edit the **Project name** and **Body** to be what you'd like your main page to display.
-1. Click **Continue to layouts**.
-1. Select a layout.
-1. Click **Publish page**.
-   
-{% else %}
-
 1. Under your repository name, click [**Settings**]({{ repoUrl }}/settings).
-1. In the "GitHub Pages" section, click **Choose a theme**.
-2. Select a theme.
-3. Click **Select theme**.
-   
-{% endif %}
+1. In the "GitHub Pages" section, in the Source drop-down, select **master branch**.
 
 After GitHub Pages is enabled and the site is started, we'll be ready to create some more content. 
 
diff --git a/responses/01_update-index.md b/responses/01_update-index.md
index 51cf165..4d7ebaf 100644
--- a/responses/01_update-index.md
+++ b/responses/01_update-index.md
@@ -1,31 +1,18 @@
 ## Step 2: Customize your homepage
 
-Great job! Now that GitHub Pages is enabled, you can view your website here: https://{{ user.username }}.github.io/{{ repo }} 
+Great job! Now that GitHub Pages is enabled, you can view your website here: {{ deploymentUrl }}
 
 You can customize your homepage by adding content to either an `index` file or the `README.md` file. GitHub Pages first looks for an `index` file. If an `index` file is found, GitHub Pages uses the content in the file to create the homepage. If an `index` file isn’t found, it uses the `README.md` to create the homepage.
 
-Your repository has an `index.html` file so we can update it to include your personalized content.
+Your repository has an `index.md` file so we can update it to include your personalized content.
 
 ### :keyboard: Activity: Create your homepage
 
-{% if GHE_HOST %}
-
-1. Navigate to the **Code** tab of this repository, and browse to the `index.html` file, or click this link [here]({{ repoUrl }}/blob/master/index.html)
-1. In the upper right corner, click the the icon to the right of the file to edit the `index.md` file
-2. Type the content you want on your homepage
-3. Scroll to the bottom, type a commit message, and click **Create a new branch for this commit and start a pull request**
-4. Open a pull request
-   
-{% else %}
-
 1. Navigate to the **Code** tab of this repository, and browse to the `index.md` file, or click this link [here]({{ repoUrl }}/blob/master/index.md)
 2. In the upper right corner, click the the icon to the right of the file to edit the `index.md` file
 3. Type the content you want on your homepage
 4. Scroll to the bottom, type a commit message, and click **Create a new branch for this commit and start a pull request**
 5. Open a pull request
-   
-{% endif %}
-
 
 > Once you have created your pull request, I will move over there to discuss next steps.
 
diff --git a/responses/03_change-theme.md b/responses/03_change-theme.md
index 76a4580..eb74c5f 100644
--- a/responses/03_change-theme.md
+++ b/responses/03_change-theme.md
@@ -1,10 +1,10 @@
 ## Step 4: Customize Site Details
 
-Great work! You can see your selected theme in action [here](https://{{ user.username }}.github.io/{{ repo }}). If you don't see your changes right away, refresh the page.
+Great work! You can see your published page [here]({{ deploymentUrl }}). If you don't see your changes right away, refresh the page.
 
 ### Getting your page blog ready
 
-GitHub added the theme you selected to your `_config.yml` file. Jekyll uses the `_config.yml` file to store  settings for your site, like your theme, as well as reusable content like your site title and GitHub handle.
+Jekyll uses a file titled `_config.yml` to store settings for your site, a your theme and reusable content like your site title and GitHub handle.
 
 You can check out the `_config.yml` file on the **Code** tab of your repository.
 
@@ -14,7 +14,7 @@ Let's change the `_config.yml` so it's a perfect fit for your new blog. First, w
 
 1. Navigate to the **Code** tab of this repository, and browse to the `_config.yml` file, or click this link [here]({{ repoUrl }}/blob/master/_config.yml).
 2. In the upper right corner, click :pencil2: to open the file editor.
-3. Change `theme:` to **jekyll-theme-minimal** so it shows in the `_config.yml` file as below:
+3. Add a `theme:` set to **jekyll-theme-minimal** so it shows in the `_config.yml` file as below:
     ```
     theme: jekyll-theme-minimal
     ```
diff --git a/responses/04_create-blog-post.md b/responses/04_create-blog-post.md
index d680485..8535dde 100644
--- a/responses/04_create-blog-post.md
+++ b/responses/04_create-blog-post.md
@@ -6,7 +6,7 @@ This pull request looks great so far. :sparkles: You've just edited the `_config
 
 ### :keyboard: Activity: Add some content to your blog
 
-**Shortcut Note**: Click this link [here](https://github.com/{{ owner }}/{{ repo }}/new/{{ branch }}/?filename=_posts/{{ date | date: "%Y-%m-%d" }}-my-first-blog-post.md) to automatically complete steps 1-4.
+**Shortcut Note**: Click [this link]({{ repoUrl }}/new/{{ branch }}/?filename=_posts/{{ date | date: "%Y-%m-%d" }}-my-first-blog-post.md) to automatically complete steps 1-4.
 
 1. On the "Code" tab, select your `{{ branch }}` branch.
 1. Click **Create new file**.
diff --git a/responses/04_wrong-theme.md b/responses/04_wrong-theme.md
index 1a1514a..2e8cf36 100644
--- a/responses/04_wrong-theme.md
+++ b/responses/04_wrong-theme.md
@@ -1,8 +1,8 @@
 It looks like you changed your theme, but for this activity we want to use `jekyll-theme-minimal`.
 
-### :keyboard: Activity: Change the theme to jekyll-theme-cayman
+### :keyboard: Activity: Change the theme to jekyll-theme-minimal
 
-Let's change the theme to `minima`:
+Let's change the theme to `jekyll-theme-minimal`:
 
 1. At the top of this Pull Request, click the **Files changed** tab.
 2. Click the icon to enter edit mode and change the  `theme:` to **jekyll-theme-minimal**.
diff --git a/responses/07_next-steps.md b/responses/07_next-steps.md
index 652e608..9173e0b 100644
--- a/responses/07_next-steps.md
+++ b/responses/07_next-steps.md
@@ -4,14 +4,13 @@
 
 Congratulations @{{ user.username }}, you've completed this course!
 
-Your blog is now live and has been deployed [here](https://{{ user.username }}.github.io/{{ repo }})!
+Your blog is now live and has been deployed [here]({{ deploymentUrl }})!
 
 Before we finish, let's recap everything you completed in this repository
 
 - You used the GitHub Flow like a natural
 - You enabled GitHub Pages
-- You picked a default theme
-- You changed the theme using the config file
+- You selected a theme using the config file
 - You learned about proper directory format and file naming conventions in Jekyll
 - You added and modified Jekyll front matter
 

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://github.com/githubtraining/github-pages/compare/v7.0.1-edits.0...v8.0.1-edits.0.diff" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://github.com/githubtraining/github-pages/compare/v7.0.1-edits.0...v8.0.1-edits.0.diff" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://github.com/githubtraining/github-pages/compare/v7.0.1-edits.0...v8.0.1-edits.0.diff" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://github.com/githubtraining/github-pages/compare/v7.0.1-edits.0...v8.0.1-edits.0.diff" target="_blank">pFad v4 Proxy</a></p></body>
</html>