diff --git a/code-401-javascript/4-postgres.md b/code-401-javascript/4-postgres.md
index 78b0e8a..57ae9af 100644
--- a/code-401-javascript/4-postgres.md
+++ b/code-401-javascript/4-postgres.md
@@ -27,8 +27,8 @@ pg_ctl -D /home/linuxbrew/.linuxbrew/var/postgres start
 Note that the postgres server will not automatically re-start after your computer reboots, so you'll need to re-run that command anytime you restart or if your clients are unable to connect. To make that easier, we can create an **alias** so that you can do that with a single command. Run this command to create the alias:
 
 ```bash
-echo 'alias pgstart="pg_ctl -D /home/linuxbrew/.linuxbrew/var/postgres start"' >> ~/.profile
-echo 'alias pgstop="pg_ctl -D /home/linuxbrew/.linuxbrew/var/postgres stop"' >> ~/.profile
+echo 'alias pgstart="pg_ctl -D /home/linuxbrew/.linuxbrew/var/postgres start"' >> ~/.zshrc
+echo 'alias pgstop="pg_ctl -D /home/linuxbrew/.linuxbrew/var/postgres stop"' >> ~/.zshrc
 ```
 
 From this point onward, you can simply run `pgstart` or `pgstop` to start and stop your postgres server
@@ -73,4 +73,4 @@ Type `\q` to exit the postgres client application and return to your bash shell.
 
 ---
 
-### [⇐ Previous](./3-aws.md)  | [Home ⇒](./)
+### [⇐ Previous](./3-aws.md) | [Home ⇒](./)
diff --git a/system-setup/1-environment.md b/system-setup/1-environment.md
index 8286bdd..08d0ed5 100644
--- a/system-setup/1-environment.md
+++ b/system-setup/1-environment.md
@@ -17,6 +17,7 @@ Make back ups of the files listed below. You may get a `No such file or director
 - `mv ~/.bashrc .bashrc.bak`
 - `mv ~/.bash_profile .bash_profile.bak`
 - `mv ~/.profile .profile.bak`
+- `mv ~/.zprofile .zprofile.bak`
 - `mv ~/.zshrc .zshrc.bak`
 
 ## Windows & Linux Users Only
@@ -25,7 +26,7 @@ Make back ups of the files listed below. You may get a `No such file or director
 sudo apt-get install zsh
 ```
 
-After installing, type `zsh`. Zsh will ask you to choose some configuration. We will do this later by installing `oh-my-zsh`.  Chose option 0 to create the config file (prevent this message to show again).
+After installing, type `zsh`. Zsh will ask you to choose some configuration. We will do this later by installing `oh-my-zsh`. Chose option 0 to create the config file (prevent this message to show again).
 
 Now, let's move on to getting our development applications installed.
 
diff --git a/system-setup/3-homebrew.md b/system-setup/3-homebrew.md
index eb65ddc..5519e17 100644
--- a/system-setup/3-homebrew.md
+++ b/system-setup/3-homebrew.md
@@ -7,21 +7,21 @@ Homebrew is a tool that simplifies installing applications on your machine. Thin
 ## Verify if Homebrew is already installed
 
 - In your terminal, run: `brew --version`
-  - *If output is similar to:* `Homebrew 3.4.11`
+  - _If output is similar to:_ `Homebrew 3.4.11`
     - Run: `brew update` to get latest updates
     - Move on to [next page](./4-git.md)
-  - *If output is not similar to the above*, continue with instructions on this page.
+  - _If output is not similar to the above_, continue with instructions on this page.
 
 ---
 
 1. In your terminal, enter the following command:
    - `/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"`
-   - You will be prompted several times along the way. Enter your password when prompted, accept all the defaults, say "Yes" if prompted. (***Note:*** *You will not have any visual feedback on your screen as you type. It is protecting your password by not displaying ANYTHING at all to the screen, but it is registering your key strokes.*)
+   - You will be prompted several times along the way. Enter your password when prompted, accept all the defaults, say "Yes" if prompted. (**_Note:_** _You will not have any visual feedback on your screen as you type. It is protecting your password by not displaying ANYTHING at all to the screen, but it is registering your key strokes._)
    - **MAC Users**
      - You will likely be prompted to install XCode command line tools. Say "Yes".
      - When it completes, follow the "Next steps:" instructions, which should be:
