diff --git a/scripts/nsmbw/anothersmb.sh b/scripts/nsmbw/anothersmb.sh
index 7ce91ea..d3a1f14 100644
--- a/scripts/nsmbw/anothersmb.sh
+++ b/scripts/nsmbw/anothersmb.sh
@@ -12,7 +12,7 @@ XML_SOURCE="${RIIVOLUTION_DIR}"
 XML_FILE="Riivolution/Another.xml"
 GAME_TYPE=RIIVOLUTION
 BANNER_LOCATION=${WORKDIR}/files/opening.bnr
-WBFS_MASK="SMN[PUJ]01"
+WBFS_MASK="SMN[PEJ]01"
 
 show_notes () {
 
diff --git a/scripts/nsmbw/awesomersuperluigi.sh b/scripts/nsmbw/awesomersuperluigi.sh
index 8217c35..13c3820 100644
--- a/scripts/nsmbw/awesomersuperluigi.sh
+++ b/scripts/nsmbw/awesomersuperluigi.sh
@@ -9,7 +9,7 @@ XML_SOURCE="${RIIVOLUTION_DIR}"/AwesomerSLM
 XML_FILE="${RIIVOLUTION_DIR}"/riivolution/ASLMriivo.xml
 GAME_TYPE=RIIVOLUTION
 BANNER_LOCATION=${WORKDIR}/files/opening.bnr
-WBFS_MASK="SMN[PUJ]01"
+WBFS_MASK="SMN[PEJ]01"
 
 show_notes () {
 
diff --git a/scripts/nsmbw/cannon.sh b/scripts/nsmbw/cannon.sh
index b9075a4..46056d2 100644
--- a/scripts/nsmbw/cannon.sh
+++ b/scripts/nsmbw/cannon.sh
@@ -10,7 +10,7 @@ XML_SOURCE="${RIIVOLUTION_DIR}"/Cannon/
 XML_FILE="${RIIVOLUTION_DIR}"/riivolution/CannonP.xml
 GAME_TYPE=RIIVOLUTION
 BANNER_LOCATION=${WORKDIR}/files/opening.bnr
-WBFS_MASK="SMN[PUJ]01"
+WBFS_MASK="SMN[PEJ]01"
 
 show_notes () {
 
diff --git a/scripts/nsmbw/darkumbrasmb.sh b/scripts/nsmbw/darkumbrasmb.sh
index 289c4d2..efb7602 100644
--- a/scripts/nsmbw/darkumbrasmb.sh
+++ b/scripts/nsmbw/darkumbrasmb.sh
@@ -10,7 +10,7 @@ XML_SOURCE="${RIIVOLUTION_DIR}"
 XML_FILE="${RIIVOLUTION_DIR}"/dusmbaePAL.xml
 GAME_TYPE=RIIVOLUTION
 BANNER_LOCATION=${WORKDIR}/files/opening.bnr
-WBFS_MASK="SMN[PUJ]01"
+WBFS_MASK="SMN[PEJ]01"
 
 show_notes () {
 
diff --git a/scripts/nsmbw/devilmariowinterspecial.sh b/scripts/nsmbw/devilmariowinterspecial.sh
index 5d252e3..98d1c2e 100644
--- a/scripts/nsmbw/devilmariowinterspecial.sh
+++ b/scripts/nsmbw/devilmariowinterspecial.sh
@@ -10,7 +10,7 @@ XML_SOURCE="${RIIVOLUTION_DIR}"
 XML_FILE="${RIIVOLUTION_DIR}/../riivolution/Devil SMWSP-Eng.xml"
 GAME_TYPE=RIIVOLUTION
 BANNER_LOCATION=${WORKDIR}/files/opening.bnr
-WBFS_MASK="SMN[PUJ]01"
+WBFS_MASK="SMN[PEJ]01"
 
 show_notes () {
 
diff --git a/scripts/nsmbw/epicbowserworld.sh b/scripts/nsmbw/epicbowserworld.sh
index 7383caa..bdbca74 100644
--- a/scripts/nsmbw/epicbowserworld.sh
+++ b/scripts/nsmbw/epicbowserworld.sh
@@ -10,7 +10,7 @@ XML_SOURCE="${RIIVOLUTION_DIR}"/ESBW/
 XML_FILE="${RIIVOLUTION_DIR}"/riivolution/ESBWP.xml
 GAME_TYPE=RIIVOLUTION
 BANNER_LOCATION=${WORKDIR}/files/opening.bnr
-WBFS_MASK="SMN[PUJ]01"
+WBFS_MASK="SMN[PEJ]01"
 
 show_notes () {
 
diff --git a/scripts/nsmbw/ghostlysuperghostbooswii.sh b/scripts/nsmbw/ghostlysuperghostbooswii.sh
index 6a14a27..22d6012 100644
--- a/scripts/nsmbw/ghostlysuperghostbooswii.sh
+++ b/scripts/nsmbw/ghostlysuperghostbooswii.sh
@@ -10,7 +10,7 @@ XML_SOURCE="${RIIVOLUTION_DIR}"
 XML_FILE="${RIIVOLUTION_DIR}/../riivolution/Ghostly"
 GAME_TYPE=RIIVOLUTION
 BANNER_LOCATION=${WORKDIR}/files/opening.bnr
-WBFS_MASK="SMN[PUJ]01"
+WBFS_MASK="SMN[PEJ]01"
 
 show_notes () {
 
diff --git a/scripts/nsmbw/koopacountry.sh b/scripts/nsmbw/koopacountry.sh
index 7ec0871..f87ca45 100644
--- a/scripts/nsmbw/koopacountry.sh
+++ b/scripts/nsmbw/koopacountry.sh
@@ -10,7 +10,7 @@ XML_SOURCE="${RIIVOLUTION_DIR}"
 XML_FILE="${RIIVOLUTION_DIR}"/../riivolution/KoopaP.xml
 GAME_TYPE=RIIVOLUTION
 BANNER_LOCATION=${WORKDIR}/files/opening.bnr
-WBFS_MASK="SMN[PUJ]01"
+WBFS_MASK="SMN[PEJ]01"
 
 show_notes () {
 
diff --git a/scripts/nsmbw/luigissuperyoshibros.sh b/scripts/nsmbw/luigissuperyoshibros.sh
index 24de56f..0475bf8 100644
--- a/scripts/nsmbw/luigissuperyoshibros.sh
+++ b/scripts/nsmbw/luigissuperyoshibros.sh
@@ -10,7 +10,7 @@ XML_SOURCE="${RIIVOLUTION_DIR}"
 XML_FILE="${RIIVOLUTION_DIR}"/LSYB
 GAME_TYPE=RIIVOLUTION
 BANNER_LOCATION=${WORKDIR}/files/opening.bnr
-WBFS_MASK="SMN[PUJ]01"
+WBFS_MASK="SMN[PEJ]01"
 
 show_notes () {
 
diff --git a/scripts/nsmbw/midissupermariowii.sh b/scripts/nsmbw/midissupermariowii.sh
index 59bdbff..6b9d719 100644
--- a/scripts/nsmbw/midissupermariowii.sh
+++ b/scripts/nsmbw/midissupermariowii.sh
@@ -10,7 +10,7 @@ XML_SOURCE="${RIIVOLUTION_DIR}"
 XML_FILE="${RIIVOLUTION_DIR}"/../riivolution/MSMBWIIJALA.xml
 GAME_TYPE=RIIVOLUTION
 BANNER_LOCATION=${WORKDIR}/files/opening.bnr
-WBFS_MASK="SMN[PUJ]01"
+WBFS_MASK="SMN[PEJ]01"
 
 show_notes () {
 
diff --git a/scripts/nsmbw/newerapocalypse.sh b/scripts/nsmbw/newerapocalypse.sh
index 1e7faaf..b254a30 100644
--- a/scripts/nsmbw/newerapocalypse.sh
+++ b/scripts/nsmbw/newerapocalypse.sh
@@ -10,7 +10,7 @@ XML_SOURCE="${RIIVOLUTION_DIR}"
 XML_FILE="${RIIVOLUTION_DIR}"/../riivolution/NewerApocalypse.xml
 GAME_TYPE=RIIVOLUTION
 BANNER_LOCATION=${WORKDIR}/files/opening.bnr
-WBFS_MASK="SMN[PUJ]01"
+WBFS_MASK="SMN[PEJ]01"
 
 show_notes () {
 
diff --git a/scripts/nsmbw/newerfallingleaf.sh b/scripts/nsmbw/newerfallingleaf.sh
index 2f2ee43..80ac427 100644
--- a/scripts/nsmbw/newerfallingleaf.sh
+++ b/scripts/nsmbw/newerfallingleaf.sh
@@ -10,7 +10,7 @@ XML_SOURCE="${RIIVOLUTION_DIR}"
 XML_FILE="${RIIVOLUTION_DIR}"/../riivolution/NewerFALLING.xml
 GAME_TYPE=RIIVOLUTION
 BANNER_LOCATION=${WORKDIR}/files/opening.bnr
-WBFS_MASK="SMN[PUJ]01"
+WBFS_MASK="SMN[PEJ]01"
 
 show_notes () {
 
diff --git a/scripts/nsmbw/newerholiday.sh b/scripts/nsmbw/newerholiday.sh
index b270358..7f016bd 100644
--- a/scripts/nsmbw/newerholiday.sh
+++ b/scripts/nsmbw/newerholiday.sh
@@ -12,7 +12,7 @@ XML_SOURCE="${RIIVOLUTION_DIR}"
 XML_FILE="riivolution/Xmas"
 GAME_TYPE=RIIVOLUTION
 BANNER_LOCATION=${WORKDIR}/files/opening.bnr
-WBFS_MASK="SMN[PUJ]01"
+WBFS_MASK="SMN[PEJ]01"
 
 show_notes () {
 
diff --git a/scripts/nsmbw/newersmb.sh b/scripts/nsmbw/newersmb.sh
index 7ddb6dd..ada825e 100644
--- a/scripts/nsmbw/newersmb.sh
+++ b/scripts/nsmbw/newersmb.sh
@@ -12,7 +12,7 @@ XML_SOURCE="${RIIVOLUTION_DIR}"
 XML_FILE="${RIIVOLUTION_DIR}"/../riivolution/NewerSMBW.xml
 GAME_TYPE=RIIVOLUTION
 BANNER_LOCATION=${WORKDIR}/files/opening.bnr
-WBFS_MASK="SMN[PUJ]01"
+WBFS_MASK="SMN[PEJ]01"
 
 show_notes () {
 
diff --git a/scripts/nsmbw/newersummersun.sh b/scripts/nsmbw/newersummersun.sh
index 1ccc3fb..1fa40a6 100644
--- a/scripts/nsmbw/newersummersun.sh
+++ b/scripts/nsmbw/newersummersun.sh
@@ -12,7 +12,7 @@ XML_SOURCE="${RIIVOLUTION_DIR}"/SumSun/
 XML_FILE="${RIIVOLUTION_DIR}"/riivolution/SumSunP.xml
 GAME_TYPE=RIIVOLUTION
 BANNER_LOCATION=${WORKDIR}/files/opening.bnr
-WBFS_MASK="SMN[PUJ]01"
+WBFS_MASK="SMN[PEJ]01"
 
 show_notes () {
 
diff --git a/scripts/nsmbw/newsmbwotherworld.sh b/scripts/nsmbw/newsmbwotherworld.sh
index 93c0804..45c41e1 100644
--- a/scripts/nsmbw/newsmbwotherworld.sh
+++ b/scripts/nsmbw/newsmbwotherworld.sh
@@ -10,7 +10,7 @@ XML_SOURCE="${RIIVOLUTION_DIR}"
 XML_FILE="${RIIVOLUTION_DIR}/../riivolution/OtherWorld"
 GAME_TYPE=RIIVOLUTION
 BANNER_LOCATION=${WORKDIR}/files/opening.bnr
-WBFS_MASK="SMN[PUJ]01"
+WBFS_MASK="SMN[PEJ]01"
 
 show_notes () {
 
diff --git a/scripts/nsmbw/nsmbw3.sh b/scripts/nsmbw/nsmbw3.sh
index 460e64c..f56cf37 100644
--- a/scripts/nsmbw/nsmbw3.sh
+++ b/scripts/nsmbw/nsmbw3.sh
@@ -10,7 +10,7 @@ XML_SOURCE="${RIIVOLUTION_DIR}"
 XML_FILE="${RIIVOLUTION_DIR}"/../riivolution/NSMBW3.XML
 GAME_TYPE=RIIVOLUTION
 BANNER_LOCATION=${WORKDIR}/files/opening.bnr
-WBFS_MASK="SMN[PUJ]01"
+WBFS_MASK="SMN[PEJ]01"
 
 show_notes () {
 
diff --git a/scripts/nsmbw/nsmbw4.sh b/scripts/nsmbw/nsmbw4.sh
index 1ebf408..b3e68fa 100644
--- a/scripts/nsmbw/nsmbw4.sh
+++ b/scripts/nsmbw/nsmbw4.sh
@@ -8,7 +8,7 @@ RIIVOLUTION_DIR="nsmb"
 GAMENAME="New Super Mario Bros. 4"
 GAME_TYPE=RIIVOLUTION
 BANNER_LOCATION=${WORKDIR}/files/opening.bnr
-WBFS_MASK="SMN[PUJ]01"
+WBFS_MASK="SMN[PEJ]01"
 
 show_notes () {
 
diff --git a/scripts/nsmbw/remixedsupermariobroswii.sh b/scripts/nsmbw/remixedsupermariobroswii.sh
index cec7d66..10ae91a 100644
--- a/scripts/nsmbw/remixedsupermariobroswii.sh
+++ b/scripts/nsmbw/remixedsupermariobroswii.sh
@@ -10,7 +10,7 @@ XML_SOURCE="${RIIVOLUTION_DIR}"
 XML_FILE="${RIIVOLUTION_DIR}/../riivolution/NSMBtemplate.xml"
 GAME_TYPE=RIIVOLUTION
 BANNER_LOCATION=${WORKDIR}/files/opening.bnr
-WBFS_MASK="SMN[PUJ]01"
+WBFS_MASK="SMN[PEJ]01"
 
 show_notes () {
 
diff --git a/scripts/nsmbw/retroremix.sh b/scripts/nsmbw/retroremix.sh
index 16c7bff..7c1b779 100644
--- a/scripts/nsmbw/retroremix.sh
+++ b/scripts/nsmbw/retroremix.sh
@@ -8,7 +8,7 @@ RIIVOLUTION_DIR="Retro Remix"
 GAMENAME="New Super Mario Bros. Wii Retro Remix"
 GAME_TYPE=RIIVOLUTION
 BANNER_LOCATION=${WORKDIR}/files/opening.bnr
-WBFS_MASK="SMN[PUJ]01"
+WBFS_MASK="SMN[PEJ]01"
 
 show_notes () {
 
diff --git a/scripts/nsmbw/revisedsupermariobroswii.sh b/scripts/nsmbw/revisedsupermariobroswii.sh
index d29a5d9..12ec2c4 100644
--- a/scripts/nsmbw/revisedsupermariobroswii.sh
+++ b/scripts/nsmbw/revisedsupermariobroswii.sh
@@ -10,7 +10,7 @@ XML_SOURCE="${RIIVOLUTION_DIR}/"
 XML_FILE="${RIIVOLUTION_DIR}/../riivolution/RSMBW.xml"
 GAME_TYPE=RIIVOLUTION
 BANNER_LOCATION=${WORKDIR}/files/opening.bnr
-WBFS_MASK="SMN[PUJ]01"
+WBFS_MASK="SMN[PEJ]01"
 
 show_notes () {
 
diff --git a/scripts/nsmbw/rvlution.sh b/scripts/nsmbw/rvlution.sh
index 68f25c7..0db51d5 100644
--- a/scripts/nsmbw/rvlution.sh
+++ b/scripts/nsmbw/rvlution.sh
@@ -10,7 +10,7 @@ XML_SOURCE="${RIIVOLUTION_DIR}"
 XML_FILE="${RIIVOLUTION_DIR}"/../riivolution/rvlwii.xml
 GAME_TYPE=RIIVOLUTION
 BANNER_LOCATION=${WORKDIR}/files/opening.bnr
-WBFS_MASK="SMN[PUJ]01"
+WBFS_MASK="SMN[PEJ]01"
 
 show_notes () {
 
diff --git a/scripts/nsmbw/skyland.sh b/scripts/nsmbw/skyland.sh
index d8f51c4..3168b97 100644
--- a/scripts/nsmbw/skyland.sh
+++ b/scripts/nsmbw/skyland.sh
@@ -10,7 +10,7 @@ XML_SOURCE="${RIIVOLUTION_DIR}"
 XML_FILE="${RIIVOLUTION_DIR}"/../riivolution/Skyland.xml
 GAME_TYPE=RIIVOLUTION
 BANNER_LOCATION=${WORKDIR}/files/opening.bnr
-WBFS_MASK="SMN[PUJ]01"
+WBFS_MASK="SMN[PEJ]01"
 
 show_notes () {
 
diff --git a/scripts/nsmbw/summervacation.sh b/scripts/nsmbw/summervacation.sh
index e365c6f..2f26301 100644
--- a/scripts/nsmbw/summervacation.sh
+++ b/scripts/nsmbw/summervacation.sh
@@ -10,7 +10,7 @@ XML_SOURCE="${RIIVOLUTION_DIR}"/Vacation
 XML_FILE="${RIIVOLUTION_DIR}"/riivolution/Vacation
 GAME_TYPE=RIIVOLUTION
 BANNER_LOCATION=${WORKDIR}/files/opening.bnr
-WBFS_MASK="SMN[PUJ]01"
+WBFS_MASK="SMN[PEJ]01"
 
 show_notes () {
 
diff --git a/scripts/nsmbw/thelegendofyoshi.sh b/scripts/nsmbw/thelegendofyoshi.sh
index 4ff854c..01b003f 100644
--- a/scripts/nsmbw/thelegendofyoshi.sh
+++ b/scripts/nsmbw/thelegendofyoshi.sh
@@ -10,7 +10,7 @@ XML_SOURCE="${RIIVOLUTION_DIR}"
 XML_FILE="${RIIVOLUTION_DIR}/../riivolution/TLOY ("
 GAME_TYPE=RIIVOLUTION
 BANNER_LOCATION=${WORKDIR}/files/opening.bnr
-WBFS_MASK="SMN[PUJ]01"
+WBFS_MASK="SMN[PEJ]01"
 
 show_notes () {
 
diff --git a/scripts/nsmbw/wintermoon.sh b/scripts/nsmbw/wintermoon.sh
index 585c187..ef94caf 100644
--- a/scripts/nsmbw/wintermoon.sh
+++ b/scripts/nsmbw/wintermoon.sh
@@ -10,7 +10,7 @@ XML_SOURCE="${RIIVOLUTION_DIR}"
 XML_FILE="${RIIVOLUTION_DIR}"/../riivolution/WinterMoon.xml
 GAME_TYPE=RIIVOLUTION
 BANNER_LOCATION=${WORKDIR}/files/opening.bnr
-WBFS_MASK="SMN[PUJ]01"
+WBFS_MASK="SMN[PEJ]01"
 
 show_notes () {