diff --git a/create_retroarch_thumbnails.sh b/create_retroarch_thumbnails.sh
index 5c07fe7..ebc3b8c 100755
--- a/create_retroarch_thumbnails.sh
+++ b/create_retroarch_thumbnails.sh
@@ -12,7 +12,7 @@ readonly USAGE="
 USAGE:
 $(basename "$0") [SYSTEM] [ROM_FOLDER] [THUMBNAILS_FOLDER]"
 
-readonly SYSTEMS="arcade atari2600 atari7800 atarilynx coleco dreamcast fds gamegear gb gba gbc mastersystem megadrive msx n64 nds nes ngp ngpc pcengine psp psx saturn sega32x segacd sg-1000 snes virtualboy wonderswan wonderswancolor"
+readonly SYSTEMS="3do 3ds amiga amstradcpc apple2 arcade arcadia astrocde atari800 atari2600 atari5200 atari7800 atarijaguar atarilynx atarist c16 c64 c128 coco coleco daphne dragon32 dreamcast fba fds gameandwatch gamegear gb gba gbc gc genesis intellivision mame-advmame mame-libretro mame-mame4all mastersystem megacd megadrive msx n64 nds neogeo nes ngp ngpc oric pc pc88 pc98 pcfx pcengine pokemini ports ps2 psp psx saturn scummvm sega32x segacd sg-1000 snes steam ti99 trs-80 vectrex vic20 videopac virtualboy wii wonderswan wonderswancolor x68000 x1 zmachine zx81 zxspectrum"
 
 # check if there are all the parameters
 if [ "$#" -ne 3 ]; then
diff --git a/create_retroarch_thumbnails_all.sh b/create_retroarch_thumbnails_all.sh
index 4230501..be2957f 100755
--- a/create_retroarch_thumbnails_all.sh
+++ b/create_retroarch_thumbnails_all.sh
@@ -25,11 +25,10 @@ if ! test -d "${ROM_FOLDER}"/"${SYSTEM}"; then
     exit 0
 fi
 
-#readonly SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 readonly ROM_FOLDER="$1"
 readonly THUMBNAILS_FOLDER="$2"
 readonly SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-readonly SYSTEMS="atari2600 atari7800 atarilynx coleco dreamcast fds gamegear gb gba gbc mastersystem megadrive msx n64 nds nes ngp ngpc pcengine psp psx saturn sega32x segacd sg-1000 snes virtualboy wonderswan wonderswancolor"
+readonly SYSTEMS="3do 3ds amiga amstradcpc apple2 arcade arcadia astrocde atari800 atari2600 atari5200 atari7800 atarijaguar atarilynx atarist c16 c64 c128 coco coleco daphne dragon32 dreamcast fba fds gameandwatch gamegear gb gba gbc gc genesis intellivision mame-advmame mame-libretro mame-mame4all mastersystem megacd megadrive msx n64 nds neogeo nes ngp ngpc oric pc pc88 pc98 pcfx pcengine pokemini ports ps2 psp psx saturn scummvm sega32x segacd sg-1000 snes steam ti99 trs-80 vectrex vic20 videopac virtualboy wii wonderswan wonderswancolor x68000 x1 zmachine zx81 zxspectrum"
 
 for SYSTEM in $SYSTEMS; do
     "${SCRIPT_DIR}"/create_retroarch_thumbnails.sh "${SYSTEM}" "${ROM_FOLDER}" "${THUMBNAILS_FOLDER}"
diff --git a/skyscraper.sh b/skyscraper.sh
index e9f4472..cf47e32 100755
--- a/skyscraper.sh
+++ b/skyscraper.sh
@@ -51,7 +51,6 @@ readonly FRONTEND="$2"
 readonly ROM_DIR="$3"
 
 readonly CONSOLE_ART=artwork.xml.retroarch
-readonly CONSOLECD_ART=artwork.xml.retroarch
 readonly ARCADE_ART=artwork.xml.retroarch
 
 readonly CONSOLE_SCRAPERS="screenscraper mobygames thegamesdb"
