diff --git a/site/source/_static/images/hardware-pics/embassy-one.png b/site/source/_static/images/hardware-pics/embassy-one.png
new file mode 100644
index 0000000..0367972
Binary files /dev/null and b/site/source/_static/images/hardware-pics/embassy-one.png differ
diff --git a/site/source/_static/images/hardware-pics/naspi-jameson-loop.png b/site/source/_static/images/hardware-pics/naspi-jameson-loop.png
new file mode 100644
index 0000000..96eb694
Binary files /dev/null and b/site/source/_static/images/hardware-pics/naspi-jameson-loop.png differ
diff --git a/site/source/_static/images/hardware-pics/naspi-jameson-loop2.png b/site/source/_static/images/hardware-pics/naspi-jameson-loop2.png
new file mode 100644
index 0000000..3517ae3
Binary files /dev/null and b/site/source/_static/images/hardware-pics/naspi-jameson-loop2.png differ
diff --git a/site/source/_static/images/hardware-pics/pro-all-highlighted.jpg b/site/source/_static/images/hardware-pics/pro-all-highlighted.jpg
new file mode 100644
index 0000000..5c9c943
Binary files /dev/null and b/site/source/_static/images/hardware-pics/pro-all-highlighted.jpg differ
diff --git a/site/source/_static/images/hardware-pics/pro-all.jpg b/site/source/_static/images/hardware-pics/pro-all.jpg
new file mode 100644
index 0000000..9ed76fd
Binary files /dev/null and b/site/source/_static/images/hardware-pics/pro-all.jpg differ
diff --git a/site/source/_static/images/hardware-pics/usb-into-naspi-edited-2.jpg b/site/source/_static/images/hardware-pics/usb-into-naspi-edited-2.jpg
new file mode 100644
index 0000000..9ee2100
Binary files /dev/null and b/site/source/_static/images/hardware-pics/usb-into-naspi-edited-2.jpg differ
diff --git a/site/source/_static/images/hardware-pics/usb-into-naspi-edited.jpg b/site/source/_static/images/hardware-pics/usb-into-naspi-edited.jpg
new file mode 100644
index 0000000..cc39830
Binary files /dev/null and b/site/source/_static/images/hardware-pics/usb-into-naspi-edited.jpg differ
diff --git a/site/source/_static/images/hardware-pics/usb-into-naspi.jpg b/site/source/_static/images/hardware-pics/usb-into-naspi.jpg
new file mode 100644
index 0000000..6578007
Binary files /dev/null and b/site/source/_static/images/hardware-pics/usb-into-naspi.jpg differ
diff --git a/site/source/_static/images/setup/transfer-from.png b/site/source/_static/images/setup/transfer-from.png
new file mode 100644
index 0000000..7da3f1b
Binary files /dev/null and b/site/source/_static/images/setup/transfer-from.png differ
diff --git a/site/source/_static/images/setup/transfer-to.png b/site/source/_static/images/setup/transfer-to.png
new file mode 100644
index 0000000..702ca85
Binary files /dev/null and b/site/source/_static/images/setup/transfer-to.png differ
diff --git a/site/source/_static/images/setup/transfer.png b/site/source/_static/images/setup/transfer.png
new file mode 100644
index 0000000..31c78e5
Binary files /dev/null and b/site/source/_static/images/setup/transfer.png differ
diff --git a/site/source/_static/images/walkthrough/shutdown.png b/site/source/_static/images/walkthrough/shutdown.png
new file mode 100644
index 0000000..33df658
Binary files /dev/null and b/site/source/_static/images/walkthrough/shutdown.png differ
diff --git a/site/source/user-manual/index.rst b/site/source/user-manual/index.rst
index 3cf3360..51ec80c 100644
--- a/site/source/user-manual/index.rst
+++ b/site/source/user-manual/index.rst
@@ -25,4 +25,4 @@ Welcome to the embassyOS user manual. Here you will discover all that your Embas
ssh
alt-marketplaces
device-guides/index
- upgrade-02/index
+ upgrade-hardware/index
diff --git a/site/source/user-manual/initial-setup.rst b/site/source/user-manual/initial-setup.rst
index 72ba854..d83eb84 100644
--- a/site/source/user-manual/initial-setup.rst
+++ b/site/source/user-manual/initial-setup.rst
@@ -20,9 +20,11 @@ Check out the video below for a guide on setting up your Embassy!
Powering On
-----------
+.. _sounds-bepchime:
+
#. Connect your Embassy to power and Ethernet.
-.. _sounds-bepchime:
+
#. If all is well, you will hear 2 distinct sounds:
diff --git a/site/source/user-manual/upgrade-02/index.rst b/site/source/user-manual/upgrade-hardware/index.rst
similarity index 70%
rename from site/source/user-manual/upgrade-02/index.rst
rename to site/source/user-manual/upgrade-hardware/index.rst
index bf7b09f..fd9a767 100644
--- a/site/source/user-manual/upgrade-02/index.rst
+++ b/site/source/user-manual/upgrade-hardware/index.rst
@@ -1,11 +1,9 @@
-.. _upgrade-02:
+.. _upgrade-hardware:
================
Upgrade Hardware
================
-Embassy One
------------
.. raw:: html
@@ -14,7 +12,25 @@ Embassy One
.. topic-box::
- :title: Use Upgrade Kit
+ :title: Upgrade from Embassy One to Embassy Pro
+ :link: upgrade-pro
+ :icon: scylla-icon scylla-icon--enterprise
+ :class: large-5
+ :anchor: Upgrade
+
+ This is for migrating from an Embassy One to an Embassy Pro
+
+.. topic-box::
+ :title: Upgrade to all-in-one NASPi case
+ :link: naspi-upgrade
+ :icon: scylla-icon scylla-icon--home
+ :class: large-5
+ :anchor: Upgrade
+
+ This is for if you purchased a NASPi upgrade kit from us
+
+.. topic-box::
+ :title: Upgrade Kit v0.2 - v0.3
:link: upgrade-kit
:icon: scylla-icon scylla-icon--getting-started
:class: large-5
@@ -31,14 +47,8 @@ Embassy One
This is for if you purchased your own hardware to migrate from embassyOS v0.2.x to v0.3+
-.. topic-box::
- :title: Upgrade to all-in-one NASPi case
- :link: naspi-upgrade
- :icon: scylla-icon scylla-icon--home
- :class: large-5
- :anchor: Upgrade
- This is for if you purchased a NASPi upgrade kit from us
+
.. raw:: html
@@ -46,17 +56,15 @@ Embassy One
-Upgrade to Embassy Pro
-----------------------
-You can migrate from an Embassy One to an Embassy Pro simply by shutting down your Embassy One, removing the SSD and connecting it to your new Embassy Pro!
-
-Your data will then migrate from your Embassy One to your Embassy Pro during :ref:`Initial setup. `
.. toctree::
:maxdepth: 2
:hidden:
+ Pro upgrade
+ NASPi upgrade
Upgrade Kit
DIY Hardware
- NASPi upgrade
\ No newline at end of file
+
+
diff --git a/site/source/user-manual/upgrade-02/naspi-upgrade.rst b/site/source/user-manual/upgrade-hardware/naspi-upgrade.rst
similarity index 100%
rename from site/source/user-manual/upgrade-02/naspi-upgrade.rst
rename to site/source/user-manual/upgrade-hardware/naspi-upgrade.rst
diff --git a/site/source/user-manual/upgrade-02/upgrade-diy.rst b/site/source/user-manual/upgrade-hardware/upgrade-diy.rst
similarity index 100%
rename from site/source/user-manual/upgrade-02/upgrade-diy.rst
rename to site/source/user-manual/upgrade-hardware/upgrade-diy.rst
diff --git a/site/source/user-manual/upgrade-02/upgrade-kit.rst b/site/source/user-manual/upgrade-hardware/upgrade-kit.rst
similarity index 100%
rename from site/source/user-manual/upgrade-02/upgrade-kit.rst
rename to site/source/user-manual/upgrade-hardware/upgrade-kit.rst
diff --git a/site/source/user-manual/upgrade-hardware/upgrade-pro.rst b/site/source/user-manual/upgrade-hardware/upgrade-pro.rst
new file mode 100644
index 0000000..11ca14b
--- /dev/null
+++ b/site/source/user-manual/upgrade-hardware/upgrade-pro.rst
@@ -0,0 +1,165 @@
+.. _upgrade-pro:
+
+=================================================
+Migrating From Embassy One to Embassy Pro (NASPi)
+=================================================
+
+This is for Embassy One users upgrading from a NASPi (pictured below). If you're using a Samsung T5/T7 please go :ref:`here `.
+
+ .. figure:: /_static/images/hardware-pics/embassy-one.png
+ :width: 30%
+
+You will need a high quality USB-A to USB-A cable like `this `_. Or a USB-A to USB-C cable like `this `_.
+
+#. Shutdown your Embassy One
+
+ .. figure:: /_static/images/walkthrough/shutdown.png
+ :width: 60%
+
+#. Listen out for the shutdown sounds, then after few more seconds, disconnect the power.
+
+ .. raw:: HTML
+
+
+
+ * Shutdown sound
+
+#. Now disconnect the USB adapter found here:
+
+ .. figure:: /_static/images/hardware-pics/naspi-jameson-loop2.png
+ :width: 60%
+
+#. Connect the USB cable to the lowest blue USB port like this:
+
+ .. figure:: /_static/images/hardware-pics/usb-into-naspi-edited.jpg
+ :width: 60%
+
+#. Now connect the Ethernet cable and then the power to your Embassy Pro
+
+ .. figure:: /_static/images/hardware-pics/pro-all.jpg
+ :width: 60%
+
+#. Head to http://embassy.local on any device on the same LAN
+
+#. Select "Recover"
+
+ .. figure:: /_static/images/setup/screen0-startfresh_or_recover.png
+ :width: 60%
+
+#. Select "Transfer"
+
+ .. figure:: /_static/images/setup/transfer.png
+ :width: 60%
+
+#. Now connect the other end of the USB cable to either an Embassy Pro USB-3 port or the USB-C port:
+
+ .. figure:: /_static/images/hardware-pics/pro-all-highlighted.jpg
+ :width: 60%
+
+#. Connect the power to the NASPi - you will hear this sound and can ignore it:
+
+ .. raw:: HTML
+
+
+
+ * Beethoven's 5th
+
+#. Select the drive inside the NASPi (you may need to hit refresh):
+
+ .. figure:: /_static/images/setup/transfer-from.png
+ :width: 60%
+
+#. Select the drive inside the Embassy Pro that you are migrating *to* (this will erase any data on this drive):
+
+ .. figure:: /_static/images/setup/transfer-to.png
+ :width: 60%
+
+#. You will be asked to create a password. It can be the same as it was previously:
+
+ .. figure:: /_static/images/setup/screen5-set_password.png
+ :width: 60%
+
+#. Your data will now transfer over - the length of this process will vary depending on how much data you have, but will likely take several hours:
+
+ .. figure:: /_static/images/setup/screen6-storage_initialize.jpg
+ :width: 60%
+
+#. You are now ready to proceed and use your Embassy Pro - it will have the same addresses and root certificate as it did before migrating.
+
+ .. figure:: /_static/images/setup/screen7-startfresh_complete.jpg
+ :width: 60%
+
+ .. warning:: Do not unders any circumstances reassemble your Embassy One without wiping the SD card first and wiping the SSD during initial setup! If you do not this will cause serious problems! If you have lightning channels you could lose all your funds!
+
+.. _samsung-drives:
+
+Samsung T5/T7/alternative drives
+================================
+
+#. Shutdown your Embassy One
+
+ .. figure:: /_static/images/walkthrough/shutdown.png
+ :width: 60%
+
+#. Listen out for the shutdown sounds, then after few more seconds, disconnect the power.
+
+ .. raw:: HTML
+
+
+
+ * Shutdown sound
+
+#. Now connect the Ethernet cable and then the power to your Embassy Pro
+
+ .. figure:: /_static/images/hardware-pics/pro-all.jpg
+ :width: 60%
+
+#. Head to http://embassy.local on any device on the same LAN
+
+#. Select "Recover"
+
+ .. figure:: /_static/images/setup/screen0-startfresh_or_recover.png
+ :width: 60%
+
+#. Select "Transfer"
+
+ .. figure:: /_static/images/setup/transfer.png
+ :width: 60%
+
+#. Now connect your Samsung T5/T7/alternative drive to any USB-3 or USB-C port on your Embassy Pro
+
+#. Select this drive (you may need to hit refresh):
+
+ .. figure:: /_static/images/setup/transfer-from.png
+ :width: 60%
+
+#. Select the drive inside the Embassy Pro that you are migrating *to* (this will erase any data on this drive):
+
+ .. figure:: /_static/images/setup/transfer-to.png
+ :width: 60%
+
+#. You will be asked to create a password. It can be the same as it was previously:
+
+ .. figure:: /_static/images/setup/screen5-set_password.png
+ :width: 60%
+
+#. Your data will now transfer over - the length of this process will vary depending on how much data you have, but will likely take several hours:
+
+ .. figure:: /_static/images/setup/screen6-storage_initialize.jpg
+ :width: 60%
+
+#. You are now ready to proceed and use your Embassy Pro - it will have the same addresses and root certificate as it did before migrating.
+
+ .. figure:: /_static/images/setup/screen7-startfresh_complete.jpg
+ :width: 60%
+
+ .. warning:: Do not unders any circumstances reassemble your Embassy One without wiping the SD card first and wiping the SSD during initial setup! If you do not this will cause serious problems! If you have lightning channels you could lose all your funds!
\ No newline at end of file