diff --git a/content/anvil/connecting_to_linux_instances_from_windows.md b/content/anvil/connecting_to_linux_instances_from_windows.md
index 3fd561a0529db69a07b85e418e29ce877428fbe2..c32565bbb41a42434e9314df012a332a1bdd06a4 100644
--- a/content/anvil/connecting_to_linux_instances_from_windows.md
+++ b/content/anvil/connecting_to_linux_instances_from_windows.md
@@ -27,44 +27,44 @@ In this example, the private key file is assumed to be
 named `anvil_key.ppk` and saved on the desktop.  In PuTTY window, click
 the '+' icon next to *SSH* under *Connection* to expand the menu.
 
-{{< figure src="/images/13599229.png" width="450" >}}
+{{< figure src="/images/AnvilLinux-Win10.png" width="450" >}}
 
 Next, click the *Auth* menu item.
 
-{{< figure src="/images/13599231.png" width="450" >}}
+{{< figure src="/images/AnvilLinux-Win10Auth.png" width="450" >}}
 
 Click the *Browse* button and the select the `anvil_key.ppk `file.
 
-{{< figure src="/images/13599236.png" width="450" >}}
+{{< figure src="/images/AnvilLinux-Win10Key.png" width="450" >}}
 
 With the private key selected, click the *Session* menu option at the
 top to return to the original PuTTY window.
 
-{{< figure src="/images/13599239.png" width="450" >}}
+{{< figure src="/images/AnvilLinux-Win10Session.png" width="450" >}}
 
 Fill in the *Host Name (or IP address)* field with the IP address of you
 instance.  Choose a name to save the settings for your instance with and
 enter it in the *Saved Sessions* field.
 
-{{< figure src="/images/13599242.png" width="450" >}}
+{{< figure src="/images/AnvilLinux-Win10SessionSaved.png" width="450" >}}
 
 Click the *Save* button to save everything.
 
-{{< figure src="/images/13599246.png" width="450" >}}
+{{< figure src="/images/AnvilLinux-Win10SessionSavedButton.png" width="450" >}}
 
 Next, click *Open* to connect to your instance.
 
-{{< figure src="/images/13599248.png" width="450" >}}
+{{< figure src="/images/AnvilLinux-Win10SessionOpen.png" width="450" >}}
 
 Since this is the first time connecting to the instance, a warning box
-will appear.  Click *Yes* to continue and save the instance's key.  This
+will appear.  Click *Accept* to continue and save the instance's key.  This
 warning box will not appear on subsequent connections.
 
-{{< figure src="/images/13599251.png" >}}
+{{< figure src="/images/AnvilLinux-Win10SessionSecurity.png" >}}
 
 You should then see a terminal window prompting for a username.
 
-{{< figure src="/images/13599255.png" >}}
+{{< figure src="/images/AnvilLinux-Win10Terminal.png" >}}
 
 Depending on which Linux OS you're using for your instance, the
 username will be different.  See the 
diff --git a/content/anvil/connecting_to_windows_instances.md b/content/anvil/connecting_to_windows_instances.md
index 327a9f1963e00e007286c9509a532cbec5c4285a..dd933bf1ec3c1cd6b119446f7b960314941c3d63 100644
--- a/content/anvil/connecting_to_windows_instances.md
+++ b/content/anvil/connecting_to_windows_instances.md
@@ -69,15 +69,12 @@ column entry on the *Instances* page:
 Start your Remote Desktop client, enter the IP address in the name (or
 address) field, and click "Connect":
 
-{{< figure src="/images/13042879.png" >}}
+{{< figure src="/images/Anvil-win10RDPClient.png" >}}
 
-When prompted, enter **cloud-user** for the username if connecting to a
-Windows 7 instance; **.\\cloud-user** if connecting to a Windows 10
+When prompted, enter **.\\cloud-user** for the username when connecting to a Windows 10
 instance, and the previously recovered password.
 
 {{% notice info %}}
-For Windows 7, the username used to connect is always `cloud-user`
-
 For Windows 10, the username used to connect is always `.\cloud-user`
 {{% /notice %}}
 
@@ -85,7 +82,7 @@ You may see a warning box about the certificate of the remote computer.
 To avoid this warning in the future, check the box that says "Don't ask
 me again for connections to this computer".
 
-{{< figure src="/images/13042885.png" height="400" >}}
+{{< figure src="/images/Anvil-win10RDPCert.png" height="400" >}}
 
 Click "Yes" to continue connecting.  The Remote Desktop session should
 then start and you will be connected to your instance.