@@ -87,7 +86,7 @@ fi
 #ALL_SYSTEMS="3do 3ds amiga amstradcpc apple2 arcade arcadia astrocde atari800 atari2600 atari5200 atari7800 atarijaguar atarilynx atarist c16 c64 c128 coco coleco daphne dragon32 dreamcast fba fds gameandwatch gamegear gb gba gbc gc genesis intellivision mame-advmame mame-libretro mame-mame4all mastersystem megacd megadrive msx n64 nds neogeo nes ngp ngpc oric pc pc88 pc98 pcfx pcengine pokemini ports ps2 psp psx saturn scummvm sega32x segacd sg-1000 snes steam ti99 trs-80 vectrex vic20 videopac virtualboy wii wonderswan wonderswancolor x68000 x1 zmachine zx81 zxspectrum"
 
 ## console systems
-CONSOLE="atari2600 atari7800 atarilynx coleco dreamcast fds gamegear gb gba gbc mastersystem megadrive msx n64 nds nes ngp ngpc pcengine psp psx saturn sega32x segacd snes virtualboy wonderswan wonderswancolor"
+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"
 for SYSTEM in $CONSOLE; do
     if test -d "${ROM_DIR}"/"${SYSTEM}"; then
         if [ "$SCRAP" = true ]; then
@@ -124,7 +123,7 @@ if test -d "${ROM_DIR}"/pcenginecd; then
         done
     fi
     if [ "$BUILD" = true ]; then
-        Skyscraper --flags "${BUILD_FLAGS_CONSOLE}" -a $CONSOLECD_ART -p pcengine -f "${FRONTEND}" -i "${ROM_DIR}"/pcenginecd
+        Skyscraper --flags "${BUILD_FLAGS_CONSOLE}" -a $CONSOLE_ART -p pcengine -f "${FRONTEND}" -i "${ROM_DIR}"/pcenginecd
     fi
 fi
 
diff --git a/skyscraper_build_all_systems.sh b/skyscraper_build_all_systems.sh
deleted file mode 100755
index 8cd9d3e..0000000
--- a/skyscraper_build_all_systems.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-console="atari2600 atarilynx fds gamegear gb gba gbc mastersystem megadrive msx nes ngp ngpc sega32x snes wonderswan wonderswancolor"
-for i in $console; do
-	Skyscraper --videos --unattend --unpack -p $i -s screenscraper
-	Skyscraper --videos --unattend -p $i -s mobygames
-	Skyscraper --videos --unattend -p $i -s thegamesdb
-	Skyscraper --videos --unattend --forcefilename --relative -a artwork.xml.screenshot -p $i
-done
-
-consolecd="segacd psx pcengine"
-for i in $consolecd; do
-	Skyscraper --videos --unattend -p $i -s screenscraper
-	Skyscraper --videos --unattend -p $i -s mobygames
-	Skyscraper --videos --unattend -p $i -s thegamesdb
-	Skyscraper --videos --unattend --forcefilename --relative -a artwork.xml.cover -p $i
-done
-
-arcade="fba neogeo mame-advmame mame-mame4all"
-for i in $arcade; do
-	Skyscraper --videos --unattend -p $i -s screenscraper
-	Skyscraper --videos --unattend -p $i -s arcadedb
-	Skyscraper --videos --unattend --relative -a artwork.xml.screenshot -p $i
-done
diff --git a/skyscraper_retroachievements.sh b/skyscraper_retroachievements.sh
deleted file mode 100755
index 807a8be..0000000
--- a/skyscraper_retroachievements.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-console="atari2600 atarilynx gamegear gb gba gbc mastersystem megadrive nes ngp ngpc pcengine snes"
-for i in $console; do
-	Skyscraper --videos --unattend --unpack -p $i -s screenscraper
-	Skyscraper --videos --unattend -p $i -s mobygames
-	Skyscraper --videos --unattend -p $i -s thegamesdb
-	Skyscraper --videos --unattend --forcefilename --relative -a artwork.xml.screenshot -p $i
-done
-
diff --git a/skyscraper_scrap_all_systems.sh b/skyscraper_scrap_all_systems.sh
deleted file mode 100755
index be8ad26..0000000
--- a/skyscraper_scrap_all_systems.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-console="atari2600 atarilynx fds gamegear gb gba gbc mastersystem megadrive msx nes ngp ngpc pcengine sega32x snes wonderswan wonderswancolor"
-for i in $console; do
-	Skyscraper --videos --unattend --unpack -p $i -s screenscraper
-	Skyscraper --videos --unattend -p $i -s mobygames
-	Skyscraper --videos --unattend -p $i -s thegamesdb
-	#Skyscraper --videos --unattend --forcefilename --relative -a artwork.xml.screenshot -p $i
-done
-
-consolecd="segacd psx"
-for i in $consolecd; do
-	Skyscraper --videos --unattend -p $i -s screenscraper
-	Skyscraper --videos --unattend -p $i -s mobygames
-	Skyscraper --videos --unattend -p $i -s thegamesdb
-	#Skyscraper --videos --unattend --forcefilename --relative -a artwork.xml.cover -p $i
-done
-
-arcade="fba neogeo mame-advmame mame-mame4all"
-for i in $arcade; do
-	Skyscraper --videos --unattend -p $i -s screenscraper
-	Skyscraper --videos --unattend -p $i -s arcadedb
-	#Skyscraper --videos --unattend --relative -a artwork.xml.screenshot -p $i
-done
diff --git a/skyscraper_system.sh b/skyscraper_system.sh
index bd21a7f..95a2346 100755
--- a/skyscraper_system.sh
+++ b/skyscraper_system.sh
@@ -12,7 +12,7 @@ function help_message() {
     done
 }
 