-       - ```echo 'eval "$(`which brew` shellenv)"' >> $HOME/.zprofile```
-       - ```eval "$(`which brew` shellenv)"```
+       - `` echo 'eval "$(`which brew` shellenv)"' >> $HOME/.zshrc ``
+       - `` eval "$(`which brew` shellenv)" ``
    - **Linux and Windows Users**
      - Once the main installation finishes (could take up to 30 minutes), enter these commands, one at a time in your terminal:
        - `test -d ~/.linuxbrew && eval $(~/.linuxbrew/bin/brew shellenv)`
@@ -30,7 +30,7 @@ Homebrew is a tool that simplifies installing applications on your machine. Thin
 
 Once the installation has completed, **run:**
 
- `brew doctor`
+`brew doctor`
 
 **if** return output is:
 
@@ -50,7 +50,7 @@ working fine: please don't worry or file an issue; just ignore this. Thanks!
 
 `brew update`
 
-**else if**  return output is:
+**else if** return output is:
 
 ```bash
 brew: command not found
@@ -58,10 +58,9 @@ brew: command not found
 
 **then** run these commands (if you're on a Windows or Linux system)
 
-1. ```echo 'export BREW_HOME="/home/linuxbrew/.linuxbrew/bin"' >> $HOME/.zprofile``` 
-1. ```echo 'export PATH="$PATH:$BREW_HOME"' >> $HOME/.zprofile``` 
-1. ```reset```
-
+1. `echo 'export BREW_HOME="/home/linuxbrew/.linuxbrew/bin"' >> $HOME/.zshrc`
+1. `echo 'export PATH="$PATH:$BREW_HOME"' >> $HOME/.zshrc`
+1. `reset`
 
 > **If `brew update` still fails to run, [click here](../error/error.md) and do not continue with the following steps until you have Homebrew properly installed**
 
diff --git a/system-setup/6-ohmyzsh.md b/system-setup/6-ohmyzsh.md
index 25fee3c..b332261 100644
--- a/system-setup/6-ohmyzsh.md
+++ b/system-setup/6-ohmyzsh.md
@@ -5,10 +5,10 @@ Now it's time to unleash your terminal potential.
 ## Verify if Oh-My-Zsh is already installed
 
 - In your terminal, run: `zsh --version`
-  - *If output is this version or higher*:
+  - _If output is this version or higher_:
     - `zsh 5.8`
     - Continue to [next page](./7-node.md)
-  - *If output is not similar to the above*, continue with instructions on this page.
+  - _If output is not similar to the above_, continue with instructions on this page.
 
 ---
 
@@ -27,12 +27,13 @@ At this point you **`must`** restart your terminal.
 ## **Confirmation**
 
 - Re-open your terminal and run the command: `brew --version`
+
   - If the terminal outputs `Homebrew 3.5` or greater:
     - You're ready to continue through the setup guide.
   - **If you get an error** such as `zsh: command not found: brew`, then run the following commands:
 
-    - `echo 'export BREW_HOME="/home/linuxbrew/.linuxbrew/bin"' >> $HOME/.zprofile`
-    - `echo 'export PATH="$PATH:$BREW_HOME"' >> $HOME/.zprofile`
+    - `echo 'export BREW_HOME="/home/linuxbrew/.linuxbrew/bin"' >> $HOME/.zshrc`
+    - `echo 'export PATH="$PATH:$BREW_HOME"' >> $HOME/.zshrc`
     - `reset`
     - Confirm with the command: `brew --version`
 
diff --git a/system-setup/linux/1-environment.md b/system-setup/linux/1-environment.md
index 1192727..52f7e6b 100644
--- a/system-setup/linux/1-environment.md
+++ b/system-setup/linux/1-environment.md
@@ -17,6 +17,7 @@ Make back ups of the files listed below. You may get a `No such file or director
 - `mv ~/.bashrc .bashrc.bak`
 - `mv ~/.bash_profile .bash_profile.bak`
 - `mv ~/.profile .profile.bak`
