diff --git a/cert_instructions/firefox_cert.md b/cert_instructions/firefox_cert.md
index 633da69..fc0e405 100644
--- a/cert_instructions/firefox_cert.md
+++ b/cert_instructions/firefox_cert.md
@@ -1,15 +1,23 @@
# Install your Bubble Certificate in Firefox
+ * Start Firefox
* Login to your Bubble
* Go to "Devices"
* In the "Download Certificate" section, click "Firefox"
- * Save the file
- * Start Firefox
+ * Save the certificate file
* Enter "about:preferences" in the URL bar and hit Enter
- * In the search box, type "certificates"
+ * In the search box, type "certificates", you should see something like the screenshot below.
+
+
* Click the "View Certificates" button
- * In the Certificate Manager, click the "Import" button
+ * You should now see the Certificate Manager, as shown in the screenshot below. Click the "Import" button.
+
+
* Select the certificate file you downloaded above.
- * Check the box "Trust this CA to identify websites" and click "OK".
- * Click "OK" to close the Certificate Manager.
+ * Check the box "Trust this CA to identify websites" and click "OK", as shown in the screenshot below.
+
+
+ * If you scroll down, you should now see your newly installed Bubble Certificate among the list of Authorities in the Certificate Manager, as shown below. Click "OK" to close the Certificate Manager.
+
+
* Congratulations! You have successfully installed your Bubble certificate!
diff --git a/cert_instructions/firefox_screenshots/01_settings_certs.png b/cert_instructions/firefox_screenshots/01_settings_certs.png
new file mode 100644
index 0000000..746c182
Binary files /dev/null and b/cert_instructions/firefox_screenshots/01_settings_certs.png differ
diff --git a/cert_instructions/firefox_screenshots/02_import_cert.png b/cert_instructions/firefox_screenshots/02_import_cert.png
new file mode 100644
index 0000000..0e73f04
Binary files /dev/null and b/cert_instructions/firefox_screenshots/02_import_cert.png differ
diff --git a/cert_instructions/firefox_screenshots/03_trust_cert.png b/cert_instructions/firefox_screenshots/03_trust_cert.png
new file mode 100644
index 0000000..9a77fd4
Binary files /dev/null and b/cert_instructions/firefox_screenshots/03_trust_cert.png differ
diff --git a/cert_instructions/firefox_screenshots/04_close_certs.png b/cert_instructions/firefox_screenshots/04_close_certs.png
new file mode 100644
index 0000000..6182b2d
Binary files /dev/null and b/cert_instructions/firefox_screenshots/04_close_certs.png differ
diff --git a/cert_instructions/windows_cert.md b/cert_instructions/windows_cert.md
index 5deb536..9dc9b5a 100644
--- a/cert_instructions/windows_cert.md
+++ b/cert_instructions/windows_cert.md
@@ -2,8 +2,8 @@
* Login to your Bubble
* Go to "Devices"
* In the "Download Certificate" section, click "Windows"
- * Save the file
- * Open the file. If you see a confirmation dialog, click "Open"
+ * Save the certificate file
+ * Open the certificate file. If you see a confirmation dialog, click "Open"
* A "Certificate" dialog will appear. Click "Install Certificate..."
* The "Certificate Import Wizard" dialog appears. Click "Next".
* On the next screen, select "Place all certificates in the following store" and click "Browse..."
diff --git a/cert_instructions/windows_screenshots/01_download_cert.png b/cert_instructions/windows_screenshots/01_download_cert.png
new file mode 100644
index 0000000..67707f5
Binary files /dev/null and b/cert_instructions/windows_screenshots/01_download_cert.png differ
diff --git a/cert_instructions/windows_screenshots/02_open_cert_file.png b/cert_instructions/windows_screenshots/02_open_cert_file.png
new file mode 100644
index 0000000..6ed8f0a
Binary files /dev/null and b/cert_instructions/windows_screenshots/02_open_cert_file.png differ
diff --git a/cert_instructions/windows_screenshots/03_install_cert.png b/cert_instructions/windows_screenshots/03_install_cert.png
new file mode 100644
index 0000000..51043c3
Binary files /dev/null and b/cert_instructions/windows_screenshots/03_install_cert.png differ
diff --git a/cert_instructions/windows_screenshots/04_cert_wizard.png b/cert_instructions/windows_screenshots/04_cert_wizard.png
new file mode 100644
index 0000000..bf35069
Binary files /dev/null and b/cert_instructions/windows_screenshots/04_cert_wizard.png differ
diff --git a/cert_instructions/windows_screenshots/05_select_cert_store.png b/cert_instructions/windows_screenshots/05_select_cert_store.png
new file mode 100644
index 0000000..82da7dd
Binary files /dev/null and b/cert_instructions/windows_screenshots/05_select_cert_store.png differ
diff --git a/cert_instructions/windows_screenshots/06_select_trusted_root_cert_store.png b/cert_instructions/windows_screenshots/06_select_trusted_root_cert_store.png
new file mode 100644
index 0000000..c9a607a
Binary files /dev/null and b/cert_instructions/windows_screenshots/06_select_trusted_root_cert_store.png differ
diff --git a/cert_instructions/windows_screenshots/07_cert_wizard.png b/cert_instructions/windows_screenshots/07_cert_wizard.png
new file mode 100644
index 0000000..3775c8d
Binary files /dev/null and b/cert_instructions/windows_screenshots/07_cert_wizard.png differ
diff --git a/cert_instructions/windows_screenshots/08_cert_wizard.png b/cert_instructions/windows_screenshots/08_cert_wizard.png
new file mode 100644
index 0000000..85679c8
Binary files /dev/null and b/cert_instructions/windows_screenshots/08_cert_wizard.png differ
diff --git a/cert_instructions/windows_screenshots/09_install_cert.png b/cert_instructions/windows_screenshots/09_install_cert.png
new file mode 100644
index 0000000..f543aed
Binary files /dev/null and b/cert_instructions/windows_screenshots/09_install_cert.png differ
diff --git a/cert_instructions/windows_screenshots/10_import_successful.png b/cert_instructions/windows_screenshots/10_import_successful.png
new file mode 100644
index 0000000..8ed3f03
Binary files /dev/null and b/cert_instructions/windows_screenshots/10_import_successful.png differ
diff --git a/device_setup/add_device.md b/device_setup/add_device.md
new file mode 100644
index 0000000..3b863cf
--- /dev/null
+++ b/device_setup/add_device.md
@@ -0,0 +1,14 @@
+# Add a new device
+
+Bubble supports all common desktop and mobile devices. To connect a new computer or mobile device to your Bubble,
+you must first add it as a device.
+
+### To add a new device to your Bubble:
+
+ * Login to your Bubble
+ * Navigate to the Devices screen
+ * In the "Add Device" section:
+ * Enter a name for the device
+ * Choose the device type
+ * Click or tap the "Add" button
+ * A link will appear with instructions to guide you through the rest of the process.
diff --git a/device_setup/android.md b/device_setup/android.md
index c914ea2..826a275 100644
--- a/device_setup/android.md
+++ b/device_setup/android.md
@@ -2,6 +2,6 @@
Connecting your Android device to Bubble requires these steps:
- * [Connecting to the Bubble VPN](../vpn_instructions/android_vpn.md)
* [Installing your Bubble Certificate](../cert_instructions/android_cert.md)
+ * [Connecting to the Bubble VPN](../vpn_instructions/android_vpn.md)
diff --git a/device_setup/ios.md b/device_setup/ios.md
index 63524a3..34bb4f9 100644
--- a/device_setup/ios.md
+++ b/device_setup/ios.md
@@ -2,6 +2,6 @@
Connecting your Apple iOS device to Bubble requires these steps:
- * [Connecting to the Bubble VPN](../vpn_instructions/ios_vpn.md)
* [Installing your Bubble Certificate](../cert_instructions/ios_cert.md)
+ * [Connecting to the Bubble VPN](../vpn_instructions/ios_vpn.md)
diff --git a/device_setup/linux.md b/device_setup/linux.md
index e807437..59916cb 100644
--- a/device_setup/linux.md
+++ b/device_setup/linux.md
@@ -2,7 +2,7 @@
Connecting your Linux system to Bubble requires these steps:
- * [Connecting to the Bubble VPN](../vpn_instructions/linux_vpn.md)
* [Installing your Bubble Certificate](../cert_instructions/linux_cert.md)
* If you use Firefox, [install your Bubble Certificate in Firefox](../cert_instructions/firefox_cert.md)
+ * [Connecting to the Bubble VPN](../vpn_instructions/linux_vpn.md)
diff --git a/device_setup/macosx.md b/device_setup/macosx.md
index 7cf73bc..16b2078 100644
--- a/device_setup/macosx.md
+++ b/device_setup/macosx.md
@@ -2,7 +2,7 @@
Connecting your Apple Mac OS X system to Bubble requires these steps:
- * [Connecting to the Bubble VPN](../vpn_instructions/macosx_vpn.md)
* [Installing your Bubble Certificate](../cert_instructions/macosx_cert.md)
* If you use Firefox, [install your Bubble Certificate in Firefox](../cert_instructions/firefox_cert.md)
+ * [Connecting to the Bubble VPN](../vpn_instructions/macosx_vpn.md)
diff --git a/device_setup/windows.md b/device_setup/windows.md
index acf1fe0..9f11c13 100644
--- a/device_setup/windows.md
+++ b/device_setup/windows.md
@@ -2,7 +2,7 @@
Connecting your Windows system to Bubble requires these steps:
- * [Connecting to the Bubble VPN](../vpn_instructions/windows_vpn.md)
* [Installing your Bubble Certificate](../cert_instructions/windows_cert.md)
* If you use Firefox, [install your Bubble Certificate in Firefox](../cert_instructions/firefox_cert.md)
+ * [Connecting to the Bubble VPN](../vpn_instructions/windows_vpn.md)
diff --git a/vpn_instructions/windows_screenshots/01_run_wireguard.png b/vpn_instructions/windows_screenshots/01_run_wireguard.png
new file mode 100644
index 0000000..f61efd0
Binary files /dev/null and b/vpn_instructions/windows_screenshots/01_run_wireguard.png differ
diff --git a/vpn_instructions/windows_screenshots/02_install_wireguard.png b/vpn_instructions/windows_screenshots/02_install_wireguard.png
new file mode 100644
index 0000000..3949d85
Binary files /dev/null and b/vpn_instructions/windows_screenshots/02_install_wireguard.png differ
diff --git a/vpn_instructions/windows_screenshots/03_install_wireguard.png b/vpn_instructions/windows_screenshots/03_install_wireguard.png
new file mode 100644
index 0000000..e1b8cc5
Binary files /dev/null and b/vpn_instructions/windows_screenshots/03_install_wireguard.png differ
diff --git a/vpn_instructions/windows_screenshots/04_import_tunnel_from_file.png b/vpn_instructions/windows_screenshots/04_import_tunnel_from_file.png
new file mode 100644
index 0000000..0a88181
Binary files /dev/null and b/vpn_instructions/windows_screenshots/04_import_tunnel_from_file.png differ
diff --git a/vpn_instructions/windows_screenshots/05_save_vpn_file.png b/vpn_instructions/windows_screenshots/05_save_vpn_file.png
new file mode 100644
index 0000000..0cc1f12
Binary files /dev/null and b/vpn_instructions/windows_screenshots/05_save_vpn_file.png differ
diff --git a/vpn_instructions/windows_screenshots/06_open_vpn_conf_file.png b/vpn_instructions/windows_screenshots/06_open_vpn_conf_file.png
new file mode 100644
index 0000000..be3602b
Binary files /dev/null and b/vpn_instructions/windows_screenshots/06_open_vpn_conf_file.png differ
diff --git a/vpn_instructions/windows_screenshots/07_activate_vpn.png b/vpn_instructions/windows_screenshots/07_activate_vpn.png
new file mode 100644
index 0000000..32eb9e4
Binary files /dev/null and b/vpn_instructions/windows_screenshots/07_activate_vpn.png differ
diff --git a/vpn_instructions/windows_screenshots/08_set_network_location.png b/vpn_instructions/windows_screenshots/08_set_network_location.png
new file mode 100644
index 0000000..b711dc5
Binary files /dev/null and b/vpn_instructions/windows_screenshots/08_set_network_location.png differ
diff --git a/vpn_instructions/windows_screenshots/09_confirm_network_location.png b/vpn_instructions/windows_screenshots/09_confirm_network_location.png
new file mode 100644
index 0000000..23d68f7
Binary files /dev/null and b/vpn_instructions/windows_screenshots/09_confirm_network_location.png differ
diff --git a/vpn_instructions/windows_vpn.md b/vpn_instructions/windows_vpn.md
index e980352..ae1711b 100644
--- a/vpn_instructions/windows_vpn.md
+++ b/vpn_instructions/windows_vpn.md
@@ -1,18 +1,37 @@
# Connect a Microsoft Windows system to your Bubble VPN
+## Download the vpn.conf file
+ * Login to your Bubble
+ * Navigate to the Devices screen
+ * Find your device in the device list, or [add your Windows system as a device](add_device.md)
+ * Click or tap "Show VPN connection info" for your new Windows device. Click the button that reads "Download vpn.conf file". A dialog will appear similar to the one shown below.
+
+ * Choose "Save File" and save the vpn.conf file to your computer.
+
+## Install WireGuard
* Download and install [WireGuard for Windows](https://download.wireguard.com/windows-client/wireguard-amd64-0.1.0.msi)
* Note: If you are running a 32-bit version of Windows, you must install the [32-bit version of Wireguard](https://download.wireguard.com/windows-client/wireguard-x86-0.1.0.msi)
* Most newer Windows systems are 64-bit. To determine if your Windows is 64-bit or 32-bit, [follow these instructions](https://www.lifewire.com/am-i-running-a-32-bit-or-64-bit-version-of-windows-2624475)
* You can find more information about the WireGuard installers on the [WireGuard Installation page](https://www.wireguard.com/install/)
* Run the WireGuard msi installer that you just downloaded
- * You will see several warning dialogs to confirm that you really want to install WireGuard. It is safe to install WireGuard; depending on the dialog, click "OK", "Run", "Yes", or "Install" to continue.
- * Login to your Bubble
- * Navigate to the Devices screen
- * In the "Add Device" section, enter a name for your Windows system and click or tap the "Add" button to add it.
- * Click or tap "Show VPN connection info" for your new Windows device. Click the button that reads "Download vpn.conf file"
- * Save the vpn.conf file to your computer.
- * Open the WireGuard application if it is not already open. You should see a screen like the one below.
- * Click the "Import tunnel(s) from file" button, and select the vpn.conf file that you downloaded.
+ * You will see several warning dialogs to confirm that you really want to install WireGuard. It is safe to install WireGuard; depending on the dialog, click "OK", "Run", "Yes", or "Install" to continue. Screenshots of the confirmation dialogs are shown below.
+
+ * Click "Open"
+
+ * Click "Yes"
+
+ * Click "Install"
+ * The WireGuard application then opens, and you should see a screen like the one below.
+
+
+## Connect to Bubble via WireGuard
+ * In the WireGuard application, click "Import tunnels(s) from file", and select the vpn.conf file that you downloaded. You should now see a screen like the one shown below.
+
+
* Click the "Activate" button to connect to the VPN.
- * If a "Set Network Location" dialog appears, click on "Public network", then click the "Close" button.
+ * You should now see a "Set Network Location" dialog, like the one shown below. Click on "Public network", then click the "Close" button.
+
+ * The next screen will ask you to confirm this network location. It should look like the screenshot below. Click "Close".
+
+
* Congratulations! You are now connected to your Bubble's VPN!