diff --git a/.gitignore b/.gitignore
index 3825ab489..afe3f25fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,7 +27,7 @@ Thumbs.db
 /Bin/Release64
 /build
 /Config/Cheats-User
-/Config/Enhancement-User
+/Config/Enhancements-User
 /Config/Project64.cache3
 /Config/Project64.cfg
 /Config/Project64.rdn
diff --git a/Config/Enhancement/1080 Snowboarding (U).enh b/Config/Enhancements/1080 Snowboarding (U).enh
similarity index 100%
rename from Config/Enhancement/1080 Snowboarding (U).enh
rename to Config/Enhancements/1080 Snowboarding (U).enh
diff --git a/Config/Enhancement/Aidyn Chronicles - The First Mage (U) [!] (V1.0).enh b/Config/Enhancements/Aidyn Chronicles - The First Mage (U) [!] (V1.0).enh
similarity index 100%
rename from Config/Enhancement/Aidyn Chronicles - The First Mage (U) [!] (V1.0).enh
rename to Config/Enhancements/Aidyn Chronicles - The First Mage (U) [!] (V1.0).enh
diff --git a/Config/Enhancement/Armorines - Project S.W.A.R.M. (U).enh b/Config/Enhancements/Armorines - Project S.W.A.R.M. (U).enh
similarity index 100%
rename from Config/Enhancement/Armorines - Project S.W.A.R.M. (U).enh
rename to Config/Enhancements/Armorines - Project S.W.A.R.M. (U).enh
diff --git a/Config/Enhancement/Automobili Lamborghini (E).enh b/Config/Enhancements/Automobili Lamborghini (E).enh
similarity index 100%
rename from Config/Enhancement/Automobili Lamborghini (E).enh
rename to Config/Enhancements/Automobili Lamborghini (E).enh
diff --git a/Config/Enhancement/Automobili Lamborghini (U).enh b/Config/Enhancements/Automobili Lamborghini (U).enh
similarity index 100%
rename from Config/Enhancement/Automobili Lamborghini (U).enh
rename to Config/Enhancements/Automobili Lamborghini (U).enh
diff --git a/Config/Enhancement/Banjo-Kazooie (U) (V1.0).enh b/Config/Enhancements/Banjo-Kazooie (U) (V1.0).enh
similarity index 100%
rename from Config/Enhancement/Banjo-Kazooie (U) (V1.0).enh
rename to Config/Enhancements/Banjo-Kazooie (U) (V1.0).enh
diff --git a/Config/Enhancement/Banjo-Kazooie (U) (V1.1).enh b/Config/Enhancements/Banjo-Kazooie (U) (V1.1).enh
similarity index 100%
rename from Config/Enhancement/Banjo-Kazooie (U) (V1.1).enh
rename to Config/Enhancements/Banjo-Kazooie (U) (V1.1).enh
diff --git a/Config/Enhancement/Banjo-Tooie (U).enh b/Config/Enhancements/Banjo-Tooie (U).enh
similarity index 100%
rename from Config/Enhancement/Banjo-Tooie (U).enh
rename to Config/Enhancements/Banjo-Tooie (U).enh
diff --git a/Config/Enhancement/Beetle Adventure Racing! (U).enh b/Config/Enhancements/Beetle Adventure Racing! (U).enh
similarity index 100%
rename from Config/Enhancement/Beetle Adventure Racing! (U).enh
rename to Config/Enhancements/Beetle Adventure Racing! (U).enh
diff --git a/Config/Enhancement/Big Mountain 2000 (U).enh b/Config/Enhancements/Big Mountain 2000 (U).enh
similarity index 100%
rename from Config/Enhancement/Big Mountain 2000 (U).enh
rename to Config/Enhancements/Big Mountain 2000 (U).enh
diff --git a/Config/Enhancement/Body Harvest (U).enh b/Config/Enhancements/Body Harvest (U).enh
similarity index 100%
rename from Config/Enhancement/Body Harvest (U).enh
rename to Config/Enhancements/Body Harvest (U).enh
diff --git a/Config/Enhancement/Bomberman 64 (U).enh b/Config/Enhancements/Bomberman 64 (U).enh
similarity index 100%
rename from Config/Enhancement/Bomberman 64 (U).enh
rename to Config/Enhancements/Bomberman 64 (U).enh
diff --git a/Config/Enhancement/Bomberman Hero (U).enh b/Config/Enhancements/Bomberman Hero (U).enh
similarity index 100%
rename from Config/Enhancement/Bomberman Hero (U).enh
rename to Config/Enhancements/Bomberman Hero (U).enh
diff --git a/Config/Enhancement/Bomberman Hero - Mirian Oujo wo Sukue! (J).enh b/Config/Enhancements/Bomberman Hero - Mirian Oujo wo Sukue! (J).enh
similarity index 100%
rename from Config/Enhancement/Bomberman Hero - Mirian Oujo wo Sukue! (J).enh
rename to Config/Enhancements/Bomberman Hero - Mirian Oujo wo Sukue! (J).enh
diff --git a/Config/Enhancement/Diddy Kong Racing (E) (M3) (V1.0).enh b/Config/Enhancements/Diddy Kong Racing (E) (M3) (V1.0).enh
similarity index 100%
rename from Config/Enhancement/Diddy Kong Racing (E) (M3) (V1.0).enh
rename to Config/Enhancements/Diddy Kong Racing (E) (M3) (V1.0).enh
diff --git a/Config/Enhancement/Diddy Kong Racing (E) (M3) (V1.1).enh b/Config/Enhancements/Diddy Kong Racing (E) (M3) (V1.1).enh
similarity index 100%
rename from Config/Enhancement/Diddy Kong Racing (E) (M3) (V1.1).enh
rename to Config/Enhancements/Diddy Kong Racing (E) (M3) (V1.1).enh
diff --git a/Config/Enhancement/Diddy Kong Racing (J).enh b/Config/Enhancements/Diddy Kong Racing (J).enh
similarity index 100%
rename from Config/Enhancement/Diddy Kong Racing (J).enh
rename to Config/Enhancements/Diddy Kong Racing (J).enh
diff --git a/Config/Enhancement/Diddy Kong Racing (U) (M2) (V1.0).enh b/Config/Enhancements/Diddy Kong Racing (U) (M2) (V1.0).enh
similarity index 100%
rename from Config/Enhancement/Diddy Kong Racing (U) (M2) (V1.0).enh
rename to Config/Enhancements/Diddy Kong Racing (U) (M2) (V1.0).enh
diff --git a/Config/Enhancement/Diddy Kong Racing (U) (M2) (V1.1).enh b/Config/Enhancements/Diddy Kong Racing (U) (M2) (V1.1).enh
similarity index 100%
rename from Config/Enhancement/Diddy Kong Racing (U) (M2) (V1.1).enh
rename to Config/Enhancements/Diddy Kong Racing (U) (M2) (V1.1).enh
diff --git a/Config/Enhancement/Doubutsu no Mori (J).enh b/Config/Enhancements/Doubutsu no Mori (J).enh
similarity index 100%
rename from Config/Enhancement/Doubutsu no Mori (J).enh
rename to Config/Enhancements/Doubutsu no Mori (J).enh
diff --git a/Config/Enhancement/Dual Heroes (U).enh b/Config/Enhancements/Dual Heroes (U).enh
similarity index 100%
rename from Config/Enhancement/Dual Heroes (U).enh
rename to Config/Enhancements/Dual Heroes (U).enh
diff --git a/Config/Enhancement/Duke Nukem - ZER0 H0UR (E).enh b/Config/Enhancements/Duke Nukem - ZER0 H0UR (E).enh
similarity index 100%
rename from Config/Enhancement/Duke Nukem - ZER0 H0UR (E).enh
rename to Config/Enhancements/Duke Nukem - ZER0 H0UR (E).enh
diff --git a/Config/Enhancement/Duke Nukem - ZER0 H0UR (F).enh b/Config/Enhancements/Duke Nukem - ZER0 H0UR (F).enh
similarity index 100%
rename from Config/Enhancement/Duke Nukem - ZER0 H0UR (F).enh
rename to Config/Enhancements/Duke Nukem - ZER0 H0UR (F).enh
diff --git a/Config/Enhancement/Duke Nukem - ZER0 H0UR (U).enh b/Config/Enhancements/Duke Nukem - ZER0 H0UR (U).enh
similarity index 100%
rename from Config/Enhancement/Duke Nukem - ZER0 H0UR (U).enh
rename to Config/Enhancements/Duke Nukem - ZER0 H0UR (U).enh
diff --git a/Config/Enhancement/Excitebike 64 (U) (V1.0).enh b/Config/Enhancements/Excitebike 64 (U) (V1.0).enh
similarity index 100%
rename from Config/Enhancement/Excitebike 64 (U) (V1.0).enh
rename to Config/Enhancements/Excitebike 64 (U) (V1.0).enh
diff --git a/Config/Enhancement/F-1 Pole Position 64 (U) (M3).enh b/Config/Enhancements/F-1 Pole Position 64 (U) (M3).enh
similarity index 100%
rename from Config/Enhancement/F-1 Pole Position 64 (U) (M3).enh
rename to Config/Enhancements/F-1 Pole Position 64 (U) (M3).enh
diff --git a/Config/Enhancement/F-ZERO X (U).enh b/Config/Enhancements/F-ZERO X (U).enh
similarity index 100%
rename from Config/Enhancement/F-ZERO X (U).enh
rename to Config/Enhancements/F-ZERO X (U).enh
diff --git a/Config/Enhancement/Forsaken 64 (U).enh b/Config/Enhancements/Forsaken 64 (U).enh
similarity index 100%
rename from Config/Enhancement/Forsaken 64 (U).enh
rename to Config/Enhancements/Forsaken 64 (U).enh
diff --git a/Config/Enhancement/Gex 3 - Deep Cover Gecko (U).enh b/Config/Enhancements/Gex 3 - Deep Cover Gecko (U).enh
similarity index 100%
rename from Config/Enhancement/Gex 3 - Deep Cover Gecko (U).enh
rename to Config/Enhancements/Gex 3 - Deep Cover Gecko (U).enh
diff --git a/Config/Enhancement/Gex 64 - Enter the Gecko (U).enh b/Config/Enhancements/Gex 64 - Enter the Gecko (U).enh
similarity index 100%
rename from Config/Enhancement/Gex 64 - Enter the Gecko (U).enh
rename to Config/Enhancements/Gex 64 - Enter the Gecko (U).enh
diff --git a/Config/Enhancement/GoldenEye 007 (U).enh b/Config/Enhancements/GoldenEye 007 (U).enh
similarity index 100%
rename from Config/Enhancement/GoldenEye 007 (U).enh
rename to Config/Enhancements/GoldenEye 007 (U).enh
diff --git a/Config/Enhancement/Iggy's Reckin' Balls (U).enh b/Config/Enhancements/Iggy's Reckin' Balls (U).enh
similarity index 100%
rename from Config/Enhancement/Iggy's Reckin' Balls (U).enh
rename to Config/Enhancements/Iggy's Reckin' Balls (U).enh
diff --git a/Config/Enhancement/Killer Instinct Gold (U) (V1.0).enh b/Config/Enhancements/Killer Instinct Gold (U) (V1.0).enh
similarity index 100%
rename from Config/Enhancement/Killer Instinct Gold (U) (V1.0).enh
rename to Config/Enhancements/Killer Instinct Gold (U) (V1.0).enh
diff --git a/Config/Enhancement/Kirby 64 - The Crystal Shards (U).enh b/Config/Enhancements/Kirby 64 - The Crystal Shards (U).enh
similarity index 100%
rename from Config/Enhancement/Kirby 64 - The Crystal Shards (U).enh
rename to Config/Enhancements/Kirby 64 - The Crystal Shards (U).enh
diff --git a/Config/Enhancement/Madden Football 64 (U).enh b/Config/Enhancements/Madden Football 64 (U).enh
similarity index 100%
rename from Config/Enhancement/Madden Football 64 (U).enh
rename to Config/Enhancements/Madden Football 64 (U).enh
diff --git a/Config/Enhancement/Mario Golf (U).enh b/Config/Enhancements/Mario Golf (U).enh
similarity index 100%
rename from Config/Enhancement/Mario Golf (U).enh
rename to Config/Enhancements/Mario Golf (U).enh
diff --git a/Config/Enhancement/Mario Kart 64 (E) (V1.0).enh b/Config/Enhancements/Mario Kart 64 (E) (V1.0).enh
similarity index 100%
rename from Config/Enhancement/Mario Kart 64 (E) (V1.0).enh
rename to Config/Enhancements/Mario Kart 64 (E) (V1.0).enh
diff --git a/Config/Enhancement/Mario Kart 64 (E) (V1.1).enh b/Config/Enhancements/Mario Kart 64 (E) (V1.1).enh
similarity index 100%
rename from Config/Enhancement/Mario Kart 64 (E) (V1.1).enh
rename to Config/Enhancements/Mario Kart 64 (E) (V1.1).enh
diff --git a/Config/Enhancement/Mario Kart 64 (J) (V1.0).enh b/Config/Enhancements/Mario Kart 64 (J) (V1.0).enh
similarity index 100%
rename from Config/Enhancement/Mario Kart 64 (J) (V1.0).enh
rename to Config/Enhancements/Mario Kart 64 (J) (V1.0).enh
diff --git a/Config/Enhancement/Mario Kart 64 (J) (V1.1).enh b/Config/Enhancements/Mario Kart 64 (J) (V1.1).enh
similarity index 100%
rename from Config/Enhancement/Mario Kart 64 (J) (V1.1).enh
rename to Config/Enhancements/Mario Kart 64 (J) (V1.1).enh
diff --git a/Config/Enhancement/Mario Kart 64 (U).enh b/Config/Enhancements/Mario Kart 64 (U).enh
similarity index 100%
rename from Config/Enhancement/Mario Kart 64 (U).enh
rename to Config/Enhancements/Mario Kart 64 (U).enh
diff --git a/Config/Enhancement/Mario Party (E).enh b/Config/Enhancements/Mario Party (E).enh
similarity index 100%
rename from Config/Enhancement/Mario Party (E).enh
rename to Config/Enhancements/Mario Party (E).enh
diff --git a/Config/Enhancement/Mario Party (J).enh b/Config/Enhancements/Mario Party (J).enh
similarity index 100%
rename from Config/Enhancement/Mario Party (J).enh
rename to Config/Enhancements/Mario Party (J).enh
diff --git a/Config/Enhancement/Mario Party (U).enh b/Config/Enhancements/Mario Party (U).enh
similarity index 100%
rename from Config/Enhancement/Mario Party (U).enh
rename to Config/Enhancements/Mario Party (U).enh
diff --git a/Config/Enhancement/Mario Party 2 (E).enh b/Config/Enhancements/Mario Party 2 (E).enh
similarity index 100%
rename from Config/Enhancement/Mario Party 2 (E).enh
rename to Config/Enhancements/Mario Party 2 (E).enh
diff --git a/Config/Enhancement/Mario Party 2 (J).enh b/Config/Enhancements/Mario Party 2 (J).enh
similarity index 100%
rename from Config/Enhancement/Mario Party 2 (J).enh
rename to Config/Enhancements/Mario Party 2 (J).enh
diff --git a/Config/Enhancement/Mario Party 2 (U).enh b/Config/Enhancements/Mario Party 2 (U).enh
similarity index 100%
rename from Config/Enhancement/Mario Party 2 (U).enh
rename to Config/Enhancements/Mario Party 2 (U).enh
diff --git a/Config/Enhancement/Mario Story (J).enh b/Config/Enhancements/Mario Story (J).enh
similarity index 100%
rename from Config/Enhancement/Mario Story (J).enh
rename to Config/Enhancements/Mario Story (J).enh
diff --git a/Config/Enhancement/Mario Tennis (U).enh b/Config/Enhancements/Mario Tennis (U).enh
similarity index 100%
rename from Config/Enhancement/Mario Tennis (U).enh
rename to Config/Enhancements/Mario Tennis (U).enh
diff --git a/Config/Enhancement/Mega Man 64 (U).enh b/Config/Enhancements/Mega Man 64 (U).enh
similarity index 100%
rename from Config/Enhancement/Mega Man 64 (U).enh
rename to Config/Enhancements/Mega Man 64 (U).enh
diff --git a/Config/Enhancement/Monopoly (U) (M2).enh b/Config/Enhancements/Monopoly (U) (M2).enh
similarity index 100%
rename from Config/Enhancement/Monopoly (U) (M2).enh
rename to Config/Enhancements/Monopoly (U) (M2).enh
diff --git a/Config/Enhancement/Mortal Kombat Mythologies - Sub-Zero (U).enh b/Config/Enhancements/Mortal Kombat Mythologies - Sub-Zero (U).enh
similarity index 100%
rename from Config/Enhancement/Mortal Kombat Mythologies - Sub-Zero (U).enh
rename to Config/Enhancements/Mortal Kombat Mythologies - Sub-Zero (U).enh
diff --git a/Config/Enhancement/Mystical Ninja 2 Starring Goemon (E) (M3).enh b/Config/Enhancements/Mystical Ninja 2 Starring Goemon (E) (M3).enh
similarity index 100%
rename from Config/Enhancement/Mystical Ninja 2 Starring Goemon (E) (M3).enh
rename to Config/Enhancements/Mystical Ninja 2 Starring Goemon (E) (M3).enh
diff --git a/Config/Enhancement/Mystical Ninja Starring Goemon (U).enh b/Config/Enhancements/Mystical Ninja Starring Goemon (U).enh
similarity index 100%
rename from Config/Enhancement/Mystical Ninja Starring Goemon (U).enh
rename to Config/Enhancements/Mystical Ninja Starring Goemon (U).enh
diff --git a/Config/Enhancement/NHL 99 (U).enh b/Config/Enhancements/NHL 99 (U).enh
similarity index 100%
rename from Config/Enhancement/NHL 99 (U).enh
rename to Config/Enhancements/NHL 99 (U).enh
diff --git a/Config/Enhancement/Nightmare Creatures (U).enh b/Config/Enhancements/Nightmare Creatures (U).enh
similarity index 100%
rename from Config/Enhancement/Nightmare Creatures (U).enh
rename to Config/Enhancements/Nightmare Creatures (U).enh
diff --git a/Config/Enhancement/Nintendo All-Star! Dairantou Smash Brothers (J).enh b/Config/Enhancements/Nintendo All-Star! Dairantou Smash Brothers (J).enh
similarity index 100%
rename from Config/Enhancement/Nintendo All-Star! Dairantou Smash Brothers (J).enh
rename to Config/Enhancements/Nintendo All-Star! Dairantou Smash Brothers (J).enh
diff --git a/Config/Enhancement/Paper Mario (U).enh b/Config/Enhancements/Paper Mario (U).enh
similarity index 100%
rename from Config/Enhancement/Paper Mario (U).enh
rename to Config/Enhancements/Paper Mario (U).enh
diff --git a/Config/Enhancement/Pilotwings 64 (E) (M3).enh b/Config/Enhancements/Pilotwings 64 (E) (M3).enh
similarity index 100%
rename from Config/Enhancement/Pilotwings 64 (E) (M3).enh
rename to Config/Enhancements/Pilotwings 64 (E) (M3).enh
diff --git a/Config/Enhancement/Pilotwings 64 (J).enh b/Config/Enhancements/Pilotwings 64 (J).enh
similarity index 100%
rename from Config/Enhancement/Pilotwings 64 (J).enh
rename to Config/Enhancements/Pilotwings 64 (J).enh
diff --git a/Config/Enhancement/Pilotwings 64 (U).enh b/Config/Enhancements/Pilotwings 64 (U).enh
similarity index 100%
rename from Config/Enhancement/Pilotwings 64 (U).enh
rename to Config/Enhancements/Pilotwings 64 (U).enh
diff --git a/Config/Enhancement/Pokemon Snap (A).enh b/Config/Enhancements/Pokemon Snap (A).enh
similarity index 100%
rename from Config/Enhancement/Pokemon Snap (A).enh
rename to Config/Enhancements/Pokemon Snap (A).enh
diff --git a/Config/Enhancement/Pokemon Snap (E).enh b/Config/Enhancements/Pokemon Snap (E).enh
similarity index 100%
rename from Config/Enhancement/Pokemon Snap (E).enh
rename to Config/Enhancements/Pokemon Snap (E).enh
diff --git a/Config/Enhancement/Pokemon Snap (F).enh b/Config/Enhancements/Pokemon Snap (F).enh
similarity index 100%
rename from Config/Enhancement/Pokemon Snap (F).enh
rename to Config/Enhancements/Pokemon Snap (F).enh
diff --git a/Config/Enhancement/Pokemon Snap (G).enh b/Config/Enhancements/Pokemon Snap (G).enh
similarity index 100%
rename from Config/Enhancement/Pokemon Snap (G).enh
rename to Config/Enhancements/Pokemon Snap (G).enh
diff --git a/Config/Enhancement/Pokemon Snap (I).enh b/Config/Enhancements/Pokemon Snap (I).enh
similarity index 100%
rename from Config/Enhancement/Pokemon Snap (I).enh
rename to Config/Enhancements/Pokemon Snap (I).enh
diff --git a/Config/Enhancement/Pokemon Snap (J) (V1.0).enh b/Config/Enhancements/Pokemon Snap (J) (V1.0).enh
similarity index 100%
rename from Config/Enhancement/Pokemon Snap (J) (V1.0).enh
rename to Config/Enhancements/Pokemon Snap (J) (V1.0).enh
diff --git a/Config/Enhancement/Pokemon Snap (J) (V1.1).enh b/Config/Enhancements/Pokemon Snap (J) (V1.1).enh
similarity index 100%
rename from Config/Enhancement/Pokemon Snap (J) (V1.1).enh
rename to Config/Enhancements/Pokemon Snap (J) (V1.1).enh
diff --git a/Config/Enhancement/Pokemon Snap (S).enh b/Config/Enhancements/Pokemon Snap (S).enh
similarity index 100%
rename from Config/Enhancement/Pokemon Snap (S).enh
rename to Config/Enhancements/Pokemon Snap (S).enh
diff --git a/Config/Enhancement/Pokemon Snap (U).enh b/Config/Enhancements/Pokemon Snap (U).enh
similarity index 100%
rename from Config/Enhancement/Pokemon Snap (U).enh
rename to Config/Enhancements/Pokemon Snap (U).enh
diff --git a/Config/Enhancement/Pokemon Snap Station (U).enh b/Config/Enhancements/Pokemon Snap Station (U).enh
similarity index 100%
rename from Config/Enhancement/Pokemon Snap Station (U).enh
rename to Config/Enhancements/Pokemon Snap Station (U).enh
diff --git a/Config/Enhancement/Pokemon Stadium (U).enh b/Config/Enhancements/Pokemon Stadium (U).enh
similarity index 100%
rename from Config/Enhancement/Pokemon Stadium (U).enh
rename to Config/Enhancements/Pokemon Stadium (U).enh
diff --git a/Config/Enhancement/Rayman 2 - The Great Escape.enh b/Config/Enhancements/Rayman 2 - The Great Escape.enh
similarity index 100%
rename from Config/Enhancement/Rayman 2 - The Great Escape.enh
rename to Config/Enhancements/Rayman 2 - The Great Escape.enh
diff --git a/Config/Enhancement/Rugrats - Scavenger Hunt (U).enh b/Config/Enhancements/Rugrats - Scavenger Hunt (U).enh
similarity index 100%
rename from Config/Enhancement/Rugrats - Scavenger Hunt (U).enh
rename to Config/Enhancements/Rugrats - Scavenger Hunt (U).enh
diff --git a/Config/Enhancement/S.C.A.R.S. (U).enh b/Config/Enhancements/S.C.A.R.S. (U).enh
similarity index 100%
rename from Config/Enhancement/S.C.A.R.S. (U).enh
rename to Config/Enhancements/S.C.A.R.S. (U).enh
diff --git a/Config/Enhancement/Sin & Punishment (J).enh b/Config/Enhancements/Sin & Punishment (J).enh
similarity index 100%
rename from Config/Enhancement/Sin & Punishment (J).enh
rename to Config/Enhancements/Sin & Punishment (J).enh
diff --git a/Config/Enhancement/Snowboard Kids (U).enh b/Config/Enhancements/Snowboard Kids (U).enh
similarity index 100%
rename from Config/Enhancement/Snowboard Kids (U).enh
rename to Config/Enhancements/Snowboard Kids (U).enh
diff --git a/Config/Enhancement/Snowboard Kids 2 (U).enh b/Config/Enhancements/Snowboard Kids 2 (U).enh
similarity index 100%
rename from Config/Enhancement/Snowboard Kids 2 (U).enh
rename to Config/Enhancements/Snowboard Kids 2 (U).enh
diff --git a/Config/Enhancement/Star Fox 64 (U) (V1.0).enh b/Config/Enhancements/Star Fox 64 (U) (V1.0).enh
similarity index 100%
rename from Config/Enhancement/Star Fox 64 (U) (V1.0).enh
rename to Config/Enhancements/Star Fox 64 (U) (V1.0).enh
diff --git a/Config/Enhancement/Star Soldier - Vanishing Earth (U).enh b/Config/Enhancements/Star Soldier - Vanishing Earth (U).enh
similarity index 100%
rename from Config/Enhancement/Star Soldier - Vanishing Earth (U).enh
rename to Config/Enhancements/Star Soldier - Vanishing Earth (U).enh
diff --git a/Config/Enhancement/Star Wars - Rogue Squadron (U).enh b/Config/Enhancements/Star Wars - Rogue Squadron (U).enh
similarity index 100%
rename from Config/Enhancement/Star Wars - Rogue Squadron (U).enh
rename to Config/Enhancements/Star Wars - Rogue Squadron (U).enh
diff --git a/Config/Enhancement/Star Wars Episode I - Racer (U).enh b/Config/Enhancements/Star Wars Episode I - Racer (U).enh
similarity index 100%
rename from Config/Enhancement/Star Wars Episode I - Racer (U).enh
rename to Config/Enhancements/Star Wars Episode I - Racer (U).enh
diff --git a/Config/Enhancement/Super Mario 64 (U).enh b/Config/Enhancements/Super Mario 64 (U).enh
similarity index 100%
rename from Config/Enhancement/Super Mario 64 (U).enh
rename to Config/Enhancements/Super Mario 64 (U).enh
diff --git a/Config/Enhancement/Super Smash Bros. (U).enh b/Config/Enhancements/Super Smash Bros. (U).enh
similarity index 100%
rename from Config/Enhancement/Super Smash Bros. (U).enh
rename to Config/Enhancements/Super Smash Bros. (U).enh
diff --git a/Config/Enhancement/Super Speed Race 64 (J).enh b/Config/Enhancements/Super Speed Race 64 (J).enh
similarity index 100%
rename from Config/Enhancement/Super Speed Race 64 (J).enh
rename to Config/Enhancements/Super Speed Race 64 (J).enh
diff --git a/Config/Enhancement/Superman (U) (M3).enh b/Config/Enhancements/Superman (U) (M3).enh
similarity index 100%
rename from Config/Enhancement/Superman (U) (M3).enh
rename to Config/Enhancements/Superman (U) (M3).enh
diff --git a/Config/Enhancement/Sydney 2000 (E).enh b/Config/Enhancements/Sydney 2000 (E).enh
similarity index 100%
rename from Config/Enhancement/Sydney 2000 (E).enh
rename to Config/Enhancements/Sydney 2000 (E).enh
diff --git a/Config/Enhancement/The Legend of Zelda - Majora's Mask (U).enh b/Config/Enhancements/The Legend of Zelda - Majora's Mask (U).enh
similarity index 100%
rename from Config/Enhancement/The Legend of Zelda - Majora's Mask (U).enh
rename to Config/Enhancements/The Legend of Zelda - Majora's Mask (U).enh
diff --git a/Config/Enhancement/The Legend of Zelda - Ocarina of Time (E) (GC).enh b/Config/Enhancements/The Legend of Zelda - Ocarina of Time (E) (GC).enh
similarity index 100%
rename from Config/Enhancement/The Legend of Zelda - Ocarina of Time (E) (GC).enh
rename to Config/Enhancements/The Legend of Zelda - Ocarina of Time (E) (GC).enh
diff --git a/Config/Enhancement/The Legend of Zelda - Ocarina of Time (E) (M3) (V1.0).enh b/Config/Enhancements/The Legend of Zelda - Ocarina of Time (E) (M3) (V1.0).enh
similarity index 100%
rename from Config/Enhancement/The Legend of Zelda - Ocarina of Time (E) (M3) (V1.0).enh
rename to Config/Enhancements/The Legend of Zelda - Ocarina of Time (E) (M3) (V1.0).enh
diff --git a/Config/Enhancement/The Legend of Zelda - Ocarina of Time (E) (M3) (V1.1).enh b/Config/Enhancements/The Legend of Zelda - Ocarina of Time (E) (M3) (V1.1).enh
similarity index 100%
rename from Config/Enhancement/The Legend of Zelda - Ocarina of Time (E) (M3) (V1.1).enh
rename to Config/Enhancements/The Legend of Zelda - Ocarina of Time (E) (M3) (V1.1).enh
diff --git a/Config/Enhancement/The Legend of Zelda - Ocarina of Time (U) (GC).enh b/Config/Enhancements/The Legend of Zelda - Ocarina of Time (U) (GC).enh
similarity index 100%
rename from Config/Enhancement/The Legend of Zelda - Ocarina of Time (U) (GC).enh
rename to Config/Enhancements/The Legend of Zelda - Ocarina of Time (U) (GC).enh
diff --git a/Config/Enhancement/The Legend of Zelda - Ocarina of Time (U) (Randomizer).enh b/Config/Enhancements/The Legend of Zelda - Ocarina of Time (U) (Randomizer).enh
similarity index 100%
rename from Config/Enhancement/The Legend of Zelda - Ocarina of Time (U) (Randomizer).enh
rename to Config/Enhancements/The Legend of Zelda - Ocarina of Time (U) (Randomizer).enh
diff --git a/Config/Enhancement/The Legend of Zelda - Ocarina of Time (U) (V1.0).enh b/Config/Enhancements/The Legend of Zelda - Ocarina of Time (U) (V1.0).enh
similarity index 100%
rename from Config/Enhancement/The Legend of Zelda - Ocarina of Time (U) (V1.0).enh
rename to Config/Enhancements/The Legend of Zelda - Ocarina of Time (U) (V1.0).enh
diff --git a/Config/Enhancement/The Legend of Zelda - Ocarina of Time (U) (V1.1).enh b/Config/Enhancements/The Legend of Zelda - Ocarina of Time (U) (V1.1).enh
similarity index 100%
rename from Config/Enhancement/The Legend of Zelda - Ocarina of Time (U) (V1.1).enh
rename to Config/Enhancements/The Legend of Zelda - Ocarina of Time (U) (V1.1).enh
diff --git a/Config/Enhancement/The Legend of Zelda - Ocarina of Time (U) (V1.2).enh b/Config/Enhancements/The Legend of Zelda - Ocarina of Time (U) (V1.2).enh
similarity index 100%
rename from Config/Enhancement/The Legend of Zelda - Ocarina of Time (U) (V1.2).enh
rename to Config/Enhancements/The Legend of Zelda - Ocarina of Time (U) (V1.2).enh
diff --git a/Config/Enhancement/The Legend of Zelda - Ocarina of Time - Master Quest (E) (GC).enh b/Config/Enhancements/The Legend of Zelda - Ocarina of Time - Master Quest (E) (GC).enh
similarity index 100%
rename from Config/Enhancement/The Legend of Zelda - Ocarina of Time - Master Quest (E) (GC).enh
rename to Config/Enhancements/The Legend of Zelda - Ocarina of Time - Master Quest (E) (GC).enh
diff --git a/Config/Enhancement/The Legend of Zelda - Ocarina of Time - Master Quest (E) [f1] (NTSC).enh b/Config/Enhancements/The Legend of Zelda - Ocarina of Time - Master Quest (E) [f1] (NTSC).enh
similarity index 100%
rename from Config/Enhancement/The Legend of Zelda - Ocarina of Time - Master Quest (E) [f1] (NTSC).enh
rename to Config/Enhancements/The Legend of Zelda - Ocarina of Time - Master Quest (E) [f1] (NTSC).enh
diff --git a/Config/Enhancement/The Legend of Zelda - Ocarina of Time - Master Quest (E) [h1C].enh b/Config/Enhancements/The Legend of Zelda - Ocarina of Time - Master Quest (E) [h1C].enh
similarity index 100%
rename from Config/Enhancement/The Legend of Zelda - Ocarina of Time - Master Quest (E) [h1C].enh
rename to Config/Enhancements/The Legend of Zelda - Ocarina of Time - Master Quest (E) [h1C].enh
diff --git a/Config/Enhancement/The Legend of Zelda - Ocarina of Time - Master Quest (U) (GC).enh b/Config/Enhancements/The Legend of Zelda - Ocarina of Time - Master Quest (U) (GC).enh
similarity index 100%
rename from Config/Enhancement/The Legend of Zelda - Ocarina of Time - Master Quest (U) (GC).enh
rename to Config/Enhancements/The Legend of Zelda - Ocarina of Time - Master Quest (U) (GC).enh
diff --git a/Config/Enhancement/Turok - Dinosaur Hunter (U) (V1.0).enh b/Config/Enhancements/Turok - Dinosaur Hunter (U) (V1.0).enh
similarity index 100%
rename from Config/Enhancement/Turok - Dinosaur Hunter (U) (V1.0).enh
rename to Config/Enhancements/Turok - Dinosaur Hunter (U) (V1.0).enh
diff --git a/Config/Enhancement/Turok 2 - Seeds of Evil (U) (V1.0).enh b/Config/Enhancements/Turok 2 - Seeds of Evil (U) (V1.0).enh
similarity index 100%
rename from Config/Enhancement/Turok 2 - Seeds of Evil (U) (V1.0).enh
rename to Config/Enhancements/Turok 2 - Seeds of Evil (U) (V1.0).enh
diff --git a/Config/Enhancement/Turok 3 - Shadow of Oblivion (U) (Beta).enh b/Config/Enhancements/Turok 3 - Shadow of Oblivion (U) (Beta).enh
similarity index 100%
rename from Config/Enhancement/Turok 3 - Shadow of Oblivion (U) (Beta).enh
rename to Config/Enhancements/Turok 3 - Shadow of Oblivion (U) (Beta).enh
diff --git a/Config/Enhancement/Turok 3 - Shadow of Oblivion (U).enh b/Config/Enhancements/Turok 3 - Shadow of Oblivion (U).enh
similarity index 100%
rename from Config/Enhancement/Turok 3 - Shadow of Oblivion (U).enh
rename to Config/Enhancements/Turok 3 - Shadow of Oblivion (U).enh
diff --git a/Config/Enhancement/Wave Race 64 (U).enh b/Config/Enhancements/Wave Race 64 (U).enh
similarity index 100%
rename from Config/Enhancement/Wave Race 64 (U).enh
rename to Config/Enhancements/Wave Race 64 (U).enh
diff --git a/Config/Enhancement/Zelda no Densetsu - Mujura no Kamen - Zelda Collection Version (J) (GC).enh b/Config/Enhancements/Zelda no Densetsu - Mujura no Kamen - Zelda Collection Version (J) (GC).enh
similarity index 100%
rename from Config/Enhancement/Zelda no Densetsu - Mujura no Kamen - Zelda Collection Version (J) (GC).enh
rename to Config/Enhancements/Zelda no Densetsu - Mujura no Kamen - Zelda Collection Version (J) (GC).enh
diff --git a/Config/Enhancement/Zelda no Densetsu - Toki no Ocarina (J) (V1.0).enh b/Config/Enhancements/Zelda no Densetsu - Toki no Ocarina (J) (V1.0).enh
similarity index 100%
rename from Config/Enhancement/Zelda no Densetsu - Toki no Ocarina (J) (V1.0).enh
rename to Config/Enhancements/Zelda no Densetsu - Toki no Ocarina (J) (V1.0).enh
diff --git a/Config/Enhancement/Zelda no Densetsu - Toki no Ocarina (J) (V1.1).enh b/Config/Enhancements/Zelda no Densetsu - Toki no Ocarina (J) (V1.1).enh
similarity index 100%
rename from Config/Enhancement/Zelda no Densetsu - Toki no Ocarina (J) (V1.1).enh
rename to Config/Enhancements/Zelda no Densetsu - Toki no Ocarina (J) (V1.1).enh
diff --git a/Config/Enhancement/Zelda no Densetsu - Toki no Ocarina (J) (V1.2).enh b/Config/Enhancements/Zelda no Densetsu - Toki no Ocarina (J) (V1.2).enh
similarity index 100%
rename from Config/Enhancement/Zelda no Densetsu - Toki no Ocarina (J) (V1.2).enh
rename to Config/Enhancements/Zelda no Densetsu - Toki no Ocarina (J) (V1.2).enh
diff --git a/Config/Enhancement/Zelda no Densetsu - Toki no Ocarina - Zelda Collection Version (J) (GC).enh b/Config/Enhancements/Zelda no Densetsu - Toki no Ocarina - Zelda Collection Version (J) (GC).enh
similarity index 100%
rename from Config/Enhancement/Zelda no Densetsu - Toki no Ocarina - Zelda Collection Version (J) (GC).enh
rename to Config/Enhancements/Zelda no Densetsu - Toki no Ocarina - Zelda Collection Version (J) (GC).enh
diff --git a/Config/Enhancement/Zelda no Densetsu - Toki no Ocarina GC (J) (GC).enh b/Config/Enhancements/Zelda no Densetsu - Toki no Ocarina GC (J) (GC).enh
similarity index 100%
rename from Config/Enhancement/Zelda no Densetsu - Toki no Ocarina GC (J) (GC).enh
rename to Config/Enhancements/Zelda no Densetsu - Toki no Ocarina GC (J) (GC).enh
diff --git a/Config/Enhancement/Zelda no Densetsu - Toki no Ocarina GC URA (J) (GC).enh b/Config/Enhancements/Zelda no Densetsu - Toki no Ocarina GC URA (J) (GC).enh
similarity index 100%
rename from Config/Enhancement/Zelda no Densetsu - Toki no Ocarina GC URA (J) (GC).enh
rename to Config/Enhancements/Zelda no Densetsu - Toki no Ocarina GC URA (J) (GC).enh
diff --git a/Config/Project64.cfg.development b/Config/Project64.cfg.development
index 1981da275..0084d7d7c 100644
--- a/Config/Project64.cfg.development
+++ b/Config/Project64.cfg.development
@@ -4,14 +4,14 @@ AudioRDB=..\..\Config\Audio.rdb
 Auto Sleep=0
 Basic Mode=0
 CheatDir=..\..\Config\Cheats\