diff --git a/content/anvil/creating_ssh_key_pairs_on_windows.md b/content/anvil/creating_ssh_key_pairs_on_windows.md
index 2b6a44c9264408c4c7d4e642f5a5f1f44ed83e19..459411872a2b22d42d303404ec26d1393dcd000d 100644
--- a/content/anvil/creating_ssh_key_pairs_on_windows.md
+++ b/content/anvil/creating_ssh_key_pairs_on_windows.md
@@ -1,4 +1,4 @@
-+++
+p+++
 title = "Creating SSH key pairs on Windows"
 description = "How to create key pairs for use with Anvil on Windows"
 +++
@@ -12,7 +12,7 @@ generate the key pair.
 Once installed, start PuTTYgen.  Click the *Generate* key to create the
 key pair.
 
-{{< figure src="/images/13598846.png" height="450" >}}
+{{< figure src="/images/PuttyGen-Generate.png" height="450" >}}
 
 You will be promoted to move the mouse in a random fashion within the
 window for several seconds to create the key.  Once the key is
@@ -20,7 +20,7 @@ generated, the public and private keys need to be saved to different
 files.  The public key is in the text box near the top of the PuTTYgen
 window.  Right click within the box and choose *Select All*.   
 
-{{< figure src="/images/13598847.png" height="450" >}}
+{{< figure src="/images/PuttyGen-Select.png" height="450" >}}
 
 Either right-click again and choose *Copy* or use *Ctrl-C* to copy the
 key text.  Paste the key into a text editor of your choice.  Save the
@@ -44,22 +44,22 @@ file.  
 To save the private key for use with the `ssh `command, choose *Export
 OpenSSH key* under the *Conversions* menu.
 
-{{< figure src="/images/13598856.png" height="450" >}}
+{{< figure src="/images/PuttyGen-Export.png" height="450" >}}
 
 A pop-up box will appear warning about saving the key without a
 passphrase; select *Yes* to continue.
 
-{{< figure src="/images/13598859.png" >}}
+{{< figure src="/images/PuttyGen-Password.png" >}}
 
 Save the OpenSSH private key somewhere convenient.  
 
 To save the PuTTY format file, click the *Save private key* button.
 
-{{< figure src="/images/13599219.png" height="450" >}}
+{{< figure src="/images/PuttyGen-PrivateKey.png" height="450" >}}
 
 An identical warning box to before will appear; click *Yes* to continue.
 
-{{< figure src="/images/13598859.png" >}}
+{{< figure src="/images/PuttyGen-Password.png" >}}
 
 You may need to change the filename slightly to avoid overwriting the
 OpenSSH key file.  Save the `.ppk` file somewhere convenient.
diff --git a/content/connecting/how_to_setup_x11_forwarding.md b/content/connecting/how_to_setup_x11_forwarding.md
index cefe284ae8a663efdeadc7146be3acafd451abc7..3d6c498b60650250058cab05b85e0e2686ede06c 100644
--- a/content/connecting/how_to_setup_x11_forwarding.md
+++ b/content/connecting/how_to_setup_x11_forwarding.md
@@ -11,12 +11,12 @@ weight = "35"
 2.  Download PuTTY to your local PC and install.  Download link: http://the.earth.li/~sgtatham/putty/latest/x86/putty.exe
 3.  Open Xming and keep it running in the background.
 4.  Configure PuTTY as below:  
-    {{< figure src="/images/11637370.png" height="400" >}}
-    {{< figure src="/images/11637371.jpg" height="400" >}}
+    {{< figure src="/images/Putty-win10.png" height="400" >}}
+    {{< figure src="/images/Putty-win10X11.png" height="400" >}}
 
 5.  To test your X11 setup, after login, type command `xeyes` and press
     enter.  
-    {{< figure src="/images/11637372.png" height="400" >}}
+    {{< figure src="/images/Putty-win10XEYES.png" height="400" >}}
 
 6.  Close the xeyes application by "Ctrl + c" from the terminal or click
     the close button on the up-right corner of the graphical window.