-SYSTEMS="apple2 arcade atari2600 atari7800 atarilynx dreamcast coleco gamegear gb gba gbc mastersystem megadrive msx n64 nds nes ngpc pcengine psp saturn sega32x sg1000 snes vectrex virtualboy wonderswan wonderswancolor"
+SYSTEMS="3do 3ds amiga amstradcpc apple2 arcade arcadia astrocde atari800 atari2600 atari5200 atari7800 atarijaguar atarilynx atarist c16 c64 c128 coco coleco daphne dragon32 dreamcast fba fds gameandwatch gamegear gb gba gbc gc genesis intellivision mame-advmame mame-libretro mame-mame4all mastersystem megacd megadrive msx n64 nds neogeo nes ngp ngpc oric pc pc88 pc98 pcfx pcengine pokemini ports ps2 psp psx saturn scummvm sega32x segacd sg-1000 snes steam ti99 trs-80 vectrex vic20 videopac virtualboy wii wonderswan wonderswancolor x68000 x1 zmachine zx81 zxspectrum"
 
 # check if there are all the parameters
 if [ "$#" -ne 3 ]; then
@@ -49,17 +49,19 @@ readonly RESET_COLOR=$(tput sgr0)
 #readonly SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 readonly ROM_DIR="$2"
 readonly SYSTEM_NAME="$3"
-readonly FRONTEND="pegasus"
+readonly FRONTEND="emulationstation"
 
-readonly CONSOLE_ART=artwork.xml.example2
-readonly CONSOLECD_ART=artwork.xml.example2
-readonly ARCADE_ART=artwork.xml.example2
+readonly CONSOLE_ART=artwork.xml.retroarch
+readonly CONSOLECD_ART=artwork.xml.retroarch
+readonly ARCADE_ART=artwork.xml.retroarch
 
 readonly CONSOLE_SCRAPERS="screenscraper mobygames thegamesdb"
 readonly ARCADE_SCRAPERS="screenacraper arcadedb"
 
-readonly CONSOLE="atari2600 atarilynx dreamcast fds gamegear gb gba gbc mastersystem megadrive msx nds nes ngp ngpc pcengine psp saturn sega32x snes wonderswan wonderswancolor"
-readonly CONSOLECD="psx segacd"
+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"
 
 SCRAP=true
@@ -77,7 +79,7 @@ if [ "$1" = BUILD ]; then
     sleep 1
 fi
 
-# console
+## console systems
 if echo "${CONSOLE}" | grep -w "${SYSTEM_NAME}" >/dev/null; then
     if [ "${SCRAP}" = true ]; then
         for SCRAPER in ${CONSOLE_SCRAPERS}; do
@@ -85,26 +87,12 @@ if echo "${CONSOLE}" | grep -w "${SYSTEM_NAME}" >/dev/null; then
         done
     fi
     if [ "${BUILD}" = true ]; then