-EnhancementDir=..\..\Config\Enhancement\
+EnhancementDir=..\..\Config\Enhancements\
 ExtInfo=..\..\Config\Project64.rdx
 Notes=..\..\Config\Project64.rdn
 RomDatabase=..\..\Config\Project64.rdb
 RomListCache=..\..\Config\Project64.cache3
 ShortCuts=..\..\Config\Project64.sc3
 UserCheatDir=..\..\Config\Cheats-User\
-UserEnhancementDir=..\..\Config\Enhancement-User\
+UserEnhancementDir=..\..\Config\Enhancements-User\
 VideoRDB=..\..\Config\Video.rdb
 
 [Debugger]
diff --git a/Source/Installer/Installer.iss b/Source/Installer/Installer.iss
index 28fde4054..c59601584 100644
--- a/Source/Installer/Installer.iss
+++ b/Source/Installer/Installer.iss
@@ -27,7 +27,7 @@ Source: "{#BaseDir}\Bin\{#Configuration}\Project64.exe"; DestDir: "{app}"; Flags
 Source: "{#BaseDir}\Config\Video.rdb"; DestDir: "{app}\Config"
 Source: "{#BaseDir}\Config\Audio.rdb"; DestDir: "{app}\Config"
 Source: "{#BaseDir}\Config\Cheats\*.cht"; DestDir: "{app}\Config\Cheats"
