diff --git a/.gitignore b/.gitignore
index 2692dd9..defb084 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 .DS_Store
 .vscode/
-build/
 build-send.sh
-utils/deploy.sh
-docs/_build
+site/_build
+site/_utils/docsearch_config.json
+site/_utils/docsearch_index.js
 .env
\ No newline at end of file
diff --git a/README.md b/README.md
index 0c6e4e6..9280e26 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ Install [pyenv](https://github.com/pyenv/pyenv)
 
 ## Development
 
-When editing these files, begin a livereload environment by running `make preview` while in the `./docs/` directory.
+When editing these files, begin a livereload environment by running `make preview` while in the `./site/` directory.
 
 When editing any css or table of contents organization changes, the livereload environment must be ended and `make clean` run before starting `make preview` again.
 
diff --git a/docs/source/index.rst b/docs/source/index.rst
deleted file mode 100644
index 38c1637..0000000
--- a/docs/source/index.rst
+++ /dev/null
@@ -1,132 +0,0 @@
-.. title:: Start9 Documentation
-
-.. raw:: html
-
-  <div class="landing landing--floating">
-
-.. hero-box::
-  :title: Welcome to the Start9 Documentation
-  :button_icon: scylla-icon scylla-icon--monitoring
-  :button_url: https://docs.start9.com/getting-started/introduction/
-  :button_text: Start here
-  :image: /_static/img/icons/docs_info.png
-
-  Here you will find guidance and information about the Start9 Embassy personal server and its operating system, EmbassyOS.
-
-.. raw:: html
-
-  <div class="landing__content landing__content">
-
-.. raw:: html
-
-  <div class="topics-grid grid-container full">
-
-  <div class="grid-x grid-margin-x">
-
-.. topic-box::
-  :title: Purchasing
-  :link:   getting-started/purchasing
-  :icon: scylla-icon scylla-icon--bitcoin
-  :class: large-6
-  :anchor: Learn more
-
-  Learn about how you can purchase Start9 products.
-
-.. topic-box::
-  :title: Videos
-  :link: https://www.youtube.com/channel/UCGEw4HJDvOn3Oy8ykR36P7Q
-  :icon: scylla-icon scylla-icon--webinars
-  :class: large-6
-  :anchor: Learn more
-
-  Check out our how to and informational videos.
-
-.. topic-box::
-  :title: Support
-  :link: support
-  :icon: scylla-icon scylla-icon--support
-  :class: large-6
-  :anchor: Learn more
-
-  Read our FAQ and learn about platform concepts.
-
-.. topic-box::
-  :title: DIY
-  :link: getting-started/diy
-  :icon: scylla-icon scylla-icon--integrations
-  :class: large-6
-  :anchor: Learn more
-
-  Get started yourself with our Do It Yourself guide
-
-.. topic-box::
-  :title: About
-  :link: about
-  :icon: scylla-icon scylla-icon--about-team
-  :class: large-6
-  :anchor: Learn more
-
-  Explore Start9's mission and philosophy.
-
-.. topic-box::
-  :title: Contribute
-  :link: contributing
-  :icon: scylla-icon scylla-icon--apps
-  :class: large-6
-  :anchor: Learn more
-
-  Learn about developing for EmbassyOS or contribute to packing services for the marketplace.
-
-.. raw:: html
-
-  </div></div>
-
-.. raw:: html
-
-  </div></div>
-
-.. toctree::
-  :maxdepth: 2
-  :caption: Getting Started
-  :hidden:
-
-  getting-started/introduction
-  getting-started/purchasing
-  getting-started/diy
-
-.. toctree::
-  :maxdepth: 2
-  :caption: User Manual
-  :hidden:
-
-  user-manual/initial-setup
-  user-manual/connecting
-  user-manual/general/index
-  user-manual/managing-services/index
-
-.. toctree::
-  :maxdepth: 2
-  :caption: Misc Guides
-  :hidden:
-
-  misc-guides/available-services
-  misc-guides/bitcoin-cli
-  misc-guides/tor-os/index
-  misc-guides/tor-firefox/index
-
-.. toctree::
-  :maxdepth: 2
-  :caption: Contributing
-  :hidden:
-
-  contributing/services/index
-  contributing/embassyos
-
-.. toctree::
-  :maxdepth: 2
-  :caption: Support
-  :hidden:
-
-  support/FAQ/index
-  support/concepts
-  support/contact
\ No newline at end of file
diff --git a/poetry.lock b/poetry.lock
index ac3ce2d..72b3968 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -24,17 +24,17 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 
 [[package]]
 name = "attrs"
-version = "21.2.0"
+version = "21.4.0"
 description = "Classes Without Boilerplate"
 category = "dev"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
 
 [package.extras]
-dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "furo", "sphinx", "sphinx-notfound-page", "pre-commit"]
+dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "furo", "sphinx", "sphinx-notfound-page", "pre-commit", "cloudpickle"]
 docs = ["furo", "sphinx", "zope.interface", "sphinx-notfound-page"]
-tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface"]
-tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins"]
+tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "cloudpickle"]
+tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "cloudpickle"]
 
 [[package]]
 name = "babel"
@@ -126,11 +126,11 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 
 [[package]]
 name = "importlib-metadata"
-version = "4.8.2"
+version = "4.10.0"
 description = "Read metadata from Python packages"
 category = "dev"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.7"
 
 [package.dependencies]
 typing-extensions = {version = ">=3.6.4", markers = "python_version < \"3.8\""}
@@ -139,7 +139,7 @@ zipp = ">=0.5"
 [package.extras]
 docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"]
 perf = ["ipython"]
-testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "packaging", "pep517", "pyfakefs", "flufl.flake8", "pytest-perf (>=0.9.2)", "pytest-black (>=0.3.7)", "pytest-mypy", "importlib-resources (>=1.3)"]
+testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "packaging", "pyfakefs", "flufl.flake8", "pytest-perf (>=0.9.2)", "pytest-black (>=0.3.7)", "pytest-mypy", "importlib-resources (>=1.3)"]
 
 [[package]]
 name = "jinja2"
