diff --git a/wiki-rtd/docs/wiki_emulator_guides/cemu/cemu-guide.md b/wiki-rtd/docs/wiki_emulator_guides/cemu/cemu-guide.md
index 9af1a45..488d3f5 100644
--- a/wiki-rtd/docs/wiki_emulator_guides/cemu/cemu-guide.md
+++ b/wiki-rtd/docs/wiki_emulator_guides/cemu/cemu-guide.md
@@ -58,7 +58,7 @@ This will be changed in a later update to the `retrodeck/bios/cemu` folder.
| Saves Folder |`retrodeck/saves/wiiu/cemu/` | |
| Config Folder |`~/.var/app/net.retrodeck.retrodeck/config/Cemu/` | `settings.xml`, `gameProfiles` folder, `controllerProfiles` folder|
| BIOS Folder | `retrodeck/bios/Cemu` | Contains `usr` and `sys` folders |
-| Data folder |`~/.var/app/org.retrodeck.retrodeck/data/Cemu` | |
+| Data Folder |`~/.var/app/org.retrodeck.retrodeck/data/Cemu` | |
## Guide - How to install DLC and Updates
diff --git a/wiki-rtd/docs/wiki_emulator_guides/dolphin-primehack/dolphin-primehack-guide.md b/wiki-rtd/docs/wiki_emulator_guides/dolphin-primehack/dolphin-primehack-guide.md
index bc8dd07..9656515 100644
--- a/wiki-rtd/docs/wiki_emulator_guides/dolphin-primehack/dolphin-primehack-guide.md
+++ b/wiki-rtd/docs/wiki_emulator_guides/dolphin-primehack/dolphin-primehack-guide.md
@@ -75,6 +75,8 @@ This shows what folder corresponds to each folder in the standard Dolphin struct
| Type | Folder | Flatpak Source | Emulator Folder | Comment |
| :---: | :---: | :---: | :---: | :---: |
+| ROMs Gamecube Folder |`retrodeck/roms/gc/` | |
+| ROMs Wii Folder |`retrodeck/roms/wii/` | |
| GameCube Saves EU|`retrodeck/saves/gc/dolphin/EU/` | `var/data/dolphin-emu/GC/EUR/` | `dolphin-emu/GC/EUR/` | |
| GameCube Saves US|`retrodeck/saves/gc/dolphin/US/` | `var/data/dolphin-emu/GC/USA/` | `dolphin-emu/GC/USA/` | |
| GameCube Saves JP| `retrodeck/saves/gc/dolphin/JP/` | `var/data/dolphin-emu/GC/JAP/` | `dolphin-emu/GC/JAP/` | |
@@ -90,6 +92,8 @@ This shows what folder corresponds to each folder in the standard PrimeHack stru
| Type | Folder | Flatpak Source | Emulator Folder | Comment |
| :---: | :---: | :---: | :---: | :---: |
+| ROMs Gamecube Folder |`retrodeck/roms/gc/` | |
+| ROMs Wii Folder |`retrodeck/roms/wii/` | |
| GameCube Saves EU|`retrodeck/saves/gc/primehack/EU/` | `var/data/primehack/GC/EUR/` | `primehack/GC/EUR/` | |
| GameCube Saves US|`retrodeck/saves/gc/primehack/US/` | `var/data/primehack/GC/USA/` | `primehack/GC/USA/` | |
| GameCube Saves JP| `retrodeck/saves/gc/primehack/JP/` | `var/data/primehack/GC/JAP/` | `primehack/GC/JAP/` | |
diff --git a/wiki-rtd/docs/wiki_emulator_guides/mame/mame-guide.md b/wiki-rtd/docs/wiki_emulator_guides/mame/mame-guide.md
index 6da06e5..ac31fb6 100644
--- a/wiki-rtd/docs/wiki_emulator_guides/mame/mame-guide.md
+++ b/wiki-rtd/docs/wiki_emulator_guides/mame/mame-guide.md
@@ -54,7 +54,7 @@ Where different types of configurations are stored
| Type | Folder | Comment |
| :---: | :---: | :---: |
-| Roms folder |`retrodeck/roms/mame/` / `retrodeck/roms/arcade/` | |
+| ROMs folder |`retrodeck/roms/mame/` / `retrodeck/roms/arcade/` | |
| Saves diff |`retrodeck/saves/mame-sa/diff/` | |
| Saves hiscore |`retrodeck/saves/mame-sa/hiscore/` | |
| Saves nvram |`retrodeck/saves/mame-sa/nvram/` | |
diff --git a/wiki-rtd/docs/wiki_emulator_guides/melonds/melonds-guide.md b/wiki-rtd/docs/wiki_emulator_guides/melonds/melonds-guide.md
index f337d2d..d5cda34 100644
--- a/wiki-rtd/docs/wiki_emulator_guides/melonds/melonds-guide.md
+++ b/wiki-rtd/docs/wiki_emulator_guides/melonds/melonds-guide.md
@@ -59,6 +59,7 @@ Directly into the folder
| Type | Folder | Comment |
| :---: | :---: | :---: |
+| ROMs Folder |`retrodeck/roms/nds/` | |
| Saves Folder |`retrodeck/saves/nds/melonds/` | |
| States Folder |`retrodeck/states/nds/melonds/` | |
| Config Folder |`~/.var/app/net.retrodeck.retrodeck/config/melonDS/` | `melonDS.ini`|
diff --git a/wiki-rtd/docs/wiki_emulator_guides/pcsx2/pcsx2-guide.md b/wiki-rtd/docs/wiki_emulator_guides/pcsx2/pcsx2-guide.md
index e40c077..dad9de4 100644
--- a/wiki-rtd/docs/wiki_emulator_guides/pcsx2/pcsx2-guide.md
+++ b/wiki-rtd/docs/wiki_emulator_guides/pcsx2/pcsx2-guide.md
@@ -38,18 +38,31 @@ Directly into the folder
`retrodeck/bios/`
+## Folder structure
+
+| Type | Folder | Comment |
+| :---: | :---: | :---: |
+| ROMs Folder |`retrodeck/roms/ps2/` | |
+| Saves Folder |`retrodeck/saves/ps2/pcsx2/memcards/` | |
+| States Folder |`retrodeck/states/ps2/pcsx2/` | |
+| Config Folder |`~/.var/app/net.retrodeck.retrodeck/config/PCSX2/` | |
+| BIOS Folder | `retrodeck/bios/Cemu` | Contains `usr` and `sys` folders |
+| Texture Pack Folder |`retrodeck/texture_packs/PCSX2/` | Represents `PCSX2/textures/` |
+
+
+
## How to enable/disable Multitap?
Multitap is a way to have up to 8 players on the Playstation 2, by hooking 4 players in each controller port.
+
Most games do not support this feature and some might not even work with it enabled.
-RetroDECK has this disabled by default.
1. Open the Configurator and open `PCSX2`.
2. Go to `Settings` -> `Controllers` -> `Controller Multitap`
3. Enable/disable Multitap by clicking the checkbox for either Port 1, Port 2 or both.
4. Several new controllers called 1A to 1D and 2A to 2D will be enabled to map.
-## Configure language
+## Change in-game language or system language
### PCSX2 Interface
@@ -69,3 +82,39 @@ Normally it should follow your system locale if supported by PCSX2
5. Within the BIOS navigate to `System Configuration` -> `Language` and change the language.
6. Close the BIOS go back to `Settings` -> `BIOS` -> `Options and Patches` and check `Fast Boot` checkbox again.
7. Close `PCSX2`.
+
+## How to add texture packs?
+
+The `~/retrodeck/texture_packs/PCSX2/` represents the `/PCSX2/textures/` folder in PCSX2.
+
+**Note:**
+
+Some texture packs could made for a specific version or region of a game. Make sure you have the right game and textures for it.
+
+`TITLEID` is different for every game.
+
+### Enable Custom Textures
+
+Open up PCSX2 from the `RetroDECK Configurator` by pressing `Open Emulator` - `PCSX2`.
+
+You can either enable textures globally or per game.
+
+**Globally for all games**
+
+1. Go to `Settings` -> `Graphics` -> `Texture Replacement`
+2. Enable `Load Textures` and `Async Texture Loading`.
+
+**Per game**
+
+1. In the main PCXS2 interface `Right Click` the game you want to bring up the menu.
+2. Go to `Game Properties` -> `Graphic Settings` -> `Texture Replacement`
+3. Enable `Load Textures` and `Async Texture Loading`.
+
+
+### Add the texture packs to the correct folder
+
+1. Extract any texture pack files from compressed `.zip` or any other compressed format.
+2. Go into `~/retrodeck/texture_packs/PCSX2/`.
+3. Find the correct `TITLEID` that mactches your game.
+4. Move textures into the right `~/retrodeck/texture_packs/PCSX2/` folder.
+5. If the textures match the game they should be loaded on next time you launch the game.
diff --git a/wiki-rtd/docs/wiki_emulator_guides/pcsx2/pcsx2-texture-pack.md b/wiki-rtd/docs/wiki_emulator_guides/pcsx2/pcsx2-texture-pack.md
deleted file mode 100644
index 81334ff..0000000
--- a/wiki-rtd/docs/wiki_emulator_guides/pcsx2/pcsx2-texture-pack.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# PCSX2 - Texture Pack Guide
-The `~/retrodeck/texture_packs/PCSX2/` represents the `/PCSX2/textures/` folder in PCSX2.
-
-**Note:**
-Some texture packs could made for a specific version or region of a game. Make sure you have the right game and textures for it.
-
-`TITLEID` is different for every game.
-
-## Enable Custom Textures
-
-Open up PCSX2 from the `RetroDECK Configurator` by pressing `Open Emulator` - `PCSX2`.
-
-### Globally for all games
-
-1. Go to `Settings` -> `Graphics` -> `Texture Replacement`
-2. Enable `Load Textures` and `Async Texture Loading`.
-
-### Per game
-
-1. In the main PCXS2 interface `Right Click` the game you want to bring up the menu.
-2. Go to `Game Properties` -> `Graphic Settings` -> `Texture Replacement`
-3. Enable `Load Textures` and `Async Texture Loading`.
-
-
-## How do I add texture packs?
-
-**Requirements:** Texture pack files
-
-**NOTE:** On the Steam Deck this could be easier to do in `Desktop Mode`.
-
-
-### Texture folder directly
-
-1. Extract any texture pack files from compressed `.zip` or any other format into folders.
-2. Go into `~/retrodeck/texture_packs/PCSX2/`. The folders are all named by `TITLEID`.
-3. Move textures into the right `~/retrodeck/texture_packs/PCSX2/` folder.
diff --git a/wiki-rtd/mkdocs.yml b/wiki-rtd/mkdocs.yml
index 9dae37d..b497c72 100644
--- a/wiki-rtd/mkdocs.yml
+++ b/wiki-rtd/mkdocs.yml
@@ -175,8 +175,7 @@ nav:
- melonDS - General Guide: wiki_emulator_guides/melonds/melonds-guide.md
- PCSX2 2️⃣:
- - PCSX2 - General Guide (WIP): wiki_emulator_guides/pcsx2/pcsx2-guide.md
- - PCSX2 - Texture Pack Guide: wiki_emulator_guides/pcsx2/pcsx2-texture-pack.md
+ - PCSX2 - General Guide: wiki_emulator_guides/pcsx2/pcsx2-guide.md
- PPSSPP 🔺:
- PPSSPP - General Guide: wiki_emulator_guides/ppsspp/ppsspp-guide.md