diff --git a/docs/contributing/testing/reporting-issues.md b/docs/contributing/testing/reporting-issues.md
index c67aca41..367ab564 100644
--- a/docs/contributing/testing/reporting-issues.md
+++ b/docs/contributing/testing/reporting-issues.md
@@ -27,8 +27,8 @@ Please report to the [Atlas GitHub Issues](https://github.com/Atlas-OS/Atlas/iss
 
 ### If it's from a GitHub branch...
 
-Ideally, report to the `📘 ┃ playbook` channel under our [Discord's 'Development' category](../../faq-and-troubleshooting/common-questions/testing-nightly-builds.md). Otherwise, report to the [Atlas GitHub Issues](https://github.com/Atlas-OS/Atlas/issues). Ensure that you follow the issue template.
+Ideally, report to the `📘 ┃ playbook` channel under our [Discord's 'Development' category](../../general-faq/testing-nightly-builds.md). Otherwise, report to the [Atlas GitHub Issues](https://github.com/Atlas-OS/Atlas/issues). Ensure that you follow the issue template.
 
-### If it's a [preview from our Discord](../../faq-and-troubleshooting/common-questions/testing-nightly-builds.md)...
+### If it's a [preview from our Discord](../../general-faq/testing-nightly-builds.md)...
 
 Report to the designated `🧪 ┃ issue-reporting` forum channel under the 'Development' category.
diff --git a/docs/contributing/testing/what-to-test.md b/docs/contributing/testing/what-to-test.md
index 34bbf020..dac9a9f8 100644
--- a/docs/contributing/testing/what-to-test.md
+++ b/docs/contributing/testing/what-to-test.md
@@ -7,7 +7,7 @@ icon: material/test-tube
 
 This page covers what we recommend testing in an in-development build. See [the reporting issues page](reporting-issues.md) if you find any problems.
 
-If you haven't set up a virtual machine, see the [Playbook contributing page](../playbook.md) on how to do so. However, feel free to test it on real hardware, especially if it's a [release candidate](../../faq-and-troubleshooting/common-questions/testing-nightly-builds.md)!
+If you haven't set up a virtual machine, see the [Playbook contributing page](../playbook.md) on how to do so. However, feel free to test it on real hardware, especially if it's a [release candidate](../../general-faq/testing-nightly-builds.md)!
 
 !!! note "Ensure what you test works on stock Windows first"
     To reduce the amount of false reports, please verify that any issues encountered on Atlas do not happen in the same environment and configuration on unmodified Windows.
diff --git a/docs/faq-and-troubleshooting/common-questions/acrobat-not-installing.md b/docs/faq-and-troubleshooting/common-questions/acrobat-not-installing.md
deleted file mode 100644
index 83ac8871..00000000
--- a/docs/faq-and-troubleshooting/common-questions/acrobat-not-installing.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-description: Fix error code 1603 when installing Adobe Acrobat
-icon: simple/adobeacrobatreader
----
-
-# :simple-adobeacrobatreader: How to fix Adobe Acrobat failing to install?
-
-**If Adobe Acrobat fails to install with error codes such as 1603, you have most likely changed your Atlas settings using the included folder.**
-
-To get Adobe Acrobat to install successfully, you will need to make sure you have enabled [Printing](../../getting-started/post-installation/atlas-folder/general-configuration.md#printing). Without the printing service enabled, Adobe Acrobat will continuously fail to install.
-
-## Why is Printing required to install Adobe Acrobat?
-
-During the installation of Adobe Acrobat, the installer will attempt to configure a virtual "Adobe PDF" printer. As this is a virtual printer, it requires the printing service to be enabled for successful installation of printer drivers.
-
-However, after installing Adobe Acrobat, you may choose to disable [Printing](../../getting-started/post-installation/atlas-folder/general-configuration.md#printing) if you do not intend to use the included printer driver or any other form of printing.
-
-!!! warning
-    Disabling [Printing](../../getting-started/post-installation/atlas-folder/general-configuration.md#printing) after the installation of Adobe Acrobat is not officially tested or endorsed by Atlas. Therefore, we cannot guarantee stability if you disable [Printing](../../getting-started/post-installation/atlas-folder/general-configuration.md#printing) after completing the Adobe Acrobat installation.
\ No newline at end of file
diff --git a/docs/general-faq/acrobat-not-installing.md b/docs/general-faq/acrobat-not-installing.md
new file mode 100644
index 00000000..bd783b20
--- /dev/null
+++ b/docs/general-faq/acrobat-not-installing.md
@@ -0,0 +1,19 @@
+---
+description: Fix error code 1603 when installing Adobe Acrobat
+icon: simple/adobeacrobatreader
+---
+
+# :simple-adobeacrobatreader: How to fix Adobe Acrobat failing to install?
+
+**If Adobe Acrobat fails to install with error codes such as 1603, you have most likely changed your Atlas settings using the included folder.**
+
+To get Adobe Acrobat to install successfully, you will need to make sure you have enabled [Printing](../getting-started/post-installation/atlas-folder/general-configuration.md#printing). Without the printing service enabled, Adobe Acrobat will continuously fail to install.
+
+## Why is Printing required to install Adobe Acrobat?
+
+During the installation of Adobe Acrobat, the installer will attempt to configure a virtual "Adobe PDF" printer. As this is a virtual printer, it requires the printing service to be enabled for successful installation of printer drivers.
+
+However, after installing Adobe Acrobat, you may choose to disable [Printing](../getting-started/post-installation/atlas-folder/general-configuration.md#printing) if you do not intend to use the included printer driver or any other form of printing.
+
+!!! warning
+    Disabling [Printing](../getting-started/post-installation/atlas-folder/general-configuration.md#printing) after the installation of Adobe Acrobat is not officially tested or endorsed by Atlas. Therefore, we cannot guarantee stability if you disable [Printing](../getting-started/post-installation/atlas-folder/general-configuration.md#printing) after completing the Adobe Acrobat installation.
\ No newline at end of file
diff --git a/docs/faq-and-troubleshooting/common-questions/atlas-and-security.md b/docs/general-faq/atlas-and-security.md
similarity index 92%
rename from docs/faq-and-troubleshooting/common-questions/atlas-and-security.md
rename to docs/general-faq/atlas-and-security.md
index d11b8beb..03d7f6f7 100644
--- a/docs/faq-and-troubleshooting/common-questions/atlas-and-security.md
+++ b/docs/general-faq/atlas-and-security.md
@@ -13,7 +13,7 @@ We believe that power users should be able to have a choice over the balance bet
 
 Atlas alerts users about the risks of disabling security features, as well as never unknowingly reducing security. One way that this is done is through the AME Wizard configuration prompts.
 
-[Configuring Security in Atlas -->](../../getting-started/post-installation/atlas-folder/security.md)
+[Configuring Security in Atlas -->](../getting-started/post-installation/atlas-folder/security.md)
 
 ## Security compared to unmodified Windows
 
@@ -25,7 +25,7 @@ Both Ameliorated and Atlas are always finding ways to be as transparent as possi
 
 ## Legacy versions of Atlas
 
-Legacy versions of Atlas, meaning before the `v0.3.x` versions, previously raised many security concerns. We advise anyone that are on these versions of Atlas to [reinstall Windows and upgrade to the latest version](../../getting-started/installation.md).
+Legacy versions of Atlas, meaning before the `v0.3.x` versions, previously raised many security concerns. We advise anyone that are on these versions of Atlas to [reinstall Windows and upgrade to the latest version](../getting-started/installation.md).
 
 We listened to the feedback, and we have taken a shift to include maintaining security as a goal of Atlas. Many of the concerns have been rectified in the latest versions, such as:
 
diff --git a/docs/faq-and-troubleshooting/common-questions/atlas-folder-missing.md b/docs/general-faq/atlas-folder-missing.md
similarity index 91%
rename from docs/faq-and-troubleshooting/common-questions/atlas-folder-missing.md
rename to docs/general-faq/atlas-folder-missing.md
index d360a0d7..5949c479 100644
--- a/docs/faq-and-troubleshooting/common-questions/atlas-folder-missing.md
+++ b/docs/general-faq/atlas-folder-missing.md
@@ -9,7 +9,7 @@ icon: material/folder-question
 
 If you wish to have the folder on your desktop, you should right-click on the folder and create a shortcut.
 
-![The AtlasDesktop folder on an AtlasOS installation, which is located in the Windows folder](../../assets/images/atlasdesktop-windows-folder.webp)
+![The AtlasDesktop folder on an AtlasOS installation, which is located in the Windows folder](../assets/images/atlasdesktop-windows-folder.webp)
 
 ## What about if I can't find AtlasDesktop?
 
diff --git a/docs/faq-and-troubleshooting/common-questions/atlas-folder-scripts.md b/docs/general-faq/atlas-folder-scripts.md
similarity index 100%
rename from docs/faq-and-troubleshooting/common-questions/atlas-folder-scripts.md
rename to docs/general-faq/atlas-folder-scripts.md
diff --git a/docs/faq-and-troubleshooting/common-questions/bluetooth-compatibility.md b/docs/general-faq/bluetooth-compatibility.md
similarity index 80%
rename from docs/faq-and-troubleshooting/common-questions/bluetooth-compatibility.md
rename to docs/general-faq/bluetooth-compatibility.md
index 4fc1a8e8..a0de7dcc 100644
--- a/docs/faq-and-troubleshooting/common-questions/bluetooth-compatibility.md
+++ b/docs/general-faq/bluetooth-compatibility.md
@@ -13,11 +13,11 @@ Follow these steps to set up Bluetooth:
 
 1. Enable Bluetooth in the Atlas folder.
 
-2. Install your Bluetooth driver. You can get this from your device's OEM or follow our [SDIO guide](../../getting-started/post-installation/drivers/others.md#snappy-driver-installer-origin).
+2. Install your Bluetooth driver. You can get this from your device's OEM or follow our [SDIO guide](../getting-started/post-installation/drivers/others.md#snappy-driver-installer-origin).
     - Most issues with Bluetooth are caused by installing improper drivers. Make sure to research and find the driver that is suited for your device.
 
 3. Turn on Bluetooth and pair your device.
 
-![The Atlas 'Bluetooth' configuration folder](../../assets/images/bluetooth-script-folder.webp)
+![The Atlas 'Bluetooth' configuration folder](../assets/images/bluetooth-script-folder.webp)
 
 If these steps did not resolve your issue, try researching further into the driver you should download for your system. These are almost always the cause and are not an issue directly with AtlasOS.
diff --git a/docs/faq-and-troubleshooting/common-questions/fifa-and-eafc-not-launching.md b/docs/general-faq/fifa-and-eafc-not-launching.md
similarity index 100%
rename from docs/faq-and-troubleshooting/common-questions/fifa-and-eafc-not-launching.md
rename to docs/general-faq/fifa-and-eafc-not-launching.md
diff --git a/docs/faq-and-troubleshooting/common-questions/itunes-compatibility.md b/docs/general-faq/itunes-compatibility.md
similarity index 69%
rename from docs/faq-and-troubleshooting/common-questions/itunes-compatibility.md
rename to docs/general-faq/itunes-compatibility.md
index f4b32ead..0af12c4d 100644
--- a/docs/faq-and-troubleshooting/common-questions/itunes-compatibility.md
+++ b/docs/general-faq/itunes-compatibility.md
@@ -7,16 +7,16 @@ icon: material/apple
 
 **If iTunes is not recognizing your Apple device, it's likely a driver issue. You can fix this by downloading and installing the Apple USB Drivers.**
 
-If you're using Atlas and have not enabled [Automatic Driver Installation](../../getting-started/post-installation/drivers/getting-started.md#want-driver-installation-updates-through-windows-update-instead), you will need to install the Apple USB driver manually.
+If you're using Atlas and have not enabled [Automatic Driver Installation](../getting-started/post-installation/drivers/getting-started.md#want-driver-installation-updates-through-windows-update-instead), you will need to install the Apple USB driver manually.
 
 ## :material-package-down: Manual Installation
 
 !!! tip
-    If you're experiencing significant issues with drivers, consider enabling [Automatic Driver Installation](../../getting-started/post-installation/atlas-folder/general-configuration.md#driver-updates) from the Atlas folder.
+    If you're experiencing significant issues with drivers, consider enabling [Automatic Driver Installation](../getting-started/post-installation/atlas-folder/general-configuration.md#driver-updates) from the Atlas folder.
 
 1. Download the latest Apple USB drivers from the [Microsoft Update Catalog](https://www.catalog.update.microsoft.com/Search.aspx?q=Apple%2C%20Inc.%20-%20USBDevice) that begins with a three-digit version number.
 
-    ![You should only select the Apple USB driver that starts with a three-digit version](../../assets/images/apple-driver-version.webp)
+    ![You should only select the Apple USB driver that starts with a three-digit version](../assets/images/apple-driver-version.webp)
 
 2. Extract the downloaded zip file using 7-Zip or Explorer. Ignore any warnings that may appear.
 
diff --git a/docs/faq-and-troubleshooting/common-questions/media-pack-not-found.md b/docs/general-faq/media-pack-not-found.md
similarity index 100%
rename from docs/faq-and-troubleshooting/common-questions/media-pack-not-found.md
rename to docs/general-faq/media-pack-not-found.md
diff --git a/docs/faq-and-troubleshooting/common-questions/microsoft-store.md b/docs/general-faq/microsoft-store.md
similarity index 95%
rename from docs/faq-and-troubleshooting/common-questions/microsoft-store.md
rename to docs/general-faq/microsoft-store.md
index f50f58aa..2505132e 100644
--- a/docs/faq-and-troubleshooting/common-questions/microsoft-store.md
+++ b/docs/general-faq/microsoft-store.md
@@ -29,5 +29,5 @@ If you're experiencing issues with the Microsoft Store, these are unrelated to A
     3. Paste in `9WZDNCRFJBMP` and click the tick button
     4. Scroll down until you find the files starting with `Microsoft.WindowsStore`
     5. Click on the one that has the highest version number and ends in `.msixbundle`
-       ![msstoreappx](../../assets/images/msstoreappx.webp)
+       ![msstoreappx](../assets/images/msstoreappx.webp)
     6. Double-click the downloaded file, and click **Install**
diff --git a/docs/faq-and-troubleshooting/common-questions/roblox-not-opening.md b/docs/general-faq/roblox-not-opening.md
similarity index 100%
rename from docs/faq-and-troubleshooting/common-questions/roblox-not-opening.md
rename to docs/general-faq/roblox-not-opening.md
diff --git a/docs/faq-and-troubleshooting/common-questions/testing-nightly-builds.md b/docs/general-faq/testing-nightly-builds.md
similarity index 81%
rename from docs/faq-and-troubleshooting/common-questions/testing-nightly-builds.md
rename to docs/general-faq/testing-nightly-builds.md
index 992d5e90..f649bfd2 100644
--- a/docs/faq-and-troubleshooting/common-questions/testing-nightly-builds.md
+++ b/docs/general-faq/testing-nightly-builds.md
@@ -13,6 +13,6 @@ We often post announcements to the development Discord role when we need help te
 
 These builds are different from the ones automatically built on our GitHub. Official development builds posted on our Discord are ready to be tested for feedback.
 
-See ['Contributing to the Atlas Playbook'](../../contributing/playbook.md) for more information on testing. :smile:
+See ['Contributing to the Atlas Playbook'](../contributing/playbook.md) for more information on testing. :smile:
 
-![The Atlas Discord server's 'Channels & Role' page, cropped onto the 'Development' role](../../assets/images/discord-development-role.webp)
+![The Atlas Discord server's 'Channels & Role' page, cropped onto the 'Development' role](../assets/images/discord-development-role.webp)
diff --git a/docs/faq-and-troubleshooting/common-questions/updating-atlas.md b/docs/general-faq/updating-atlas.md
similarity index 92%
rename from docs/faq-and-troubleshooting/common-questions/updating-atlas.md
rename to docs/general-faq/updating-atlas.md
index 7c68216a..c1c4c4b3 100644
--- a/docs/faq-and-troubleshooting/common-questions/updating-atlas.md
+++ b/docs/general-faq/updating-atlas.md
@@ -15,4 +15,4 @@ Many changes that older Atlas versions made were irreversible, meaning that upda
 
 Previous versions of Atlas [have security concerns](atlas-and-security.md#legacy-versions-of-atlas), which only increase over time due to a lack of Windows Updates. These versions of Atlas are no longer supported, lack features, and lack many bug fixes.
 
-[Reinstalling Windows and installing Atlas -->](../../getting-started/installation.md)
+[Reinstalling Windows and installing Atlas -->](../getting-started/installation.md)
diff --git a/docs/faq-and-troubleshooting/common-questions/windows-update-errors.md b/docs/general-faq/windows-update-errors.md
similarity index 92%
rename from docs/faq-and-troubleshooting/common-questions/windows-update-errors.md
rename to docs/general-faq/windows-update-errors.md
index 0620f146..409d2fa2 100644
--- a/docs/faq-and-troubleshooting/common-questions/windows-update-errors.md
+++ b/docs/general-faq/windows-update-errors.md
@@ -9,13 +9,13 @@ icon: material/update
 
 ## :material-microsoft-windows: Windows 10 Error 0x80070643
 
-![A screenshot of Windows 10's 'Windows Update' page with the error 0x80070643](../../assets/images/win10-winre-update-error.png)
+![A screenshot of Windows 10's 'Windows Update' page with the error 0x80070643](../assets/images/win10-winre-update-error.png)
 
 This issue is on Microsoft's end with the update [KB5034441 for Windows 10](https://support.microsoft.com/en-gb/topic/kb5034441-windows-recovery-environment-update-for-windows-10-version-21h2-and-22h2-january-9-2024-62c04204-aaa5-4fee-a02a-2fdea17075a8). Try the two fixes listed below and retry updates:
 
 1. **Ensure that you have adequate free storage**
     
-    You should have at least 1GB of free storage on your Windows drive. If you have little free storage after reinstalling Windows, you likely haven't removed the backup of your previous Windows installation. See [Your old Windows installation](../../getting-started/installation.md#your-old-windows-installation) for more information.
+    You should have at least 1GB of free storage on your Windows drive. If you have little free storage after reinstalling Windows, you likely haven't removed the backup of your previous Windows installation. See [Your old Windows installation](../getting-started/installation.md#your-old-windows-installation) for more information.
 
 1. **Enable Windows Recovery**    
     1. Open **Command Prompt as Administrator**
diff --git a/docs/getting-started/installation.md b/docs/getting-started/installation.md
index 7d3e539a..0ee3399b 100644
--- a/docs/getting-started/installation.md
+++ b/docs/getting-started/installation.md
@@ -8,7 +8,7 @@ icon: material/cogs
 
 This guide will walk you through fully reinstalling Windows, installing Atlas on top of it, and completing other necessary steps. A full Windows reinstall is needed to ensure stability during the initial installation of Atlas.
 
-Before continuing, we recommend reviewing our page on [who Atlas is for](../faq-and-troubleshooting/who-is-atlas-for.md).
+Before continuing, we recommend reviewing our page on [who Atlas is for](../install-faq/who-is-atlas-for.md).
 
 <!-- --8<-- [start:prerequisites] -->
 ## :material-clipboard-list-outline: Prerequisites
@@ -127,7 +127,7 @@ You can find your network driver online by searching for your device/motherboard
     1. Type in your noted-down drive letter, including the colon, and then **without a space**, type `\sources\setup.exe` after it. [**Example:** `H:\sources\setup.exe`](../assets/images/win-setup-run-dialog.webp)
 
     1. Press ++enter++ on the Run dialog, and accept the User Account Control prompt
-        - The message ["Make sure BitLocker Drive Encryption is suspended"](../assets/images/bitlocker-error-setup.jpg) could appear from the Windows Setup when you press ++enter++. Refer to our [BitLocker decrypting instructions](../faq-and-troubleshooting/common-questions/decryptying-using-bitlocker.md) to resolve this, and then attempt this again
+        - The message ["Make sure BitLocker Drive Encryption is suspended"](../assets/images/bitlocker-error-setup.jpg) could appear from the Windows Setup when you press ++enter++. Refer to our [BitLocker decrypting instructions](../install-faq/decrypting-using-bitlocker.md) to resolve this, and then attempt this again
 
     1. Select **No thanks** when prompted for updates and uncheck the box for **I want to help make the Windows installation better**
 
@@ -135,7 +135,7 @@ You can find your network driver online by searching for your device/motherboard
 
     1. Choose your edition of Windows
     <!-- --8<-- [end:reinstalling] -->
-        - For Atlas, we strongly recommend and officially support Windows Pro, with **Windows Home not being officially supported.** See our page on [Windows Editions](../faq-and-troubleshooting/common-questions/windows-editions.md) for more information
+        - For Atlas, we strongly recommend and officially support Windows Pro, with **Windows Home not being officially supported.** See our page on [Windows Editions](../install-faq/windows-editions.md) for more information
     <!-- --8<-- [start:reinstalling1] -->
 
     1. Accept the license agreement and click **Custom: Install Windows only (advanced)**
@@ -198,7 +198,7 @@ You can find your network driver online by searching for your device/motherboard
 
     1. Follow [Microsoft's guide](https://support.microsoft.com/en-us/windows/reinstall-windows-d8369486-3e33-7d9c-dccc-859e2b022fc7#ID0EDBBBBBBBDBD) for a clean installation from step 4 (clicking **Install now**)
     <!-- --8<-- [end:reinstalling1] -->
-        - For Atlas, we strongly recommend and officially support Windows Pro, with **Windows Home not being officially supported.** See our page on [Windows Editions](../faq-and-troubleshooting/common-questions/windows-editions.md) for more information
+        - For Atlas, we strongly recommend and officially support Windows Pro, with **Windows Home not being officially supported.** See our page on [Windows Editions](../install-faq/windows-editions.md) for more information
 
 
 ### :material-cog: Initial setup (OOBE)
@@ -269,7 +269,7 @@ If you don't know, choose 'Driver Installation & Updates from Windows Update.'
 ??? danger "AME Wizard suddenly closing or being deleted?"
     Add AME Wizard as an exclusion or disable **Real-time protection** in the Windows Security settings. This is usually necessary when a new version of AME Wizard is released, which has not been used much yet.
 
-    To read more about this, view our [**AME Wizard Deleted**](../faq-and-troubleshooting/ame-wizard-errors/ame-wizard-deleted.md) page.
+    To read more about this, view our [**AME Wizard Deleted**](../install-faq/ame-wizard-errors/ame-wizard-deleted.md) page.
 
 
 1. Open Microsoft Edge, search [`atlasos.net`](https://atlasos.net), then download the **Atlas Playbook** and **AME Wizard**
@@ -279,14 +279,14 @@ If you don't know, choose 'Driver Installation & Updates from Windows Update.'
 1. If you have chosen [**Manual Driver Installation**](#driver-updates), run `Disable Drivers Installation in Windows Update.reg` from the extracted Atlas Playbook download and restart
 
 1. Open **Settings** and update Windows, including optional updates, until no more updates are available. If paused, un-pause Windows Updates to follow this step
-    - If there's an error updating on Windows 10, see our page on [:material-update: Windows Update Errors](../faq-and-troubleshooting/common-questions/windows-update-errors.md#windows-10-error-0x80070643) for a fix, retry updating, and continue with the rest of the installation guide
+    - If there's an error updating on Windows 10, see our page on [:material-update: Windows Update Errors](../general-faq/windows-update-errors.md#windows-10-error-0x80070643) for a fix, retry updating, and continue with the rest of the installation guide
 
 1. Open the **Microsoft Store** and update all apps that have pending updates
 
 1. Restart after all updates are complete. After restarting, check again for updates repeatedly until there are no more updates that pop up
 
 1. Open `AME Wizard Beta.exe` from the AME Wizard folder
-    1. If there is a warning from SmartScreen that AME Wizard is an [unrecognized application](../faq-and-troubleshooting/ame-wizard-errors/ame-wizard-deleted.md#why-is-it-being-falsely-flagged), bypass this warning by clicking **More info** and **Run anyway**
+    1. If there is a warning from SmartScreen that AME Wizard is an [unrecognized application](../install-faq/ame-wizard-errors/ame-wizard-deleted.md#why-is-it-being-falsely-flagged), bypass this warning by clicking **More info** and **Run anyway**
     1. Click on **Updates** at the top and make sure AME Wizard is up to date
 
 1. Drag `Atlas Playbook.apbx` from the Atlas Playbook folder into AME Wizard
@@ -318,6 +318,6 @@ If you need any help, you can find links below to a large community of individua
 We hope you enjoy using AtlasOS! :smile:
 
 - [:simple-discord: Discord server](https://discord.atlasos.net) & [:material-forum: Forums](https://forum.atlasos.net)
-- [:material-chat-question: FAQ & Troubleshooting](../faq-and-troubleshooting/removed-features.md)
+- [:material-chat-question: FAQ & Troubleshooting](../install-faq/removed-features.md)
 - [:material-cog: Configure your Atlas installation](post-installation/atlas-folder/general-configuration.md)
 
diff --git a/docs/getting-started/post-installation/atlas-folder/advanced-configuration.md b/docs/getting-started/post-installation/atlas-folder/advanced-configuration.md
index 6527c8e1..a7ee6bec 100644
--- a/docs/getting-started/post-installation/atlas-folder/advanced-configuration.md
+++ b/docs/getting-started/post-installation/atlas-folder/advanced-configuration.md
@@ -10,7 +10,7 @@ icon: material/sign-caution
     
     Any misinterpretation can result in compatibility issues and other problems. Therefore, it's essential to understand what you are doing and how to revert it. 
 
-Each section here corresponds to a sub-folder in the `6. Advanced Configuration` directory located in the Atlas folder, which you can find in the Start Menu or on the desktop. Check out [our guide to restore the Atlas folder](../../../faq-and-troubleshooting/common-questions/atlas-folder-missing.md) if you can't find it.
+Each section here corresponds to a sub-folder in the `6. Advanced Configuration` directory located in the Atlas folder, which you can find in the Start Menu or on the desktop. Check out [our guide to restore the Atlas folder](../../../general-faq/atlas-folder-missing.md) if you can't find it.
 
 ## :material-hammer-screwdriver: Driver Configuration
 
diff --git a/docs/getting-started/post-installation/atlas-folder/general-configuration.md b/docs/getting-started/post-installation/atlas-folder/general-configuration.md
index 5a699c91..ab162cbc 100644
--- a/docs/getting-started/post-installation/atlas-folder/general-configuration.md
+++ b/docs/getting-started/post-installation/atlas-folder/general-configuration.md
@@ -13,7 +13,7 @@ For more configuration options, check:
 - [Windows Settings ->](windows-settings.md)
 - [Advanced Configuration ->](advanced-configuration.md)
 
-Each section here corresponds to a sub-folder in the `3. General Configuration` directory located in the Atlas folder, which you can find in the Start Menu or on the desktop. Check out [our guide to restore the Atlas folder](../../../faq-and-troubleshooting/common-questions/atlas-folder-missing.md) if you can't find it.
+Each section here corresponds to a sub-folder in the `3. General Configuration` directory located in the Atlas folder, which you can find in the Start Menu or on the desktop. Check out [our guide to restore the Atlas folder](../../../general-faq/atlas-folder-missing.md) if you can't find it.
 
 ## :material-application: Background Apps
 
@@ -25,7 +25,7 @@ On Atlas, we have made Bluetooth support a configurable option to allow users wh
 
 Although the initial setup prompts if you want to disable Bluetooth support, you can toggle it afterward. Run the `Enable Bluetooth.cmd` or `Disable Bluetooth.cmd` script and restart your computer.
 
-Remember that you may need to install drivers for Bluetooth to work. [View our guide here](../../../faq-and-troubleshooting/common-questions/bluetooth-compatibility.md).
+Remember that you may need to install drivers for Bluetooth to work. [View our guide here](../../../general-faq/bluetooth-compatibility.md).
 
 ## :material-gamepad: FSO and Game Bar
 
diff --git a/docs/getting-started/post-installation/atlas-folder/interface-tweaks.md b/docs/getting-started/post-installation/atlas-folder/interface-tweaks.md
index d4ef951e..3179300b 100644
--- a/docs/getting-started/post-installation/atlas-folder/interface-tweaks.md
+++ b/docs/getting-started/post-installation/atlas-folder/interface-tweaks.md
@@ -7,7 +7,7 @@ icon: material/hammer
 
 Atlas applies many interface tweaks to improve Windows' general usability, with customizability in many changes. For example, you could toggle Windows 11's modern context menu. Overall, we aim to enable you to pick and choose how you like your Windows.
 
-Each section here corresponds to a sub-folder in the `3. Interface Tweaks` directory located in the Atlas folder, which you can find in the Start Menu or on the desktop. Check out [our guide to restore the Atlas folder](../../../faq-and-troubleshooting/common-questions/atlas-folder-missing.md) if you can't find it.
+Each section here corresponds to a sub-folder in the `3. Interface Tweaks` directory located in the Atlas folder, which you can find in the Start Menu or on the desktop. Check out [our guide to restore the Atlas folder](../../../general-faq/atlas-folder-missing.md) if you can't find it.
 
 ## :material-keyboard-tab: Alt-Tab
 
diff --git a/docs/getting-started/post-installation/atlas-folder/security.md b/docs/getting-started/post-installation/atlas-folder/security.md
index 7ed37b9f..4b9c9aa3 100644
--- a/docs/getting-started/post-installation/atlas-folder/security.md
+++ b/docs/getting-started/post-installation/atlas-folder/security.md
@@ -14,7 +14,7 @@ icon: material/security
 
     **Atlas is not responsible** for any damages caused by disabling security features against our recommendations.
 
-Each section here corresponds to a sub-folder in the `7. Security` directory located in the Atlas folder, which you can find in the Start Menu or on the desktop. Check out [our guide to restore the Atlas folder](../../../faq-and-troubleshooting/common-questions/atlas-folder-missing.md) if you can't find it.
+Each section here corresponds to a sub-folder in the `7. Security` directory located in the Atlas folder, which you can find in the Start Menu or on the desktop. Check out [our guide to restore the Atlas folder](../../../general-faq/atlas-folder-missing.md) if you can't find it.
 
 ## :material-shield-bug-outline: Core Isolation (VBS)
 
diff --git a/docs/getting-started/post-installation/atlas-folder/windows-settings.md b/docs/getting-started/post-installation/atlas-folder/windows-settings.md
index a86b4925..6a67e13e 100644
--- a/docs/getting-started/post-installation/atlas-folder/windows-settings.md
+++ b/docs/getting-started/post-installation/atlas-folder/windows-settings.md
@@ -7,7 +7,7 @@ icon: material/microsoft-windows
 
 This folder contains shortcuts to commonly used Windows Settings for Atlas. When you run these shortcuts, you will go straight to the Windows Settings page for the setting you want to configure.
 
-Each section here corresponds to a sub-folder in the `5. Windows Settings` directory located in the Atlas folder, which you can find in the Start Menu or on the desktop. Check out [our guide to restore the Atlas folder](../../../faq-and-troubleshooting/common-questions/atlas-folder-missing.md) if you can't find it.
+Each section here corresponds to a sub-folder in the `5. Windows Settings` directory located in the Atlas folder, which you can find in the Start Menu or on the desktop. Check out [our guide to restore the Atlas folder](../../../general-faq/atlas-folder-missing.md) if you can't find it.
 
 ## :material-lock-open-outline: Activation
 
diff --git a/docs/getting-started/post-installation/drivers/getting-started.md b/docs/getting-started/post-installation/drivers/getting-started.md
index 58fc2c12..3ace7bdf 100644
--- a/docs/getting-started/post-installation/drivers/getting-started.md
+++ b/docs/getting-started/post-installation/drivers/getting-started.md
@@ -11,7 +11,7 @@ If you have installed AtlasOS through the manual driver installation method, thi
 !!! question "What is best?"
     You can find a comparison of both options on the [Installation](../../installation.md#driver-updates) page.
 
-You can find files to toggle getting drivers from Windows Update in the `2. Drivers` directory located in the Atlas folder, which you can find in the Start Menu or on the desktop. Check out [our guide to restore the Atlas folder](../../../faq-and-troubleshooting/common-questions/atlas-folder-missing.md) if you can't find it.
+You can find files to toggle getting drivers from Windows Update in the `2. Drivers` directory located in the Atlas folder, which you can find in the Start Menu or on the desktop. Check out [our guide to restore the Atlas folder](../../../general-faq/atlas-folder-missing.md) if you can't find it.
 
 Remember that toggling this option will not uninstall any current drivers on your computer. You must manually check for Windows Updates to get driver updates if you don't have [automatic Windows Updates](../atlas-folder/general-configuration.md#automatic-updates) enabled.
 
diff --git a/docs/index.md b/docs/index.md
index 9ef878c4..638768c3 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -23,15 +23,15 @@ icon: material/home
 
     [-> Post Installation](getting-started/post-installation/atlas-folder/general-configuration.md)
 
--   :material-chat-question:{ .lg .middle } __FAQ & Troubleshooting__
+-   :material-chat-question:{ .lg .middle } __Frequently Asked Questions__
 
     ---
 
     Get the answer to any frequently asked questions regarding AtlasOS.
 
-    [-> Visit FAQ](faq-and-troubleshooting/removed-features.md)
+    [-> Install FAQ](install-faq/removed-features.md) | [-> General FAQ](general-faq/atlas-and-security.md)
 
--   :material-handshake:{ .lg .middle } __Contribution Guidelines__
+-   :material-handshake:{ .lg .middle } __Development__
 
     ---
 
diff --git a/docs/faq-and-troubleshooting/ame-wizard-errors/ame-wizard-deleted.md b/docs/install-faq/ame-wizard-errors/ame-wizard-deleted.md
similarity index 100%
rename from docs/faq-and-troubleshooting/ame-wizard-errors/ame-wizard-deleted.md
rename to docs/install-faq/ame-wizard-errors/ame-wizard-deleted.md
diff --git a/docs/faq-and-troubleshooting/ame-wizard-errors/atlas-playbook-stuck.md b/docs/install-faq/ame-wizard-errors/atlas-playbook-stuck.md
similarity index 100%
rename from docs/faq-and-troubleshooting/ame-wizard-errors/atlas-playbook-stuck.md
rename to docs/install-faq/ame-wizard-errors/atlas-playbook-stuck.md
diff --git a/docs/faq-and-troubleshooting/ame-wizard-errors/build-not-supported.md b/docs/install-faq/ame-wizard-errors/build-not-supported.md
similarity index 100%
rename from docs/faq-and-troubleshooting/ame-wizard-errors/build-not-supported.md
rename to docs/install-faq/ame-wizard-errors/build-not-supported.md
diff --git a/docs/faq-and-troubleshooting/ame-wizard-errors/cant-disable-defender.md b/docs/install-faq/ame-wizard-errors/cant-disable-defender.md
similarity index 100%
rename from docs/faq-and-troubleshooting/ame-wizard-errors/cant-disable-defender.md
rename to docs/install-faq/ame-wizard-errors/cant-disable-defender.md
diff --git a/docs/faq-and-troubleshooting/common-questions/atlas-iso-files.md b/docs/install-faq/atlas-iso-files.md
similarity index 100%
rename from docs/faq-and-troubleshooting/common-questions/atlas-iso-files.md
rename to docs/install-faq/atlas-iso-files.md
diff --git a/docs/faq-and-troubleshooting/common-questions/decryptying-using-bitlocker.md b/docs/install-faq/decrypting-using-bitlocker.md
similarity index 71%
rename from docs/faq-and-troubleshooting/common-questions/decryptying-using-bitlocker.md
rename to docs/install-faq/decrypting-using-bitlocker.md
index 8632b8bb..8ea05128 100644
--- a/docs/faq-and-troubleshooting/common-questions/decryptying-using-bitlocker.md
+++ b/docs/install-faq/decrypting-using-bitlocker.md
@@ -14,6 +14,6 @@ Device encryption is enabled by default on many Windows 11 laptops. Although thi
 
 1. Search for **cmd** in the Start menu, right-click on it, and select **Run as administrator**.
 1. Type `manage-bde -off %SystemDrive%` and press ++enter++. This command starts the decryption process.
-    - If you see the error message ["This volume stores external key(s) that can automatically unlock other volumes"](../../assets/images/bitlocker-error-decrypting.jpg), type `manage-bde -autounlock - ClearAllKeys %SystemDrive%` and press ++enter++ to clear the keys. After completion, re-type `manage-bde -off %SystemDrive%` and press ++enter++ to continue decrypting.
+    - If you see the error message ["This volume stores external key(s) that can automatically unlock other volumes"](../assets/images/bitlocker-error-decrypting.jpg), type `manage-bde -autounlock - ClearAllKeys %SystemDrive%` and press ++enter++ to clear the keys. After completion, re-type `manage-bde -off %SystemDrive%` and press ++enter++ to continue decrypting.
 1. If you see the message **Decryption is now in progress**, you have completed the steps correctly. The decryption process will take some time.
-1. To check the progress, type `manage-bde -status` and look at the ["Percentage Encrypted"](../../assets/images/bitlocker-decryption-progress.webp). Once it has reached **0%**, you've successfully decrypted the drive!
\ No newline at end of file
+1. To check the progress, type `manage-bde -status` and look at the ["Percentage Encrypted"](../assets/images/bitlocker-decryption-progress.webp). Once it has reached **0%**, you've successfully decrypted the drive!
\ No newline at end of file
diff --git a/docs/faq-and-troubleshooting/removed-features.md b/docs/install-faq/removed-features.md
similarity index 100%
rename from docs/faq-and-troubleshooting/removed-features.md
rename to docs/install-faq/removed-features.md
diff --git a/docs/faq-and-troubleshooting/who-is-atlas-for.md b/docs/install-faq/who-is-atlas-for.md
similarity index 100%
rename from docs/faq-and-troubleshooting/who-is-atlas-for.md
rename to docs/install-faq/who-is-atlas-for.md
diff --git a/docs/faq-and-troubleshooting/common-questions/windows-editions.md b/docs/install-faq/windows-editions.md
similarity index 100%
rename from docs/faq-and-troubleshooting/common-questions/windows-editions.md
rename to docs/install-faq/windows-editions.md
diff --git a/mkdocs.insiders.yml b/mkdocs.insiders.yml
index 942a6314..1a5c2521 100644
--- a/mkdocs.insiders.yml
+++ b/mkdocs.insiders.yml
@@ -45,9 +45,9 @@ plugins:
         'getting-started/post-installation/atlas-folder/optional-tweaks.md': 'getting-started/post-installation/atlas-folder/interface-tweaks.md'
 
           # New AME Wizard errors section
-        'faq-and-troubleshooting/common-questions/atlas-playbook-stuck.md': 'faq-and-troubleshooting/ame-wizard-errors/atlas-playbook-stuck.md'
-        'faq-and-troubleshooting/common-questions/build-not-supported.md': 'faq-and-troubleshooting/ame-wizard-errors/build-not-supported.md'
-        'faq-and-troubleshooting/common-questions/ame-wizard-deleted.md': 'faq-and-troubleshooting/ame-wizard-errors/ame-wizard-deleted.md'
+        'faq-and-troubleshooting/common-questions/atlas-playbook-stuck.md': 'install-faq/ame-wizard-errors/atlas-playbook-stuck.md'
+        'faq-and-troubleshooting/common-questions/build-not-supported.md': 'install-faq/ame-wizard-errors/build-not-supported.md'
+        'faq-and-troubleshooting/common-questions/ame-wizard-deleted.md': 'install-faq/ame-wizard-errors/ame-wizard-deleted.md'
 
           # Moved as it gives mostly software recommendations
         'faq-and-troubleshooting/common-questions/recommended-antiviruses.md': 'getting-started/post-installation/software/anti-virus.md'
@@ -57,5 +57,29 @@ plugins:
         'faq-and-troubleshooting/common-questions/reverting-atlas.md': 'getting-started/reverting-atlas.md'
         'faq-and-troubleshooting/reverting-atlas.md': 'getting-started/reverting-atlas.md'
 
+          # Seperating 'FAQ & Troubleshooting' into 'General FAQ' and 'Install FAQ'
+        'faq-and-troubleshooting/removed-features.md': 'install-faq/removed-features.md'
+        'faq-and-troubleshooting/who-is-atlas-for.md': 'install-faq/who-is-atlas-for.md'
+        'faq-and-troubleshooting/ame-wizard-errors/ame-wizard-deleted.md': 'install-faq/ame-wizard-errors/ame-wizard-deleted.md'
+        'faq-and-troubleshooting/ame-wizard-errors/atlas-playbook-stuck.md': 'install-faq/ame-wizard-errors/atlas-playbook-stuck.md'
+        'faq-and-troubleshooting/ame-wizard-errors/build-not-supported.md': 'install-faq/ame-wizard-errors/build-not-supported.md'
+        'faq-and-troubleshooting/ame-wizard-errors/cant-disable-defender.md': 'install-faq/ame-wizard-errors/cant-disable-defender.md'
+        'faq-and-troubleshooting/common-questions/decryptying-using-bitlocker.md': 'install-faq/decrypting-using-bitlocker.md'
+        'faq-and-troubleshooting/common-questions/windows-editions.md': 'install-faq/windows-editions.md'
+        'faq-and-troubleshooting/common-questions/atlas-iso-files.md': 'install-faq/atlas-iso-files.md'
+        'faq-and-troubleshooting/common-questions/atlas-and-security.md': 'general-faq/atlas-and-security.md'
+        'faq-and-troubleshooting/common-questions/updating-atlas.md': 'general-faq/updating-atlas.md'
+        'faq-and-troubleshooting/common-questions/atlas-folder-missing.md': 'general-faq/atlas-folder-missing.md'
+        'faq-and-troubleshooting/common-questions/atlas-folder-scripts.md': 'general-faq/atlas-folder-scripts.md'
+        'faq-and-troubleshooting/common-questions/windows-update-errors.md': 'general-faq/windows-update-errors.md'
+        'faq-and-troubleshooting/common-questions/testing-nightly-builds.md': 'general-faq/testing-nightly-builds.md'
+        'faq-and-troubleshooting/common-questions/acrobat-not-installing.md': 'general-faq/acrobat-not-installing.md'
+        'faq-and-troubleshooting/common-questions/bluetooth-compatibility.md': 'general-faq/bluetooth-compatibility.md'
+        'faq-and-troubleshooting/common-questions/itunes-compatibility.md': 'general-faq/itunes-compatibility.md'
+        'faq-and-troubleshooting/common-questions/media-pack-not-found.md': 'general-faq/media-pack-not-found.md'
+        'faq-and-troubleshooting/common-questions/microsoft-store.md': 'general-faq/microsoft-store.md'
+        'faq-and-troubleshooting/common-questions/roblox-not-opening.md': 'general-faq/roblox-not-opening.md'
+        'faq-and-troubleshooting/common-questions/fifa-and-eafc-not-launching.md': 'general-faq/fifa-and-eafc-not-launching.md'
+
   # https://squidfunk.github.io/mkdocs-material/reference/#built-in-typeset-plugin (Insiders)
   - typeset
diff --git a/mkdocs.yml b/mkdocs.yml
index c6b9026b..0149cb73 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -56,34 +56,35 @@ nav:
       - Advanced Configuration: getting-started/post-installation/atlas-folder/advanced-configuration.md
       - Security: getting-started/post-installation/atlas-folder/security.md
 
-  - FAQ & Troubleshooting:
-    - What's removed?: faq-and-troubleshooting/removed-features.md
+  - Install FAQ:
+    - What's removed?: install-faq/removed-features.md
       # discord_bot_names: ['removed-features', 'deleted-features', 'whats-stripped']
-    - Who is Atlas for?: faq-and-troubleshooting/who-is-atlas-for.md
+    - Who is Atlas for?: install-faq/who-is-atlas-for.md
+    - Atlas ISO files: install-faq/atlas-iso-files.md
+    - Windows Editions: install-faq/windows-editions.md
+    - Decrypting using BitLocker: install-faq/decrypting-using-bitlocker.md
     - Reverting Atlas: getting-started/reverting-atlas.md
       # discord_friendly_name: ['revert', 'uninstall-atlas']
     - AME Wizard Errors:
-      - AME Wizard Deleted: faq-and-troubleshooting/ame-wizard-errors/ame-wizard-deleted.md
-      - Atlas Playbook Stuck: faq-and-troubleshooting/ame-wizard-errors/atlas-playbook-stuck.md
-      - Build Not Supported: faq-and-troubleshooting/ame-wizard-errors/build-not-supported.md
-      - Can't Disable Defender: faq-and-troubleshooting/ame-wizard-errors/cant-disable-defender.md
-    - Common Questions:
-      - Atlas and Security: faq-and-troubleshooting/common-questions/atlas-and-security.md
-      - Updating Atlas: faq-and-troubleshooting/common-questions/updating-atlas.md
-      - Atlas ISO files: faq-and-troubleshooting/common-questions/atlas-iso-files.md
-      - Atlas Folder Missing: faq-and-troubleshooting/common-questions/atlas-folder-missing.md
-      - Atlas Folder Scripts: faq-and-troubleshooting/common-questions/atlas-folder-scripts.md
-      - Windows Editions: faq-and-troubleshooting/common-questions/windows-editions.md
-      - Windows Update Errors: faq-and-troubleshooting/common-questions/windows-update-errors.md
-      - Testing Nightly Builds: faq-and-troubleshooting/common-questions/testing-nightly-builds.md
-      - Acrobat not installing: faq-and-troubleshooting/common-questions/acrobat-not-installing.md
-      - Bluetooth Compatibility: faq-and-troubleshooting/common-questions/bluetooth-compatibility.md
-      - Decrypting using BitLocker: faq-and-troubleshooting/common-questions/decryptying-using-bitlocker.md
-      - iTunes Compatibility: faq-and-troubleshooting/common-questions/itunes-compatibility.md
-      - Installing the Media Pack: faq-and-troubleshooting/common-questions/media-pack-not-found.md
-      - Microsoft Store: faq-and-troubleshooting/common-questions/microsoft-store.md
-      - Roblox not opening: faq-and-troubleshooting/common-questions/roblox-not-opening.md
-      - FIFA/EAFC not launching: faq-and-troubleshooting/common-questions/fifa-and-eafc-not-launching.md
+      - AME Wizard Deleted: install-faq/ame-wizard-errors/ame-wizard-deleted.md
+      - Atlas Playbook Stuck: install-faq/ame-wizard-errors/atlas-playbook-stuck.md
+      - Build Not Supported: install-faq/ame-wizard-errors/build-not-supported.md
+      - Can't Disable Defender: install-faq/ame-wizard-errors/cant-disable-defender.md
+
+  - General FAQ:
+    - Atlas and Security: general-faq/atlas-and-security.md
+    - Updating Atlas: general-faq/updating-atlas.md
+    - Atlas Folder Missing: general-faq/atlas-folder-missing.md
+    - Atlas Folder Scripts: general-faq/atlas-folder-scripts.md
+    - Windows Update Errors: general-faq/windows-update-errors.md
+    - Testing Nightly Builds: general-faq/testing-nightly-builds.md
+    - Acrobat not installing: general-faq/acrobat-not-installing.md
+    - Bluetooth Compatibility: general-faq/bluetooth-compatibility.md
+    - iTunes Compatibility: general-faq/itunes-compatibility.md
+    - Installing the Media Pack: general-faq/media-pack-not-found.md
+    - Microsoft Store: general-faq/microsoft-store.md
+    - Roblox not opening: general-faq/roblox-not-opening.md
+    - FIFA/EAFC not launching: general-faq/fifa-and-eafc-not-launching.md
 
   - Development:
     - Contribution Guidelines: contributing/contribution-guidelines.md