diff --git a/content/connecting/how_to_setup_x11_forwarding.md b/content/connecting/how_to_setup_x11_forwarding.md
index 399371c3c93842fe0e57de5306625b8ff29a4fe8..ed70c77b8ebc8b79711b9c8519b4b902c5a478da 100644
--- a/content/connecting/how_to_setup_x11_forwarding.md
+++ b/content/connecting/how_to_setup_x11_forwarding.md
@@ -27,12 +27,15 @@ weight = "35"
 
 - If your OS version is newer than 10.8, please do the following:
   1. Download and install XQuartz.
-    Download link: https://dl.bintray.com/xquartz/downloads/XQuartz-2.7.11.dmg
+    Download link: https://github.com/XQuartz/XQuartz/releases/download/XQuartz-2.8.5/XQuartz-2.8.5.pkg
+
+    {{% notice info %}}**Note that the screenshots given here use XQuartz 2.8.5. Different versions may have different prompts.**{{% /notice %}}
+
   2. Type `ssh -Y username@hostname` in your terminal to login.
   3. To test your X11 setup, after login, type command "xeyes" and press
     enter. 
 
-    {{< figure src="/images/11637374.png" height="400" >}} 
+    {{< figure src="/images/mac_x11_forwarding.png" height="400" >}} 
   4. Close the xeyes application by "Control + c" from the terminal or
     click the close button on the up-left corner of the graphical
     window.  