+- `mv ~/.zprofile .zprofile.bak`
 - `mv ~/.zshrc .zshrc.bak`
 
 ## Install Z Shell
@@ -25,7 +26,7 @@ Make back ups of the files listed below. You may get a `No such file or director
 sudo apt-get install zsh
 ```
 
-After installing, type `zsh`. Zsh will ask you to choose some configuration. We will do this later by installing `oh-my-zsh`.  Chose option 0 to create the config file (prevent this message to show again).
+After installing, type `zsh`. Zsh will ask you to choose some configuration. We will do this later by installing `oh-my-zsh`. Chose option 0 to create the config file (prevent this message to show again).
 
 Now, let's move on to getting our development applications installed.
 
diff --git a/system-setup/linux/3-homebrew.md b/system-setup/linux/3-homebrew.md
index d471562..c06c087 100644
--- a/system-setup/linux/3-homebrew.md
+++ b/system-setup/linux/3-homebrew.md
@@ -7,17 +7,17 @@ Homebrew is a tool that simplifies installing applications on your machine. Thin
 ## Verify if Homebrew is already installed
 
 - In your terminal, run: `brew --version`
-  - *If output is similar to:* `Homebrew 3.4.11`
+  - _If output is similar to:_ `Homebrew 3.4.11`
     - Run: `brew update` to get latest updates
     - Move on to [next page](./4-git.md)
-  - *If output is not similar to the above*, continue with instructions on this page.
+  - _If output is not similar to the above_, continue with instructions on this page.
 
 ---
 
 In your terminal, enter the following command:
 
 - `/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"`
-- You will be prompted several times along the way. Enter your password when prompted, accept all the defaults, say "Yes" if prompted. (***Note:*** *You will not have any visual feedback on your screen as you type. It is protecting your password by not displaying ANYTHING at all to the screen, but it is registering your key strokes.*)
+- You will be prompted several times along the way. Enter your password when prompted, accept all the defaults, say "Yes" if prompted. (**_Note:_** _You will not have any visual feedback on your screen as you type. It is protecting your password by not displaying ANYTHING at all to the screen, but it is registering your key strokes._)
 - Once the main installation finishes (could take up to 30 minutes), **look at the output at the bottom of your terminal**. You may see an arrow pointing to "Next Steps" line with 2 commands.
 
 ![Homebrew No Next Steps example](../../images/homebrew-next-steps.png)
@@ -30,7 +30,7 @@ In your terminal, enter the following command:
 
 Once the installation has completed, **run:**
 
- `brew doctor`
+`brew doctor`
 
 **if** return output is:
 
@@ -50,7 +50,7 @@ working fine: please don't worry or file an issue; just ignore this. Thanks!
 
 `brew update`
 