diff --git a/content/connecting/putty.md b/content/connecting/putty.md
index 8cb395a7ad14ffe3976fa2e595263b2ed9bea109..20efba0616f08482d0edc11768c05ecf8c182848 100644
--- a/content/connecting/putty.md
+++ b/content/connecting/putty.md
@@ -9,7 +9,7 @@ weight = "20"
 
 - [Connecting to HCC Clusters](#connecting-to-hcc-clusters)
 - [Windows 10](#windows-10)
-- [Windows 7 and 8.1](#windows-7-and-8-1)
+- [Windows 8.1](#windows-8-1)
 - [Next Steps:](#next-steps)
 
 ## Connecting to HCC Clusters
@@ -27,7 +27,7 @@ Windows 10 users, can connect using the
 Command Prompt. Please see [Connecting with the Terminal]({{< relref "/connecting/terminal" >}})
 for more details.
 
-## Windows 7 and 8.1
+## Windows 8.1
 --------------
 
 For users with older Windows versions, you will need to install an SSH client to connect.
diff --git a/content/handling_data/data_transfer/scp.md b/content/handling_data/data_transfer/scp.md
index f69d8cabb886eeeea714c693594a5451264e8861..fc66cf8a7461bfdb45d80e59e9ebbcbeaaa82d44 100644
--- a/content/handling_data/data_transfer/scp.md
+++ b/content/handling_data/data_transfer/scp.md
@@ -6,7 +6,7 @@ weight = "10"
 
 ## Using the SCP command
 
-For MacOS, Linux, and later Windows users, file transferring between your personal computer
+For MacOS, Linux, and Windows 10 users, file transferring between your personal computer
 and the HCC supercomputers can be achieved through the command `scp` which stands for secure copy.
 This method is ideal for quick transfer of smaller files. For large volume transfers,
 we recommend the using [Globus] or an SCP client such as [WinSCP for Windows]({{< relref "winscp">}}) or 
diff --git a/content/handling_data/data_transfer/winscp.md b/content/handling_data/data_transfer/winscp.md
index 2c5d61deffb23d5a63e80010313996f24660adcd..4d87804091c4b28e56a59feb63a43f9856e10aa4 100644
--- a/content/handling_data/data_transfer/winscp.md
+++ b/content/handling_data/data_transfer/winscp.md
@@ -45,7 +45,7 @@ with `rhino.unl.edu`.
 
 6.  Now you can drop and drag the files between your personal computer
     and the HCC supercomputers.   
-    {{< figure src="/images/3178539.png" height="450" >}}
+    {{< figure src="/images/WinSCPUploadDownload.png" height="450" >}}
 
 
 
diff --git a/static/images/11637370.png b/static/images/11637370.png
deleted file mode 100644
index b0ea626e46996770e4e1f894ad59df5f78300410..0000000000000000000000000000000000000000
Binary files a/static/images/11637370.png and /dev/null differ
diff --git a/static/images/11637371.jpg b/static/images/11637371.jpg
deleted file mode 100644
index 8df254bde99eeff3eda0c481697387311019781e..0000000000000000000000000000000000000000
Binary files a/static/images/11637371.jpg and /dev/null differ
diff --git a/static/images/11637372.png b/static/images/11637372.png
deleted file mode 100644
index 15d0edc933b8df9359783117a1d05c347018463c..0000000000000000000000000000000000000000
Binary files a/static/images/11637372.png and /dev/null differ
diff --git a/static/images/13042879.png b/static/images/13042879.png
deleted file mode 100644
index 0d2d1e65d09581b7385f34cda3ad4077f8bd59e9..0000000000000000000000000000000000000000
Binary files a/static/images/13042879.png and /dev/null differ
diff --git a/static/images/13042885.png b/static/images/13042885.png
deleted file mode 100644
index f9864e8debfa4a7b6a63338b0c69871d0f03105b..0000000000000000000000000000000000000000
Binary files a/static/images/13042885.png and /dev/null differ
diff --git a/static/images/13598846.png b/static/images/13598846.png
deleted file mode 100644
index 4e4b9081cb6b0f846a36294fbecca590a59e8a74..0000000000000000000000000000000000000000
Binary files a/static/images/13598846.png and /dev/null differ
diff --git a/static/images/13598847.png b/static/images/13598847.png
deleted file mode 100644
index f5e840cc6cbe2a1ca8095b18eab0c669303ee008..0000000000000000000000000000000000000000
Binary files a/static/images/13598847.png and /dev/null differ
diff --git a/static/images/13598856.png b/static/images/13598856.png
deleted file mode 100644
index d8369287c17f613aff733282d986fb11320c770c..0000000000000000000000000000000000000000
Binary files a/static/images/13598856.png and /dev/null differ
diff --git a/static/images/13598859.png b/static/images/13598859.png
deleted file mode 100644
index 0ded4c09e5ea1547150f5b5b7a423e98cce88c69..0000000000000000000000000000000000000000
Binary files a/static/images/13598859.png and /dev/null differ
diff --git a/static/images/13599219.png b/static/images/13599219.png
deleted file mode 100644
index b736f8cf22aa79dd6234e29c9070e4ec707abb90..0000000000000000000000000000000000000000
Binary files a/static/images/13599219.png and /dev/null differ
diff --git a/static/images/13599229.png b/static/images/13599229.png
deleted file mode 100644
index 955507c0b2f1a28363af10ed159b7fb23fb411ad..0000000000000000000000000000000000000000
Binary files a/static/images/13599229.png and /dev/null differ
diff --git a/static/images/13599231.png b/static/images/13599231.png
deleted file mode 100644
index e8880343705212d081296e82bad246afb7fed6d7..0000000000000000000000000000000000000000
Binary files a/static/images/13599231.png and /dev/null differ
diff --git a/static/images/13599236.png b/static/images/13599236.png
deleted file mode 100644
index b17e329ec0e3631483134600a06c5a5670e7a4bc..0000000000000000000000000000000000000000
Binary files a/static/images/13599236.png and /dev/null differ
diff --git a/static/images/13599239.png b/static/images/13599239.png
deleted file mode 100644
index 9369e0f1c88487260711831a1e7fca55a96707f3..0000000000000000000000000000000000000000
Binary files a/static/images/13599239.png and /dev/null differ
diff --git a/static/images/13599242.png b/static/images/13599242.png
deleted file mode 100644
index 167538e3a26162ff299baadac5639f0c4f8d0f20..0000000000000000000000000000000000000000
Binary files a/static/images/13599242.png and /dev/null differ
diff --git a/static/images/13599248.png b/static/images/13599248.png
deleted file mode 100644
index 32ae89754def70d1b5600e989e94ad4f2db8a5fc..0000000000000000000000000000000000000000
Binary files a/static/images/13599248.png and /dev/null differ
diff --git a/static/images/13599255.png b/static/images/13599255.png
deleted file mode 100644
index 76a3d1315608dde35c57eb99193fe4f6c2dab96c..0000000000000000000000000000000000000000
Binary files a/static/images/13599255.png and /dev/null differ
diff --git a/static/images/3178539.png b/static/images/3178539.png
deleted file mode 100644
index c48e3b07a6ba20d15008b3bfa9c6bd3637320600..0000000000000000000000000000000000000000
Binary files a/static/images/3178539.png and /dev/null differ
diff --git a/static/images/Anvil-win10RDPCert.png b/static/images/Anvil-win10RDPCert.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ea34188744ab1d07080731d45ad1c2835a6bc27
Binary files /dev/null and b/static/images/Anvil-win10RDPCert.png differ
diff --git a/static/images/Anvil-win10RDPClient.png b/static/images/Anvil-win10RDPClient.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec1fbfb4898511cbfcce5b491b1692e084869993
Binary files /dev/null and b/static/images/Anvil-win10RDPClient.png differ
diff --git a/static/images/AnvilLinux-Win10.png b/static/images/AnvilLinux-Win10.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d1f3d401a293c265d1df838041f6601ec6448ca
Binary files /dev/null and b/static/images/AnvilLinux-Win10.png differ
diff --git a/static/images/AnvilLinux-Win10Auth.png b/static/images/AnvilLinux-Win10Auth.png
new file mode 100644
index 0000000000000000000000000000000000000000..acee195da632510a9f07d80fdf862dd0d405b816
Binary files /dev/null and b/static/images/AnvilLinux-Win10Auth.png differ
diff --git a/static/images/AnvilLinux-Win10AuthKey.png b/static/images/AnvilLinux-Win10AuthKey.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb24bf3aacb44fd8c973ecbabca21bcc482da3e5
Binary files /dev/null and b/static/images/AnvilLinux-Win10AuthKey.png differ
diff --git a/static/images/AnvilLinux-Win10Key.png b/static/images/AnvilLinux-Win10Key.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1aaa5fe48bea62a4c275f2dc341892deee801fb
Binary files /dev/null and b/static/images/AnvilLinux-Win10Key.png differ
diff --git a/static/images/AnvilLinux-Win10Session.png b/static/images/AnvilLinux-Win10Session.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3113c75f271576c1fe6e8004ae90b71e9b16d89
Binary files /dev/null and b/static/images/AnvilLinux-Win10Session.png differ
diff --git a/static/images/AnvilLinux-Win10SessionOpen.png b/static/images/AnvilLinux-Win10SessionOpen.png
new file mode 100644
index 0000000000000000000000000000000000000000..2cfd809e24b0c1938e917c517567edab421a4242
Binary files /dev/null and b/static/images/AnvilLinux-Win10SessionOpen.png differ
diff --git a/static/images/AnvilLinux-Win10SessionSaved.png b/static/images/AnvilLinux-Win10SessionSaved.png
new file mode 100644
index 0000000000000000000000000000000000000000..af41128cef9c7e305652850b99ff46f5d65d9984
Binary files /dev/null and b/static/images/AnvilLinux-Win10SessionSaved.png differ
diff --git a/static/images/AnvilLinux-Win10SessionSavedButton.png b/static/images/AnvilLinux-Win10SessionSavedButton.png
new file mode 100644
index 0000000000000000000000000000000000000000..967d3f0eff0a168d7a9c7dcd075d5ace73dc466b
Binary files /dev/null and b/static/images/AnvilLinux-Win10SessionSavedButton.png differ
diff --git a/static/images/AnvilLinux-Win10SessionSecurity.png b/static/images/AnvilLinux-Win10SessionSecurity.png
new file mode 100644
index 0000000000000000000000000000000000000000..b40744f8e3440e82fb481f9102c6860069ede788
Binary files /dev/null and b/static/images/AnvilLinux-Win10SessionSecurity.png differ
diff --git a/static/images/AnvilLinux-Win10Terminal.png b/static/images/AnvilLinux-Win10Terminal.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd7beae4bcb9bf3ebcd06c9a836fba1fb46a089a
Binary files /dev/null and b/static/images/AnvilLinux-Win10Terminal.png differ
diff --git a/static/images/Putty-win10.png b/static/images/Putty-win10.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed9ee2b4387cbb617db146dde4e6e8ac62f3679c
Binary files /dev/null and b/static/images/Putty-win10.png differ
diff --git a/static/images/Putty-win10X11.png b/static/images/Putty-win10X11.png
new file mode 100644
index 0000000000000000000000000000000000000000..54d80875df15f89530518f5e9b17b7d94cc2e86a
Binary files /dev/null and b/static/images/Putty-win10X11.png differ
diff --git a/static/images/Putty-win10XEYES.png b/static/images/Putty-win10XEYES.png
new file mode 100644
index 0000000000000000000000000000000000000000..b85691d1268270daeaad997a5494827bf182d188
Binary files /dev/null and b/static/images/Putty-win10XEYES.png differ
diff --git a/static/images/PuttyGen-Export.png b/static/images/PuttyGen-Export.png
new file mode 100644
index 0000000000000000000000000000000000000000..141259f95ae20d6704ff8333af1607a2daad0298
Binary files /dev/null and b/static/images/PuttyGen-Export.png differ
diff --git a/static/images/PuttyGen-Generate.png b/static/images/PuttyGen-Generate.png
new file mode 100644
index 0000000000000000000000000000000000000000..c0100927d01867cac18d3d1d0dfa8f02a2bd5076
Binary files /dev/null and b/static/images/PuttyGen-Generate.png differ
diff --git a/static/images/PuttyGen-Password.png b/static/images/PuttyGen-Password.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd5e58d3e5a837fb15257995f3b8f303b46e7056
Binary files /dev/null and b/static/images/PuttyGen-Password.png differ
diff --git a/static/images/PuttyGen-PrivateKey.png b/static/images/PuttyGen-PrivateKey.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f32011b8651d2dc21bb80206464062e54cd1ccb
Binary files /dev/null and b/static/images/PuttyGen-PrivateKey.png differ
diff --git a/static/images/PuttyGen-Select.png b/static/images/PuttyGen-Select.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5932752f70fe7f896278285d682930085580533
Binary files /dev/null and b/static/images/PuttyGen-Select.png differ
diff --git a/static/images/WinSCPUploadDownload.png b/static/images/WinSCPUploadDownload.png
new file mode 100644
index 0000000000000000000000000000000000000000..a65a016638c28144d94bc708f1fbe6651dd603c5
Binary files /dev/null and b/static/images/WinSCPUploadDownload.png differ