@@ -633,8 +633,8 @@ atomicwrites = [
     {file = "atomicwrites-1.4.0.tar.gz", hash = "sha256:ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a"},
 ]
 attrs = [
-    {file = "attrs-21.2.0-py2.py3-none-any.whl", hash = "sha256:149e90d6d8ac20db7a955ad60cf0e6881a3f20d37096140088356da6c716b0b1"},
-    {file = "attrs-21.2.0.tar.gz", hash = "sha256:ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb"},
+    {file = "attrs-21.4.0-py2.py3-none-any.whl", hash = "sha256:2d27e3784d7a565d36ab851fe94887c5eccd6a463168875832a1be79c82828b4"},
+    {file = "attrs-21.4.0.tar.gz", hash = "sha256:626ba8234211db98e869df76230a137c4c40a12d72445c45d5f5b716f076e2fd"},
 ]
 babel = [
     {file = "Babel-2.9.1-py2.py3-none-any.whl", hash = "sha256:ab49e12b91d937cd11f0b67cb259a57ab4ad2b59ac7a3b41d6c06c0ac5b0def9"},
@@ -673,8 +673,8 @@ imagesize = [
     {file = "imagesize-1.3.0.tar.gz", hash = "sha256:cd1750d452385ca327479d45b64d9c7729ecf0b3969a58148298c77092261f9d"},
 ]
 importlib-metadata = [
-    {file = "importlib_metadata-4.8.2-py3-none-any.whl", hash = "sha256:53ccfd5c134223e497627b9815d5030edf77d2ed573922f7a0b8f8bb81a1c100"},
-    {file = "importlib_metadata-4.8.2.tar.gz", hash = "sha256:75bdec14c397f528724c1bfd9709d660b33a4d2e77387a3358f20b848bb5e5fb"},
+    {file = "importlib_metadata-4.10.0-py3-none-any.whl", hash = "sha256:b7cf7d3fef75f1e4c80a96ca660efbd51473d7e8f39b5ab9210febc7809012a4"},
+    {file = "importlib_metadata-4.10.0.tar.gz", hash = "sha256:92a8b58ce734b2a4494878e0ecf7d79ccd7a128b5fc6014c401e0b61f006f0f6"},
 ]
 jinja2 = [
     {file = "Jinja2-3.0.3-py3-none-any.whl", hash = "sha256:077ce6014f7b40d03b47d1f1ca4b0fc8328a692bd284016f806ed0eaca390ad8"},
diff --git a/docs/Makefile b/site/Makefile
similarity index 100%
rename from docs/Makefile
rename to site/Makefile
diff --git a/docs/_utils/deploy_staging.sh b/site/_utils/deploy_staging.sh
similarity index 100%
rename from docs/_utils/deploy_staging.sh
rename to site/_utils/deploy_staging.sh
diff --git a/docs/_utils/setup.sh b/site/_utils/setup.sh
similarity index 100%
rename from docs/_utils/setup.sh
rename to site/_utils/setup.sh
diff --git a/docs/source/_static/favicon.ico b/site/source/_static/favicon.ico
similarity index 100%
rename from docs/source/_static/favicon.ico
rename to site/source/_static/favicon.ico
diff --git a/docs/source/_static/images/about_screen.png b/site/source/_static/images/about_screen.png
similarity index 100%
rename from docs/source/_static/images/about_screen.png
rename to site/source/_static/images/about_screen.png
diff --git a/docs/source/_static/images/backup_warning.png b/site/source/_static/images/backup_warning.png
similarity index 100%
rename from docs/source/_static/images/backup_warning.png
rename to site/source/_static/images/backup_warning.png
diff --git a/docs/source/_static/images/bitcoin_backup_view_no_storage.png b/site/source/_static/images/bitcoin_backup_view_no_storage.png
similarity index 100%
rename from docs/source/_static/images/bitcoin_backup_view_no_storage.png
rename to site/source/_static/images/bitcoin_backup_view_no_storage.png
diff --git a/docs/source/_static/images/bitcoin_backup_view_storage.png b/site/source/_static/images/bitcoin_backup_view_storage.png
similarity index 100%
rename from docs/source/_static/images/bitcoin_backup_view_storage.png
rename to site/source/_static/images/bitcoin_backup_view_storage.png
diff --git a/docs/source/_static/images/bitcoin_creating_backup.png b/site/source/_static/images/bitcoin_creating_backup.png
similarity index 100%
rename from docs/source/_static/images/bitcoin_creating_backup.png
rename to site/source/_static/images/bitcoin_creating_backup.png
diff --git a/docs/source/_static/images/bitcoin_instructions.png b/site/source/_static/images/bitcoin_instructions.png
similarity index 100%
rename from docs/source/_static/images/bitcoin_instructions.png
rename to site/source/_static/images/bitcoin_instructions.png
diff --git a/docs/source/_static/images/bitcoin_instructions_view.png b/site/source/_static/images/bitcoin_instructions_view.png
similarity index 100%
rename from docs/source/_static/images/bitcoin_instructions_view.png
rename to site/source/_static/images/bitcoin_instructions_view.png
diff --git a/docs/source/_static/images/bitcoin_view.png b/site/source/_static/images/bitcoin_view.png
similarity index 100%
rename from docs/source/_static/images/bitcoin_view.png
rename to site/source/_static/images/bitcoin_view.png
diff --git a/docs/source/_static/images/decrypt_backup.png b/site/source/_static/images/decrypt_backup.png
similarity index 100%
rename from docs/source/_static/images/decrypt_backup.png
rename to site/source/_static/images/decrypt_backup.png
diff --git a/docs/source/_static/images/diy/balena.png b/site/source/_static/images/diy/balena.png
similarity index 100%
rename from docs/source/_static/images/diy/balena.png
rename to site/source/_static/images/diy/balena.png
diff --git a/docs/source/_static/images/diy/pi.png b/site/source/_static/images/diy/pi.png
similarity index 100%
rename from docs/source/_static/images/diy/pi.png
rename to site/source/_static/images/diy/pi.png
diff --git a/docs/source/_static/images/diy/pins.png b/site/source/_static/images/diy/pins.png
similarity index 100%
rename from docs/source/_static/images/diy/pins.png
rename to site/source/_static/images/diy/pins.png
diff --git a/docs/source/_static/images/embassy_auto_check_updates.png b/site/source/_static/images/embassy_auto_check_updates.png
similarity index 100%
rename from docs/source/_static/images/embassy_auto_check_updates.png
rename to site/source/_static/images/embassy_auto_check_updates.png
diff --git a/docs/source/_static/images/embassy_config.png b/site/source/_static/images/embassy_config.png
similarity index 100%
rename from docs/source/_static/images/embassy_config.png
rename to site/source/_static/images/embassy_config.png
diff --git a/docs/source/_static/images/embassy_lan_setup.png b/site/source/_static/images/embassy_lan_setup.png
similarity index 100%
rename from docs/source/_static/images/embassy_lan_setup.png
rename to site/source/_static/images/embassy_lan_setup.png
diff --git a/docs/source/_static/images/embassy_metrics.png b/site/source/_static/images/embassy_metrics.png
similarity index 100%
rename from docs/source/_static/images/embassy_metrics.png
rename to site/source/_static/images/embassy_metrics.png
diff --git a/docs/source/_static/images/embassy_notification.png b/site/source/_static/images/embassy_notification.png
similarity index 100%
rename from docs/source/_static/images/embassy_notification.png
rename to site/source/_static/images/embassy_notification.png
diff --git a/docs/source/_static/images/embassy_notifications.png b/site/source/_static/images/embassy_notifications.png
similarity index 100%
rename from docs/source/_static/images/embassy_notifications.png
rename to site/source/_static/images/embassy_notifications.png
diff --git a/docs/source/_static/images/embassy_tab.png b/site/source/_static/images/embassy_tab.png
similarity index 100%
rename from docs/source/_static/images/embassy_tab.png
rename to site/source/_static/images/embassy_tab.png
diff --git a/docs/source/_static/images/embassy_wifi.png b/site/source/_static/images/embassy_wifi.png
similarity index 100%
rename from docs/source/_static/images/embassy_wifi.png
rename to site/source/_static/images/embassy_wifi.png
diff --git a/docs/source/_static/images/private_dns.png b/site/source/_static/images/private_dns.png
similarity index 100%
rename from docs/source/_static/images/private_dns.png
rename to site/source/_static/images/private_dns.png
diff --git a/docs/source/_static/images/restore_backup_menu.png b/site/source/_static/images/restore_backup_menu.png
similarity index 100%
rename from docs/source/_static/images/restore_backup_menu.png
rename to site/source/_static/images/restore_backup_menu.png
diff --git a/docs/source/_static/images/restore_backup_submenu.png b/site/source/_static/images/restore_backup_submenu.png
similarity index 100%
rename from docs/source/_static/images/restore_backup_submenu.png
rename to site/source/_static/images/restore_backup_submenu.png
diff --git a/docs/source/_static/images/restoring_backup.png b/site/source/_static/images/restoring_backup.png
similarity index 100%
rename from docs/source/_static/images/restoring_backup.png
rename to site/source/_static/images/restoring_backup.png
diff --git a/docs/source/_static/images/secure_lan_setup_page.png b/site/source/_static/images/secure_lan_setup_page.png
similarity index 100%
rename from docs/source/_static/images/secure_lan_setup_page.png
rename to site/source/_static/images/secure_lan_setup_page.png
diff --git a/docs/source/_static/images/secure_lan_setup_prompt.png b/site/source/_static/images/secure_lan_setup_prompt.png
similarity index 100%
rename from docs/source/_static/images/secure_lan_setup_prompt.png
rename to site/source/_static/images/secure_lan_setup_prompt.png
diff --git a/docs/source/_static/images/service/bitcoin_config.png b/site/source/_static/images/service/bitcoin_config.png
similarity index 100%
rename from docs/source/_static/images/service/bitcoin_config.png
rename to site/source/_static/images/service/bitcoin_config.png
diff --git a/docs/source/_static/images/service/bitcoin_instructions.png b/site/source/_static/images/service/bitcoin_instructions.png
similarity index 100%
rename from docs/source/_static/images/service/bitcoin_instructions.png
rename to site/source/_static/images/service/bitcoin_instructions.png
diff --git a/docs/source/_static/images/service/bitcoin_rpc.png b/site/source/_static/images/service/bitcoin_rpc.png
similarity index 100%
rename from docs/source/_static/images/service/bitcoin_rpc.png
rename to site/source/_static/images/service/bitcoin_rpc.png
diff --git a/docs/source/_static/images/service/boolean_toggle.png b/site/source/_static/images/service/boolean_toggle.png
similarity index 100%
rename from docs/source/_static/images/service/boolean_toggle.png
rename to site/source/_static/images/service/boolean_toggle.png
diff --git a/docs/source/_static/images/service/btcproxy_config.png b/site/source/_static/images/service/btcproxy_config.png
similarity index 100%
rename from docs/source/_static/images/service/btcproxy_config.png
rename to site/source/_static/images/service/btcproxy_config.png
diff --git a/docs/source/_static/images/service/btcproxy_rpc.png b/site/source/_static/images/service/btcproxy_rpc.png
similarity index 100%
rename from docs/source/_static/images/service/btcproxy_rpc.png
rename to site/source/_static/images/service/btcproxy_rpc.png
diff --git a/docs/source/_static/images/service/service_properties.png b/site/source/_static/images/service/service_properties.png
similarity index 100%
rename from docs/source/_static/images/service/service_properties.png
rename to site/source/_static/images/service/service_properties.png
diff --git a/docs/source/_static/images/ssl/browser/brave_security_settings.png b/site/source/_static/images/ssl/browser/brave_security_settings.png
similarity index 100%
rename from docs/source/_static/images/ssl/browser/brave_security_settings.png
rename to site/source/_static/images/ssl/browser/brave_security_settings.png
diff --git a/docs/source/_static/images/ssl/browser/brave_view_certs.png b/site/source/_static/images/ssl/browser/brave_view_certs.png
similarity index 100%
rename from docs/source/_static/images/ssl/browser/brave_view_certs.png
rename to site/source/_static/images/ssl/browser/brave_view_certs.png
diff --git a/docs/source/_static/images/ssl/browser/firefox_security_settings.png b/site/source/_static/images/ssl/browser/firefox_security_settings.png
similarity index 100%
rename from docs/source/_static/images/ssl/browser/firefox_security_settings.png
rename to site/source/_static/images/ssl/browser/firefox_security_settings.png
diff --git a/docs/source/_static/images/ssl/browser/firefox_view_certs.png b/site/source/_static/images/ssl/browser/firefox_view_certs.png
similarity index 100%
rename from docs/source/_static/images/ssl/browser/firefox_view_certs.png
rename to site/source/_static/images/ssl/browser/firefox_view_certs.png
diff --git a/docs/source/_static/images/ssl/macos/always_trust.png b/site/source/_static/images/ssl/macos/always_trust.png
similarity index 100%
rename from docs/source/_static/images/ssl/macos/always_trust.png
rename to site/source/_static/images/ssl/macos/always_trust.png
diff --git a/docs/source/_static/images/ssl/macos/certificate_trusted.png b/site/source/_static/images/ssl/macos/certificate_trusted.png
similarity index 100%
rename from docs/source/_static/images/ssl/macos/certificate_trusted.png
rename to site/source/_static/images/ssl/macos/certificate_trusted.png
diff --git a/docs/source/_static/images/ssl/macos/certificate_untrusted.png b/site/source/_static/images/ssl/macos/certificate_untrusted.png
similarity index 100%
rename from docs/source/_static/images/ssl/macos/certificate_untrusted.png
rename to site/source/_static/images/ssl/macos/certificate_untrusted.png
diff --git a/docs/source/_static/images/ssl/mobile/ssl_certificate_install_page.PNG b/site/source/_static/images/ssl/mobile/ssl_certificate_install_page.PNG
similarity index 100%
rename from docs/source/_static/images/ssl/mobile/ssl_certificate_install_page.PNG
rename to site/source/_static/images/ssl/mobile/ssl_certificate_install_page.PNG
diff --git a/docs/source/_static/images/ssl/mobile/ssl_ipad_cert_trust.PNG b/site/source/_static/images/ssl/mobile/ssl_ipad_cert_trust.PNG
similarity index 100%
rename from docs/source/_static/images/ssl/mobile/ssl_ipad_cert_trust.PNG
rename to site/source/_static/images/ssl/mobile/ssl_ipad_cert_trust.PNG
diff --git a/docs/source/_static/images/ssl/mobile/ssl_ipad_cert_trust_settings.PNG b/site/source/_static/images/ssl/mobile/ssl_ipad_cert_trust_settings.PNG
similarity index 100%
rename from docs/source/_static/images/ssl/mobile/ssl_ipad_cert_trust_settings.PNG
rename to site/source/_static/images/ssl/mobile/ssl_ipad_cert_trust_settings.PNG
diff --git a/docs/source/_static/images/ssl/mobile/ssl_ipad_general_settings.PNG b/site/source/_static/images/ssl/mobile/ssl_ipad_general_settings.PNG
similarity index 100%
rename from docs/source/_static/images/ssl/mobile/ssl_ipad_general_settings.PNG
rename to site/source/_static/images/ssl/mobile/ssl_ipad_general_settings.PNG
diff --git a/docs/source/_static/images/ssl/mobile/ssl_ipad_install_profile.PNG b/site/source/_static/images/ssl/mobile/ssl_ipad_install_profile.PNG
similarity index 100%
rename from docs/source/_static/images/ssl/mobile/ssl_ipad_install_profile.PNG
rename to site/source/_static/images/ssl/mobile/ssl_ipad_install_profile.PNG
diff --git a/docs/source/_static/images/ssl/mobile/ssl_ipad_profiles.PNG b/site/source/_static/images/ssl/mobile/ssl_ipad_profiles.PNG
similarity index 100%
rename from docs/source/_static/images/ssl/mobile/ssl_ipad_profiles.PNG
rename to site/source/_static/images/ssl/mobile/ssl_ipad_profiles.PNG
diff --git a/docs/source/_static/images/ssl/mobile/ssl_setup_app_advanced.PNG b/site/source/_static/images/ssl/mobile/ssl_setup_app_advanced.PNG
similarity index 100%
rename from docs/source/_static/images/ssl/mobile/ssl_setup_app_advanced.PNG
rename to site/source/_static/images/ssl/mobile/ssl_setup_app_advanced.PNG
diff --git a/docs/source/_static/images/ssl/mobile/ssl_setup_app_complete.PNG b/site/source/_static/images/ssl/mobile/ssl_setup_app_complete.PNG
similarity index 100%
rename from docs/source/_static/images/ssl/mobile/ssl_setup_app_complete.PNG
rename to site/source/_static/images/ssl/mobile/ssl_setup_app_complete.PNG
diff --git a/docs/source/_static/images/ssl/windows/1_windows_mmc.png b/site/source/_static/images/ssl/windows/1_windows_mmc.png
similarity index 100%
rename from docs/source/_static/images/ssl/windows/1_windows_mmc.png
rename to site/source/_static/images/ssl/windows/1_windows_mmc.png
diff --git a/docs/source/_static/images/ssl/windows/2_windows_console_root.png b/site/source/_static/images/ssl/windows/2_windows_console_root.png
similarity index 100%
rename from docs/source/_static/images/ssl/windows/2_windows_console_root.png
rename to site/source/_static/images/ssl/windows/2_windows_console_root.png
diff --git a/docs/source/_static/images/ssl/windows/3_windows_add_certificates.png b/site/source/_static/images/ssl/windows/3_windows_add_certificates.png
similarity index 100%
rename from docs/source/_static/images/ssl/windows/3_windows_add_certificates.png
rename to site/source/_static/images/ssl/windows/3_windows_add_certificates.png
diff --git a/docs/source/_static/images/ssl/windows/4_windows_selected_snapin.png b/site/source/_static/images/ssl/windows/4_windows_selected_snapin.png
similarity index 100%
rename from docs/source/_static/images/ssl/windows/4_windows_selected_snapin.png
rename to site/source/_static/images/ssl/windows/4_windows_selected_snapin.png
diff --git a/docs/source/_static/images/ssl/windows/5_windows_trusted_certificate_menu.png b/site/source/_static/images/ssl/windows/5_windows_trusted_certificate_menu.png
similarity index 100%
rename from docs/source/_static/images/ssl/windows/5_windows_trusted_certificate_menu.png
rename to site/source/_static/images/ssl/windows/5_windows_trusted_certificate_menu.png
diff --git a/docs/source/_static/images/ssl/windows/6_windows_import_cert.png b/site/source/_static/images/ssl/windows/6_windows_import_cert.png
similarity index 100%
rename from docs/source/_static/images/ssl/windows/6_windows_import_cert.png
rename to site/source/_static/images/ssl/windows/6_windows_import_cert.png
diff --git a/docs/source/_static/images/ssl/windows/7_windows_import_cert_wizard.png b/site/source/_static/images/ssl/windows/7_windows_import_cert_wizard.png
similarity index 100%
rename from docs/source/_static/images/ssl/windows/7_windows_import_cert_wizard.png
rename to site/source/_static/images/ssl/windows/7_windows_import_cert_wizard.png
diff --git a/docs/source/_static/images/ssl/windows/8_windows_successful_cert_install.png b/site/source/_static/images/ssl/windows/8_windows_successful_cert_install.png
similarity index 100%
rename from docs/source/_static/images/ssl/windows/8_windows_successful_cert_install.png
rename to site/source/_static/images/ssl/windows/8_windows_successful_cert_install.png
diff --git a/docs/source/_static/images/ssl/windows/windows_download_cert.png b/site/source/_static/images/ssl/windows/windows_download_cert.png
similarity index 100%
rename from docs/source/_static/images/ssl/windows/windows_download_cert.png
rename to site/source/_static/images/ssl/windows/windows_download_cert.png
diff --git a/docs/source/_static/images/tor/about_config.png b/site/source/_static/images/tor/about_config.png
similarity index 100%
rename from docs/source/_static/images/tor/about_config.png
rename to site/source/_static/images/tor/about_config.png
diff --git a/docs/source/_static/images/tor/autoconfig_url.png b/site/source/_static/images/tor/autoconfig_url.png
similarity index 100%
rename from docs/source/_static/images/tor/autoconfig_url.png
rename to site/source/_static/images/tor/autoconfig_url.png
diff --git a/docs/source/_static/images/tor/firefox_options_windows.png b/site/source/_static/images/tor/firefox_options_windows.png
similarity index 100%
rename from docs/source/_static/images/tor/firefox_options_windows.png
rename to site/source/_static/images/tor/firefox_options_windows.png
diff --git a/docs/source/_static/images/tor/firefox_preferences.png b/site/source/_static/images/tor/firefox_preferences.png
similarity index 100%
rename from docs/source/_static/images/tor/firefox_preferences.png
rename to site/source/_static/images/tor/firefox_preferences.png
diff --git a/docs/source/_static/images/tor/firefox_proxy.png b/site/source/_static/images/tor/firefox_proxy.png
similarity index 100%
rename from docs/source/_static/images/tor/firefox_proxy.png
rename to site/source/_static/images/tor/firefox_proxy.png
diff --git a/docs/source/_static/images/tor/firefox_search.png b/site/source/_static/images/tor/firefox_search.png
similarity index 100%
rename from docs/source/_static/images/tor/firefox_search.png
rename to site/source/_static/images/tor/firefox_search.png
diff --git a/docs/source/_static/images/tor/firefox_whitelist.png b/site/source/_static/images/tor/firefox_whitelist.png
similarity index 100%
rename from docs/source/_static/images/tor/firefox_whitelist.png
rename to site/source/_static/images/tor/firefox_whitelist.png
diff --git a/docs/source/_static/images/tor/firefox_whitelist_mobile.png b/site/source/_static/images/tor/firefox_whitelist_mobile.png
similarity index 100%
rename from docs/source/_static/images/tor/firefox_whitelist_mobile.png
rename to site/source/_static/images/tor/firefox_whitelist_mobile.png
diff --git a/docs/source/_static/images/tor/install_homebrew.png b/site/source/_static/images/tor/install_homebrew.png
similarity index 100%
rename from docs/source/_static/images/tor/install_homebrew.png
rename to site/source/_static/images/tor/install_homebrew.png
diff --git a/docs/source/_static/images/tor/install_homebrew1.png b/site/source/_static/images/tor/install_homebrew1.png
similarity index 100%
rename from docs/source/_static/images/tor/install_homebrew1.png
rename to site/source/_static/images/tor/install_homebrew1.png
diff --git a/docs/source/_static/images/tor/install_tor.png b/site/source/_static/images/tor/install_tor.png
similarity index 100%
rename from docs/source/_static/images/tor/install_tor.png
rename to site/source/_static/images/tor/install_tor.png
diff --git a/docs/source/_static/images/tor/network_proxy_type.png b/site/source/_static/images/tor/network_proxy_type.png
similarity index 100%
rename from docs/source/_static/images/tor/network_proxy_type.png
rename to site/source/_static/images/tor/network_proxy_type.png
diff --git a/docs/source/_static/images/tor/orbot_apps.png b/site/source/_static/images/tor/orbot_apps.png
similarity index 100%
rename from docs/source/_static/images/tor/orbot_apps.png
rename to site/source/_static/images/tor/orbot_apps.png
diff --git a/docs/source/_static/images/tor/orbot_menu.png b/site/source/_static/images/tor/orbot_menu.png
similarity index 100%
rename from docs/source/_static/images/tor/orbot_menu.png
rename to site/source/_static/images/tor/orbot_menu.png
diff --git a/docs/source/_static/images/tor/orbot_settings.png b/site/source/_static/images/tor/orbot_settings.png
similarity index 100%
rename from docs/source/_static/images/tor/orbot_settings.png
rename to site/source/_static/images/tor/orbot_settings.png
diff --git a/docs/source/_static/images/tor/orbot_start.png b/site/source/_static/images/tor/orbot_start.png
similarity index 100%
rename from docs/source/_static/images/tor/orbot_start.png
rename to site/source/_static/images/tor/orbot_start.png
diff --git a/docs/source/_static/images/tor/orbot_started.png b/site/source/_static/images/tor/orbot_started.png
similarity index 100%
rename from docs/source/_static/images/tor/orbot_started.png
rename to site/source/_static/images/tor/orbot_started.png
diff --git a/docs/source/_static/images/tor/orbot_vpn.png b/site/source/_static/images/tor/orbot_vpn.png
similarity index 100%
rename from docs/source/_static/images/tor/orbot_vpn.png
rename to site/source/_static/images/tor/orbot_vpn.png
diff --git a/docs/source/_static/images/tor/private_dns_off.png b/site/source/_static/images/tor/private_dns_off.png
similarity index 100%
rename from docs/source/_static/images/tor/private_dns_off.png
rename to site/source/_static/images/tor/private_dns_off.png
diff --git a/docs/source/_static/images/tor/socks_remote_dns.png b/site/source/_static/images/tor/socks_remote_dns.png
similarity index 100%
rename from docs/source/_static/images/tor/socks_remote_dns.png
rename to site/source/_static/images/tor/socks_remote_dns.png
diff --git a/docs/source/_static/images/tor/tor_download_windows.png b/site/source/_static/images/tor/tor_download_windows.png
similarity index 100%
rename from docs/source/_static/images/tor/tor_download_windows.png
rename to site/source/_static/images/tor/tor_download_windows.png
diff --git a/docs/source/_static/images/tor/tor_windows_install.png b/site/source/_static/images/tor/tor_windows_install.png
similarity index 100%
rename from docs/source/_static/images/tor/tor_windows_install.png
rename to site/source/_static/images/tor/tor_windows_install.png
diff --git a/docs/source/_static/images/tor/tor_windows_terminal.png b/site/source/_static/images/tor/tor_windows_terminal.png
similarity index 100%
rename from docs/source/_static/images/tor/tor_windows_terminal.png
rename to site/source/_static/images/tor/tor_windows_terminal.png
diff --git a/docs/source/_static/logo.png b/site/source/_static/logo.png
similarity index 100%
rename from docs/source/_static/logo.png
rename to site/source/_static/logo.png
diff --git a/docs/source/_templates/layout.html b/site/source/_templates/layout.html
similarity index 100%
rename from docs/source/_templates/layout.html
rename to site/source/_templates/layout.html
diff --git a/docs/source/conf.py b/site/source/conf.py
similarity index 100%
rename from docs/source/conf.py
rename to site/source/conf.py
diff --git a/docs/source/contributing/embassyos.rst b/site/source/contributing/embassyos.rst
similarity index 100%
rename from docs/source/contributing/embassyos.rst
rename to site/source/contributing/embassyos.rst
diff --git a/site/source/contributing/index.rst b/site/source/contributing/index.rst
new file mode 100644
index 0000000..b1f0bab
--- /dev/null
+++ b/site/source/contributing/index.rst
@@ -0,0 +1,17 @@
+Contributing
+============
+
+.. toctree::
+   :maxdepth: 2
+   :hidden:
+
+   embassyos
+   services/index
+
+.. panel-box::
+  :title: Overview
+  :id: contributing
+  :class: my-panel
+
+  * :doc:`Developer Contributions <embassyos>` - Learn how you can contribute to EmbassyOS
+  * :doc:`Service Packaging Guide <services/index>` - Learn more about packaging services for EmbassyOS
\ No newline at end of file
diff --git a/docs/source/contributing/services/backups.rst b/site/source/contributing/services/backups.rst
similarity index 100%
rename from docs/source/contributing/services/backups.rst
rename to site/source/contributing/services/backups.rst
diff --git a/docs/source/contributing/services/config.rst b/site/source/contributing/services/config.rst
similarity index 100%
rename from docs/source/contributing/services/config.rst
rename to site/source/contributing/services/config.rst
diff --git a/docs/source/contributing/services/docker.rst b/site/source/contributing/services/docker.rst
similarity index 100%
rename from docs/source/contributing/services/docker.rst
rename to site/source/contributing/services/docker.rst
diff --git a/docs/source/contributing/services/index.rst b/site/source/contributing/services/index.rst
similarity index 100%
rename from docs/source/contributing/services/index.rst
rename to site/source/contributing/services/index.rst
diff --git a/docs/source/contributing/services/instructions.rst b/site/source/contributing/services/instructions.rst
similarity index 100%
rename from docs/source/contributing/services/instructions.rst
rename to site/source/contributing/services/instructions.rst
diff --git a/docs/source/contributing/services/makefile.rst b/site/source/contributing/services/makefile.rst
similarity index 100%
rename from docs/source/contributing/services/makefile.rst
rename to site/source/contributing/services/makefile.rst
diff --git a/docs/source/contributing/services/manifest.rst b/site/source/contributing/services/manifest.rst
similarity index 100%
rename from docs/source/contributing/services/manifest.rst
rename to site/source/contributing/services/manifest.rst
diff --git a/docs/source/contributing/services/overview.rst b/site/source/contributing/services/overview.rst
similarity index 100%
rename from docs/source/contributing/services/overview.rst
rename to site/source/contributing/services/overview.rst
diff --git a/docs/source/contributing/services/properties.rst b/site/source/contributing/services/properties.rst
similarity index 100%
rename from docs/source/contributing/services/properties.rst
rename to site/source/contributing/services/properties.rst
diff --git a/docs/source/contributing/services/wrapper.rst b/site/source/contributing/services/wrapper.rst
similarity index 100%
rename from docs/source/contributing/services/wrapper.rst
rename to site/source/contributing/services/wrapper.rst
diff --git a/docs/source/getting-started/diy.rst b/site/source/getting-started/diy.rst
similarity index 100%
rename from docs/source/getting-started/diy.rst
rename to site/source/getting-started/diy.rst
diff --git a/site/source/getting-started/index.rst b/site/source/getting-started/index.rst
new file mode 100644
index 0000000..943051f
--- /dev/null
+++ b/site/source/getting-started/index.rst
@@ -0,0 +1,19 @@
+Getting Started
+===============
+
+.. toctree::
+   :maxdepth: 2
+   :hidden:
+
+   introduction
+   purchasing
+   diy
+
+.. panel-box::
+  :title: Overview
+  :id: "getting-started"
+  :class: my-panel
+
+  * :doc:`Introduction <introduction>` - Welcome to the future of sovereign computing
+  * :doc:`Purchasing <purchasing>` - Ways to acquire an Embassy or EmbassyOS
+  * :doc:`DIY Guide <diy>` - A guide on building your own Embassy
\ No newline at end of file
diff --git a/docs/source/getting-started/introduction.rst b/site/source/getting-started/introduction.rst
similarity index 100%
rename from docs/source/getting-started/introduction.rst
rename to site/source/getting-started/introduction.rst
diff --git a/docs/source/getting-started/purchasing.rst b/site/source/getting-started/purchasing.rst
similarity index 100%
rename from docs/source/getting-started/purchasing.rst
rename to site/source/getting-started/purchasing.rst
diff --git a/site/source/index.rst b/site/source/index.rst
new file mode 100644
index 0000000..153b2fd
--- /dev/null
+++ b/site/source/index.rst
@@ -0,0 +1,89 @@
+.. title:: Start9 Documentation
+
+.. raw:: html
+
+  <div class="landing landing--floating">
+
+.. hero-box::
+  :title: Documentation
+  :button_icon: scylla-icon scylla-icon--monitoring
+  :image: /_static/img/docs_icon.svg
+
+  Here you will find guidance and information about the Start9 Embassy personal server and its operating system, EmbassyOS.
+
+.. raw:: html
+
+  <div class="landing__content landing__content">
+
+.. raw:: html
+
+  <div class="topics-grid grid-container full">
+
+  <div class="grid-x grid-margin-x">
+
+.. topic-box::
+  :title: Guides
+  :link: getting-started
+  :icon: scylla-icon scylla-icon--monitoring
+  :class: large-6
+  :anchor: View
+
+  Read the documentation
+
+
+.. topic-box::
+  :title: User Manual
+  :link: user-manual
+  :icon: scylla-icon scylla-icon--knowledge-base
+  :class: large-6
+  :anchor: View
+
+  Get started with your Embassy
+
+.. topic-box::
+  :title: Support
+  :link: support
+  :icon: scylla-icon scylla-icon--support
+  :class: large-6
+  :anchor: Get help
+
+  Find answers to your questions
+
+.. topic-box::
+  :title: Learn
+  :link: support/faq
+  :icon: scylla-icon scylla-icon--webinars
+  :class: large-6
+  :anchor: Get started
+
+  Read our FAQ and learn about platform concepts
+
+.. .. topic-box::
+..   :title: Purchasing
+..   :link:   https://store.start9.com
+..   :icon: scylla-icon scylla-icon--bitcoin
+..   :class: large-4
+..   :anchor: Buy now
+
+..   Learn about how you can purchase Start9 products
+
+.. .. topic-box::
+..   :title: Build your own
+..   :link: user-manual/tuning/diy
+..   :icon: scylla-icon scylla-icon--integrations
+..   :class: large-4
+..   :anchor: Get started
+
+..   Build from source with our DIY guide
+
+
+.. This is for the side navigation display
+.. toctree::
+  :maxdepth: 2
+  :hidden:
+
+  getting-started/index
+  user-manual/index
+  misc-guides/index
+  contributing/index
+  support/index
\ No newline at end of file
diff --git a/docs/source/misc-guides/available-services.rst b/site/source/misc-guides/available-services.rst
similarity index 100%
rename from docs/source/misc-guides/available-services.rst
rename to site/source/misc-guides/available-services.rst
diff --git a/docs/source/misc-guides/bitcoin-cli.rst b/site/source/misc-guides/bitcoin-cli.rst
similarity index 100%
rename from docs/source/misc-guides/bitcoin-cli.rst
rename to site/source/misc-guides/bitcoin-cli.rst
diff --git a/site/source/misc-guides/index.rst b/site/source/misc-guides/index.rst
new file mode 100644
index 0000000..6a175c6
--- /dev/null
+++ b/site/source/misc-guides/index.rst
@@ -0,0 +1,21 @@
+Miscellaneous Guides
+====================
+
+.. toctree::
+   :maxdepth: 2
+   :hidden:
+
+   tor-os/index
+   tor-firefox/index
+   available-services
+   bitcoin-cli
+
+.. panel-box::
+  :title: Overview
+  :id: "misc-guides"
+  :class: my-panel
+
+  * :doc:`Tor for your computer <tor-os/index>` - A guide on how to run Tor on your computer's operating system
+  * :doc:`Tor for Firefox <tor-firefox/index>` - A guide on how to configure Tor for Firefox browser
+  * :doc:`Bitcoin CLI <bitcoin-cli>` - Steps on how to access the command line interface of bitcoind on your Embassy
+  * :doc:`Available services <available-services>` - A comprehensive list of services currently offered on EmbassyOS
\ No newline at end of file
diff --git a/docs/source/misc-guides/tor-firefox/android.rst b/site/source/misc-guides/tor-firefox/android.rst
similarity index 100%
rename from docs/source/misc-guides/tor-firefox/android.rst
rename to site/source/misc-guides/tor-firefox/android.rst
diff --git a/docs/source/misc-guides/tor-firefox/desktop.rst b/site/source/misc-guides/tor-firefox/desktop.rst
similarity index 100%
rename from docs/source/misc-guides/tor-firefox/desktop.rst
rename to site/source/misc-guides/tor-firefox/desktop.rst
diff --git a/docs/source/misc-guides/tor-firefox/index.rst b/site/source/misc-guides/tor-firefox/index.rst
similarity index 100%
rename from docs/source/misc-guides/tor-firefox/index.rst
rename to site/source/misc-guides/tor-firefox/index.rst
diff --git a/docs/source/misc-guides/tor-firefox/ios.rst b/site/source/misc-guides/tor-firefox/ios.rst
similarity index 100%
rename from docs/source/misc-guides/tor-firefox/ios.rst
rename to site/source/misc-guides/tor-firefox/ios.rst
diff --git a/docs/source/misc-guides/tor-firefox/mobile.rst b/site/source/misc-guides/tor-firefox/mobile.rst
similarity index 100%
rename from docs/source/misc-guides/tor-firefox/mobile.rst
rename to site/source/misc-guides/tor-firefox/mobile.rst
diff --git a/docs/source/misc-guides/tor-os/android.rst b/site/source/misc-guides/tor-os/android.rst
similarity index 100%
rename from docs/source/misc-guides/tor-os/android.rst
rename to site/source/misc-guides/tor-os/android.rst
diff --git a/docs/source/misc-guides/tor-os/index.rst b/site/source/misc-guides/tor-os/index.rst
similarity index 100%
rename from docs/source/misc-guides/tor-os/index.rst
rename to site/source/misc-guides/tor-os/index.rst
diff --git a/docs/source/misc-guides/tor-os/ios.rst b/site/source/misc-guides/tor-os/ios.rst
similarity index 100%
rename from docs/source/misc-guides/tor-os/ios.rst
rename to site/source/misc-guides/tor-os/ios.rst
diff --git a/docs/source/misc-guides/tor-os/linux.rst b/site/source/misc-guides/tor-os/linux.rst
similarity index 100%
rename from docs/source/misc-guides/tor-os/linux.rst
rename to site/source/misc-guides/tor-os/linux.rst
diff --git a/docs/source/misc-guides/tor-os/mac.rst b/site/source/misc-guides/tor-os/mac.rst
similarity index 100%
rename from docs/source/misc-guides/tor-os/mac.rst
rename to site/source/misc-guides/tor-os/mac.rst
diff --git a/docs/source/misc-guides/tor-os/windows.rst b/site/source/misc-guides/tor-os/windows.rst
similarity index 100%
rename from docs/source/misc-guides/tor-os/windows.rst
rename to site/source/misc-guides/tor-os/windows.rst
diff --git a/docs/source/support/FAQ/030-faq.rst b/site/source/support/FAQ/030-faq.rst
similarity index 100%
rename from docs/source/support/FAQ/030-faq.rst
rename to site/source/support/FAQ/030-faq.rst
diff --git a/docs/source/support/FAQ/bitcoin-faq.rst b/site/source/support/FAQ/bitcoin-faq.rst
similarity index 100%
rename from docs/source/support/FAQ/bitcoin-faq.rst
rename to site/source/support/FAQ/bitcoin-faq.rst
diff --git a/docs/source/support/FAQ/dev-faq.rst b/site/source/support/FAQ/dev-faq.rst
similarity index 100%
rename from docs/source/support/FAQ/dev-faq.rst
rename to site/source/support/FAQ/dev-faq.rst
diff --git a/docs/source/support/FAQ/embassy-faq.rst b/site/source/support/FAQ/embassy-faq.rst
similarity index 100%
rename from docs/source/support/FAQ/embassy-faq.rst
rename to site/source/support/FAQ/embassy-faq.rst
diff --git a/docs/source/support/FAQ/general-faq.rst b/site/source/support/FAQ/general-faq.rst
similarity index 100%
rename from docs/source/support/FAQ/general-faq.rst
rename to site/source/support/FAQ/general-faq.rst
diff --git a/docs/source/support/FAQ/index.rst b/site/source/support/FAQ/index.rst
similarity index 100%
rename from docs/source/support/FAQ/index.rst
rename to site/source/support/FAQ/index.rst
diff --git a/docs/source/support/FAQ/services-faq.rst b/site/source/support/FAQ/services-faq.rst
similarity index 100%
rename from docs/source/support/FAQ/services-faq.rst
rename to site/source/support/FAQ/services-faq.rst
diff --git a/docs/source/support/FAQ/setup-faq.rst b/site/source/support/FAQ/setup-faq.rst
similarity index 100%
rename from docs/source/support/FAQ/setup-faq.rst
rename to site/source/support/FAQ/setup-faq.rst
diff --git a/docs/source/support/FAQ/usage-faq.rst b/site/source/support/FAQ/usage-faq.rst
similarity index 100%
rename from docs/source/support/FAQ/usage-faq.rst
rename to site/source/support/FAQ/usage-faq.rst
diff --git a/docs/source/support/concepts.rst b/site/source/support/concepts.rst
similarity index 100%
rename from docs/source/support/concepts.rst
rename to site/source/support/concepts.rst
diff --git a/docs/source/support/contact.rst b/site/source/support/contact.rst
similarity index 100%
rename from docs/source/support/contact.rst
rename to site/source/support/contact.rst
diff --git a/site/source/support/index.rst b/site/source/support/index.rst
new file mode 100644
index 0000000..673fd19
--- /dev/null
+++ b/site/source/support/index.rst
@@ -0,0 +1,19 @@
+Support
+=======
+
+.. toctree::
+   :maxdepth: 2
+   :hidden:
+
+   FAQ/index
+   concepts
+   contact
+
+.. panel-box::
+  :title: Overview
+  :id: support
+  :class: my-panel
+
+  * :doc:`FAQ <FAQ/index>` - Comprehensive source of Frequently Asked Questions
+  * :doc:`Concepts <concepts>` - Familiarize yourself with concepts related to EmbassyOS
+  * :doc:`Contact <contact>` - Get in touch with further questions
\ No newline at end of file
diff --git a/docs/source/user-manual/connecting.rst b/site/source/user-manual/connecting.rst
similarity index 100%
rename from docs/source/user-manual/connecting.rst
rename to site/source/user-manual/connecting.rst
diff --git a/docs/source/user-manual/general/developer-options/alt-marketplace.rst b/site/source/user-manual/general/developer-options/alt-marketplace.rst
similarity index 100%
rename from docs/source/user-manual/general/developer-options/alt-marketplace.rst
rename to site/source/user-manual/general/developer-options/alt-marketplace.rst
diff --git a/docs/source/user-manual/general/developer-options/index.rst b/site/source/user-manual/general/developer-options/index.rst
similarity index 100%
rename from docs/source/user-manual/general/developer-options/index.rst
rename to site/source/user-manual/general/developer-options/index.rst
diff --git a/docs/source/user-manual/general/developer-options/ssh-setup.rst b/site/source/user-manual/general/developer-options/ssh-setup.rst
similarity index 100%
rename from docs/source/user-manual/general/developer-options/ssh-setup.rst
rename to site/source/user-manual/general/developer-options/ssh-setup.rst
diff --git a/docs/source/user-manual/general/embassy-config.rst b/site/source/user-manual/general/embassy-config.rst
similarity index 100%
rename from docs/source/user-manual/general/embassy-config.rst
rename to site/source/user-manual/general/embassy-config.rst
diff --git a/docs/source/user-manual/general/forgot-password.rst b/site/source/user-manual/general/forgot-password.rst
similarity index 100%
rename from docs/source/user-manual/general/forgot-password.rst
rename to site/source/user-manual/general/forgot-password.rst
diff --git a/docs/source/user-manual/general/index.rst b/site/source/user-manual/general/index.rst
similarity index 100%
rename from docs/source/user-manual/general/index.rst
rename to site/source/user-manual/general/index.rst
diff --git a/docs/source/user-manual/general/lan-setup/browser-setup.rst b/site/source/user-manual/general/lan-setup/browser-setup.rst
similarity index 100%
rename from docs/source/user-manual/general/lan-setup/browser-setup.rst
rename to site/source/user-manual/general/lan-setup/browser-setup.rst
diff --git a/docs/source/user-manual/general/lan-setup/computer-setup.rst b/site/source/user-manual/general/lan-setup/computer-setup.rst
similarity index 100%
rename from docs/source/user-manual/general/lan-setup/computer-setup.rst
rename to site/source/user-manual/general/lan-setup/computer-setup.rst
diff --git a/docs/source/user-manual/general/lan-setup/desktop.rst b/site/source/user-manual/general/lan-setup/desktop.rst
similarity index 100%
rename from docs/source/user-manual/general/lan-setup/desktop.rst
rename to site/source/user-manual/general/lan-setup/desktop.rst
diff --git a/docs/source/user-manual/general/lan-setup/index.rst b/site/source/user-manual/general/lan-setup/index.rst
similarity index 100%
rename from docs/source/user-manual/general/lan-setup/index.rst
rename to site/source/user-manual/general/lan-setup/index.rst
diff --git a/docs/source/user-manual/general/lan-setup/mobile.rst b/site/source/user-manual/general/lan-setup/mobile.rst
similarity index 100%
rename from docs/source/user-manual/general/lan-setup/mobile.rst
rename to site/source/user-manual/general/lan-setup/mobile.rst
diff --git a/docs/source/user-manual/general/notifications.rst b/site/source/user-manual/general/notifications.rst
similarity index 100%
rename from docs/source/user-manual/general/notifications.rst
rename to site/source/user-manual/general/notifications.rst
diff --git a/docs/source/user-manual/general/power.rst b/site/source/user-manual/general/power.rst
similarity index 100%
rename from docs/source/user-manual/general/power.rst
rename to site/source/user-manual/general/power.rst
diff --git a/docs/source/user-manual/general/updating.rst b/site/source/user-manual/general/updating.rst
similarity index 100%
rename from docs/source/user-manual/general/updating.rst
rename to site/source/user-manual/general/updating.rst
diff --git a/docs/source/user-manual/general/wifi.rst b/site/source/user-manual/general/wifi.rst
similarity index 100%
rename from docs/source/user-manual/general/wifi.rst
rename to site/source/user-manual/general/wifi.rst
diff --git a/site/source/user-manual/index.rst b/site/source/user-manual/index.rst
new file mode 100644
index 0000000..e41c713
--- /dev/null
+++ b/site/source/user-manual/index.rst
@@ -0,0 +1,21 @@
+User Manual
+============
+
+.. toctree::
+   :maxdepth: 2
+   :hidden:
+
+   general/index
+   managing-services/index
+   connecting
+   initial-setup
+
+.. panel-box::
+  :title: Overview
+  :id: "user-manual"
+  :class: my-panel
+
+  * :doc:`Initial Setup <initial-setup>` - How to setup your Embassy
+  * :doc:`Connecting <connecting>` - Ways to connect to your Embassy
+  * :doc:`Managing Services <managing-services/index>` - Working with the open source projects made compatible for the Embassy
+  * :doc:`General <general/index>` - An overview of EmbassyOS general capabilities
\ No newline at end of file
diff --git a/docs/source/user-manual/initial-setup.rst b/site/source/user-manual/initial-setup.rst
similarity index 100%
rename from docs/source/user-manual/initial-setup.rst
rename to site/source/user-manual/initial-setup.rst
diff --git a/docs/source/user-manual/managing-services/backups.rst b/site/source/user-manual/managing-services/backups.rst
similarity index 100%
rename from docs/source/user-manual/managing-services/backups.rst
rename to site/source/user-manual/managing-services/backups.rst
diff --git a/docs/source/user-manual/managing-services/index.rst b/site/source/user-manual/managing-services/index.rst
similarity index 100%
rename from docs/source/user-manual/managing-services/index.rst
rename to site/source/user-manual/managing-services/index.rst
diff --git a/docs/source/user-manual/managing-services/installing.rst b/site/source/user-manual/managing-services/installing.rst
similarity index 100%
rename from docs/source/user-manual/managing-services/installing.rst
rename to site/source/user-manual/managing-services/installing.rst
diff --git a/docs/source/user-manual/managing-services/instructions.rst b/site/source/user-manual/managing-services/instructions.rst
similarity index 100%
rename from docs/source/user-manual/managing-services/instructions.rst
rename to site/source/user-manual/managing-services/instructions.rst
diff --git a/docs/source/user-manual/managing-services/logs.rst b/site/source/user-manual/managing-services/logs.rst
similarity index 100%
rename from docs/source/user-manual/managing-services/logs.rst
rename to site/source/user-manual/managing-services/logs.rst
diff --git a/docs/source/user-manual/managing-services/managing-deps.rst b/site/source/user-manual/managing-services/managing-deps.rst
similarity index 100%
rename from docs/source/user-manual/managing-services/managing-deps.rst
rename to site/source/user-manual/managing-services/managing-deps.rst
diff --git a/docs/source/user-manual/managing-services/properties.rst b/site/source/user-manual/managing-services/properties.rst
similarity index 100%
rename from docs/source/user-manual/managing-services/properties.rst
rename to site/source/user-manual/managing-services/properties.rst
diff --git a/docs/source/user-manual/managing-services/service-config.rst b/site/source/user-manual/managing-services/service-config.rst
similarity index 100%
rename from docs/source/user-manual/managing-services/service-config.rst
rename to site/source/user-manual/managing-services/service-config.rst
diff --git a/sphinx-scylladb-theme b/sphinx-scylladb-theme
index 8551e5b..c05eb02 160000
--- a/sphinx-scylladb-theme
+++ b/sphinx-scylladb-theme
@@ -1 +1 @@
-Subproject commit 8551e5b27e7fd16a3cb5899bb7551ace3ef03c86
+Subproject commit c05eb02e3f9dac35a549963bc5b200deec3d8ced