diff --git a/docs/assets/brand/preview/wallpapers/v0.5/rev-1/preview-wallpaper-v0.5-rev1.0.png b/docs/assets/brand/preview/wallpapers/v0.5/rev-1/preview-wallpaper-v0.5-rev1.0.png
new file mode 100644
index 00000000..db4dc681
Binary files /dev/null and b/docs/assets/brand/preview/wallpapers/v0.5/rev-1/preview-wallpaper-v0.5-rev1.0.png differ
diff --git a/docs/assets/brand/preview/wallpapers/v0.5/rev-1/preview-wallpaper-v0.5-rev1.1.png b/docs/assets/brand/preview/wallpapers/v0.5/rev-1/preview-wallpaper-v0.5-rev1.1.png
new file mode 100644
index 00000000..5a8db7c7
Binary files /dev/null and b/docs/assets/brand/preview/wallpapers/v0.5/rev-1/preview-wallpaper-v0.5-rev1.1.png differ
diff --git a/docs/branding.md b/docs/branding.md
index 3a61a6fe..9b17e692 100644
--- a/docs/branding.md
+++ b/docs/branding.md
@@ -1,4 +1,5 @@
---
+title: Branding
description: See the official branding and wallpapers for AtlasOS
icon: material/palette
---
@@ -262,6 +263,30 @@ We make all our brand assets available to the public in various formats and size
## Wallpapers
+### Atlas v0.5
+
+#### Rev 1
+
+=== "v0.5 Rev 1.0"
+ { width=830 loading=lazy }
+
+
+
### Atlas v0.4
#### Rev 1
diff --git a/docs/faq/index.md b/docs/faq/index.md
new file mode 100644
index 00000000..7c53a479
--- /dev/null
+++ b/docs/faq/index.md
@@ -0,0 +1 @@
+## TBD
\ No newline at end of file
diff --git a/docs/general-faq/atlas-and-security.md b/docs/general-faq/atlas-and-security.md
deleted file mode 100644
index b1a7abb2..00000000
--- a/docs/general-faq/atlas-and-security.md
+++ /dev/null
@@ -1,36 +0,0 @@
----
-description: How secure is AtlasOS?
-icon: material/shield
----
-
-# :material-shield: How secure is AtlasOS?
-
-**Atlas aims to be as secure as you want, including the ability to toggle Windows Defender, [mitigations](../getting-started/post-installation/atlas-folder/security.md#mitigations), and automatic Windows updates freely.**
-
-While knowing potential risks, we believe power users should be able to customize security and convenience. Atlas alerts users about the dangers of turning off security features. We alert you through pre-install configuration prompts, [documentation](../getting-started/post-installation/atlas-folder/security.md), and our Atlas folder scripts.
-
-Additionally, you can always change security post-install.
-
-## :material-microsoft: Security compared to unmodified Windows
-
-Fundamentally, unmodified Windows from Microsoft will always be the most trusted and secure version of Windows available.
-
-Regardless, Atlas aims to have similar parity with unmodified Windows' security while being as transparent as possible. [Atlas is open source on GitHub](https://github.com/Atlas-OS/Atlas), and Ameliorated's AME Wizard, utilized by Atlas to make changes, has its [backend open source under MIT](https://git.ameliorated.info/Styris/trusted-uninstaller-cli).
-
-## :material-timeline-question: Legacy versions of Atlas
-
-Versions of Atlas earlier than `v0.3` are now considered legacy and previously raised many security concerns. We **strongly recommend** that anyone on these Atlas versions [reinstall Windows and upgrade to the latest version](../getting-started/installation.md), as they are unsecure and unsupported.
-
-### Why was Atlas unsecure previously?
-
-When Atlas became more popular, we realized the necessity of catering to a broader audience that expects these security features. Under new development, we acted on the feedback and have shifted Atlas's goals to include maintaining security, which is what we should have done previously.
-
-### What has changed since?
-
-As well as many feature and stability improvements, the latest versions of Atlas have many security improvements, such as:
-
-1. Windows Update support
-1. Windows Defender support
-1. User Account Control enabled by default
-1. Core isolation support
-1. Improved transparency and resources about security features
\ No newline at end of file
diff --git a/docs/general-faq/atlas-folder-missing.md b/docs/general-faq/atlas-folder-missing.md
deleted file mode 100644
index ca932eb7..00000000
--- a/docs/general-faq/atlas-folder-missing.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-description: How to fix the missing Atlas folder on AtlasOS
-icon: material/folder-question
----
-
-# :material-folder-question: How do I get the Atlas configuration folder back?
-
-**If you deleted the Atlas configuration folder shortcut on your desktop, you can find it here: `C:\Windows\AtlasDesktop`.**
-
-If you wish to have the folder on your desktop, you should right-click on the folder and create a shortcut.
-
-
-
-## What about if I can't find AtlasDesktop?
-
-You can download the **.zip** archive below, extract it, and place the `AtlasDesktop` folder in `C:\Windows`. The link below updates upon each new Atlas release.
-
-[Download AtlasDesktop -->](https://download-directory.github.io/?url=https%3A%2F%2Fgithub.com%2FAtlas-OS%2FAtlas%2Ftree%2F{{ atlas.release }}%2Fsrc%2Fplaybook%2FExecutables%2FAtlasDesktop)
\ No newline at end of file
diff --git a/docs/general-faq/bluetooth-compatibility.md b/docs/general-faq/bluetooth-compatibility.md
deleted file mode 100644
index 11f95d44..00000000
--- a/docs/general-faq/bluetooth-compatibility.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-description: Does Bluetooth work on AtlasOS?
-icon: material/bluetooth
----
-
-# :material-bluetooth: Does Bluetooth work on AtlasOS?
-
-**Yes, Bluetooth is fully functional on AtlasOS.**
-
-If you're using AtlasOS 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 Bluetooth driver manually. Follow these steps to set up Bluetooth:
-
-1. If you've disabled Bluetooth, [enable Bluetooth services](../getting-started/post-installation/atlas-folder/advanced-configuration.md#services) in the Atlas folder.
-
-2. Install your Bluetooth driver. You can follow our [drivers guide](../getting-started/post-installation/drivers/others.md) for this.
- - 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.
-
-
-
-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/general-faq/checking-atlas-version.md b/docs/general-faq/checking-atlas-version.md
deleted file mode 100644
index be5087e1..00000000
--- a/docs/general-faq/checking-atlas-version.md
+++ /dev/null
@@ -1,40 +0,0 @@
----
-description: How to check which version of AtlasOS you have installed.
-icon: material/information-outline
----
-
-# :material-information-outline: Checking Your AtlasOS Version
-
-Knowing which version of AtlasOS you have installed is important, especially when considering updates or troubleshooting. As mentioned in our [Updating AtlasOS guide](./updating-atlas.md), different versions have different update paths and support levels.
-
-There are two primary ways to check your installed Windows version, which corresponds to your AtlasOS version:
-
-## 1. Using the `winver` Command
-
-This is a quick way to see your Windows build number and the Atlas Playbook version.
-
-1. Press ++win+r++ on your keyboard to open the Run dialog.
-2. Type `winver` and press Enter or click OK.
-3. A window will appear showing your Windows version and OS Build number. Below the user name, you should also see the **Atlas Playbook version** installed (e.g., `Atlas Playbook v0.4.1`).
-
-
- 
- Atlas Playbook v0.4.1 shown in the winver dialog
-
-
-## 2. Using Windows Settings
-
-You can also find detailed system information, including the Atlas Playbook version, in the Settings app.
-
-1. Open Windows Settings (you can press ++win+i++).
-2. Navigate to `System`.
-3. Click on `About`.
-4. Look directly under your PC's name (e.g., `DESKTOP-PDSCPN3`). You should see the **Atlas Playbook version** listed there (e.g., `Atlas Playbook v0.4.1`).
-5. Further down, under the "Windows specifications" section, you'll find the base Windows Edition (e.g., Windows 11 Pro) and the Version number (e.g., 22H2).
-
-
- 
- Atlas Playbook v0.4.1 shown in the Windows Settings About page
-
-
-By checking the **Atlas Playbook version** using either of these methods, you can easily identify your installed release, helping you follow the correct [update procedures](./updating-atlas.md) or seek appropriate support.
\ No newline at end of file
diff --git a/docs/general-faq/enabling-tpm.md b/docs/general-faq/enabling-tpm.md
deleted file mode 100644
index f3e7b57d..00000000
--- a/docs/general-faq/enabling-tpm.md
+++ /dev/null
@@ -1,67 +0,0 @@
----
-title: Enabling TPM 2.0 for Windows 11 Installation
-description: How to enable the Trusted Platform Module (TPM) in your system's BIOS/UEFI, a requirement for Windows 11.
-icon: material/chip
----
-
-# :material-chip: Enabling TPM 2.0 for Windows 11 Installation
-
-Windows 11 has specific system requirements, including the need for **Trusted Platform Module (TPM) version 2.0** to be enabled on your system. If you are trying to install Windows 11 (as part of the AtlasOS installation process) and encounter an error stating your PC doesn't meet the requirements, you may need to enable TPM in your system's BIOS or UEFI settings.
-
-TPM is a security feature built into modern motherboards or CPUs that provides hardware-based security functions.
-
-!!! warning "Proceed with Caution"
- Modifying BIOS/UEFI settings incorrectly can potentially cause system instability. While enabling TPM is generally safe, only change settings you understand. If unsure, consult your motherboard or computer manufacturer's documentation.
-
-## Step 1: Accessing BIOS/UEFI
-
-You need to restart your computer and enter the BIOS/UEFI setup utility before Windows starts loading.
-
-1. **Restart your computer.**
-2. **Immediately press the BIOS/UEFI entry key repeatedly** as the system powers on. Common keys include:
- * `DEL` (Delete)
- * `F2`
- * `F10`
- * `F12`
- * `ESC` (Escape)
- * The correct key often briefly appears on the screen during startup (e.g., "Press DEL to enter Setup"). If unsure, check your computer or motherboard manual, or search online for your specific model.
-
-## Step 2: Finding the TPM Setting
-
-BIOS/UEFI interfaces vary significantly between manufacturers (ASUS, Gigabyte, MSI, Dell, HP, Lenovo, etc.) and even between models. You will need to navigate through the menus to find the relevant setting.
-
-* **Look for sections named:**
- * `Security`
- * `Advanced`
- * `Trusted Computing`
- * `Peripherals`
- * `CPU Configuration`
-
-* **Look for setting names like:**
- * `TPM` / `TPM Device` / `TPM Support` / `TPM State`
- * `Security Device` / `Security Device Support`
- * **For Intel CPUs:** `PTT` (Platform Trust Technology) or `Intel PTT`
- * **For AMD CPUs:** `fTPM` (Firmware TPM) or `AMD fTPM switch` / `CPU fTPM`
-
-!!! tip "Can't find it?"
- Sometimes the setting might be nested under another option (e.g., under `Advanced\PCH-FW Configuration` for some Intel systems). Refer to your motherboard/PC manual or manufacturer's support website for specific guidance. If the option seems entirely missing, ensure your BIOS/UEFI is up-to-date, but be aware BIOS updates carry risks.
-
-## Step 3: Enabling TPM
-
-Once you find the setting:
-
-1. Select the TPM (or equivalent, like PTT/fTPM) option.
-2. Change its value from `Disabled` / `Off` / `Hidden` to `Enabled` / `On` / `Available` / `Firmware TPM`.
- * *Note:* Sometimes there are separate options for the TPM state and device visibility. Ensure the device itself is enabled or activated.
-
-## Step 4: Saving Changes and Exiting
-
-1. Navigate to the `Exit` section of your BIOS/UEFI.
-2. Select the option to **Save Changes and Exit** (often `F10` key followed by `Y` or `Enter` to confirm). Common menu names are `Save & Exit Setup`, `Exit Saving Changes`.
-3. Your computer will restart.
-
-## Step 5: Retry Windows Installation
-
-After your computer restarts, attempt the Windows 11 installation step from the [Atlas Installation Guide](../getting-started/installation.md) again. The requirements check should now pass if TPM was the only issue.
-
-If you continue to have problems, double-check your BIOS/UEFI settings and consult your hardware manufacturer's documentation.
\ No newline at end of file
diff --git a/docs/general-faq/fifa-and-eafc-not-launching.md b/docs/general-faq/fifa-and-eafc-not-launching.md
deleted file mode 100644
index 5c1e5bf5..00000000
--- a/docs/general-faq/fifa-and-eafc-not-launching.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-description: FIFA/EAFC not launching
-icon: simple/fifa
----
-
-# :simple-fifa: Why are FIFA and EAFC not launching?
-
-**Both FIFA and EAFC require Windows Defender to be enabled and running.**
-
-To enable Defender, navigate to `C:\Windows\AtlasDesktop\7. Security\Defender` and run `Toggle Defender.cmd`.
diff --git a/docs/general-faq/game-url-files.md b/docs/general-faq/game-url-files.md
deleted file mode 100644
index 37a8d240..00000000
--- a/docs/general-faq/game-url-files.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-icon: material/arrow-top-right-thick
-description: How to fix my shortcuts showing up as .url files or without an icon?
----
-
-# :material-arrow-top-right-thick: How do I fix my shortcuts showing up as .url files or without an icon?
-
-**Simply set the shortcut to open in "Internet Browser".**
-
-=== ":material-microsoft-windows: Windows 10"
-
- 1. Right click the shortcut and click `Choose another app` under `Open With...`
-
- 
-
- !!! failure "If there is no `Open With...` menu, double click the shortcut instead."
-
- 2. Choose **Internet Browser** and tick `Always use this app to open .url files`
-
- 
-
- 3. Press `OK`
-=== ":material-microsoft: Windows 11"
-
- 1. Right click the shortcut and click `Choose another app` under `Open With...`
-
- !!! failure "If there is no `Open With...` menu, double click the shortcut instead."
-
- 2. Choose **Internet Browser** and click `Always`
diff --git a/docs/general-faq/installation-data-loss.md b/docs/general-faq/installation-data-loss.md
deleted file mode 100644
index ac8849aa..00000000
--- a/docs/general-faq/installation-data-loss.md
+++ /dev/null
@@ -1,36 +0,0 @@
----
-description: Do I need to reinstall Windows or lose my data to install AtlasOS?
-icon: material/database-arrow-down-outline
----
-
-# :material-database-arrow-down-outline: Installing AtlasOS, Fresh Install & Data Loss
-
-Many users ask if they need to perform a fresh Windows installation or if their personal data will be lost when applying AtlasOS. Here's a breakdown:
-
-## :material-help-circle-outline: Do I need to reinstall Windows?
-
-**Yes, a fresh/clean installation of Windows is required for a stable and functional AtlasOS experience.**
-
-Attempting to apply AtlasOS on an existing, non-fresh Windows installation **will cause system instability, failed optimizations, broken features, and leave your system in an unsupported state.** It is not a viable alternative to a clean install.
-
-For a working and supported AtlasOS system, you **must**:
-1. Perform a clean installation of a compatible Windows version.
-2. Apply the Atlas playbook immediately after the Windows setup.
-
-[:link: Refer to the Installation Guide for supported Windows versions and steps](../getting-started/installation.md)
-
-## :material-file-document-outline: Will I lose my personal files and data?
-
-**No.** Applying AtlasOS **does not** intentionally delete your personal files, documents, photos, games, or other user data stored on your drives. The process focuses on modifying Windows system settings, services, and components.
-
-However, some Windows features or built-in apps that Atlas removes might be associated with specific data *within those apps*. If you rely heavily on a feature Atlas removes, ensure you have alternatives or backups for that specific data.
-
-## :material-microsoft-windows: Do I need Windows installed first?
-
-**Yes.** AtlasOS is a modification applied on top of Windows; it is **not** a standalone operating system.
-
-If you are asking this question, it means you have **not** read or followed the **official Atlas Installation Guide**. Following this guide precisely is **mandatory** for a successful and supported installation. It covers all prerequisites, including the requirement to have a compatible version of Windows installed first.
-
-**Do not proceed further without consulting the guide:**
-
-[:link: Atlas Installation Guide](../getting-started/installation.md)
\ No newline at end of file
diff --git a/docs/general-faq/itunes-compatibility.md b/docs/general-faq/itunes-compatibility.md
deleted file mode 100644
index 0d434c4a..00000000
--- a/docs/general-faq/itunes-compatibility.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-description: How to fix iTunes not recognizing Apple devices?
-icon: material/apple
----
-
-# :material-apple: Why is iTunes not recognizing my Apple device?
-
-**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.
-
-## :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#automatic-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.
-
- 
-
-2. Extract the downloaded zip file using 7-Zip or Explorer. Ignore any warnings that may appear.
-
-3. Find the `.inf` file in the extracted folder. **Right-click** on the `.inf` file and select **Install**.
diff --git a/docs/general-faq/media-pack-not-found.md b/docs/general-faq/media-pack-not-found.md
deleted file mode 100644
index 28f8b401..00000000
--- a/docs/general-faq/media-pack-not-found.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-description: How do I install media features?
-icon: material/play-pause
----
-
-# :material-play-pause: How do I install the Media Feature Pack?
-
-**In Atlas v0.4.0, Windows Media Player (Legacy) is uninstalled by default, which can cause an error about missing Media Features in some apps. It can be reinstalled reasonably easily. [Scroll to see solutions](#reinstalling-the-media-pack).**
-
-Alternatively, you might be on an N-edition of Windows. We recommend not using these as there's little benefit; Atlas already does the debloating. You can check in `winver.exe`.
-
-## :material-checkbox-marked-outline: Reinstalling the Media Pack
-
-1. Open **Settings**, and navigate from:
-
- [System -> Optional Features -> View/Add features](ms-settings:optionalfeatures){ .md-button }
-
-1. Search for **'Windows Media'** and check **'Windows Media Player Legacy (App)'**
- - If you're on an N-edition of Windows, search for 'Media Feature Pack' instead
-
-1. Click **Next** then **Add**
-
-1. Wait for it to install
\ No newline at end of file
diff --git a/docs/general-faq/microsoft-account-usage.md b/docs/general-faq/microsoft-account-usage.md
deleted file mode 100644
index e83caaac..00000000
--- a/docs/general-faq/microsoft-account-usage.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-description: Can I use my Microsoft account with AtlasOS or the Microsoft Store?
-icon: material/account-circle-outline
----
-
-# :material-account-circle-outline: Using Your Microsoft Account with AtlasOS
-
-A common question is whether you can or should use your Microsoft account with AtlasOS. Here's the breakdown:
-
-## :material-store: Microsoft Store and Apps
-
-**Yes, you can sign in with your Microsoft account within the Microsoft Store** or within specific applications (like the Xbox app) that require it.
-
-This allows you to:
-
-* Install apps you own.
-* Access subscriptions linked to your account (like Game Pass).
-* Sync progress in certain games or apps.
-
-Signing into the Store or individual apps does **not** require you to use a Microsoft account for your main Windows login.
-
-## :material-account-off-outline: Windows User Account (Login)
-
-While you *can* technically use a Microsoft account to sign in to Windows itself on AtlasOS, **we strongly recommend using a local account instead for privacy reasons.**
-
-* **Why a local account?** AtlasOS aims to minimize data collection and telemetry sent to Microsoft. Using a local account is a key step in achieving this, as it avoids directly linking your device usage and diagnostics to your personal Microsoft account profile. Microsoft accounts inherently involve more data synchronization and potential tracking compared to offline, local accounts.
-* **Functionality:** You can still access most Windows features and install software using a local account. Signing into specific apps (like the Store, as mentioned above) is separate from your main Windows login.
-
-**In summary:** Feel free to use your Microsoft account where needed *within* apps like the Microsoft Store, but stick to a local account for your main Windows user profile to align with our privacy-focused goals.
\ No newline at end of file
diff --git a/docs/general-faq/microsoft-store.md b/docs/general-faq/microsoft-store.md
deleted file mode 100644
index 2505132e..00000000
--- a/docs/general-faq/microsoft-store.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-description: Does Microsoft Store work on Atlas?
-icon: material/microsoft
----
-
-# :material-microsoft: Does AtlasOS support the Microsoft Store?
-
-**Yes, the Microsoft Store works the same as on unmodified Windows.**
-
-If you're experiencing issues with the Microsoft Store, these are unrelated to Atlas. However, we have some general fixes below which will restore its functionality.
-
-## :material-store-check: Fixes
-
-=== "Method 1 (Recommended)"
-
- ??? tip "Video demonstration"
-
-
-
-
- 1. Press ++win+r++ to open the **Run** dialog
- 2. Type in `wsreset -i` and press ++enter++
- 3. Try opening the Microsoft Store again. Once it's open, head to **Downloads and Updates** and wait for Microsoft Store to update
-
-=== "Method 2"
-
- 1. Go to [store.rg-adguard.net](https://store.rg-adguard.net)
- 2. Change the drop-down on the left to **ProductID**
- 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`
- 
- 6. Double-click the downloaded file, and click **Install**
diff --git a/docs/general-faq/resetting-atlas.md b/docs/general-faq/resetting-atlas.md
deleted file mode 100644
index 7bdf1ffe..00000000
--- a/docs/general-faq/resetting-atlas.md
+++ /dev/null
@@ -1,32 +0,0 @@
----
-description: Explains why the standard Windows 'Reset this PC' feature doesn't work with AtlasOS and details the correct procedure.
-icon: material/backup-restore
----
-
-# :material-backup-restore: Resetting or Reinstalling AtlasOS
-
-A common question is how to "reset" a PC running AtlasOS, perhaps to start fresh or fix persistent issues. It's crucial to understand that using the standard Windows "Reset this PC" feature is **not the correct method and will likely cause problems.**
-
-## :material-alert-circle-outline: Why Standard Windows Reset Fails
-
-AtlasOS makes deep changes to the standard Windows installation. Because of these modifications, the built-in **"Reset this PC" feature does not work correctly** with AtlasOS. It is designed for standard Windows systems and cannot handle the changes Atlas applies.
-
-Attempting to use "Reset this PC" will likely fail or leave your system in a broken, inconsistent, and unsupported state.
-
-**Do NOT use the standard Windows "Reset this PC" option.**
-
-## :material-tools: The Correct Way to "Reset" or Reinstall AtlasOS
-
-If you want to start fresh with AtlasOS (effectively "resetting" your Atlas installation), the **only supported and recommended method** is to perform a clean installation following the official Atlas Installation Guide.
-
-**Before you begin, make sure to back up any important personal data**, as this process involves reinstalling Windows and will wipe your system drive.
-
-**Follow the official Installation Guide for detailed steps:**
-
-[:link: Atlas Installation Guide](../getting-started/installation.md)
-
-## :material-undo-variant: Just Want to Remove Atlas?
-
-If your goal is simply to return to a standard version of Windows without AtlasOS, you should follow the guide for reverting Atlas, which also involves a clean Windows installation.
-
-[:link: Reverting Atlas Guide](../getting-started/reverting-atlas.md)
\ No newline at end of file
diff --git a/docs/general-faq/roblox-not-launching.md b/docs/general-faq/roblox-not-launching.md
deleted file mode 100644
index bad9998b..00000000
--- a/docs/general-faq/roblox-not-launching.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-description: Why is Roblox not launching?
-icon: simple/roblox
----
-
-# :simple-roblox: Why is Roblox not launching?
-
-**Some users may experience Roblox not launching on Atlas due to various factors.**
-
-Follow the methods below to fix the problem.
-
-1. Change time and date
-
- - Open the Start Menu, search for `Date & time settings` and toggle `Set the time automatically` off.
-
- - Click on `Change` and add one day (I.e. `Jan. 20th` --> `Jan. 21th`) to the date setting.
-
- - After one day, you can re-enable the automatic time and date setting.
-
-2. Enable TPM and Secure Boot
-
- - To enable **TPM 2.0** and **Secure Boot**, you need to access the BIOS of your computer and enable **TPM 2.0** (or **Trusted Platform Module**) and **Secure Boot**. Refer to your motherboard's manual if you don't know how to access your BIOS.
-
-3. Enable UAC
-
- - Open the Control Panel, search for `Change User Account Control settings` and set it to either Level 1, 2 or 3. **If UAC was disabled (set to Level 0), reinstall Roblox after enabling it.**
-
diff --git a/docs/general-faq/testing-nightly-builds.md b/docs/general-faq/testing-nightly-builds.md
deleted file mode 100644
index f649bfd2..00000000
--- a/docs/general-faq/testing-nightly-builds.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-description: How can I test pre-release builds of AtlasOS?
-icon: material/test-tube
----
-
-# :material-test-tube: How can I test pre-release builds of AtlasOS?
-
-**If you wish to take part in testing nightly, pre-release development builds, you can do so by adding the 'Development' Discord role on our Discord server.**
-
----
-
-We often post announcements to the development Discord role when we need help testing new pre-release builds, small polls, and development updates. If interested, you can [join our Discord server](https://discord.atlasos.net/) and apply the development role to your profile.
-
-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:
-
-
diff --git a/docs/general-faq/updating-atlas.md b/docs/general-faq/updating-atlas.md
deleted file mode 100644
index 73b8d4b3..00000000
--- a/docs/general-faq/updating-atlas.md
+++ /dev/null
@@ -1,30 +0,0 @@
----
-description: How do I update AtlasOS to the latest version?
-icon: material/microsoft-windows
----
-
-# :material-microsoft-windows: Keeping AtlasOS Up-to-Date
-
-Keeping your AtlasOS installation current ensures you benefit from the latest features, security updates, and compatibility improvements. How you update depends on the version you're currently running. You can find out which version you have by following the steps in the [Checking Your AtlasOS Version guide](./checking-atlas-version.md).
-
-Check the table below to see the update options available for your version:
-
-| | Windows Update | Updating Atlas | Support from the Atlas team |
-| -------------- | ------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------- | ----------------------------------- |
-| v0.2.0 & below | :material-close-octagon: No support | :material-close-octagon: No support | :material-close-octagon: No support |
-| v0.3.x | :material-check: Can't upgrade to v0.5, so 24H2 won't be available | :material-close-octagon: No support | :material-close-octagon: No support |
-| v0.4.0 | :material-check-all: Will be able to update to 24H2 when v0.5 releases | :material-check: Will be able to update to Atlas v0.5 on its release | :material-check-all: Supported |
-| v0.4.1 | :material-check-all: Will be able to update to future Windows feature releases when v0.5 releases | :material-check: Will be able to update to Atlas v0.5 on its release | :material-check-all: Supported |
-
-**Good news!** If you're on version 0.4.0 or later, Atlas supports cumulative Windows Updates. This means you'll receive regular security and quality patches directly from Microsoft. When future major Windows versions (like 24H2) and new Atlas releases (like v0.5) become available, you'll be able to update smoothly.
-
-## What if I'm on an older, unsupported version (v0.3.x or earlier)?
-
-We understand it can be frustrating to be on an older version. Unfortunately, versions v0.3.x and earlier don't support direct updates to newer Atlas releases or the latest Windows feature updates.
-
-To ensure you have the best and most secure experience, we **strongly** recommend one of these options:
-
-1. **Fresh Start with the Latest Atlas:** [Reinstall Windows and then install the newest version of AtlasOS.](../getting-started/installation.md) This is the best way to get all the current benefits.
-2. **Return to Standard Windows:** [Reinstall a standard, unmodified version of Windows.](../getting-started/reverting-atlas.md)
-
-We know reinstalling can be a bit of work, but it's the safest path forward from these older versions.
diff --git a/docs/general-faq/upgrading-windows-version.md b/docs/general-faq/upgrading-windows-version.md
deleted file mode 100644
index 48a50273..00000000
--- a/docs/general-faq/upgrading-windows-version.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-description: Can I upgrade my Windows version (e.g., 10 to 11) with AtlasOS installed?
-icon: material/arrow-up-bold-box-outline
----
-
-# :material-arrow-up-bold-box-outline: Upgrading Windows Version with AtlasOS Installed
-
-Upgrading your underlying Windows version (e.g., from Windows 10 to Windows 11) while AtlasOS is applied is **strongly discouraged and not supported.**
-
-## :material-alert-circle-outline: Why is upgrading not supported?
-
-AtlasOS applies deep modifications to the Windows operating system it's installed on. These changes are specific to the version and build of Windows present during the Atlas playbook execution.
-
-Major Windows version upgrades (like the jump from 10 to 11) involve substantial changes to core system files, services, and the registry. Attempting to perform such an upgrade on an Atlas-modified system can lead to:
-
-* **System Instability:** Conflicts between the upgrade process and Atlas modifications can cause crashes, boot loops, or unpredictable behavior.
-* **Broken Features:** Atlas tweaks or Windows features might stop working correctly.
-* **Partial or Full Reversion:** The upgrade process may overwrite or undo many of the optimizations and changes applied by Atlas.
-* **Unusable System:** In worst-case scenarios, the system may become unbootable or require a complete reinstallation.
-
-Because of these potential conflicts and the unpredictability of the outcome, the Atlas team does not provide support for systems that have been upgraded in this manner.
-
-## :material-tools: What is the recommended procedure?
-
-If you wish to move to a newer version of Windows (e.g., Windows 11) and continue using AtlasOS, the **only recommended and supported method** is to perform a clean installation.
-
-**Follow the official Installation Guide** to reinstall the desired Windows version (e.g., Windows 11) and apply the corresponding AtlasOS playbook. Remember to back up your personal data beforehand.
-
-[:link: Atlas Installation Guide](../getting-started/installation.md)
-
-This process ensures a clean slate for both the new Windows installation and the Atlas modifications, minimizing the risk of conflicts and ensuring a stable, supported system.
\ No newline at end of file
diff --git a/docs/general-faq/verify-iso-integrity.md b/docs/general-faq/verify-iso-integrity.md
deleted file mode 100644
index 5dc60e7d..00000000
--- a/docs/general-faq/verify-iso-integrity.md
+++ /dev/null
@@ -1,36 +0,0 @@
----
-description: How to verify the integrity of your Windows ISO for AtlasOS installation
-icon: material/check-decagram
----
-
-# :material-check-decagram: How do I verify the integrity of my Windows ISO?
-
-**A damaged or altered ISO file can lead to installation errors like random BSODs, application crashes, or unstable system behavior. This guide will help you verify your Windows ISO file before proceeding with your installation.**
-
-## :material-information: Why Verify?
-
-Verifying your ISO ensures:
-- **Completeness:** The file is fully downloaded and unaltered.
-- **Reliability:** Avoids mysterious errors during or after installation.
-- **Consistency:** Confirms the file's integrity, especially if downloaded more than once.
-
-## :material-console: How to Verify Your ISO
-
-### **On Windows**
-1. Open **Command Prompt as Administrator**.
-2. Run the following command (replace `` with the actual path to your ISO file):
- ```cmd
- certutil -hashfile SHA256
- ```
-3. Download the ISO file twice from the same source.
- Compare the hash values of both downloads using the command provided above.
- If the hash values match, your ISO file is intact and safe to use. If they do not match, try downloading the file again and repeat the verification process.
-
-## :material-alert: Note
-
-Due to the large number of language editions available, we do not list individual hash values for each variant. Instead, verify your download’s consistency by comparing checksums from separate downloads if you suspect any issues.
-
-## :material-check-circle-outline: Next Steps
-
-Once you have confirmed the ISO’s integrity, proceed to burn the ISO to a disk or create a bootable USB drive and continue with your Windows installation and AtlasOS setup.
-
diff --git a/docs/general-faq/windows-10-vs-11.md b/docs/general-faq/windows-10-vs-11.md
deleted file mode 100644
index b521553d..00000000
--- a/docs/general-faq/windows-10-vs-11.md
+++ /dev/null
@@ -1,35 +0,0 @@
----
-description: Should I use Windows 10 or Windows 11 with AtlasOS?
-icon: material/microsoft-windows
----
-
-# :material-alert-decagram-outline: Windows 11 is Strongly Recommended for AtlasOS
-
-When choosing which Windows version to use as a base for AtlasOS, **Windows 11 is the strongly recommended and preferred choice.** While Windows 10 is currently supported, its use is discouraged due to its upcoming end of support.
-
-## :material-calendar-remove: Windows 10 End of Support (October 14, 2025)
-
-Microsoft's official support for Windows 10 is scheduled to end on **October 14, 2025**. After this date, Windows 10 will no longer receive critical security updates, non-security fixes, or technical support from Microsoft.
-
-Running an operating system without security updates poses a significant security risk.
-
-## :material-dev-to: Atlas Development Focus & Future Support
-
-AtlasOS development prioritizes compatibility and optimization for the **latest supported Windows versions**, which is currently Windows 11.
-
-* **Primary Focus:** Windows 11 receives the primary focus for development, testing, and new features.
-* **Secondary Support for Windows 10:** While Windows 10 is supported for now, it is considered secondary.
-* **End of Atlas Support for Win10:** AtlasOS will **cease support for Windows 10** in alignment with Microsoft's end-of-life date (October 14, 2025). Future Atlas releases beyond this date may not be compatible with or tested on Windows 10.
-
-## :material-check-decagram-outline: Conclusion: Use Windows 11
-
-Using Windows 11 as the base for your AtlasOS installation is crucial for:
-
-* Receiving ongoing security updates from Microsoft.
-* Ensuring the best compatibility and performance with current and future AtlasOS releases.
-* Maintaining a secure and stable system.
-
-We strongly advise against new installations using Windows 10.
-
-[:link: View Supported Windows Versions](/install-faq/windows-version-support)
-[:link: Atlas Installation Guide](/getting-started/installation)
\ No newline at end of file
diff --git a/docs/general-faq/windows-update-errors.md b/docs/general-faq/windows-update-errors.md
deleted file mode 100644
index f7fd4975..00000000
--- a/docs/general-faq/windows-update-errors.md
+++ /dev/null
@@ -1,25 +0,0 @@
----
-description: How to fix common Windows Update errors in AtlasOS
-icon: material/update
----
-
-# :material-update: How do I fix errors with Windows Update on AtlasOS?
-
-**Some users may have a Windows Update error when installing specific Windows updates. This page will guide you through fixing these errors.**
-
-## :material-restore-alert: General errors
-
-To fix some general Windows Update errors, try the following steps:
-
-1. Open **Command Prompt as Administrator**, and enter the commands below in order:
-
- ```
- dism /online /cleanup-image /restorehealth
- sfc /scannow
- ```
-
- It is expected that the commands will take a while to complete. The first command will likely error with **'The source files could not be found,'** but you can safely ignore this.
-
-1. Restart your computer
-
-1. Attempt to update Windows again
diff --git a/docs/getting-started/index.md b/docs/getting-started/index.md
new file mode 100644
index 00000000..066cbcea
--- /dev/null
+++ b/docs/getting-started/index.md
@@ -0,0 +1,40 @@
+---
+title: Getting Started
+description: Choose your way to start your AtlasOS journey, fresh or upgrade your current installation
+---
+
+Choose your way to start your AtlasOS Journey!
+
+
+
+- #### :material-cogs: Fresh Install
+
+ ---
+
+ For systems that do not have atlas installed, or matching anything below.
+
+ **Situations:**
+
+ - Atlas version ≤ v0.4.0
+ - Using AtlasOS on Windows 10
+
+ ---
+
+ **[-> Install](/getting-started/install/before-continuing)**
+
+- #### :material-rocket: Update Current Install
+
+ ---
+
+ For systems that currently have Atlas installed.
+
+ **Requirements:**
+
+ - Currently on Atlas v0.4.1
+ - Using AtlasOS on Windows 11 24H2
+
+ ---
+
+ **[-> Upgrade](/getting-started/upgrade/before-continuing)**
+
+
\ No newline at end of file
diff --git a/docs/getting-started/install/before-continuing.md b/docs/getting-started/install/before-continuing.md
new file mode 100644
index 00000000..02de21b7
--- /dev/null
+++ b/docs/getting-started/install/before-continuing.md
@@ -0,0 +1,22 @@
+---
+title: 0. Before Continuing
+description: Verify system requirements and backup your data before installing AtlasOS
+---
+
+Please confirm that you have met all of the following requirements.
+
+- **Backed up all of your current install's data to somewhere safe.**
+ - Cloud Storage (Google Drive, Microsoft Onedrive, Dropbox)
+ - Private Storage (NAS, Portable Storage, USB Drive)
+
+- Meeting the **system requirements for [Windows 11](https://www.microsoft.com/windows/windows-11-specifications#table1)**
+
+- **64-bit CPU** ([you can check what you have](https://support.microsoft.com/en-us/windows/which-version-of-windows-operating-system-am-i-running-628bec99-476a-2c13-5296-9dd081cdd808))
+
+
+
+
+
diff --git a/docs/getting-started/install/download-iso.md b/docs/getting-started/install/download-iso.md
new file mode 100644
index 00000000..298432df
--- /dev/null
+++ b/docs/getting-started/install/download-iso.md
@@ -0,0 +1,86 @@
+---
+title: 1. Download an ISO
+description: Download a Windows ISO and prepare network drivers for AtlasOS installation
+---
+
+
+## :material-disc: **1.1** Download an ISO
+
+
+Before installing Atlas, you need a clean ISO.
+
+
+To fully reinstall Windows, you need to download your desired Windows version's ISO file, which will be used later in the guide.
+
+The buttons below download an ISO directly from Microsoft's servers. It gets the latest version of your desired Windows version for [Intel, AMD, and ARM CPUs](https://www.tenforums.com/tutorials/132836-check-what-processor-cpu-windows-pc.html#option1).
+
+
+
+!!! question "Which version should I choose?"
+ If you are using a **Intel or AMD CPU** with the `x86_64` architecture, Download the x86_64 version.
+
+ If you are using a **Snapdragon SoC** with the `ARM64` architecture, Download the ARM64 version.
+
+??? grey-tip "Alternatives"
+
+ !!! tip
+ Even though the downloader in our docs uses official Microsoft servers, you can still download the ISO directly from their website.
+
+
+ === "Official Microsoft Sources"
+
+ ### [Windows 11 :material-download:](https://www.microsoft.com/en-us/software-download/windows11)
+
+ - Click the link above and find "Download Windows 11 Disk Image (ISO) for x64 devices"
+ - Click on the"Select Download" dropdown, choose **Windows 11 (multi-edition ISO)**, and click **Confirm.**
+ - Select your desired language and press confirm.
+ - Click **64-bit Download** to begin your download.
+
+
+{% include 'msdl.md' %}
+
+
+## :material-ethernet: **1.2** Network Drivers
+
+By default, Windows may not have your computer's network drivers, meaning after reinstalling, your computer could have no internet connection.
+
+For this reason, we **strongly** recommend that you do one of the following:
+
+- Download your network drivers beforehand and store them on external storage
+- Have the ability to download and transfer network drivers from another device later
+
+!!! question "Where do I get my network drivers?"
+ You can find your computer's network drivers online by searching for your device or motherboard's official support page. If you can't find it, try searching online for your network device's name in [Device Manager](../assets/images/device-manager-nic.webp) instead. If multiple of the latest network drivers are available, download them all.
+
+
+## :material-monitor-arrow-down: **1.3** Choose your Install Method
+
+Atlas provides two installation methods, Playbook & ISO Injection.
+
+
+
+- #### :material-book-cog: Playbook
+
+ ---
+
+ Traditional Playbook method, best for average users.
+
+ ---
+
+ **[-> Install with Playbook](/getting-started/install/install-playbook)**
+
+- #### :material-minidisc: ISO Injection
+
+ ---
+
+ New installation method for experienced users.
+
+
+ ---
+
+ **[-> Install with ISO Injection](/getting-started/install/install-iso-injection)**
+
+
\ No newline at end of file
diff --git a/docs/getting-started/install/install-iso-injection.md b/docs/getting-started/install/install-iso-injection.md
new file mode 100644
index 00000000..2420bbc9
--- /dev/null
+++ b/docs/getting-started/install/install-iso-injection.md
@@ -0,0 +1,73 @@
+---
+title: 2b. Install with ISO
+description: Install AtlasOS using the ISO injection method for experienced users
+---
+
+## TBD
+
+=== ":material-usb-flash-drive: USB Drive"
+
+ This method works on Linux and Windows.
+
+ 1. Download the latest release of [Ventoy :material-download:](https://github.com/ventoy/Ventoy/releases/) and extract it wherever you feel comfortable.
+ - Linux users can get it using a package manager
+
+ 1. Inside the Ventoy folder, run **Ventoy2Disk**
+
+ 1. In the opened window, select your USB drive and click **Install**
+ - This will destroy all data on the USB drive!
+
+ 1. Copy your downloaded ISO file into the USB drive (labeled Ventoy)
+
+ 1. Disconnect any cables providing your computer internet, such as an ethernet cable
+ - Do not reconnect to the internet until instructed to
+
+ 1. Restart your computer, boot into your BIOS' boot menu, then select the USB drive
+
+ ??? failure "'Security Violation' Error"
+
+ ??? tip "Video Demonstration"
+
+
+
Credit to [Ventoy](https://ventoy.net/doc_secure.html) for the video demonstration.
+
+
+ { align=right width=200 }
+
+ If you get an error screen saying there was a 'Security Violation,' follow the steps below:
+
+ 1\. Press ++enter++ to load **MokManager**
+
+ 2\. Press any key to begin key management
+
+ 3\. Choose **Enroll Key From Disk**
+
+ - The controls are arrow keys to move and ++enter++ to select
+
+ 4\. Choose `VTOYEFI`
+
+ 5\. Choose `ENROLL_THIS_KEY_IN_MOKMANAGER.cer`
+
+ 6\. Choose **Continue**, then **Yes**, and finally **Reboot**
+
+ 7\. Boot from the USB again, as the issue should be resolved
+
+ ------
+
+ If it is still not working, try 'Hash Enrollment,' as detailed in [Ventoy's guide](https://ventoy.net/doc_secure.html).
+
+ 1. Once booted into the Ventoy menu, select the Windows ISO using the arrow keys, press ++enter++, click **Boot in normal mode**, and press ++enter++ again
+
+ 1. **If you're installing Windows 11,** once booted into the Windows Setup, click 'Next' twice, then click 'Previous version of setup' in the bottom left corner of the window
+
+ 1. Select your preferred language preferences, click **Next**, then click **Install Now**
+
+ 1. If prompted, click **I don't have a product key**, as Windows will activate automatically later (as long as you have previously activated Windows legitimately)
+
+ 1. Choose your Windows edition
+
+
+
+- #### Next: **[-> Setting up Atlas](/getting-started/install/setting-up)**
+
+
\ No newline at end of file
diff --git a/docs/getting-started/installation.md b/docs/getting-started/install/install-playbook.md
similarity index 62%
rename from docs/getting-started/installation.md
rename to docs/getting-started/install/install-playbook.md
index 12cd3646..bb187f3c 100644
--- a/docs/getting-started/installation.md
+++ b/docs/getting-started/install/install-playbook.md
@@ -1,98 +1,9 @@
---
-title: Installation
-description: The official AtlasOS playbook installation guide
-icon: material/cogs
+title: 2a. Install with Playbook
+description: Install AtlasOS using the traditional Playbook method with AME Wizard
---
-# :material-package-down: Installing AtlasOS
-
-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 to see [who Atlas is for](../install-faq/who-is-atlas-for.md).
-
-
-
-
-
-## **0.** :material-clipboard-list-outline: Prerequisites
-
-!!! danger "Atlas requires a full Windows reinstall to uninstall"
- As of the current versions of Atlas, if you ever need to uninstall it, you'll need to [reinstall Windows](reverting-atlas.md).
-
-- Meeting the system requirements for [Windows 11](https://www.microsoft.com/windows/windows-11-specifications#table1) or [Windows 10](https://www.microsoft.com/windows/windows-10-specifications#primaryR2)
- - We don't recommend bypassing Windows 11's requirements due to potential problems with updates and game anti-cheats
-- 64-bit CPU ([you can check what you have](https://support.microsoft.com/en-us/windows/which-version-of-windows-operating-system-am-i-running-628bec99-476a-2c13-5296-9dd081cdd808))
- - If you have an ARM-based CPU, you can only use Atlas with Windows 11
-- Knowledge of general Windows troubleshooting and usage
-
-
-## **1.** :material-disc: Download an ISO
-
-
-Before installing Atlas, you need to reinstall Windows.
-To fully reinstall Windows, you need to download your desired Windows version's ISO file, which will be used later in the guide.
-
-The buttons below download an ISO directly from Microsoft's servers. It gets the latest version of your desired Windows version for [Intel and AMD CPUs](https://www.tenforums.com/tutorials/132836-check-what-processor-cpu-windows-pc.html#option1). ARM ISOs have to be [built manually](https://uupdump.net/fetchupd.php?arch=arm64&ring=retail&build=22631.1).
-
-
-
-!!! question "Which version should I choose?"
- If you meet the official requirements, we **strongly** recommend choosing Windows 11. If not, use Windows 10.
-
-!!! warning "Please download Windows 11 using the button below"
- Downloading Windows 11 from Microsoft's website will get you Windows 11 25H2, which is not yet supported by Atlas.
-
-??? grey-tip "Alternatives (Windows 10 Only)"
-
- !!! tip
- Even though the downloader we use in our docs use Microsoft's servers, you can also download the ISO directly from Microsoft or use the Windows Media Creation Tool.
-
-
- === "Official Microsoft Sources"
-
- ### [Windows 10 :material-download:](https://www.microsoft.com/en-us/software-download/windows10ISO)
-
- - Click the link abvove and select **Windows 10 (multi-edition ISO)** and click **Confirm.**
- - Select your desired language and press confirm.
- - Click **64-bit Download** to begin your download.
-
- === "Windows Media Creation Tool"
-
- 1. Download the [Windows 10 :material-download:](https://go.microsoft.com/fwlink/?LinkId=691209) Media Creation Tool, then open it
- 1. Click the **Accept** button to agree to the Microsoft license terms
- 1. Select **Create installation media (USB flash drive, DVD, or ISO file) for another PC**, click **Next**, and choose:
- - **Language:** Your desired language
- - **Edition:** Windows 10
- - **Architecture (Windows 10 only):** 64-bit (x64)
- 1. Choose the **ISO file** option, then choose the download location
- 1. After the ISO has completed downloading, click **Finish**
-
-
-{% include 'msdl.md' %}
-
-
-## **2.** :material-ethernet: Network Drivers
-
-By default, Windows may not have your computer's network drivers, meaning after reinstalling, your computer could have no internet connection.
-
-For this reason, we **strongly** recommend that you do one of the following:
-
-- Download your network drivers beforehand and store them on external storage
-- Have the ability to download and transfer network drivers from another device later
-
-!!! question "Where do I get my network drivers?"
- You can find your computer's network drivers online by searching for your device or motherboard's official support page. If you can't find it, try searching online for your network device's name in [Device Manager](../assets/images/device-manager-nic.webp) instead. If multiple of the latest network drivers are available, download them all.
-
-
-
-## **3.** :material-microsoft-windows: Reinstalling Windows
+## :material-microsoft-windows: **2a.1** Reinstalling Windows
Before continuing, we **strongly** recommend you back up any valuable data to an external drive or [a cloud service](https://mega.io/).
@@ -239,37 +150,25 @@ Before continuing, we **strongly** recommend you back up any valuable data to an
1. Wait for Windows to install
-### **3.1.** :material-cog: Initial setup (OOBE)
+## :material-cog: **2a.2** Initial setup (OOBE)
You can either watch the video or use the 'Written Instructions' for this section.
-=== "Windows 11"
- ??? info "Written Instructions"
- 1. Once the setup starts, select your language and then your keyboard layout
- 1. Press ++shift+f10++ to open Command Prompt
- 1. Type in `start ms-cxh:localonly`, press ++enter++
- 1. Enter your username, password, and security questions
- - Deny each option in the **Privacy** section and press **Accept**
-
+=== "Video"
-=== "Windows 10"
- ??? info "Written Instructions"
- Go through the setup, but make sure to:
+=== "Written Instructions"
- - Click **I don't have internet** when prompted to connect to the internet
- - Click **Continue with limited setup** or **Domain join** after the 'Internet' page
- - Deny each option in the **Privacy** section
- - Deny Cortana
-
-
-
-
+ 1. Once the setup starts, select your language and then your keyboard layout
+ 2. Press ++shift+f10++ to open Command Prompt
+ 3. Type in `start ms-cxh:localonly`, press ++enter++
+ 4. Enter your username, password, and security questions
+ - Deny each option in the **Privacy** section and press **Accept**
-## **4.** :material-screwdriver: Driver Updates
+## :material-screwdriver: **2a.3** Driver Updates
Drivers are essential software components that enable the OS to communicate with hardware devices. While Windows has fundamental drivers, some devices need external drivers to function correctly.
On Atlas, there are two options for external drivers:
@@ -301,7 +200,7 @@ If you don't know, choose 'Driver Installation & Updates from Windows Update.'
1. Move on to the next section
-## **5.** :material-wrench-cog-outline: Installing AtlasOS
+## :material-wrench-cog-outline: **2a.4** Installing AtlasOS
??? danger "AME Wizard suddenly closing or being deleted?"
Especially when a new version of AME Wizard is released, you might need to add AME Wizard as an exclusion or turn off **Real-time protection** in Windows Security.
@@ -332,7 +231,7 @@ If you don't know, choose 'Driver Installation & Updates from Windows Update.'
1. Follow the on-screen instructions from AME Wizard to install the Atlas Playbook
-### **5.1.** :material-microsoft-windows-classic: Your old Windows installation
+## :material-microsoft-windows-classic: **2a.5** Your old Windows installation
If you previously followed steps that mentioned a `Windows.old` folder, you can find your previous Windows data at the start of your Windows drive in `Windows.old`.
@@ -344,21 +243,9 @@ When you're sure that you've retrieved any valuable data from it, follow these s
1. Select **Previous version of Windows**, and then click **Remove files**
-## **6.** :material-package-variant-closed-plus: Getting your drivers
-
-You've almost finished setting up Atlas!
-
-- **Manual Driver Installation:** If you previously chose this, we recommend seeing [our post-installation driver guide](post-installation/drivers/getting-started.md) to help set up the needed drivers.
-
-- **Driver Installation & Updates from Windows Update:** If you previously chose this, get drivers by manually checking for Windows Updates. To get them automatically, enable [automatic Windows Updates](../getting-started/post-installation/atlas-folder/general-configuration.md#automatic-updates).
-
-## **7.** :material-flag-checkered: All done!
-If you need any help, you can find links below to a large community of individuals who are dedicated to helping others, as well as a few other areas of the documentation.
+
-We hope you enjoy using AtlasOS! :smile:
+- #### Next: **[-> Setting up Atlas](/getting-started/install/setting-up)**
-- [:material-download: Install your Drivers](post-installation/drivers/getting-started.md)
-- [:material-cog: Configure your Atlas installation](post-installation/atlas-folder/general-configuration.md)
-- [:simple-discord: Discord server](https://discord.atlasos.net) & [:material-github: GitHub Discussions](https://github.com/Atlas-OS/Atlas/discussions)
-- [:material-chat-question: FAQ & Troubleshooting](../install-faq/removed-features.md)
+
diff --git a/docs/getting-started/install/setting-up.md b/docs/getting-started/install/setting-up.md
new file mode 100644
index 00000000..b886dcc2
--- /dev/null
+++ b/docs/getting-started/install/setting-up.md
@@ -0,0 +1,23 @@
+---
+title: 3. Setting Up Atlas
+description: Complete your AtlasOS setup by installing drivers and configuring your system
+---
+
+## :material-package-variant-closed-plus: **3.1** Getting your drivers
+
+You've almost finished setting up Atlas!
+
+- **Manual Driver Installation:** If you previously chose this, we recommend seeing [our post-installation driver guide](post-installation/drivers/getting-started.md) to help set up the needed drivers.
+
+- **Driver Installation & Updates from Windows Update:** If you previously chose this, get drivers by manually checking for Windows Updates. To get them automatically, enable [automatic Windows Updates](../getting-started/post-installation/atlas-folder/general-configuration.md#automatic-updates).
+
+## :material-flag-checkered: All done!
+
+If you need any help, you can find links below to a large community of individuals who are dedicated to helping others, as well as a few other areas of the documentation.
+
+We hope you enjoy using AtlasOS! :smile:
+
+- [:material-download: Install your Drivers](post-installation/drivers/getting-started.md)
+- [:material-cog: Configure your Atlas installation](post-installation/atlas-folder/general-configuration.md)
+- [:simple-discord: Discord server](https://discord.atlasos.net) & [:material-github: GitHub Discussions](https://github.com/Atlas-OS/Atlas/discussions)
+- [:material-chat-question: FAQ & Troubleshooting](../install-faq/removed-features.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
deleted file mode 100644
index 99aaa637..00000000
--- a/docs/getting-started/post-installation/atlas-folder/advanced-configuration.md
+++ /dev/null
@@ -1,78 +0,0 @@
----
-description: An overview of all advanced configuration options installed by the AtlasOS playbook
-icon: material/sign-caution
----
-
-# :material-sign-caution: Advanced Configuration
-
-!!! danger "User risk"
- If you are not confident in your technical ability, it is recommended that you avoid this section.
-
- 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](../../../general-faq/atlas-folder-missing.md) if you can't find it.
-
-## :material-desktop-tower: Boot Configuration
-
-Here, you can change the boot configuration for Windows for quality of life and troubleshooting.
-
-See the `View Current Values.cmd` script for your boot configuration.
-
-## :material-hammer-screwdriver: Driver Configuration
-
-This folder contains links to tools to set driver affinities manually. Affinities allow you to specify which core a driver or process runs on. You can manually alter this for a *potential* performance gain, as Windows defaults most drivers on CPU core 0. Allocating drivers to their separate cores should theoretically help reduce interrupts on core 0.
-
-Additionally, this folder has a link to [MSI Utility V3](https://forums.guru3d.com/threads/windows-line-based-vs-message-signaled-based-interrupts-msi-tool.378044/) to configure Message Signal-based Interrupts for devices.
-
-## :material-list-box: Process Explorer
-
-Process Explorer is an application part of the [Microsoft Sysinternals](https://learn.microsoft.com/en-us/sysinternals/) suite of utilities. It can be best described as an advanced version of the Task Manager. [Microsoft's documentation](https://learn.microsoft.com/en-us/sysinternals/downloads/process-explorer) for Process Explorer gives more information about its capabilities.
-
-This folder has scripts that can automate the installation and uninstallation of this utility.
-
-## :material-cog: Services
-
-!!! danger "Disabling services"
- It's highly unlikely that you'll get any performance gains out of disabling these services, and disabling some might break seemingly unrelated functionality.
-
- **Only proceed if you're okay with this.**
-
-### Bluetooth
-
-These scripts toggle Bluetooth support. Remember that you may need to install drivers for Bluetooth to work. [View our guide here](../../../general-faq/bluetooth-compatibility.md).
-
-### Lanman Workstation (SMB)
-
-Lanman Workstation (SMB) is a service required for features such as file sharing, but it is also necessary for many pieces of software to function, such as AMD Ryzen Master.
-
-To disable it, run the `Disable Lanman Workstation.cmd` script, but **remember the bad compatibility**.
-
-### Network Discovery
-
-Network discovery is a built-in feature in Windows that discovers other computers on your network.
-On Atlas, we keep its services enabled by default as we have determined they are not resource-intensive. If you want to disable them, run the `Disable Network Discovery Services.cmd` script and restart.
-
-### NVIDIA Display Container
-
-!!! warning "Disabling will break features"
- Disabling the NVIDIA Display Container will break the NVIDIA Control Panel and any other NVIDIA features until it is re-enabled.
- These scripts are aimed at users that have a stripped driver, and people that barely touch the NVIDIA Control Panel.
-
-These scripts allow you to toggle the 'NVIDIA Display Container LS' service, as it has some network activity and uses a tiny bit of CPU usage.
-
-### Printing
-
-!!! warning "Acrobat Support"
- Disabling printing services is known to break installing Adobe Acrobat.
-
-These scripts toggle printing support. Remember that you'll likely need to install drivers for printing to work.
-
-### Superfetch
-
-These scripts toggle the Superfetch service, which has a primary purpose of improving system responsiveness and application launch times by preloading frequently used programs and files into RAM.
-
-Some users argue that Superfetch causes high CPU usage for them, or that it's unnecessary on fast SSDs. For this reason, you can disable the service by running `Disable SuperFetch.cmd`.
-
-## :material-network: Static IP
-
-In this folder, you can use the `Automatically Set Static IP.cmd` script to automatically configure your network locally with a static IP, which can be helpful if your computer serves as a local server.
diff --git a/docs/getting-started/post-installation/atlas-folder/general-configuration.md b/docs/getting-started/post-installation/atlas-folder/general-configuration.md
deleted file mode 100644
index 4796b792..00000000
--- a/docs/getting-started/post-installation/atlas-folder/general-configuration.md
+++ /dev/null
@@ -1,182 +0,0 @@
----
-description: An overview of all general configuration options installed by the AtlasOS playbook
-icon: material/cog
----
-
-# :material-cog: General Configuration
-
-This page will present a comprehensive list of the general configuration options in the Atlas folder. It is important to note that you should only modify these configuration settings if you understand what you are doing or if a team member requests you to do so.
-
-For more configuration options, check:
-
-- [Interface Tweaks ->](interface-tweaks.md)
-- [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](../../../general-faq/atlas-folder-missing.md) if you can't find it.
-
-
-## :material-update: Automatic Updates
-
-Automatic Windows Updates automatically download and install security and other updates to your computer.
-
-On Atlas, they are disabled by default, as [update notifications](#update-notifications) should notify users of critical updates without interrupting their work. However, this is fundamentally a decrease in security for convenience, and it is an overall personal preference. If you keep them disabled, remember to install updates occasionally for security.
-
-Run the `Enable Automatic Updates.reg` file to enable automatic updates.
-
-## :material-application: Background Apps
-
-By default, Atlas disables background apps in Windows. However, you may need to enable this for games like Sea of Thieves or specific apps with background notifications. To enable background apps, run `Enable Background Apps.reg` and restart.
-
-## :material-run-fast: CPU Idle
-
-!!! danger "Read first"
- Disabling CPU idle on systems where [hyper-threading](https://www.intel.com/content/www/us/en/gaming/resources/hyper-threading.html) or [SMT](https://www.wepc.com/cpu/faq/what-does-smt-mean-what-is-smt-multithreading-explained/) is enabled will cause a major drop in performance. You can't use the script below if Atlas detects that either is enabled.
-
- Remember that disabling idle will likely cause more power usage and increased temperatures.
- Therefore, it is not recommended to disable idle if you leave your PC running for extended durations, have inadequate cooling, uncontrolled voltages or a laptop.
-
-Disabling idle should theoretically increase performance as it forces the CPU to operate at [C-State 0](https://learn.microsoft.com/en-us/previous-versions/windows/desktop/xperf/p-states-and-c-states), which prevents the CPU clocks from constantly fluctuating and eliminates the latency penalty introduced from restoring and transitioning to a higher C-State.
-
-You can use the `Disable Idle.cmd` script to disable idle, or the `Enable Idle (default).cmd` to enable it. Additionally, you can add a toggle to disable idle on the desktop by running the `Add Idle Toggle in Desktop Context Menu.reg` file.
-
-## :material-laptop: Delivery Optimization
-
-Delivery Optimization helps speed up Windows Updates by sharing the data via other Windows machines on your local network. We've disabled this to reduce background network usage. If you wish to enable this, run the `Enable Delivery Optimization.reg` file.
-
-## :material-share: File Sharing
-
-File sharing allows sending files across your local network to other Windows devices, and it's a part of network discovery.
-
-File sharing is disabled by default on Windows. However, you can only use it on Atlas by running the `Enable File Sharing.cmd` script.
-
-#### Network Navigation Pane
-
-The network navigation pane is in the File Explorer sidebar labeled 'Network,' allowing you to view other devices on your local network.
-
-Atlas disables the network navigation pane by default, but if you want to see the network pane, run the `User Network Navigation Pane choice.reg` file, restart your computer, right-click the File Explorer sidebar, and check the box to enable it.
-
-## :material-gamepad: FSO and Game Bar
-
-!!! note "This doesn't fully disable Game Bar"
- The script included in Atlas to disable Game Bar only turns off support for Game Bar, meaning that games might not use a display mode that supports Game Bar, and it might run in the background less, if at all. However, Game Bar will still be accessible with ++win+g++.
-
- There's no known method to fully disable Game Bar except for uninstalling it, which isn't officially supported and is known to cause issues.
-
-!!! warning "Performance issues"
- Disabling support for Game Bar on modern AMD CPUs could cause [performance problems](https://www.neowin.net/news/microsofts-xbox-game-bar-boosts-windows-11-and-10-gaming-performance-on-amd-ryzen-7950x3d/).
-
-Game Bar is a built-in feature in Windows that can record your screen, take screenshots, show performance information, and more. It relies on [Fullscreen Optimizations](https://devblogs.microsoft.com/directx/demystifying-full-screen-optimizations/), which is shortened to FSO.
-
-Atlas enables both Game Bar and FSO support by default. However, if you want to use [Fullscreen Exclusive](https://wiki.special-k.info/en/SwapChain) instead, run `Disable FSO & Game Bar Support.reg`, which should allow you to use Fullscreen Exclusive in supported games. Remember that specific games might still require the **Disable full-screen optimizations** compatibility option.
-
-## :material-harddisk: Hibernation
-
-Hibernate essentially puts your computer to sleep, but instead of saving your running applications to your RAM, it saves them to your drive. This allows your computer to turn off entirely, meaning hibernation mode uses no power. Once the computer is powered back on, it will resume everything you left off.
-
-Hibernation is disabled by default due to excess storage used for a hibernation file, but you can enable it by running the `Enable Hibernation.cmd` script.
-
-## :material-compass: Location
-
-Microsoft's location service enables Windows devices to pinpoint their exact geographic location, allowing apps to provide location-based features such as navigation.
-
-Atlas disables location by default due to it often not being needed, but you can enable it by running the `Enable Location.cmd` script.
-
-## :material-robot-happy: AI Features
-
-### Microsoft Copilot
-
-!!! tip "Microsoft Edge"
- This feature requires Microsoft Edge, so the script will prompt you to re-install it if Edge is not installed.
-
-[Copilot](https://en.wikipedia.org/wiki/Microsoft_Copilot) is an AI chatbot by Microsoft integrated into the latest Windows 10 and 11 versions, with an icon in the taskbar to open its sidebar where you can interact with it.
-
-By default, Atlas disables Copilot as it is seen as an annoyance to most users and raises privacy concerns for some users. To enable it again, run the `Enable Microsoft Copilot.cmd` script.
-
-### Recall
-
-!!! info "Windows 11-only"
-
-Recall uses AI to automatically take screenshots of the content you view, so that you can easily search or use a timeline to see exactly what you were doing later.
-
-By default, Atlas disables Recall as it is a privacy concern. To re-enable it for supported devices, run the `Enable Recall Support.reg` script.
-
-## :material-phone: Mobile Devices (Phone Link)
-
-'Mobile devices' refers to the Settings page where you can link your phone to Windows in various ways, such as using the 'Phone Link' app or the new 'Manage mobile devices' app in Windows 11.
-
-By default, Atlas disables this Settings page as it conflicts with some policies. Run the `Enable Mobile Device Settings.cmd` script to enable it again.
-
-## :material-tree: Power-saving
-
-This folder's scripts control multiple power-saving aspects, such as the power scheme and device power saving. Disabling power-saving increases power consumption and idle temperatures but can improve responsiveness and performance.
-
-Although the initial setup prompts if you want to disable power-saving, you can toggle it afterward. Run `Default Power-saving.cmd` or `Disable Power-saving.cmd` script and restart your computer.
-
-## :material-card-search: Search Indexing
-
-Search indexing is a built-in feature in Windows that indexes the contents of your computer. Indexing the contents of your PC helps you get faster results when you're searching it for files and other things.
-
-On Atlas, we have made indexing not search in your files to make the system more lightweight by default, as indexing can be a resource-intensive process. However, if you want to enable all indexing, run the `Enable Search Indexing.cmd` script and restart your computer.
-
-## :material-power-sleep: Sleep
-
-Sleep mode is a feature that puts your device into a state that keeps your work in memory while using very little power, so you can easily and quickly resume what you were doing later.
-
-Atlas enables sleep mode by default. However, some users might want to disable it to use hibernation only, or for other purposes. You can disable sleep by running the `Disable Sleep.cmd` script.
-
-## :material-sleep: Sleep Study
-
-[SleepStudy](https://learn.microsoft.com/en-us/windows-hardware/design/device-experiences/modern-standby-sleepstudy) is a feature in Windows that allows users to diagnose modern standby. By default, Atlas disables SleepStudy's components to reduce any potential overhead it could bring. However, tracking laptop battery levels while sleeping may need these components, so Atlas includes the `Enable Sleep Study.cmd` script to re-enable it.
-
-## :material-store: Store App Archiving
-
-App archiving automatically removes unused apps from your device, preserving their data and settings for easy reinstallation when needed again.
-
-Atlas disables this by default so that you can always use your apps. However, you can enable app archiving again by running `Enable Store App Archiving.reg`.
-
-## :material-restore: System Restore
-
-System Restore is a final resort when taking snapshots of your machine. It backs up certain Windows and application settings that can be restored later.
-
-By default, Atlas leaves System Restore enabled. However, you might want to disable it as it is sometimes ineffective and can cause problems.
-You can disable it by running `Disable System Restore.reg` in the `System Restore` folder, followed by a system restart.
-
-## :material-timer: Timer Resolution
-
-!!! info "Windows 11-only"
-
-Atlas includes a script that uses [@valleyofdoom's TimerResolution utility](https://github.com/valleyofdoom/TimerResolution) to increase the precision of Windows' timer, which benefits applications requiring consistent pacing or [sleeping](https://en.wikipedia.org/wiki/Sleep_(system_call)), such as framerate limiters in some games.
-
-However, this is at the cost of increased power consumption and is not always beneficial for all applications, so we recommend you do testing.
-
-Run the `Enable timer resolution.cmd` script to enable this high precision, and use the `! MeasureSleep.exe` utility to track it. See [@valleyofdoom's TimerResolution repository](https://github.com/valleyofdoom/TimerResolution#timerresolution) for more information.
-
-## :material-bell: Update Notifications
-
-Windows Update typically shows update notifications to alert a user of when an update is going to be installed, or if automatic updates are disabled, to manually click 'Check for updates' to update the system.
-
-On Atlas, they are enabled by default so that users with [notifications](#notifications) enabled get alerts about important updates.
-
-## :material-search-web: Web Search (includes Search Highlights)
-
-Web search refers to Windows' online functionality related to the search in the start menu or search icon on the taskbar, such as Bing search results.
-
-Search highlights are a part of this in the form of an icon on the search box that allows you to see the current topic of the day.
-
-By default, Atlas disables web search as it makes Windows Search feel slower and has potential privacy issues for some users. You can enable web search again by running the `Enable Web Search.cmd` script.
-
-## :material-widgets: Widgets (News and Interests)
-
-!!! tip "Microsoft Edge"
- This feature requires Microsoft Edge, so the script will prompt you to re-install it if Edge is not installed.
-
-[Widgets](https://support.microsoft.com/en-us/windows/stay-up-to-date-with-widgets-7ba79aaa-dac6-4687-b460-ad16a06be6e4), known as [News and Interests](https://support.microsoft.com/en-gb/windows/stay-up-to-date-with-news-and-interests-a39baa08-7488-4169-9ed8-577238f46f8f) on Windows 10, are additions to the taskbar that have cards that include information such as the news and the weather.
-
-By default, Atlas disables Widgets or News and Interests because it is seen as an annoyance to many users and a potential privacy concern to some users. You can enable Widgets or News and Interests again by running the `Enable Widgets.cmd` script.
-
-## :material-pine-tree: Windows Spotlight
-
-Windows Spotlight is a feature included with Windows 10 and 11, which downloads images and advertisements from Bing and displays them as background wallpapers on the lock screen or desktop.
-
-By default, Atlas disables it as Atlas has its theme, and the feature raises privacy concerns for some users. To enable it, run the `Windows Spotlight.reg` file and restart your computer.
diff --git a/docs/getting-started/post-installation/atlas-folder/interface-tweaks.md b/docs/getting-started/post-installation/atlas-folder/interface-tweaks.md
deleted file mode 100644
index 9afaff78..00000000
--- a/docs/getting-started/post-installation/atlas-folder/interface-tweaks.md
+++ /dev/null
@@ -1,179 +0,0 @@
----
-description: An overview of all the optional tweak scripts installed by the AtlasOS playbook
-icon: material/hammer
----
-
-# :material-hammer: Interface Tweaks
-
-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](../../../general-faq/atlas-folder-missing.md) if you can't find it.
-
-!!! tip "Applying changes"
- You might need to run the `Restart Explorer.cmd` file after changing your settings to apply them.
-
-## :material-keyboard-tab: Alt-Tab
-
-!!! info "Windows 10-only"
-
-The Alt-Tab folder lets you choose whether to use the modern Alt-Tab menu or the legacy one. The modern one is the default Windows Alt-Tab menu, while the legacy one is used in Windows 7 and below.
-
-By default, Atlas keeps the modern Alt-Tab menu, but if you wish to use the legacy menu, run the `Legacy Alt-Tab.reg` file.
-
-## :material-menu-open: Context Menus
-
-### Extract in the Context Menu
-
-By default, Atlas hides the extract option in the context menu and replaces it with [NanaZip](https://github.com/M2Team/NanaZip).
-
-To add back the extract option in the context menu, run `Add Extract.reg`, go up a directory and run `Restart Explorer.cmd`.
-
-### Run With Priority in the Context Menu
-
-Process priorities are a feature in Windows that tells Windows how to allocate resources to an application.
-
-You can run an application with a custom-defined priority using the context menu by running the `Add Run With Priority In Context Menu.reg` file.
-
-### Send To Context Menu
-
-With the `Debloat Send To Context Menu.cmd` script, you can toggle the default items in the "Send To" context menu.
-
-### Terminals Context Menu
-
-??? danger "SYSTEM User Permissions"
- Please be advised that the SYSTEM user privilege grants complete access to your system, and any unintended actions resulting from its use may damage core operating system components. This privilege should only be used by those aware of its potential consequences.
-
-With the `Add Terminals.reg` file, you can add a context menu with varying privileges to launch various shells to the context menu. By default, this includes Windows Terminal, PowerShell, and Command Prompt, which you can each launch as a standard user, administrator, or SYSTEM user.
-
-You can alternatively use `Add Terminals (no Windows Terminal).reg` to have the 'Terminals' context menu not have Windows Terminal.
-
-### Windows 11 Context Menu
-
-!!! info "Windows 11-only"
-
-By default, Atlas restores the legacy context menu on Windows 11, which has more options and is more responsive. You can run the `New Context Menu.reg` file if you prefer the modern context menu.
-
-## :material-gesture-swipe-down: Edge Swipe
-
-Edge swipe is anything that has to do with gestures on the edges of the screen, e.g., on touchscreens, swiping right or left to open Widgets or the Notification Center.
-
-However, it also consists of a title bar that shows when you put your mouse cursor to the top of the screen in some fullscreen games. Some users are inconvenienced by this. For this reason, you can disable edge swipe on Atlas by running `Disallow Edge Swipe.reg` and restarting Explorer.
-
-## :material-folder-cog: File Explorer Customization
-
-### App Icons on Thumbnails
-
-By default, Atlas displays the default app for certain files in the corner of the thumbnail. A common example would be a video thumbnail showing the associated media player in the bottom right.
-
-To disable this, run `Disable App Icons on Thumbnails.reg`, go up a directory and use the 'Restart Explorer' shortcut.
-
-### Automatic Folder Discovery
-
-On default Windows, File Explorer determines the type of folder based on its content and applies a respective template. For example, a folder containing primarily videos will get the "Icons" view type.
-
-On Atlas, it is disabled by default due to responsiveness issues experienced by some users when navigating through File Explorer. You can re-enable this feature by running `Enable Automatic Folder Discovery.reg`, going up a directory and running `Restart Explorer.cmd`.
-
-### Compact View
-
-!!! info "Windows 11-only"
-
-When Windows 11 refreshed the File Explorer, Microsoft introduced larger padding to the interface. This change can be reverted by using File Explorer's compact view mode.
-
-By default, Atlas enables compact mode. You can disable it by going into File Explorer and navigating to **View** -> **Show** -> **Compact View** at the top, or by running the `Disable Compact View.reg` file.
-
-### Folders in This PC
-
-!!! info "Windows 10-only"
-
-You can change the folders shown by default in File Explorer's "This PC" section. By default, Atlas removes all of the folders in favor of Quick Access. If you wish to restore the folders, run the `Restore all folders in This PC.reg` file.
-
-### Gallery
-
-!!! info "Windows 11-only"
-
-In Windows 11, the Gallery is a pane in the File Explorer sidebar to make it easy to access your photos. By default, Atlas disables it, but if you wish to restore it, run the `Enable Gallery.reg` file.
-
-### Quick Access
-
-!!! info "Windows 10-only"
-
-In File Explorer, a section in the File Explorer sidebar called "Quick Access" shows you your pinned folders. By default, Atlas keeps Quick Access enabled, but you can run the `Remove Quick Access.reg` to remove it from File Explorer.
-
-### Removable Drives in Sidebar
-
-By default, Windows shows removable drivers in the File Explorer sidebar, such as USB sticks. As you can use "This PC" in the sidebar to view your drives instead, Atlas disables this by default to reduce clutter.
-
-To enable it, run the `Enable Removable Drives in Sidebar.reg` file.
-
-## :material-lock: Lock Screen
-
-The lock screen in Windows shows the date and time and, optionally, other add-ons.
-
-By default, Atlas has the lock screen enabled. If you want to disable the lock screen, run the `Hide Lock Screen.reg` file.
-
-## :material-microsoft-windows-classic: Old Flyouts
-
-!!! info "Windows 10-only"
-
-### Battery Flyout
-
-Reverts to the old [Windows 7 battery flyout](https://www.tenforums.com/tutorials/15754-use-old-new-battery-flyout-power-indicator-windows-10-a.html), which might pop-up faster on older systems.
-
-### Date and Time Flyout
-
-Reverts to the old [Windows 7 Date and Time flyout](https://winaero.com/get-the-old-windows-7-like-calendar-and-date-pane-in-windows-10/), which might pop-up faster on older systems.
-
-### Volume Flyout
-
-Reverts to the old [Windows 7 volume flyout](https://winaero.com/enable-old-volume-control-in-windows-10/), which might pop-up faster on older systems.
-
-## :material-file-link: Shortcut Icon
-
-Shortcuts created in Windows have an icon indicating that they're shortcuts by default.
-
-You can customize this icon on Atlas by disabling it or setting it to the legacy but smaller classic icon. Run either the `Classic.reg` file or the `None (security risk).reg` file.
-
-**None is a security risk** because there's no way to see whether an icon is a shortcut or not. As an example, you could double-click something with a folder icon, thinking it's a folder, but it could be a shortcut to run a malicious command.
-
-## :material-link-edit: Shortcut Text
-
-By default, Windows appends `- Shortcut` to the end of new shortcut names. By default, Altas disables this. You can tell something is a shortcut by looking at the icon anyway.
-
-You can restore the default `- Shortcut` text using the `Restore Shortcut Text.reg` file.
-
-## :material-link-edit: Snap Layouts
-
-!!! info "Windows 11-only"
-
-Windows 11 offers Snap Layouts, a feature that enables you to choose from presets how to arrange the current window on your screen.
-
-By default, Atlas keeps them enabled. However, some users might find them annoying, so you can disable them by running `Disable Snap Layouts.reg`.
-
-## :material-microsoft-windows: Start Menu
-
-!!! info "AMD and Intel CPUs only"
- Open-Shell is incompatible with ARM64-based CPUs, so the script and preset linked below won't exist for Atlas installations on ARM.
-
-The Start Menu folder primarily contains the `Install Open-Shell.cmd` script that automatically installs [Open-Shell](https://open-shell.github.io/Open-Shell-Menu/), the [Fluent-Metro skin](https://github.com/bonzibudd/Fluent-Metro), and the Atlas Open-Shell Preset that configures it.
-
-Additionally, there are some extra links to other start menu customization programs. You can uninstall these programs later to revert to the regular Windows start menu.
-
-## :material-file-document-multiple: Unlock Recent Items
-
-In this case, recent items refer to the multiple features in Windows that track recently opened documents, application usage, and more.
-
-By default, Atlas disables recent items using policies, meaning you can't change the settings. However, by running `Unlock Recent Items.cmd`, you can unlock recent item settings and re-enable whichever you'd like.
-
-## :material-message-text: Verbose Status Messages
-
-Here you can enable verbose startup, shutdown, logon, and logoff status messages so you can have more insight into exactly what's happening in each process.
-
-Atlas keeps them disabled by default to prevent confusion, but you can enable them by running `Enable Verbose Messages.reg`.
-
-## :material-animation: Visual Effects (Animations)
-
-Windows enables various visual effects by default. These include animated menus, icons, and animations while minimizing and maximizing windows.
-
-These can significantly enhance the appearance of Windows but can reduce overall responsiveness and the feeling of 'snappiness.'
-
-For this reason, Atlas disables visual effects by default. Run the `Default Windows Visual Effects.cmd` file to restore Windows' default visual effects.
diff --git a/docs/getting-started/post-installation/atlas-folder/security.md b/docs/getting-started/post-installation/atlas-folder/security.md
deleted file mode 100644
index 2246cc3d..00000000
--- a/docs/getting-started/post-installation/atlas-folder/security.md
+++ /dev/null
@@ -1,79 +0,0 @@
----
-title: Security
-description: All the configurable security options in AtlasOS
-icon: material/security
----
-
-# :material-security: Security
-
-!!! danger "User risk"
- Disabling security features is at **your own risk**, and you should only disable any security features if:
-
- - You know what it does
- - You know how to keep yourself safe without it
-
- **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](../../../general-faq/atlas-folder-missing.md) if you can't find it.
-
-## :material-shield-bug-outline: Core Isolation (VBS)
-
-=== "Information"
-
-
- !!! tip "Missing the page?"
- If you can't find the core isolation page in Windows Security, you may need to enable virtualization in your BIOS/UEFI settings.
-
- [Core isolation](https://support.microsoft.com/en-us/windows/core-isolation-e30ed737-17d8-42f3-a2a9-87521df09b78) is a security feature of Windows that protects essential core processes of Windows from malicious software by isolating them in memory. It mostly does this by running those core processes in a virtualized environment.
-
- For Windows 11 users on supported hardware, core isolation features are enabled by default. Although effective, it comes at a **significant performance cost**. We generally recommend disabling core isolation features as the [performance hit](https://www.tomshardware.com/news/windows-11-gaming-benchmarks-performance-vbs-hvci-security) outweighs the security benefits for many users. However, remember that core isolation might not affect some applications and games more than others.
-
- This folder contains the `Current Configuration.cmd` script to check which core isolation features are available, enabled, and configured, along with a shortcut to the Windows Security app core isolation page. Additionally, Atlas's initial configuration in AME Wizard has a prompt for turning off core isolation features.
-
-=== "Core Isolation Features"
-
- Please note that not all features may be available due to available hardware security features or your Windows edition and version. Windows 11 should generally have more Core isolation features.
-
- - **Memory integrity**
- Also known as HVCI or 'Hypervisor-protected Code Integrity,' it acts as a 'security guard' between the core components of Windows.
- - **Credential Guard**
- Protects `lsass.exe` by preventing attackers from stealing/dumping credentials, as it contains many authentication tokens used by Windows.
- - **Microsoft Vulnerable Driver Blocklist**
- A blocklist to block drivers with known security vulnerabilities, as drivers have unrestricted access to a system.
- - **Firmware protection**
- Protects against a compromised UEFI/BIOS, which can backdoor or control the operating system.
- - **Memory access protection**
- Also known as 'Kernel DMA protection,' which prevents attacks that can occur when a malicious PCI device is plugged in, such as through a Thunderbolt port.
- - **Kernel-mode Hardware-enforced Stack Protection**
- Protects against [Return-Oriented Programming (ROP)](https://en.wikipedia.org/wiki/Return-oriented_programming) attacks towards the core components of Windows.
-
-
-## :octicons-shield-check-16: Defender
-
-!!! tip "Using another anti-virus?"
- If you use another anti-virus, disabling Defender isn't needed, as Windows will automatically deactivate it.
-
-For many Windows users, Windows Defender is a **key component** that protects against many threats from the internet, such as ransomware and spyware.
-
-Some users may want to risk using no protection for improved privacy and responsiveness, especially on older hardware, i.e., hard drives.
-For this reason, we have given the option to toggle Defender at a component level. You can do this by using the `Toggle Defender.cmd` script.
-This folder also has tweaks related to Defender or Windows Security.
-
-Remember that disabling Defender puts you at a **much higher risk** of infection, and Atlas does not recommend it.
-
-## :material-cpu-64-bit: Mitigations
-
-In Atlas' context, mitigations refer to software or hardware techniques implemented to address security vulnerabilities in a CPU. These mitigations help prevent software (e.g., vulnerable games) from being exploited to execute code on the system remotely.
-
-On Atlas, as well as having a prompt in AME Wizard, you can use the `Disable All Mitigations.cmd` script to turn mitigations on or off within Windows, as some older CPUs have significantly worsened performance due to mitigations. However, modern CPUs are unlikely to see a performance gain, and some CPUs can even be negatively impacted (like [Zen 4 CPUs](https://www.phoronix.com/news/AMD-Zen-4-Mitigations-Off)) if you turn off mitigations.
-
-To restore default mitigations, run the `Set Windows Default Mitigations.cmd` script. Alternatively, if you want the maximum security, you can use `Enable All Mitigations.cmd`, but that forces all mitigations to be enabled, which can reduce performance significantly and reduces compatibility.
-
-### Fault Tolerant Heap
-
-!!! info "AMD and Intel CPUs only"
- This tweak does not exist on ARM64-based CPUs.
-
-[Fault Tolerant Heap](https://learn.microsoft.com/en-us/windows/win32/win7appqual/fault-tolerant-heap "Microsoft FTH documentation") is a feature (unrelated to security) that applies software mitigations to repeatedly crashing processes at the cost of significantly reduced performance. Atlas disables this by default.
-
-If you are having consistent application crashes, try enabling FTH.
diff --git a/docs/getting-started/post-installation/atlas-folder/troubleshooting.md b/docs/getting-started/post-installation/atlas-folder/troubleshooting.md
deleted file mode 100644
index 2e0e9948..00000000
--- a/docs/getting-started/post-installation/atlas-folder/troubleshooting.md
+++ /dev/null
@@ -1,63 +0,0 @@
----
-description: All troubleshooting scripts bundled in the AtlasOS playbook
-icon: material/auto-fix
----
-
-# :material-auto-fix: Troubleshooting
-
-Atlas includes scripts for troubleshooting and resolving specific problems with your installation.
-
-Each section here corresponds to a sub-folder in the `8. Troubleshooting` 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-network-outline: Network
-
-Here, you can either:
-
-- Re-apply Atlas' network tweaks
-- Reset networking back to the Windows defaults
-
-Atlas applies a small number of network tweaks by default to potentially improve latency on your network card. These scripts can help you ensure that the Atlas modifications aren't causing an issue and re-applying them in case you decide it's not the issue.
-
-## :material-shield-lock-outline: Safe Mode
-
-Safe mode starts Windows with only the necessities, such as fewer services, drivers, and no startup apps. If a problem does not occur in safe mode, the default settings or primary device drivers do not cause the problem.
-
-Safe mode is not meant to be used constantly. It's only for doing tasks like:
-
-- Narrowing down problems when troubleshooting
-- Uninstalling and fixing drivers
-- Getting rid of viruses
-
-### Safe Mode
-
-Safe Mode starts your computer in the default safe mode, which only has the drivers and files Windows needs to run. You will not be able to connect to the internet in this state.
-
-### Safe Mode with Command Prompt
-
-The Command Prompt (CMD) is available in all safe mode states, but "Safe Mode with Command Prompt" only gives you the Command Prompt. You will not have a user interface to help you navigate your system. Instead, you will have an admin-level command prompt.
-
-### Safe Mode with Networking
-
-Safe Mode with Networking functions similarly to safe mode without networking, but it also adds networking with network drivers and services you need to connect to the internet.
-
-## :material-application-brackets: Fix Errors 2502 and 2503
-
-When installing some apps, some users may experience errors 2502 and 2503. These errors are related to the `C:\Windows\Temp` folder permissions being incorrect, often mistakenly done by tweak tools.
-
-This script resets those permissions to the Windows defaults, fixing the issue.
-
-## :material-update: Repair Windows Components
-
-This script will repair and replace any corrupt Windows components and system files. For general issues, this might be an easy fix. Note that no components of Atlas are reverted by using this script.
-
-## :material-cog-outline: Set Services to Defaults
-
-This script goes through the [`8. Advanced Configuration\Services`](advanced-configuration.md#services) folder and sets the Atlas defaults for everything. Additionally, you have the option to restore a service backup.
-
-## :material-folder-information: Telemetry Components
-
-This script adds or removes Atlas' NoTelemetry package, which eliminates specific telemetry components in Windows.
-
-Removing the package restores the telemetry components, which can aid in troubleshooting. If resolving the issue involves removing the package, please report this as an issue on our [GitHub Issues](https://github.com/Atlas-OS/Atlas/issues).
-
-Atlas retains policies that should turn off telemetry even after the package removal. However, most of these policies do not work on Windows Home edition.
\ No newline at end of file
diff --git a/docs/getting-started/post-installation/atlas-folder/windows-settings.md b/docs/getting-started/post-installation/atlas-folder/windows-settings.md
deleted file mode 100644
index 6a67e13e..00000000
--- a/docs/getting-started/post-installation/atlas-folder/windows-settings.md
+++ /dev/null
@@ -1,53 +0,0 @@
----
-description: An overview of the Windows setting shortcuts installed by the AtlasOS playbook
-icon: material/microsoft-windows
----
-
-# :material-microsoft-windows: Windows Settings
-
-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](../../../general-faq/atlas-folder-missing.md) if you can't find it.
-
-## :material-lock-open-outline: Activation
-
-!!! note "Atlas does not modify Windows activation"
- Atlas is **not** a pre-activated (pirated) version of Windows.
-
-This shortcut will take you to the Windows Settings 'Activation' page. Before you can change some of the other settings, you will need to activate Windows.
-
-## :material-palette-swatch-outline: Colors
-
-This shortcut will take you to the Windows Settings 'Colors' page. Here, you can change the accent color and other related options for your Atlas installation.
-
-## :material-clock-outline: Date & Time
-
-This shortcut will take you to the Windows Settings 'Date & Time' page. On this page, you can change and correct how your Atlas installation shows the time and date.
-
-## :material-apps: Default Apps
-
-This shortcut will take you to the Windows Settings 'Default Apps' page. Here, you can change the default apps for specific file types. For instance, you can change the default browser.
-
-## :material-clock-fast: Default Graphics Settings (HAGS)
-
-This shortcut will take you to the Windows Settings 'Default Graphics Settings' page. Here, you can select options such as [Hardware Accelerated GPU Scheduling](https://devblogs.microsoft.com/directx/hardware-accelerated-gpu-scheduling/).
-
-## :material-monitor-screenshot: Desktop Icons
-
-This shortcut will take you to the settings page for desktop icons. You can change the icons you want to see on your desktop.
-
-## :material-alphabetical: Language
-
-This shortcut will take you to the Windows Settings 'Language & Region' page. Here, you can change your Atlas installation's display and input language.
-
-## :material-account-eye-outline: Privacy
-
-This shortcut will take you to the Windows Settings 'Privacy & Security' page. Here, you can change how private your Atlas installation is.
-
-## :material-globe-model: Region
-
-This shortcut will take you to the legacy settings page for region settings. Here, you have more control over the standard Windows Settings 'Language & Region' page.
-
-## :material-menu: Taskbar
-
-This shortcut will take you to the Windows Settings 'Taskbar' page. Here, you can customize the taskbar to your liking.
diff --git a/docs/getting-started/reverting-atlas.md b/docs/getting-started/reverting-atlas.md
deleted file mode 100644
index 180badf3..00000000
--- a/docs/getting-started/reverting-atlas.md
+++ /dev/null
@@ -1,56 +0,0 @@
----
-title: Reverting Atlas
-description: How to uninstall AtlasOS
-icon: material/emoticon-cry
----
-
-# :material-emoticon-cry: Reverting Atlas
-
-As Atlas disables the 'Reset this PC' feature due to its unreliability and not being a full reinstall of Windows, some users are unsure how to get back to stock Windows.
-
-This page details how to reinstall from Atlas to stock Windows fully, which uninstalls Atlas.
-
-## :material-handshake: Before uninstalling
-
-If you're on an [outdated version of Atlas](https://github.com/Atlas-OS/Atlas/releases), we unfortunately can't help. Otherwise, we can help you if you're experiencing issues on the latest version. See the below:
-
-- :material-file-search: The documentation you're on currently
--
- :material-robot: 'Ask AI' in the corner of this page
-
-- [:simple-discord: Our Discord server](https://discord.atlasos.net)
-- [:material-github: Atlas' GitHub Discussions](https://github.com/Atlas-OS/Atlas/discussions)
-
-### If you're still having problems...
-
-We're constantly improving Atlas, so although you're uninstalling now, we hope to see your problem solved in the future. :slight_smile:
-
-Please consider reporting your problem on the [Atlas GitHub Issues](https://github.com/Atlas-OS/Atlas/issues) so we can fix it.
-Alternatively, give feedback in our GitHub Discussions or Discord, as mentioned earlier.
-
----
-
-!!! tip "Looking to reinstall/install Atlas?"
- Follow the [Atlas installation guide](installation.md) instead. This page is for reverting Atlas.
-
---8<--
-installation.md:style
-installation.md:iso
-installation.md:iso1
---8<--
-{% include 'msdl.md' %}
---8<--
-installation.md:drivers
-installation.md:reinstalling
-installation.md:reinstalling1
-installation.md:reinstalling2
- installation.md:windowsOldNotice
-installation.md:reinstalling3
---8<--
-
-## **4.** :material-desktop-classic: Continue with setup
-
-You should now be at the regular Windows initial setup and back on stock Windows.
-
-### **4.1.** :material-microsoft-windows-classic: Your old Windows installation
---8<-- "installation.md:oldinstall"
\ No newline at end of file
diff --git a/docs/getting-started/upgrade/before-continuing.md b/docs/getting-started/upgrade/before-continuing.md
new file mode 100644
index 00000000..4d898254
--- /dev/null
+++ b/docs/getting-started/upgrade/before-continuing.md
@@ -0,0 +1,22 @@
+---
+title: 0. Before Continuing
+description: How to upgrade an existing AtlasOS installation to a newer version without reinstalling Windows.
+---
+
+# :material-rocket-launch: Upgrading AtlasOS
+
+> **TLDR:** If you're already running AtlasOS **v0.4.x or later**, you can upgrade straight to a newer version (for example v0.5.x) with AME Wizard. Clean installs are not required, but are still recommended.
+
+## Requirements
+
+* Your PC must currently have **AtlasOS 0.4.x or newer** installed.
+ Users on **0.3.x** need to perform a fresh install instead.
+* The latest **AME Wizard** executable.
+* The **new Atlas Playbook** (`.apbx`) you want to upgrade to (e.g. `Atlas Playbook 0.5.x`).
+
+If you've met all of the requirements above, click below to proceed to the next step.
+
\ No newline at end of file
diff --git a/docs/getting-started/upgrade/upgrade-playbook.md b/docs/getting-started/upgrade/upgrade-playbook.md
new file mode 100644
index 00000000..55b4dfdd
--- /dev/null
+++ b/docs/getting-started/upgrade/upgrade-playbook.md
@@ -0,0 +1,31 @@
+---
+title: 1. Update
+description: Upgrade your existing AtlasOS installation to the latest version using AME Wizard
+---
+
+1. **Download assets**
+ Grab the newest Atlas Playbook and AME Wizard from the [AtlasOS website](https://atlasos.net) (or the same links used in the installation guide).
+2. **Launch AME Wizard**
+ Run `AME Wizard Beta.exe` (update the wizard first if it offers an update).
+3. **Drag the playbook in**
+ Drop the downloaded `.apbx` file into the AME Wizard window.
+4. **Choose "Upgrade"**
+ When prompted, select **Upgrade** rather than **Run again**.
+ AME Wizard will analyze the current installation and apply only the changes required for the new version.
+5. **Let the wizard finish**
+ Follow on-screen instructions and wait until the process completes. Your PC will reboot.
+
+## What happens to my settings?
+
+* All user files, apps and most AtlasOS tweaks will be kept.
+* **Known limitation:** Upgrading **from 0.4.x → 0.5.x** currently **does not carry over the Atlas Folder configuration** (General Configuration, Interface Tweaks, etc.). You'll need to re-apply these after the upgrade. This will not be a problem when upgrading to 0.5.x → later.
+
+## Troubleshooting & older versions
+
+* If AME Wizard doesn't offer the **Upgrade** option, double-check that you're on Atlas 0.4.x or newer by using the [Checking Atlas Version](../general-faq/checking-atlas-version.md) guide.
+* Systems on **0.3.x** can't be upgraded in-place—follow the [Installation guide](installation.md) for a clean reinstall.
+
+---
+
+Need help? Ask in the [:simple-discord: Discord server](https://discord.atlasos.net) or open a topic on [:material-github: GitHub Discussions](https://github.com/Atlas-OS/Atlas/discussions).
+
diff --git a/docs/index.md b/docs/index.md
index 2db4b575..730b3cd9 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,27 +1,29 @@
---
+title: Home
description: The official documentation for AtlasOS
icon: material/home
---
+
# :material-home: AtlasOS Documentation
-- :material-power:{ .lg .middle } __Install AtlasOS__
+- :material-power:{ .lg .middle } __Install / Upgrade Atlas__
---
Get started with setting up AtlasOS on your system in just a few minutes.
- [-> Install AtlasOS](getting-started/installation.md)
+ [-> Install / Upgrade](getting-started/index.md)
-- :material-wrench:{ .lg .middle } __Post Installation__
+- :material-wrench:{ .lg .middle } __Post Install__
---
- Customize and tweak your AtlasOS installation to your liking.
+ Complete common post-installation tasks and optimize it for your daily use.
- [-> Post Installation](getting-started/post-installation/atlas-folder/general-configuration.md)
+ [-> Install / Upgrade](getting-started/index.md)
- :material-chat-question:{ .lg .middle } __Frequently Asked Questions__
diff --git a/docs/install-faq/ame-wizard-errors/ame-wizard-deleted.md b/docs/install-faq/ame-wizard-errors/ame-wizard-deleted.md
deleted file mode 100644
index 1eb6d1d9..00000000
--- a/docs/install-faq/ame-wizard-errors/ame-wizard-deleted.md
+++ /dev/null
@@ -1,32 +0,0 @@
----
-description: Why is AME Wizard being detected as a virus?
-icon: material/virus
----
-
-# :material-virus: Why is AME Wizard being detected as a virus?
-
-**AME Wizard can be falsely flagged as a virus. To avoid it being detected, add it to your Windows Defender exclusions list.**
-
-Windows Defender may automatically flag AME Wizard as malicious when trying to run it or even delete it before running it.
-
-To avoid these problems, temporarily disable **Real Time Protection** or follow [AME's Security Exceptions Documentation (recommended)](https://docs.ameliorated.io/guides/security-exceptions.html).
-
-## :material-file-question: Why is it being falsely flagged?
-
-### New releases
-
-Combined with the other factors below, new releases of AME Wizard are highly likely to be falsely flagged due to them never being seen before by Windows Defender. The more times that antiviruses see users use a program, the more the trust level goes up by antiviruses.
-
-### Lack of code signing
-
-Code signing is a system that allows users to verify that a third party has not altered the executable they receive. This is standard on most applications from companies, such as your web browser and games. Code signing makes false positives highly unlikely from antiviruses.
-
-However, code-signing certificates are expensive and tedious to get. This is why AME Wizard currently has no code signing certificate but will do so in the future.
-
-### Modifications to the operating system
-
-Some actions that AME Wizard can run are suspicious to antiviruses.
-
-For example, AME Wizard can irreversibly remove Windows Defender from Windows, which Atlas does not utilize, but some Playbooks do. In their Playbook's case, this is for the more extreme privacy their advanced users want.
-
-Although these removals are within the user's knowledge, antiviruses can see this and falsely flag AME Wizard as malicious.
\ No newline at end of file
diff --git a/docs/install-faq/ame-wizard-errors/atlas-playbook-stuck.md b/docs/install-faq/ame-wizard-errors/atlas-playbook-stuck.md
deleted file mode 100644
index 42d6ab7c..00000000
--- a/docs/install-faq/ame-wizard-errors/atlas-playbook-stuck.md
+++ /dev/null
@@ -1,43 +0,0 @@
----
-description: How do I fix 'Reticulating Splines' or 'Action taking a long time'?
-icon: material/timer-lock
----
-
-# :material-timer-lock: How do I fix 'Reticulating Splines' or 'Action taking a long time'?
-
-When running the Playbook, some users might experience these messages:
-
-- **'Reticulating splines'** - meaning there has been no status change in 5 minutes
-- **'Action taking a long time'** - meaning there has been no status change in 15 minutes
-
-Most of the time, this isn't an issue and is likely due to a slow internet connection or computer. However, it could be stuck if it has been on this screen for a long time. In that case, [scroll down to see solutions](#prerequisites).
-
-
-
-## :material-broom: Prerequisites
-
-1. Ensure that you're on a fresh install of fully updated Windows. We **highly** recommend following our [installation guide](../../getting-started/installation.md) for this. Installing Atlas on a non-fresh Windows installation is considered unsupported and can cause the Playbook to get stuck.
-
-1. Make sure that your hardware is stable. If you have overclocks, try turning them off.
-
-1. Make sure you're using the latest version of the Atlas Playbook.
-
-## :material-checkbox-marked-outline: Fixes
-
-Try following these in order. If one doesn't solve your problem, move to the next.
-
-### Restarting and re-applying the Playbook
-
-You can restart Windows and attempt to re-apply the Playbook on a fresh startup. Again, ensure that Windows is updated, and try re-running the Playbook.
-
-### Killing the responsible process
-
-Click **Show logs** at the 'Action is taking a long time' status, open **Output.txt**, and scroll to the bottom to see what is stuck. If it's a PowerShell or Command Prompt action, you can kill those in the 'Details' section of Task Manager. Alternatively, if it's DISM, you would kill DISM instead.
-
-However, please remember that these actions are responsible for specific functionality in Atlas, so interrupting them could cause an incomplete installation. Re-applying the Playbook is preferred if it works.
-
-### Reporting the issue or asking for help
-
-Consider asking for help on the [Discord server](https://discord.atlasos.net/) or [GitHub Discussions](https://github.com/Atlas-OS/Atlas/discussions), and if there's no solution, consider opening a [GitHub Issue](https://github.com/atlas-os/atlas/issues) to help us fix your problem.
-
-Make sure to include your `Output.txt` log.
\ No newline at end of file
diff --git a/docs/install-faq/ame-wizard-errors/build-not-supported.md b/docs/install-faq/ame-wizard-errors/build-not-supported.md
deleted file mode 100644
index f47a158f..00000000
--- a/docs/install-faq/ame-wizard-errors/build-not-supported.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-description: How do I fix AME Wizard 'Requirements not met' when installing AtlasOS?
-icon: material/microsoft-windows-classic
----
-
-# :material-microsoft-windows-classic: How do I fix AME Wizard saying that this Windows build is not supported?
-
-**You have likely not followed the Atlas installation guide to reinstall Windows.**
-
-You'll see an error under **"Requirements not met"** saying that your Windows build isn't supported. To get to [a supported version](../windows-version-support.md), follow the installation guide.
-
-[Installing AtlasOS -->](../../getting-started/installation.md)
-
-
\ No newline at end of file
diff --git a/docs/install-faq/ame-wizard-errors/cant-disable-defender.md b/docs/install-faq/ame-wizard-errors/cant-disable-defender.md
deleted file mode 100644
index 1b4379af..00000000
--- a/docs/install-faq/ame-wizard-errors/cant-disable-defender.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-description: How do I fix being unable to disable Defender to continue?
-icon: material/shield-search
----
-
-# :material-shield-search: How do I fix being unable to disable Defender to continue?
-
-**You have likely not followed the installation documentation to reinstall Windows.**
-
-Atlas requires you to follow the installation documentation to reinstall the latest version of Windows. We advise against using the **Reset this PC** feature within Windows, as this is not considered a complete Windows reinstall and would likely not solve this issue.
-
-[Installing AtlasOS -->](../../getting-started/installation.md)
-
-
diff --git a/docs/install-faq/atlas-iso-files.md b/docs/install-faq/atlas-iso-files.md
deleted file mode 100644
index 25ef30ca..00000000
--- a/docs/install-faq/atlas-iso-files.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-description: Where can I find the Atlas ISO file?
-icon: material/disc
----
-
-# :material-disc: Where is the Atlas ISO file?
-
-**Atlas doesn't have an ISO file. It uses AME Wizard to modify Windows on a new live installation, applying configurations like an ISO file.**
-
-Distributing ISO files violates Microsoft's terms and poses **major safety risks** due to there being no easy way to verify modified third-party ISOs aren't malicious.
-
-> "For software downloads, unless expressly permitted in the accompanying License Terms or End-User License Agreement (EULA), Microsoft does not allow redistribution. You may link to the download page, but not directly to the download, from your product or website."
->
-> 🔗
-
-## How does Atlas work then?
-
-To ensure compliance and safety, you install Atlas by using [AME Wizard](https://ameliorated.io/), which modifies stock Windows installations. We recommend reading our [installation guide](../getting-started/installation.md) to install Atlas using this system.
-
-## What does the ISO downloader do?
-
-The [ISO downloader in our documentation](../getting-started/installation.md#1-download-an-iso) downloads unmodified ISOs directly from Microsoft's servers. They are there for your convenience.
diff --git a/docs/install-faq/decrypting-using-bitlocker.md b/docs/install-faq/decrypting-using-bitlocker.md
deleted file mode 100644
index 033e7254..00000000
--- a/docs/install-faq/decrypting-using-bitlocker.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-description: A guide on how to decrypt your system drive using BitLocker
-icon: material/lock-check
----
-
-# :material-lock-check: How do I decrypt my BitLocker-encrypted drive?
-
-Device encryption is enabled by default on many Windows 11 laptops. Although this is good for security, this means that our method of reinstalling Windows would not work. This guide will walk you through the process of decrypting your Windows drive using BitLocker.
-
-## Decryption
-
-!!! warning "BitLocker data loss"
- BitLocker is a powerful encryption tool, and using it improperly may result in data loss. It is safe to follow these instructions, but failure to follow steps may result in loss of data.
-
-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.
-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!
-1. [:material-cogs: Go back to the installation guide -->](../getting-started/installation.md#3-reinstalling-windows)
diff --git a/docs/install-faq/removed-features.md b/docs/install-faq/removed-features.md
deleted file mode 100644
index 49446dca..00000000
--- a/docs/install-faq/removed-features.md
+++ /dev/null
@@ -1,70 +0,0 @@
----
-description: Lists of the different components and features removed or disabled from Atlas
-icon: material/cog
----
-
-# :material-cog: Components and features removed or disabled from Atlas
-
-Atlas turns off many unnecessary Windows components and features for optimal performance, usability, and privacy; for some features or components, enabling them again requires manual tweaking. We have compiled a list of most of Atlas's changes on this page.
-
-To see the exact changes made, refer to the [Atlas source code](https://github.com/Atlas-OS/Atlas).
-
-## :material-delete: What's permanently deleted?
-
-These components require a Windows reinstall to get back.
-
-- [Smart App Control](https://support.microsoft.com/en-gb/topic/what-is-smart-app-control-285ea03d-fa88-4d56-882e-6698afdb7003)
- - Once it's disabled in Windows, you can't reinstall it
- - Disabled as it sends lots of data to Microsoft
- - Requires optional diagnostic data in Windows
- - Causes unusable slowdowns if Defender is disabled
-
-## :material-cog-pause: What's disabled?
-
-These components require manual tweaking to re-enable and are not tested.
-
-- Telemetry
- - Atlas has the option to toggle telemetry components for troubleshooting
- - The underlying policies turning off various telemetry have no options in the Atlas folder. This includes Windows Error Reporting, CEIP, and more
-- Various syncing using a Microsoft account
-- General advertisements and Windows tips
-- Uncommonly used context menus
-- Activity history
-
-## :material-application: Applications uninstalled by default
-
-These can be reinstalled after installation, but are removed by default.
-
-- **Internet Explorer**
- Only on Windows 10, can be re-enabled as an optional feature
-- **OneDrive**
- If it's set up, it's not removed. This is to prevent data loss
-- **Microsoft Edge**
- Optional - the user has a choice to keep or remove it
- Edge can be reinstalled using the `1. Software\Remove Edge.cmd` script
-- **Steps Recorder**
- Deprecated - can be re-enabled as an optional feature
-- **Legacy Windows Media Player**
- Replaced by modern player - can be re-enabled as an optional feature
-- **Maths Recognizer**
- Only on stock Windows 10 by default, can be enabled as an optional feature
-
-### Microsoft Store Apps
-
-You can reinstall all of the below using the Microsoft Store.
-
-| **Store Apps (Column 1)** | **Store Apps (Column 2)** | **Store Apps (Column 3)** |
-| ------------------------- | ----------------------------------- | ------------------------- |
-| Microsoft Teams | Clipchamp | Disney+ |
-| Cortana (deprecated) | Xbox Console Companion (deprecated) | Mail and Calendar |
-| Tips (deprecated) | Films & TV | Microsoft Family Safety |
-| Dev Home | Microsoft Weather | Microsoft News |
-| Get Help | 3D Viewer | Microsoft Office Hub |
-| Microsoft Sticky Notes | Microsoft OneNote | People |
-| Skype | Microsoft To Do | Windows Alarms & Clock |
-| Feedback Hub | Windows Maps | Voice Recorder |
-| Phone Link | Snipping Tool (optional) | Snip & Sketch (optional) |
-
-## Having a problem?
-
-If something isn't working, search the documentation for a script or configuration file to fix the particular feature or service. Atlas allows you to toggle many options inside the Atlas configuration folder.
diff --git a/docs/install-faq/who-is-atlas-for.md b/docs/install-faq/who-is-atlas-for.md
deleted file mode 100644
index b34f6929..00000000
--- a/docs/install-faq/who-is-atlas-for.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-description: Who is AtlasOS designed for?
-icon: material/head-check
----
-
-# :material-head-check: Who is Atlas designed for?
-
-**We designed Atlas for any enthusiast looking to improve Windows' privacy, performance, and ease of use.**
-
----
-
-Atlas's goal is to make a stable and easy-to-use Windows modification that *almost everyone* can use, with a strong focus on compatibility and usability.
-
-However, with that in mind, we wouldn't recommend installing Atlas if:
-
-- You're installing it on a computer you do not wholly own
-- You aren't willing to perform potential Windows troubleshooting
-- You aren't willing to reinstall Windows
-
-### New releases
-
-Remember that Atlas continuously improves by fixing bugs and adding more features with each new version, meaning the likelihood of issues will continually decrease.
-
-We hope that Atlas helps you get more out of Windows! :smile:
\ No newline at end of file
diff --git a/docs/install-faq/windows-home.md b/docs/install-faq/windows-home.md
deleted file mode 100644
index bf171432..00000000
--- a/docs/install-faq/windows-home.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-description: Does Atlas support Windows Home edition?
-icon: material/home-remove
----
-
-# :material-home-remove: Does Atlas support Windows Home edition?
-
-**Although you can install Atlas on Windows Home, we do not recommend it as some of Atlas' privacy, usability, and performance optimizations don't apply.**
-
-Atlas uses group policies to tweak various parts of Windows that generally can't be done in regular Settings. However, many group policies on Windows Home do not work, such as disabling [**Automatic Driver Installation**](../getting-started/installation.md#driver-updates).
-
-Additionally, Windows Home is missing valuable features, such as:[^1]
-
-- Hyper-V
-- BitLocker encryption
-- Windows Subsystem for Linux
-- Hosting Remote Desktop
-
-!!! tip "You can always upgrade after installing Atlas"
- You can upgrade to Windows Pro or another supported edition by changing your Windows product key, without any requirement to re-apply Atlas.
-
-[^1]: There are more differences [listed on Wikipedia](https://en.wikipedia.org/wiki/Windows_10_editions#Comparison_chart).
diff --git a/docs/install-faq/windows-version-support.md b/docs/install-faq/windows-version-support.md
deleted file mode 100644
index 4017b2db..00000000
--- a/docs/install-faq/windows-version-support.md
+++ /dev/null
@@ -1,41 +0,0 @@
----
-description: Which Windows versions does Atlas support and can Atlas be applied on your system?
-icon: material/list-status
----
-
-# :material-list-status: Which Windows versions does Atlas support?
-
-Atlas is designed to work on specific, stable Windows builds to ensure a reliable experience. **Atlas supports the latest stable Windows 10 and 11 versions in the same download.** However, [Windows Home editions aren't supported](windows-home.md).
-
----
-
-## :material-check: Supported Windows Builds
-
-As of the latest version, Atlas only supports:
-
-- **Windows 11:** {{ msdl.win11.version }}
-- **Windows 10:** {{ msdl.win10.version }}
-- **Windows 11 ARM:** {{ msdl.win11.version }}
-
-For the best results, please use one of these supported stable builds.
-
-!!! Warning "Pre‑release Channels Not Supported"
- Pre‑release channels are not supported. This includes:
- • **Canary**
- • **Dev**
- • **Beta**
- • **Release Preview**
-
-Only the latest non‑beta, non‑Insider versions are supported.
-Insider builds **are not** designed for **stability**. They may include untested bugs and require additional diagnostic data to be sent to Microsoft.
-
----
-
-## :material-package: Supported Windows Editions
-
-We recommend **Windows Pro** or **Windows Enterprise**. With the exception of [Windows Home](windows-home.md), most other Windows editions are supported. The only exclusions are:
-
-- **Enterprise LTSC:** These editions often lag behind the latest Windows versions, which we don't test or support.
-- **Windows Server:** Supporting these would require too much extra testing.
-
-We *strongly recommend* following our [installation guide](../getting-started/installation.md) for installing a supported version, as the initial Atlas install requires a Windows reinstallation regardless.
diff --git a/docs/getting-started/post-installation/drivers/amd.md b/docs/post-install/drivers/amd.md
similarity index 100%
rename from docs/getting-started/post-installation/drivers/amd.md
rename to docs/post-install/drivers/amd.md
diff --git a/docs/getting-started/post-installation/drivers/chipset.md b/docs/post-install/drivers/chipset.md
similarity index 100%
rename from docs/getting-started/post-installation/drivers/chipset.md
rename to docs/post-install/drivers/chipset.md
diff --git a/docs/getting-started/post-installation/drivers/getting-started.md b/docs/post-install/drivers/index.md
similarity index 100%
rename from docs/getting-started/post-installation/drivers/getting-started.md
rename to docs/post-install/drivers/index.md
diff --git a/docs/getting-started/post-installation/drivers/intel.md b/docs/post-install/drivers/intel.md
similarity index 100%
rename from docs/getting-started/post-installation/drivers/intel.md
rename to docs/post-install/drivers/intel.md
diff --git a/docs/getting-started/post-installation/drivers/nvidia.md b/docs/post-install/drivers/nvidia.md
similarity index 100%
rename from docs/getting-started/post-installation/drivers/nvidia.md
rename to docs/post-install/drivers/nvidia.md
diff --git a/docs/getting-started/post-installation/drivers/others.md b/docs/post-install/drivers/others.md
similarity index 100%
rename from docs/getting-started/post-installation/drivers/others.md
rename to docs/post-install/drivers/others.md
diff --git a/docs/getting-started/post-installation/hardware/enabling-xmp-or-docp.md b/docs/post-install/hardware/enabling-xmp-or-docp.md
similarity index 100%
rename from docs/getting-started/post-installation/hardware/enabling-xmp-or-docp.md
rename to docs/post-install/hardware/enabling-xmp-or-docp.md
diff --git a/docs/post-install/hardware/index.md b/docs/post-install/hardware/index.md
new file mode 100644
index 00000000..7c53a479
--- /dev/null
+++ b/docs/post-install/hardware/index.md
@@ -0,0 +1 @@
+## TBD
\ No newline at end of file
diff --git a/docs/getting-started/post-installation/hardware/resizable-bar.md b/docs/post-install/hardware/resizable-bar.md
similarity index 100%
rename from docs/getting-started/post-installation/hardware/resizable-bar.md
rename to docs/post-install/hardware/resizable-bar.md
diff --git a/docs/getting-started/post-installation/hardware/updating-the-bios.md b/docs/post-install/hardware/updating-the-bios.md
similarity index 100%
rename from docs/getting-started/post-installation/hardware/updating-the-bios.md
rename to docs/post-install/hardware/updating-the-bios.md
diff --git a/docs/post-install/index.md b/docs/post-install/index.md
new file mode 100644
index 00000000..6b162fd2
--- /dev/null
+++ b/docs/post-install/index.md
@@ -0,0 +1,20 @@
+---
+title: Post Install
+description: Steps and recommendations to finish setup, configure Atlas, install drivers, and optimize your system after installing AtlasOS.
+---
+
+# Post Install
+
+After installing AtlasOS, this section walks you through the recommended next steps to finish setup, configure Atlas-specific settings, install and update drivers, and optimize your hardware and software for stability and performance.
+
+Use the links below to jump to the topic you need:
+
+- [:material-toolbox: Toolbox & utilities](toolbox/index.md) — Helpful tools, scripts, and utilities to manage and maintain your Atlas installation.
+- [:material-chip: Drivers](drivers/index.md) — Guidance for installing and updating device drivers (Intel, AMD, NVIDIA, chipsets, and others).
+- [:material-memory: Hardware tweaks](hardware/index.md) — Hardware-related optimizations such as enabling XMP/DOCP, Resizable BAR, and BIOS/UEFI updates.
+- [:material-microsoft-windows: Software recommendations](software/index.md) — Suggested apps and software settings including anti-virus, media playback, image viewers, and more.
+
+If you’re unsure where to start, follow the order above:.
+
+For troubleshooting and FAQs related to post-install tasks, see the relevant pages under each section or search the documentation.
+
diff --git a/docs/getting-started/post-installation/software/anti-virus.md b/docs/post-install/software/anti-virus.md
similarity index 100%
rename from docs/getting-started/post-installation/software/anti-virus.md
rename to docs/post-install/software/anti-virus.md
diff --git a/docs/getting-started/post-installation/software/image-viewer.md b/docs/post-install/software/image-viewer.md
similarity index 100%
rename from docs/getting-started/post-installation/software/image-viewer.md
rename to docs/post-install/software/image-viewer.md
diff --git a/docs/getting-started/post-installation/software/getting-started.md b/docs/post-install/software/index.md
similarity index 100%
rename from docs/getting-started/post-installation/software/getting-started.md
rename to docs/post-install/software/index.md
diff --git a/docs/getting-started/post-installation/software/media-playback.md b/docs/post-install/software/media-playback.md
similarity index 100%
rename from docs/getting-started/post-installation/software/media-playback.md
rename to docs/post-install/software/media-playback.md
diff --git a/docs/getting-started/post-installation/software/screenshotting.md b/docs/post-install/software/screenshotting.md
similarity index 100%
rename from docs/getting-started/post-installation/software/screenshotting.md
rename to docs/post-install/software/screenshotting.md
diff --git a/docs/getting-started/post-installation/software/system-info.md b/docs/post-install/software/system-info.md
similarity index 100%
rename from docs/getting-started/post-installation/software/system-info.md
rename to docs/post-install/software/system-info.md
diff --git a/docs/getting-started/post-installation/software/text-editors.md b/docs/post-install/software/text-editors.md
similarity index 100%
rename from docs/getting-started/post-installation/software/text-editors.md
rename to docs/post-install/software/text-editors.md
diff --git a/docs/getting-started/post-installation/software/web-browsers.md b/docs/post-install/software/web-browsers.md
similarity index 100%
rename from docs/getting-started/post-installation/software/web-browsers.md
rename to docs/post-install/software/web-browsers.md
diff --git a/docs/post-install/toolbox/index.md b/docs/post-install/toolbox/index.md
new file mode 100644
index 00000000..7c53a479
--- /dev/null
+++ b/docs/post-install/toolbox/index.md
@@ -0,0 +1 @@
+## TBD
\ No newline at end of file
diff --git a/includes/msdl.md b/includes/msdl.md
index 85d319a0..2c1bb62d 100644
--- a/includes/msdl.md
+++ b/includes/msdl.md
@@ -14,8 +14,8 @@