-        Skyscraper --flags videos,unattend,forcefilename,relative,skipexistingvideos -a $CONSOLE_ART -p "${SYSTEM_NAME}" -f "${FRONTEND}" -i "${ROM_DIR}"/"${SYSTEM_NAME}"
-        #Skyscraper --flags videos,unattend,relative,skipexistingvideos -a $CONSOLE_ART -p $i
+        Skyscraper --flags "${BUILD_FLAGS_CONSOLE}" -a $CONSOLE_ART -p "${SYSTEM_NAME}" -f "${FRONTEND}" -i "${ROM_DIR}"/"${SYSTEM_NAME}"
     fi
     exit 0
 fi
 
-# consolecd
-if echo "${CONSOLECD}" | grep -w "${SYSTEM_NAME}" >/dev/null; then
-    if [ "${SCRAP}" = true ]; then
-        for SCRAPER in ${CONSOLE_SCRAPERS}; do
-            Skyscraper --flags videos,unattend,noresize -p "${SYSTEM_NAME}" -s "${SCRAPER}" -i "${ROM_DIR}"/"${SYSTEM_NAME}"
-        done
-    fi
-    if [ "${BUILD}" = true ]; then
-        Skyscraper --flags videos,unattend,forcefilename,relative,skipexistingvideos,nobrackets -a $CONSOLECD_ART -p "$SYSTEM_NAME" -f "${FRONTEND}" -i "${ROM_DIR}"/"${SYSTEM_NAME}"
-    fi
-    exit 0
-fi
-
-# arcade
+## arcade systems
 if echo "${ARCADE}" | grep -w "${SYSTEM_NAME}" >/dev/null; then
     if [ "${SCRAP}" = true ]; then
         for SCRAPER in ${ARCADE_SCRAPERS}; do
@@ -112,26 +100,31 @@ if echo "${ARCADE}" | grep -w "${SYSTEM_NAME}" >/dev/null; then
         done
     fi
     if [ "${BUILD}" = true ]; then
-        Skyscraper --flags videos,unattend,relative,skipexistingvideos,nobrackets -a $ARCADE_ART -p "${SYSTEM_NAME}" -f "${FRONTEND}" -i "${ROM_DIR}"/"${SYSTEM_NAME}"
+        Skyscraper --flags "${BUILD_FLAGS_ARCADE}" -a $ARCADE_ART -p "${SYSTEM_NAME}" -f "${FRONTEND}" -i "${ROM_DIR}"/"${SYSTEM_NAME}"
     fi
     exit 0
 fi
 
-# pcenginecd
-if [ "$SYSTEM_NAME" = "pcenginecd" ]; then
-    mv -v "${ROM_DIR}"/pcengine "${ROM_DIR}"/pcengine.cart
-    mv -v "${ROM_DIR}"/pcenginecd "${ROM_DIR}"/pcengine
-
-    if [ "${SCRAP}" = true ]; then
+## pcenginecd folder
+if test -d "${ROM_DIR}"/pcenginecd; then
+    if [ "$SCRAP" = true ]; then
         for SCRAPER in $CONSOLE_SCRAPERS; do
-            Skyscraper --flags videos,unattend,noresize -p "${SYSTEM_NAME}" -s "${SCRAPER}" -i "${ROM_DIR}"/"${SYSTEM_NAME}"
+            Skyscraper --flags videos,unattend,noresize,unpack -p pcengine -s "$SCRAPER" -i "${ROM_DIR}"/pcenginecd
         done
     fi
-    if [ "${BUILD}" = true ]; then
-        Skyscraper --flags videos,unattend,forcefilename,relative,skipexistingvideos,nobrackets -a $CONSOLECD_ART -p "${SYSTEM_NAME}" -f "${FRONTEND}" -i "${ROM_DIR}"/"${SYSTEM_NAME}"
+    if [ "$BUILD" = true ]; then
+        Skyscraper --flags "${BUILD_FLAGS_CONSOLE}" -a $CONSOLECD_ART -p pcengine -f "${FRONTEND}" -i "${ROM_DIR}"/pcenginecd
     fi
-
-    mv -v "${ROM_DIR}"/pcengine "${ROM_DIR}"/pcenginecd
-    mv -v "${ROM_DIR}"/pcengine.cart "${ROM_DIR}"/pcengine
-    exit 0
 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
+    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