-Source: "{#BaseDir}\Config\Enhancement\*.enh"; DestDir: "{app}\Config\Enhancement"
+Source: "{#BaseDir}\Config\Enhancements\*.enh"; DestDir: "{app}\Config\Enhancements"
 Source: "{#BaseDir}\Config\Project64.rdb"; DestDir: "{app}\Config"
 Source: "{#BaseDir}\Config\Project64.rdx"; DestDir: "{app}\Config"
 Source: "{#BaseDir}\Lang\*.pj.Lang"; DestDir: "{app}\Lang"
diff --git a/Source/Project64-core/Settings.cpp b/Source/Project64-core/Settings.cpp
index 20dcda178..948201554 100644
--- a/Source/Project64-core/Settings.cpp
+++ b/Source/Project64-core/Settings.cpp
@@ -92,9 +92,9 @@ void CSettings::AddHowToHandleSetting(const char * BaseDirectory)
     AddHandler(SupportFile_UserCheatDir, new CSettingTypeApplicationPath("Settings", "UserCheatDir", SupportFile_UserCheatDirDefault));
     AddHandler(SupportFile_UserCheatDirDefault, new CSettingTypeRelativePath("Config\\Cheats-User", ""));
     AddHandler(SupportFile_EnhancementDir, new CSettingTypeApplicationPath("Settings", "EnhancementDir", SupportFile_EnhancementDirDefault));
