diff --git a/skyscraper_system.sh b/skyscraper_system.sh
index 538cfc4..af4cb16 100755
--- a/skyscraper_system.sh
+++ b/skyscraper_system.sh
@@ -61,7 +61,7 @@ readonly BUILD_FLAGS_CONSOLE="unattend,forcefilename,relative"
 readonly BUILD_FLAGS_ARCADE="unattend,relative"
 
 readonly CONSOLE="3do 3ds amiga amstradcpc apple2 arcadia astrocde atari800 atari2600 atari5200 atari7800 atarijaguar atarilynx atarist c16 c64 c128 coco coleco daphne dragon32 dreamcast fds gameandwatch gamegear gb gba gbc gc genesis intellivision mastersystem megacd megadrive msx n64 nds nes ngp ngpc oric pc pc88 pc98 pcfx pcengine pokemini ports ps2 psp psx saturn scummvm sega32x segacd sg-1000 snes ti99 trs-80 vectrex vic20 videopac virtualboy wii wonderswan wonderswancolor x68000 x1 zmachine zx81 zxspectrum"
-readonly ARCADE="fba neogeo mame-advmame mame-mame4all"
+readonly ARCADE="arcade fba neogeo mame-advmame mame-mame4all"
 
 SCRAP=true
 BUILD=true
@@ -105,25 +105,29 @@ if echo "${ARCADE}" | grep -w "${SYSTEM_NAME}" >/dev/null; then
 fi
 
 ## pcenginecd folder
-if test -d "${ROM_DIR}"/pcenginecd; then
-    if [ "$SCRAP" = true ]; then
-        for SCRAPER in $CONSOLE_SCRAPERS; do
-            Skyscraper --flags videos,unattend,noresize,unpack -p pcengine -s "$SCRAPER" -i "${ROM_DIR}"/pcenginecd
-        done
-    fi
-    if [ "$BUILD" = true ]; then
-        Skyscraper --flags "${BUILD_FLAGS_CONSOLE}" -a $CONSOLE_ART -p pcengine -f "${FRONTEND}" -i "${ROM_DIR}"/pcenginecd
+if [ "${SYSTEM_NAME}" = pcenginecd ]; then
+    if test -d "${ROM_DIR}"/pcenginecd; then
+        if [ "$SCRAP" = true ]; then
+            for SCRAPER in $CONSOLE_SCRAPERS; do
+                Skyscraper --flags videos,unattend,noresize,unpack -p pcengine -s "$SCRAPER" -i "${ROM_DIR}"/pcenginecd
+            done
+        fi
+        if [ "$BUILD" = true ]; then
+            Skyscraper --flags "${BUILD_FLAGS_CONSOLE}" -a $CONSOLE_ART -p pcengine -f "${FRONTEND}" -i "${ROM_DIR}"/pcenginecd
+        fi
     fi
 fi
 
 ## arcade folder
-if test -d "${ROM_DIR}"/arcade; then
-    if [ "$SCRAP" = true ]; then
-        for SCRAPER in $ARCADE_SCRAPERS; do
-            Skyscraper --flags videos,unattend,noresize -p fba -s "$SCRAPER" -i "${ROM_DIR}"/arcade
-        done
+if [ "${SYSTEM_NAME}" = arcade ]; then
+    if test -d "${ROM_DIR}"/arcade; then
+        if [ "$SCRAP" = true ]; then
+            for SCRAPER in $ARCADE_SCRAPERS; do
+                Skyscraper --flags videos,unattend,noresize -p fba -s "$SCRAPER" -i "${ROM_DIR}"/arcade
+            done
+        fi
+        if [ "$BUILD" = true ]; then
+            Skyscraper --flags "${BUILD_FLAGS_ARCADE}" -a $ARCADE_ART -p mame-advmame -f "${FRONTEND}" -i "${ROM_DIR}"/arcade
+        fi
     fi
-    if [ "$BUILD" = true ]; then
-        Skyscraper --flags "${BUILD_FLAGS_ARCADE}" -a $ARCADE_ART -p mame-advmame -f "${FRONTEND}" -i "${ROM_DIR}"/arcade
-    fi
-fi
\ No newline at end of file
+fi