diff --git a/site/03-todo.md b/site/03-todo.md
index 57bd937..05807fd 100644
--- a/site/03-todo.md
+++ b/site/03-todo.md
@@ -18,13 +18,10 @@
     - Introduction
     - Purchasing
     - Initial Setup
-    - Device-specific Setup Guides <label links with connectivity, performance, reliability, or tuning> - **ASK LUCY ABOUT "BADGES?"**
+    - Device-specific Setup Guides <label links with connectivity, performance, reliability, or tuning>
             - Change to topic or hero boxes
             - (after release) create badges
 - Configuration
-        - Basic Config
-            - Name Your Embassy
-            - WiFi Setup
         - Tor Setup
             - Desktop
                 - Linux
@@ -101,4 +98,6 @@
     - Service Packaging Walkthrough (Hello-World Example)
     - Development FAQ
         - Contributing
-        - Service Packaging -->
+        - Service Packaging
+
+-->
diff --git a/site/source/_static/images/config/basic-config0.png b/site/source/_static/images/config/basic-config0.png
deleted file mode 100644
index b6d27e0..0000000
Binary files a/site/source/_static/images/config/basic-config0.png and /dev/null differ
diff --git a/site/source/_static/images/config/basic-config0.svg b/site/source/_static/images/config/basic-config0.svg
new file mode 100644
index 0000000..aebd97e
Binary files /dev/null and b/site/source/_static/images/config/basic-config0.svg differ
diff --git a/site/source/_static/images/config/basic-config1.png b/site/source/_static/images/config/basic-config1.png
deleted file mode 100644
index 1da7bf1..0000000
Binary files a/site/source/_static/images/config/basic-config1.png and /dev/null differ
diff --git a/site/source/_static/images/config/basic-config1.svg b/site/source/_static/images/config/basic-config1.svg
new file mode 100644
index 0000000..860f025
Binary files /dev/null and b/site/source/_static/images/config/basic-config1.svg differ
diff --git a/site/source/_static/images/config/basic-config2.png b/site/source/_static/images/config/basic-config2.svg
similarity index 100%
rename from site/source/_static/images/config/basic-config2.png
rename to site/source/_static/images/config/basic-config2.svg
diff --git a/site/source/_static/images/config/wifi0.png b/site/source/_static/images/config/wifi0.png
deleted file mode 100644
index e8f0740..0000000
Binary files a/site/source/_static/images/config/wifi0.png and /dev/null differ
diff --git a/site/source/_static/images/config/wifi0.svg b/site/source/_static/images/config/wifi0.svg
new file mode 100644
index 0000000..43c3517
Binary files /dev/null and b/site/source/_static/images/config/wifi0.svg differ
diff --git a/site/source/_static/images/config/wifi1.png b/site/source/_static/images/config/wifi1.png
deleted file mode 100644
index 6cca137..0000000
Binary files a/site/source/_static/images/config/wifi1.png and /dev/null differ
diff --git a/site/source/_static/images/config/wifi1.svg b/site/source/_static/images/config/wifi1.svg
new file mode 100644
index 0000000..c2fa4e5
Binary files /dev/null and b/site/source/_static/images/config/wifi1.svg differ
diff --git a/site/source/_static/images/config/wifi2.png b/site/source/_static/images/config/wifi2.png
deleted file mode 100644
index e3948ef..0000000
Binary files a/site/source/_static/images/config/wifi2.png and /dev/null differ
diff --git a/site/source/_static/images/config/wifi2.svg b/site/source/_static/images/config/wifi2.svg
new file mode 100644
index 0000000..3b82d64
Binary files /dev/null and b/site/source/_static/images/config/wifi2.svg differ
diff --git a/site/source/_static/images/config/wifi3.png b/site/source/_static/images/config/wifi3.png
deleted file mode 100644
index c6aa71e..0000000
Binary files a/site/source/_static/images/config/wifi3.png and /dev/null differ
diff --git a/site/source/_static/images/config/wifi3.svg b/site/source/_static/images/config/wifi3.svg
new file mode 100644
index 0000000..968c871
Binary files /dev/null and b/site/source/_static/images/config/wifi3.svg differ
diff --git a/site/source/_static/images/config/wifi4.svg b/site/source/_static/images/config/wifi4.svg
new file mode 100644
index 0000000..8c6af20
Binary files /dev/null and b/site/source/_static/images/config/wifi4.svg differ
diff --git a/site/source/_static/images/config/wifi5.svg b/site/source/_static/images/config/wifi5.svg
new file mode 100644
index 0000000..4daf51d
Binary files /dev/null and b/site/source/_static/images/config/wifi5.svg differ
diff --git a/site/source/_static/images/walkthrough/reorder0.svg b/site/source/_static/images/walkthrough/reorder0.svg
new file mode 100644
index 0000000..cddd847
Binary files /dev/null and b/site/source/_static/images/walkthrough/reorder0.svg differ
diff --git a/site/source/_static/images/walkthrough/reorder1.svg b/site/source/_static/images/walkthrough/reorder1.svg
new file mode 100644
index 0000000..3529fc8
Binary files /dev/null and b/site/source/_static/images/walkthrough/reorder1.svg differ
diff --git a/site/source/support/user-manual/configuration/wifi.rst b/site/source/support/user-manual/configuration/wifi.rst
index af5a4e8..29eca0b 100644
--- a/site/source/support/user-manual/configuration/wifi.rst
+++ b/site/source/support/user-manual/configuration/wifi.rst
@@ -1,32 +1,45 @@
 .. _wifi:
 
 ===============
-Setting up WiFi - ***VERIFY CONNECTION BEHAVIOR and UPDATE FINAL SCREEN***
+Setting up WiFi
 ===============
 