-    AddHandler(SupportFile_EnhancementDirDefault, new CSettingTypeRelativePath("Config\\Enhancement", ""));
+    AddHandler(SupportFile_EnhancementDirDefault, new CSettingTypeRelativePath("Config\\Enhancements", ""));
     AddHandler(SupportFile_UserEnhancementDir, new CSettingTypeApplicationPath("Settings", "UserEnhancementDir", SupportFile_UserEnhancementDirDefault));
-    AddHandler(SupportFile_UserEnhancementDirDefault, new CSettingTypeRelativePath("Config\\Enhancement-User", ""));
+    AddHandler(SupportFile_UserEnhancementDirDefault, new CSettingTypeRelativePath("Config\\Enhancements-User", ""));
 	AddHandler(SupportFile_Notes, new CSettingTypeApplicationPath("Settings", "Notes", SupportFile_NotesDefault));
     AddHandler(SupportFile_NotesDefault, new CSettingTypeRelativePath("Config", "Project64.rdn"));
     AddHandler(SupportFile_ExtInfo, new CSettingTypeApplicationPath("Settings", "ExtInfo", SupportFile_ExtInfoDefault));
diff --git a/Source/Script/package_zip.cmd b/Source/Script/package_zip.cmd
index 629fe9eda..c5af16199 100644
--- a/Source/Script/package_zip.cmd
+++ b/Source/Script/package_zip.cmd
@@ -31,7 +31,7 @@ rd "%base_dir%\Bin\Package" /Q /S > NUL 2>&1
 md "%base_dir%\Bin\Package"
 md "%base_dir%\Bin\Package\Config"
 md "%base_dir%\Bin\Package\Config\Cheats"