diff --git a/content/handling_data/data_transfer/cyberduck.md b/content/handling_data/data_transfer/cyberduck.md
index 77e596a0d9f3af7f819b39aad7082294e913c6a2..455c4901f773d79f9233b0234b30abfac441d4b1 100644
--- a/content/handling_data/data_transfer/cyberduck.md
+++ b/content/handling_data/data_transfer/cyberduck.md
@@ -20,60 +20,52 @@ correctly with Duo two-factor authentication.  Mac users are recommended
 to use [Cyberduck](https://cyberduck.io). It is compatible with Duo, but a
 few settings need to be changed.
 
-Under **Preferences - General**, change the default protocol to SFTP:
+{{% notice info %}}**Note that the screenshots given here use Cyberduck 8.6.0. Different versions may have different prompts.**{{% /notice %}}
 
-{{< figure src="/images/7274497.png" height="450" >}}
+Under **Preferences - Connection**, change the default protocol to SFTP:
+
+{{< figure src="/images/mac_cyberduck_1.png" height="450" >}}
 
 Under **Preferences - Transfers**, reuse the browser connection for file
 transfers.  This will avoid the need to reenter your password for every
 file transfer:
 
-{{< figure src="/images/7274498.png" height="450" >}}
-
-Finally, under **Preferences - SFTP**, set the file transfer method to
-SCP:
-
-{{< figure src="/images/7274499.png" height="450" >}}
+{{< figure src="/images/mac_cyberduck_2.png" height="450" >}}
 
-To add an HCC machine, in the bookmarks pane click the "+" icon:
+To add an HCC machine, in the bookmarks panel click the "+" icon:
 
-{{< figure src="/images/7274500.png" height="450" >}}
+{{< figure src="/images/mac_cyberduck_3.png" height="450" >}}
 
 Ensure the type of connection is SFTP.  Enter the hostname of the machine 
 you wish to connect to (swan.unl.edu) in the **Server**
-field, and your HCC username in the **Username** field.  The
-**Nickname** field is arbitrary, so enter whatever you prefer.
+field, and your HCC username and HCC password in the **Username** and **Password** fields.  
+The **Nickname** field is arbitrary, so enter whatever you prefer.
 
-{{< figure src="/images/7274501.png" height="450" >}}
+{{< figure src="/images/mac_cyberduck_4.png" height="450" >}}
 
 After you add the bookmark, double-click it to connect.
 
-{{< figure src="/images/7274505.png" height="450" >}}
+{{< figure src="/images/mac_cyberduck_5.png" height="450" >}}
 
-Enter your HCC username and password in the dialog box that will appear
-and click *Login*.
+Click on **Allow** and check **Always** if you want to skip this prompt in future.
 
-{{< figure src="/images/7274508.png" height="450" >}}
+{{< figure src="/images/mac_cyberduck_6.png" height="450" >}}
 
-A second login dialogue will now appear.  Notice the text has changed to
-say Duo two-factor.
+A Duo two-factor login dialogue will appear.
 
-{{< figure src="/images/7274510.png" height="450" >}}
+{{< figure src="/images/mac_cyberduck_7.png" height="450" >}}
 
-Clear the **Password** field in the dialogue.  If you are using the Duo
-Mobile app, enter '1' to have a push notification send to your phone or
-tablet.  If you are using a Yubikey, ensure the cursor is active in the
-**Password** field, and press the button on the Yubikey.
-
-{{< figure src="/images/7274509.png" height="450" >}}
+If you are using the Duo Mobile app, enter '1' to have a push 
+notification send to your phone or tablet.  If you are using a 
+Yubikey, ensure the cursor is active in the **Passcode or option** field, 
+and press the button on the Yubikey.
 
 The login should complete and you can simply drag and drop files to or
 from the window.
 
-{{< figure src="/images/7274511.png" height="450" >}}
+{{< figure src="/images/mac_cyberduck_8.png" height="450" >}}
 
 If you run into issues with two-factor authentication, try the command below for a quick fix:
 {{< highlight bash >}}
-$ rm -rf ~/Library/ApplicationSupport/Cyberduck
+$ rm -rf ~/Library/Group\ Containers/G69SCX94XU.duck/Library/Application\ Support/duck/
 {{< /highlight >}}
-
diff --git a/static/images/11637374.png b/static/images/11637374.png
deleted file mode 100644
index 75df3a95551b23535e74dd6d24adf5b177d86df9..0000000000000000000000000000000000000000
Binary files a/static/images/11637374.png and /dev/null differ
diff --git a/static/images/7274497.png b/static/images/7274497.png
deleted file mode 100644
index 3a58e430f90e8c5d7132854878d7c68ade446fd0..0000000000000000000000000000000000000000
Binary files a/static/images/7274497.png and /dev/null differ
diff --git a/static/images/7274498.png b/static/images/7274498.png
deleted file mode 100644
index 36727f2b399656b8015c7a6a7e94197f47e39856..0000000000000000000000000000000000000000
Binary files a/static/images/7274498.png and /dev/null differ
diff --git a/static/images/7274499.png b/static/images/7274499.png
deleted file mode 100644
index 5bc7675c7c5673a8efb73bb15938c5830a4c1f80..0000000000000000000000000000000000000000
Binary files a/static/images/7274499.png and /dev/null differ
diff --git a/static/images/7274500.png b/static/images/7274500.png
deleted file mode 100644
index df555c00768bca393638ec97852d0f0bd4176af1..0000000000000000000000000000000000000000
Binary files a/static/images/7274500.png and /dev/null differ
diff --git a/static/images/7274501.png b/static/images/7274501.png
deleted file mode 100644
index a9ea2635bcdfdd047c236a53e157fa25f112bc74..0000000000000000000000000000000000000000
Binary files a/static/images/7274501.png and /dev/null differ
diff --git a/static/images/7274505.png b/static/images/7274505.png
deleted file mode 100644
index 802893aa8b1723281db3c434bab4c0ad30cc02c2..0000000000000000000000000000000000000000
Binary files a/static/images/7274505.png and /dev/null differ
diff --git a/static/images/7274508.png b/static/images/7274508.png
deleted file mode 100644
index efaf1ebda39a87e27f16fcb830149fe588599a88..0000000000000000000000000000000000000000
Binary files a/static/images/7274508.png and /dev/null differ
diff --git a/static/images/7274509.png b/static/images/7274509.png
deleted file mode 100644
index 40db3f9b9bb330b82b51f57fef68dab50848fdcd..0000000000000000000000000000000000000000
Binary files a/static/images/7274509.png and /dev/null differ
diff --git a/static/images/7274510.png b/static/images/7274510.png
deleted file mode 100644
index d7120ffb0cb247e6410493a97d225d98073fcf84..0000000000000000000000000000000000000000
Binary files a/static/images/7274510.png and /dev/null differ
diff --git a/static/images/7274511.png b/static/images/7274511.png
deleted file mode 100644
index f2b2ddc8470ad3a527a1a9088f9a41f5a95824d3..0000000000000000000000000000000000000000
Binary files a/static/images/7274511.png and /dev/null differ
diff --git a/static/images/mac_cyberduck_1.png b/static/images/mac_cyberduck_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..6841fd6d54674e27912cf03050469659ab7b00a0
Binary files /dev/null and b/static/images/mac_cyberduck_1.png differ
diff --git a/static/images/mac_cyberduck_2.png b/static/images/mac_cyberduck_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a6a7e4b455cef6913993a84282ff06d4d04f9ea
Binary files /dev/null and b/static/images/mac_cyberduck_2.png differ
diff --git a/static/images/mac_cyberduck_3.png b/static/images/mac_cyberduck_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..cce2e11331d573247307123cd754afdc59821a63
Binary files /dev/null and b/static/images/mac_cyberduck_3.png differ
diff --git a/static/images/mac_cyberduck_4.png b/static/images/mac_cyberduck_4.png
new file mode 100644
index 0000000000000000000000000000000000000000..f8afa0a2f19267857ee3d4327a86f133619d9cb5
Binary files /dev/null and b/static/images/mac_cyberduck_4.png differ
diff --git a/static/images/mac_cyberduck_5.png b/static/images/mac_cyberduck_5.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5a308dfdb344bb7a7d8fe0ebeb94b5fb4bde956
Binary files /dev/null and b/static/images/mac_cyberduck_5.png differ
diff --git a/static/images/mac_cyberduck_6.png b/static/images/mac_cyberduck_6.png
new file mode 100644
index 0000000000000000000000000000000000000000..f005b8882e4b9868bb54835595e372970f12a198
Binary files /dev/null and b/static/images/mac_cyberduck_6.png differ
diff --git a/static/images/mac_cyberduck_7.png b/static/images/mac_cyberduck_7.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba8aee6369e51b5614903990f6c2f51c4f4b3d76
Binary files /dev/null and b/static/images/mac_cyberduck_7.png differ
diff --git a/static/images/mac_cyberduck_8.png b/static/images/mac_cyberduck_8.png
new file mode 100644
index 0000000000000000000000000000000000000000..972222004b749ab4a3db37adeffe8e2fdf84471c
Binary files /dev/null and b/static/images/mac_cyberduck_8.png differ
diff --git a/static/images/mac_x11_forwarding.png b/static/images/mac_x11_forwarding.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f4b4fd8b0eb2cdb1c2b37512ccceb6050daca45
Binary files /dev/null and b/static/images/mac_x11_forwarding.png differ