-**else if**  return output is:
+**else if** return output is:
 
 ```bash
 brew: command not found
@@ -58,10 +58,9 @@ brew: command not found
 
 **then** run these commands
 
-1. ```echo 'export BREW_HOME="/home/linuxbrew/.linuxbrew/bin"' >> $HOME/.zprofile``` 
-1. ```echo 'export PATH="$PATH:$BREW_HOME"' >> $HOME/.zprofile``` 
-1. ```reset```
-
+1. `echo 'export BREW_HOME="/home/linuxbrew/.linuxbrew/bin"' >> $HOME/.zshrc`
+1. `echo 'export PATH="$PATH:$BREW_HOME"' >> $HOME/.zshrc`
+1. `reset`
 
 > **If `brew update` still fails to run, [click here](../../error/error.md) and do not continue with the following steps until you have Homebrew properly installed**
 
diff --git a/system-setup/linux/6-ohmyzsh.md b/system-setup/linux/6-ohmyzsh.md
index 25fee3c..b332261 100644
--- a/system-setup/linux/6-ohmyzsh.md
+++ b/system-setup/linux/6-ohmyzsh.md
@@ -5,10 +5,10 @@ Now it's time to unleash your terminal potential.
 ## Verify if Oh-My-Zsh is already installed
 
 - In your terminal, run: `zsh --version`
-  - *If output is this version or higher*:
+  - _If output is this version or higher_:
     - `zsh 5.8`
     - Continue to [next page](./7-node.md)
-  - *If output is not similar to the above*, continue with instructions on this page.
+  - _If output is not similar to the above_, continue with instructions on this page.
 
 ---
 
@@ -27,12 +27,13 @@ At this point you **`must`** restart your terminal.
 ## **Confirmation**
 
 - Re-open your terminal and run the command: `brew --version`
+
   - If the terminal outputs `Homebrew 3.5` or greater:
     - You're ready to continue through the setup guide.
   - **If you get an error** such as `zsh: command not found: brew`, then run the following commands:
 
-    - `echo 'export BREW_HOME="/home/linuxbrew/.linuxbrew/bin"' >> $HOME/.zprofile`
-    - `echo 'export PATH="$PATH:$BREW_HOME"' >> $HOME/.zprofile`
+    - `echo 'export BREW_HOME="/home/linuxbrew/.linuxbrew/bin"' >> $HOME/.zshrc`
+    - `echo 'export PATH="$PATH:$BREW_HOME"' >> $HOME/.zshrc`
     - `reset`
     - Confirm with the command: `brew --version`
 
diff --git a/system-setup/mac/1-environment.md b/system-setup/mac/1-environment.md
index c465401..57ade3f 100644
--- a/system-setup/mac/1-environment.md
+++ b/system-setup/mac/1-environment.md
@@ -17,6 +17,7 @@ Make back ups of the files listed below. You may get a `No such file or director
 - `mv ~/.bashrc .bashrc.bak`
 - `mv ~/.bash_profile .bash_profile.bak`
 - `mv ~/.profile .profile.bak`
+- `mv ~/.zprofile .zprofile.bak`
 - `mv ~/.zshrc .zshrc.bak`
 
 Now, let's move on to getting our development applications installed.
diff --git a/system-setup/mac/2-homebrew.md b/system-setup/mac/2-homebrew.md
index a649779..bf0fcba 100644
--- a/system-setup/mac/2-homebrew.md
+++ b/system-setup/mac/2-homebrew.md
@@ -7,10 +7,10 @@ Homebrew is a tool that simplifies installing applications on your machine. Thin
 ## Verify if Homebrew is already installed
 
 - In your terminal, run: `brew --version`
-  - *If output is similar to:* `Homebrew 3.4.11`
+  - _If output is similar to:_ `Homebrew 3.4.11`
     - Run: `brew update` to get latest updates
     - Move on to [next page](./3-git.md)
-  - *If output is not similar to the above*, continue with instructions on this page.
+  - _If output is not similar to the above_, continue with instructions on this page.
 
 ---
 
@@ -18,7 +18,7 @@ In your terminal, enter the following command:
 
 - `/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"`
 
-- You will be prompted several times along the way. Enter your password when prompted, accept all the defaults, say "Yes" if prompted. (***Note:*** *You will not have any visual feedback on your screen as you type. It is protecting your password by not displaying ANYTHING at all to the screen, but it is registering your key strokes.*)
+- You will be prompted several times along the way. Enter your password when prompted, accept all the defaults, say "Yes" if prompted. (**_Note:_** _You will not have any visual feedback on your screen as you type. It is protecting your password by not displaying ANYTHING at all to the screen, but it is registering your key strokes._)
 
 - You will likely be prompted to install XCode command line tools. Say "Yes".
 
@@ -27,8 +27,8 @@ In your terminal, enter the following command:
 ![Homebrew No Next Steps example](../../images/homebrew-next-steps.png)
 
 - which should be similar to:
-  - ```echo 'eval "$(`which brew` shellenv)"' >> $HOME/.zprofile```
-  - ```eval "$(`which brew` shellenv)"```
+  - `` echo 'eval "$(`which brew` shellenv)"' >> $HOME/.zshrc ``
+  - `` eval "$(`which brew` shellenv)" ``
 
 Once the installation has completed, **run:**
 
@@ -52,7 +52,7 @@ working fine: please don't worry or file an issue; just ignore this. Thanks!
 
 - `brew update`
 
-**else if**  return output is:
+**else if** return output is:
 
 ```bash
 brew: command not found
diff --git a/system-setup/mac/5-ohmyzsh.md b/system-setup/mac/5-ohmyzsh.md
index c168936..b3d80da 100644
--- a/system-setup/mac/5-ohmyzsh.md
+++ b/system-setup/mac/5-ohmyzsh.md
@@ -5,10 +5,10 @@ Now it's time to unleash your terminal potential.
 ## Verify if Oh-My-Zsh is already installed
 
 - In your terminal, run: `zsh --version`
-  - *If output is this version or higher*:
+  - _If output is this version or higher_:
     - `zsh 5.8`
     - Continue to [next page](./6-node.md)
-  - *If output is not similar to the above*, continue with instructions on this page.
+  - _If output is not similar to the above_, continue with instructions on this page.
 
 ---
 
@@ -27,12 +27,13 @@ At this point you **`must`** restart your terminal.
 ## **Confirmation**
 
 - Re-open your terminal and run the command: `brew --version`
+
   - If the terminal outputs `Homebrew 3.5` or greater:
     - You're ready to continue through the setup guide.
   - **If you get an error** such as `zsh: command not found: brew`, then run the following commands:
 
-    - `echo 'export BREW_HOME="/home/linuxbrew/.linuxbrew/bin"' >> $HOME/.zprofile`
-    - `echo 'export PATH="$PATH:$BREW_HOME"' >> $HOME/.zprofile`
+    - `echo 'export BREW_HOME="/home/linuxbrew/.linuxbrew/bin"' >> $HOME/.zshrc`
+    - `echo 'export PATH="$PATH:$BREW_HOME"' >> $HOME/.zshrc`
     - `reset`
     - Confirm with the command: `brew --version`
 
diff --git a/system-setup/windows/1-environment.md b/system-setup/windows/1-environment.md
index 1192727..52f7e6b 100644
--- a/system-setup/windows/1-environment.md
+++ b/system-setup/windows/1-environment.md
@@ -17,6 +17,7 @@ Make back ups of the files listed below. You may get a `No such file or director
 - `mv ~/.bashrc .bashrc.bak`
 - `mv ~/.bash_profile .bash_profile.bak`
 - `mv ~/.profile .profile.bak`
+- `mv ~/.zprofile .zprofile.bak`
 - `mv ~/.zshrc .zshrc.bak`
 
 ## Install Z Shell
@@ -25,7 +26,7 @@ Make back ups of the files listed below. You may get a `No such file or director
 sudo apt-get install zsh
 ```
 
-After installing, type `zsh`. Zsh will ask you to choose some configuration. We will do this later by installing `oh-my-zsh`.  Chose option 0 to create the config file (prevent this message to show again).
+After installing, type `zsh`. Zsh will ask you to choose some configuration. We will do this later by installing `oh-my-zsh`. Chose option 0 to create the config file (prevent this message to show again).
 
 Now, let's move on to getting our development applications installed.
 
diff --git a/system-setup/windows/3-homebrew.md b/system-setup/windows/3-homebrew.md
index d471562..c06c087 100644
--- a/system-setup/windows/3-homebrew.md
+++ b/system-setup/windows/3-homebrew.md
@@ -7,17 +7,17 @@ Homebrew is a tool that simplifies installing applications on your machine. Thin
 ## Verify if Homebrew is already installed
 
 - In your terminal, run: `brew --version`
-  - *If output is similar to:* `Homebrew 3.4.11`
+  - _If output is similar to:_ `Homebrew 3.4.11`
     - Run: `brew update` to get latest updates
     - Move on to [next page](./4-git.md)