-md "%base_dir%\Bin\Package\Config\Enhancement"
+md "%base_dir%\Bin\Package\Config\Enhancements"
 md "%base_dir%\Bin\Package\Lang"
 md "%base_dir%\Bin\Package\Plugin%VSPlatform%"
 md "%base_dir%\Bin\Package\Plugin%VSPlatform%\Audio"
@@ -51,7 +51,7 @@ copy "%base_dir%\Bin\Release%VSPlatform%\Project64.exe" "%base_dir%\Bin\Package"
 copy "%base_dir%\Config\Video.rdb" "%base_dir%\Bin\Package\Config"
 copy "%base_dir%\Config\Audio.rdb" "%base_dir%\Bin\Package\Config"
 copy "%base_dir%\Config\Cheats\*.cht" "%base_dir%\Bin\Package\Config\Cheats"
-copy "%base_dir%\Config\Enhancement\*.enh" "%base_dir%\Bin\Package\Config\Enhancement"
+copy "%base_dir%\Config\Enhancements\*.enh" "%base_dir%\Bin\Package\Config\Enhancements"
 copy "%base_dir%\Config\Project64.rdb" "%base_dir%\Bin\Package\Config"
 copy "%base_dir%\Config\Project64.rdx" "%base_dir%\Bin\Package\Config"
 copy "%base_dir%\Lang\*.pj.Lang" "%base_dir%\Bin\Package\Lang"