diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..dbe9c82
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.vscode/
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
index 6db91f0..6c4f812 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,32 +1,32 @@
-THE "Sussy Baka" LICENSE, VERSION 1
-
-Copyright (c) 2021 Michael Zheng, Fengzi, and Moon1789. All rights reserved.
-
-Redistribution and use in binary form, with or without modification, are permitted provided that the following conditions are met:
-
- 1. Redistribution must reproduce the above copyright notice, this list of conditions and the following disclaimer
- in the documentation and/or other materials provided with the distribution.
-
- 2. All advertising materials mentioning this website must display credits to either the Github page https://github.com/Amog-OS/AmogOS or website https://www.AmogOS.studio.
-
- 3. Neither the name of the copyright holder(s) nor the names of its contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
- 4. Redistributions binary form shall be used for good, not evil. The definitions of "Good" and "Evil" are at the
- sole discretion of the licensor.
-
- 5. Redistribution of any code must be free to download and use and cannot be sold in any way unless given written consent by the copyright holders.
-
- 6. All code used from this website must have explicit attribution to the original repository it was taken from.
-
-THIS SOFTWARE IS PROVIDED BY COPYRIGHT HOLDER "AS IS" AND ANY EXPRESS
-OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THE "Sussy Baka" LICENSE, VERSION 1
+
+Copyright (c) 2021 Michael Zheng, Fengzi, and Moon1789. All rights reserved.
+
+Redistribution and use in binary form, with or without modification, are permitted provided that the following conditions are met:
+
+ 1. Redistribution must reproduce the above copyright notice, this list of conditions and the following disclaimer
+ in the documentation and/or other materials provided with the distribution.
+
+ 2. All advertising materials mentioning this website must display credits to either the Github page https://github.com/Amog-OS/AmogOS or website https://amog-os.github.io
+
+ 3. Neither the name of the copyright holder(s) nor the names of its contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ 4. Redistributions binary form shall be used for good, not evil. The definitions of "Good" and "Evil" are at the
+ sole discretion of the licensor.
+
+ 5. Redistribution of any code must be free to download and use and cannot be sold in any way unless given written consent by the copyright holders.
+
+ 6. All code used from this website must have explicit attribution to the original repository it was taken from.
+
+THIS SOFTWARE IS PROVIDED BY COPYRIGHT HOLDER "AS IS" AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/README.md b/README.md
index 8be6feb..ae2653b 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,14 @@
-# Official website for AmogOS
-
-## Credit
-Originally made by Fengzi! `Disclaimer: Fengzi is not responsible for any changes beyond the original template.`
-
-Current maintenance mainly by Nooz
-
-(POWERRRR by Moon1789)
-
-### **Website link: https://amog-os.github.io/**
+# Official website for AmogOS Toppat
+
+## Credit
+
+Original website for AmogOS 1 made by Fengzi!
+`Disclaimer: Fengzi is not responsible for any changes beyond the original template.`
+
+New website for AmogOS 2 made by BeauTheBeau and Zaka
+
+Current maintenance mainly by Nooz
+
+(POWERRRR by Moon1789)
+
+### **Website link: [https://amog-os.github.io/](https://amog-os.github.io)**
diff --git a/credits.html b/credits.html
new file mode 100644
index 0000000..b8afed0
--- /dev/null
+++ b/credits.html
@@ -0,0 +1,209 @@
+
+
+
+ See the people and the story behind this
+ sussy wussy operating system
+
+
+
+
+
+
What is AmogOS
+
+ This was mostly inspired by
+ this reddit post. AmogOS is a meme OS based on the hit game Among Us, in
+ the same vein as Hannah Montana Linux, but it's also
+ developed and made to be a lightweight operating system.
+ AmogOS is also less bloated than some other distros (cough cough
+ Ubuntu). Chad AmogOS vs bloated mainstream distro, as
+ youtuber TechHut put it. Don't take this too seriously :p\n
+ - Nooz, Lead Dev
+
+
+
+
+
Who is AmogOS
+
+
+
+
buddyjojo
+
OS developer
+
+ "creator of jostroOS, worli, some phone
+ stuff, a bunch of random stuff and the amogos
+ overlord"
+
+ Follow these steps to ensure you make your PC sus!
+
+
+
You'll need an 8GB USB or more.
+
+ STEP 1: Download a flashing
+ software like Rufus (x64) or RPI Imager (RPI)
+
+
+ STEP 2: Download your AmogOS
+ file and flash it using your program
+
+
+ STEP 2.1: Those using the VM
+ file for x64 should boot the vmdk in VirturalBox
+ if possible
+
+
+ STEP 4: Boot your PC from the
+ USB if you are on PC (either using the
+ bootloader or changing the boot order from the
+ BIOS (putting the USB first))
+
+
+ STEP 5: A live version of
+ AmogOS will boot, so you can try it out and if
+ you like it, you'll have there the final steps
+ to make your PC sus
+
+
+ STEP 6: Your PC is now sus.
+ Enjoy.
+
+
+
+
+
+
+
+ AmogOS-chan by
+
+ xyriiel. No r34 yet (for now?!?!).
+
+ Nothing will stop your PC from becoming a sussy
+ baka
+
+
+
+
+
+
Support articles
+
+
Issue: AmogOS refuses to display anything
+
+ If the OS refuses to display anything, you may need to
+ install AMD/NVIDIA GPU drivers if you have one. Install
+ it by SSHing into the OS with ssh amogos@AmogOS.local on
+ a linux computer on the same network at the AmogOS PC,
+ then doing the following for AMD GPUS sudo apt purge -y
+ xserver-xorg-video-nouveau libdrm-nouveau2 && sudo apt
+ install -y firmware-amd-graphics libgl1-mesa-dri
+ libglx-mesa0 mesa-vulkan-drivers xserver-xorg-video-all
+ (nouveau drivers for NVIDIA graphic cards are installed
+ by default)
+
+
+
+
Issue: Non-straight display resolution
+
+ If the screen resolution looks wonky, click the "Display
+ Settings" shortcut on the desktop and change resolutions
+ until you find one that works for you. Also note that if
+ the dock looks like it's positioning is broken, run
+ plank --preferences in the terminal and change the
+ position to "Bottom". You can also set the alignment to
+ "Center" and manually change the spacing with the
+ slider.
+
+
+
+
+
+
+
+
+ Didn't find what you were looking for? Ask us!
+
+ AmogOS comes with a set of custom wallpapers, so you
+ can make your desktop even sussier! Check them out
+ in ~/Pictures/.AmogOS/, or download
+ them
+
+ here.
+
+
+
+
+
+
+
Custom Neofetch
+
+ AmogOS comes with a custom Neofetch, so you can show
+ off your sussy OS to your friends! Check it out by
+ running neofetch in the terminal.
+
+
+
+
+
+
+
Epic Xfce
+
+ AmogOS uses the Xfce desktop environment, which is
+ lightweight and easy to use. It's also very
+ customisable, so you can make it even more sussy!
+
+
+
+
diff --git a/legacy-site/LICENSE b/legacy-site/LICENSE
new file mode 100644
index 0000000..c179a62
--- /dev/null
+++ b/legacy-site/LICENSE
@@ -0,0 +1,32 @@
+THE "Sussy Baka" LICENSE, VERSION 1
+
+Copyright (c) 2021 Michael Zheng, Fengzi, and Moon1789. All rights reserved.
+
+Redistribution and use in binary form, with or without modification, are permitted provided that the following conditions are met:
+
+ 1. Redistribution must reproduce the above copyright notice, this list of conditions and the following disclaimer
+ in the documentation and/or other materials provided with the distribution.
+
+ 2. All advertising materials mentioning this website must display credits to either the Github page https://github.com/Amog-OS/AmogOS or website https://www.AmogOS.studio.
+
+ 3. Neither the name of the copyright holder(s) nor the names of its contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ 4. Redistributions binary form shall be used for good, not evil. The definitions of "Good" and "Evil" are at the
+ sole discretion of the licensor.
+
+ 5. Redistribution of any code must be free to download and use and cannot be sold in any way unless given written consent by the copyright holders.
+
+ 6. All code used from this website must have explicit attribution to the original repository it was taken from.
+
+THIS SOFTWARE IS PROVIDED BY COPYRIGHT HOLDER "AS IS" AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/legacy-site/README.md b/legacy-site/README.md
new file mode 100644
index 0000000..69216ea
--- /dev/null
+++ b/legacy-site/README.md
@@ -0,0 +1,10 @@
+# Official website for AmogOS
+
+## Credit
+Originally made by Fengzi! `Disclaimer: Fengzi is not responsible for any changes beyond the original template.`
+
+Current maintenance mainly by Nooz
+
+(POWERRRR by Moon1789)
+
+### **Website link: https://amog-os.github.io/**
diff --git a/about.html b/legacy-site/about.html
similarity index 98%
rename from about.html
rename to legacy-site/about.html
index e28b010..44066df 100644
--- a/about.html
+++ b/legacy-site/about.html
@@ -1,96 +1,96 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- About - AmogOS
-
-
-
-
-
-
-
-
-
About AmogOS
-
Watch me explain why this OS is not an impostor.
-
Project Info
-
AmogOS, a custom riced meme OS inspired by a Reddit post. Initially made for the Raspberry Pi, based on RPi OS (RPi versions) and Debian (x86_64 versions).
-
-
Features:
-
Up-to-date features list is on our GitHub Readme page. (pwease wead it i spent lots of time puttting important info into it UwU)
AmogOS, a custom riced meme OS inspired by a Reddit post. Initially made for the Raspberry Pi, based on RPi OS (RPi versions) and Debian (x86_64 versions).
+
+
Features:
+
Up-to-date features list is on our GitHub Readme page. (pwease wead it i spent lots of time puttting important info into it UwU)
AmogOS is pretty much a joke project, but there are actual people that work on it.
-
If you liked the project, feel free to donate to support the team, or not.
-
You can donate with OpenCollective, which supports many popular payment methods. It also supports crypto in case you sit on a pile of NFTs... (they're bad)
AmogOS is pretty much a joke project, but there are actual people that work on it.
+
If you liked the project, feel free to donate to support the team, or not.
+
You can donate with OpenCollective, which supports many popular payment methods. It also supports crypto in case you sit on a pile of NFTs... (they're bad)
+
+
+
+
diff --git a/icons/Santa_hat.png b/legacy-site/icons/Santa_hat.png
similarity index 100%
rename from icons/Santa_hat.png
rename to legacy-site/icons/Santa_hat.png
diff --git a/legacy-site/icons/anime.png b/legacy-site/icons/anime.png
new file mode 100644
index 0000000..0bc68fc
Binary files /dev/null and b/legacy-site/icons/anime.png differ
diff --git a/icons/anime.png b/legacy-site/icons/anime_old.png
similarity index 100%
rename from icons/anime.png
rename to legacy-site/icons/anime_old.png
diff --git a/icons/bg-1080p.jpg b/legacy-site/icons/bg-1080p.jpg
similarity index 100%
rename from icons/bg-1080p.jpg
rename to legacy-site/icons/bg-1080p.jpg
diff --git a/icons/bg-720p-progressive-christmas.jpg b/legacy-site/icons/bg-720p-progressive-christmas.jpg
similarity index 100%
rename from icons/bg-720p-progressive-christmas.jpg
rename to legacy-site/icons/bg-720p-progressive-christmas.jpg
diff --git a/icons/bg-720p-progressive.jpg b/legacy-site/icons/bg-720p-progressive.jpg
similarity index 100%
rename from icons/bg-720p-progressive.jpg
rename to legacy-site/icons/bg-720p-progressive.jpg
diff --git a/icons/bg.png b/legacy-site/icons/bg.png
similarity index 100%
rename from icons/bg.png
rename to legacy-site/icons/bg.png
diff --git a/icons/download/RPI_direct.png b/legacy-site/icons/download/RPI_direct.png
similarity index 100%
rename from icons/download/RPI_direct.png
rename to legacy-site/icons/download/RPI_direct.png
diff --git a/icons/download/RPI_torrent.png b/legacy-site/icons/download/RPI_torrent.png
similarity index 100%
rename from icons/download/RPI_torrent.png
rename to legacy-site/icons/download/RPI_torrent.png
diff --git a/icons/download/x64_direct.png b/legacy-site/icons/download/x64_direct.png
similarity index 100%
rename from icons/download/x64_direct.png
rename to legacy-site/icons/download/x64_direct.png
diff --git a/icons/download/x64_torrent.png b/legacy-site/icons/download/x64_torrent.png
similarity index 100%
rename from icons/download/x64_torrent.png
rename to legacy-site/icons/download/x64_torrent.png
diff --git a/icons/fongzoi.png b/legacy-site/icons/fongzoi.png
similarity index 100%
rename from icons/fongzoi.png
rename to legacy-site/icons/fongzoi.png
diff --git a/icons/sus-christmas.ico b/legacy-site/icons/sus-christmas.ico
similarity index 100%
rename from icons/sus-christmas.ico
rename to legacy-site/icons/sus-christmas.ico
diff --git a/icons/sus-christmas.png b/legacy-site/icons/sus-christmas.png
similarity index 100%
rename from icons/sus-christmas.png
rename to legacy-site/icons/sus-christmas.png
diff --git a/icons/sus.ico b/legacy-site/icons/sus.ico
similarity index 100%
rename from icons/sus.ico
rename to legacy-site/icons/sus.ico
diff --git a/legacy-site/icons/sus.png b/legacy-site/icons/sus.png
new file mode 100644
index 0000000..0c16753
Binary files /dev/null and b/legacy-site/icons/sus.png differ
diff --git a/icons/webp/RPI_direct.webp b/legacy-site/icons/webp/RPI_direct.webp
similarity index 100%
rename from icons/webp/RPI_direct.webp
rename to legacy-site/icons/webp/RPI_direct.webp
diff --git a/icons/webp/RPI_torrent.webp b/legacy-site/icons/webp/RPI_torrent.webp
similarity index 100%
rename from icons/webp/RPI_torrent.webp
rename to legacy-site/icons/webp/RPI_torrent.webp
diff --git a/icons/webp/bg.webp b/legacy-site/icons/webp/bg.webp
similarity index 100%
rename from icons/webp/bg.webp
rename to legacy-site/icons/webp/bg.webp
diff --git a/icons/webp/sus.webp b/legacy-site/icons/webp/sus.webp
similarity index 100%
rename from icons/webp/sus.webp
rename to legacy-site/icons/webp/sus.webp
diff --git a/icons/webp/x64_direct.webp b/legacy-site/icons/webp/x64_direct.webp
similarity index 100%
rename from icons/webp/x64_direct.webp
rename to legacy-site/icons/webp/x64_direct.webp
diff --git a/icons/webp/x64_torrent.webp b/legacy-site/icons/webp/x64_torrent.webp
similarity index 100%
rename from icons/webp/x64_torrent.webp
rename to legacy-site/icons/webp/x64_torrent.webp
diff --git a/legacy-site/index.html b/legacy-site/index.html
new file mode 100644
index 0000000..8be1072
--- /dev/null
+++ b/legacy-site/index.html
@@ -0,0 +1,194 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AmogOS | Sussy wussy.
+
+
+
+
x86_64 Version: Flash the .iso to your USB stick using Universal USB Imager to run it on bare metal, or manually flash the zip if you are using Linux.
(Instructions for both can be found in a detailed instructions file). You can also run the OS in your browser with DistroTest.net, or run it as a VM with VirturalBox/VMware by downloading the VM disk from the home page and importing the .ova file into your VM software of choice.
-
-
-
3. Boot it up and it's done! Your device is now a sussy wussy baka!
x86_64 Version: Flash the .iso to your USB stick using Universal USB Imager to run it on bare metal, or manually flash the zip if you are using Linux.
(Instructions for both can be found in a detailed instructions file). You can also run the OS in your browser with DistroTest.net, or run it as a VM with VirturalBox/VMware by downloading the VM disk from the home page and importing the .ova file into your VM software of choice.
+
+
+
3. Boot it up and it's done! Your device is now a sussy wussy baka!