-  - *If output is not similar to the above*, continue with instructions on this page.
+  - _If output is not similar to the above_, continue with instructions on this page.
 
 ---
 
 In your terminal, enter the following command:
 
 - `/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"`
-- You will be prompted several times along the way. Enter your password when prompted, accept all the defaults, say "Yes" if prompted. (***Note:*** *You will not have any visual feedback on your screen as you type. It is protecting your password by not displaying ANYTHING at all to the screen, but it is registering your key strokes.*)
+- You will be prompted several times along the way. Enter your password when prompted, accept all the defaults, say "Yes" if prompted. (**_Note:_** _You will not have any visual feedback on your screen as you type. It is protecting your password by not displaying ANYTHING at all to the screen, but it is registering your key strokes._)
 - Once the main installation finishes (could take up to 30 minutes), **look at the output at the bottom of your terminal**. You may see an arrow pointing to "Next Steps" line with 2 commands.
 
 ![Homebrew No Next Steps example](../../images/homebrew-next-steps.png)
@@ -30,7 +30,7 @@ In your terminal, enter the following command:
 
 Once the installation has completed, **run:**
 
- `brew doctor`
+`brew doctor`
 
 **if** return output is:
 
@@ -50,7 +50,7 @@ working fine: please don't worry or file an issue; just ignore this. Thanks!
 
 `brew update`
 
-**else if**  return output is:
+**else if** return output is:
 
 ```bash
 brew: command not found
@@ -58,10 +58,9 @@ brew: command not found
 
 **then** run these commands
 
-1. ```echo 'export BREW_HOME="/home/linuxbrew/.linuxbrew/bin"' >> $HOME/.zprofile``` 
-1. ```echo 'export PATH="$PATH:$BREW_HOME"' >> $HOME/.zprofile``` 
-1. ```reset```
-
+1. `echo 'export BREW_HOME="/home/linuxbrew/.linuxbrew/bin"' >> $HOME/.zshrc`
+1. `echo 'export PATH="$PATH:$BREW_HOME"' >> $HOME/.zshrc`
+1. `reset`
 
 > **If `brew update` still fails to run, [click here](../../error/error.md) and do not continue with the following steps until you have Homebrew properly installed**
 
diff --git a/system-setup/windows/6-ohmyzsh.md b/system-setup/windows/6-ohmyzsh.md
index 657a152..c34c74d 100644
--- a/system-setup/windows/6-ohmyzsh.md
+++ b/system-setup/windows/6-ohmyzsh.md
@@ -5,10 +5,10 @@ Now it's time to unleash your terminal potential.
 ## Verify if Oh-My-Zsh is already installed
 
 - In your terminal, run: `zsh --version`
-  - *If output is this version or higher*:
+  - _If output is this version or higher_:
     - `zsh 5.8`
     - Continue to [next page](./7-node.md)
-  - *If output is not similar to the above*, continue with instructions on this page.
+  - _If output is not similar to the above_, continue with instructions on this page.
 
 ---
 
@@ -27,12 +27,13 @@ At this point you **`must`** restart your terminal.
 ## **Confirmation**
 
 - Re-open your terminal and run the command: `brew --version`
+
   - If the terminal outputs `Homebrew 3.5.10` or something similar:
     - You're ready to continue through the setup guide.
   - **If you get an error** such as `zsh: command not found: brew`, then run the following commands:
 
-    - `echo 'export BREW_HOME="/home/linuxbrew/.linuxbrew/bin"' >> $HOME/.zprofile`
-    - `echo 'export PATH="$PATH:$BREW_HOME"' >> $HOME/.zprofile`
+    - `echo 'export BREW_HOME="/home/linuxbrew/.linuxbrew/bin"' >> $HOME/.zshrc`
+    - `echo 'export PATH="$PATH:$BREW_HOME"' >> $HOME/.zshrc`
     - `reset`
     - Confirm with the command: `brew --version`