-You can connect your Embassy with a wireless connection if you prefer.  Follow the directions below to connect to a WiFi network, or save your credentials for later to connect to a network you are not currently in proximity to.
+Although we highly recommend a wired (ethernet) connection for best performance, you can connect your Embassy with a wireless connection if you prefer.  Follow the directions below to connect to a WiFi network, or save your credentials for later to connect to a network you are not currently in proximity to.
 
 #. On the ``Embassy`` tab, Under ``Settings``, Click  ``WiFi``
-#. Select the appropriate region at the top
 
-   .. figure:: /_static/images/config/wifi0.png
+   .. figure:: /_static/images/config/wifi0.svg
     :width: 60%
     :alt: Select Region
 
-#. Click the ``+ Add new network``
+#. Select the appropriate region at the top
 
-   .. figure:: /_static/images/config/wifi1.png
+   .. figure:: /_static/images/config/wifi1.svg
+    :width: 60%
+    :alt: Select Region
+
+#. Select the network you would like from the list of available networks.  You will get an idea of signal strength on the right, from red (weak signal) to green (strong signal).  If you can move your Embassy closer to the WiFi broadcasting device, you will get a better signal, and as a result, better performance.
+
+   .. figure:: /_static/images/config/wifi2.svg
     :width: 60%
     :alt: Add WiFi Network
 
-#. Enter your WiFi SSID and password and either select ``Save for Later`` or ``Save and Connect`` to connect immediately
+   .. tip:: You may also select the network labeled ``Other`` at the bottom of the list in order to add a hidden network, or a network that is not nearby, for connecting to at a later time.
 
-   .. figure:: /_static/images/config/wifi2.png
+#. Enter your WiFi password and either select ``Save for Later`` or ``Save and Connect`` to connect immediately.
+
+   .. figure:: /_static/images/config/wifi3.svg
     :width: 60%
     :alt: Enter Credentials
 
-#. The saved network will appear in the list when successfully added. Click on it for connection options.  If you are successfully connected, the WiFi symbol will be green, at which point, you can safely disconnect the Embassy from your router.
+#. If you saved the network, it will appear in the list when successfully added, but not show connected.  If you connect immediately, you will receive a dialogue box and a green checkmark to show connection is live.
 
-   .. figure:: /_static/images/config/wifi3.png
+   .. figure:: /_static/images/config/wifi4.svg
+    :width: 60%
+    :alt: Connect
+
+#. Click on a saved network for connection options.  If you are successfully connected, you will receive a dialogue box and a green checkmark to show connection is live.  At this point, you can safely disconnect the ethernet cable from your Embassy, if you wish to use WiFi.
+
+   .. figure:: /_static/images/config/wifi5.svg
     :width: 60%
     :alt: Connect
diff --git a/site/source/support/user-manual/tuning/index.rst b/site/source/support/user-manual/tuning/index.rst
index c9b4a7e..4ca2013 100644
--- a/site/source/support/user-manual/tuning/index.rst
+++ b/site/source/support/user-manual/tuning/index.rst
@@ -1,3 +1,5 @@
+.. _tuning:
+
 ======
 Tuning
 ======
diff --git a/site/source/support/user-manual/tuning/tune-embassy-os.rst b/site/source/support/user-manual/tuning/tune-embassy-os.rst
index 9ea31ee..a852444 100644
--- a/site/source/support/user-manual/tuning/tune-embassy-os.rst
+++ b/site/source/support/user-manual/tuning/tune-embassy-os.rst
@@ -1,7 +1,7 @@
 .. _tune-embassy-os:
 
 =====================
-Customizing EmbassyOS - *** NEEDS SCREENS FOR REORDER ***
+Customizing EmbassyOS
 =====================
 
 .. _device-name:
@@ -11,27 +11,39 @@ Set Device Name
 
 Here you can change the name of your Embassy!
 
-1. Go to the ``Embassy`` tab on the main menu on the left side of the UI
+#. Go to the ``Embassy`` tab on the main menu on the left side of the UI
 
-.. figure:: /_static/images/config/basic-config0.png
-  :width: 60%
-  :alt: Embassy Tab
+    .. figure:: /_static/images/config/basic-config0.svg
+      :width: 60%
+      :alt: Embassy Tab
 
-2. Under the ``Settings`` section, click ``Preferences``
+#. Under the ``Settings`` section, click ``Preferences``
 
-.. figure:: /_static/images/config/basic-config1.png
-  :width: 60%
-  :alt: Preferences
+    .. figure:: /_static/images/config/basic-config1.svg
+      :width: 60%
+      :alt: Preferences
 
-3. Then click ``Device Name``, set to desired name, and click ``Save``
+#. Then click ``Device Name``, set to desired name, and click ``Save``
 
-.. figure:: /_static/images/config/basic-config2.png
-  :width: 60%
-  :alt: Rename Embassy
+    .. figure:: /_static/images/config/basic-config2.svg
+      :width: 60%
+      :alt: Rename Embassy
 
 .. _reorder:
 
 Reorder Service Page
 --------------------
 
-Customize Services layout
+You may customize the layout of your Services by re-arranging them to your liking.
+
+#. Simply visit the ``Services`` tab on the main menu on the left side of the UI, and select ``Reorder`` in the top right.
+
+    .. figure:: /_static/images/walkthrough/reorder0.svg
+      :width: 60%
+      :alt: Reorder Button
+
+#. You can now click and drag on each service to create the ordered list you desire.  When satisfied, click ``Done`` in the top right to save.
+
+    .. figure:: /_static/images/walkthrough/reorder1.svg
+      :width: 60%
+      :alt: Reorder Services