diff --git a/skyscraper_system.sh b/skyscraper_system.sh
index 1ac8d46..8513f97 100755
--- a/skyscraper_system.sh
+++ b/skyscraper_system.sh
@@ -44,7 +44,7 @@ readonly COLOR_BACKGROUND_RED=$(tput setab 1)
 #readonly COLOR_BACKGROUND_MAGENTA=$(tput setab 5)
 #readonly COLOR_BACKGROUND_CYAN=$(tput setab 6)
 #readonly COLOR_BACKGROUND_WHITE=$(tput setab 7)
-#readonly RESET_COLOR=$(tput sgr0)
+readonly RESET_COLOR=$(tput sgr0)
 
 #readonly SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 readonly ROM_DIR="$2"
@@ -73,58 +73,61 @@ if [ "$1" = BUILD ]; then
     sleep 1
 fi
 
-#if echo "${CONSOLE}" | grep -w "${SYSTEM_NAME}" >/dev/null; then
-#    if [ "${SCRAP}" = true ]; then
-#        for SCRAPER in ${CONSOLE_SCRAPERS}; do
-#            Skyscraper --flags videos,unattend,noresize,unpack -p "${SYSTEM_NAME}" -s "${SCRAPER}"
-#        done
-#    fi
-#    if [ "${BUILD}" = true ]; then
-#        Skyscraper --flags videos,unattend,forcefilename,relative,skipexistingvideos -a $CONSOLE_ART -p "${SYSTEM_NAME}"
-#        #Skyscraper --flags videos,unattend,relative,skipexistingvideos -a $CONSOLE_ART -p $i
-#    fi
-#    exit 0
-#fi
-#
-#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}"
-#        done
-#    fi
-#    if [ "${BUILD}" = true ]; then
-#        Skyscraper --flags videos,unattend,forcefilename,relative,skipexistingvideos,nobrackets -a $CONSOLECD_ART -p "$SYSTEM_NAME"
-#    fi
-#    exit 0
-#fi
-#
-#if echo "${ARCADE}" | grep -w "${SYSTEM_NAME}" >/dev/null; then
-#    if [ "${SCRAP}" = true ]; then
-#        for SCRAPER in ${ARCADE_SCRAPERS}; do
-#            Skyscraper --flags videos,unattend,noresize -p "${SYSTEM_NAME}" -s "${SCRAPER}"
-#        done
-#    fi
-#    if [ "${BUILD}" = true ]; then
-#        Skyscraper --flags videos,unattend,relative,skipexistingvideos,nobrackets -a $ARCADE_ART -p "${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
-#        for SCRAPER in $CONSOLE_SCRAPERS; do
-#            Skyscraper --flags videos,unattend,noresize -p "${SYSTEM_NAME}" -s "${SCRAPER}"
-#        done
-#    fi
-#    if [ "${BUILD}" = true ]; then
-#        Skyscraper --flags videos,unattend,forcefilename,relative,skipexistingvideos,nobrackets -a $CONSOLECD_ART -p "${SYSTEM_NAME}"
-#    fi
-#
-#    mv -v "${ROM_DIR}"/pcengine "${ROM_DIR}"/pcenginecd
-#    mv -v "${ROM_DIR}"/pcengine.cart "${ROM_DIR}"/pcengine
-#    exit 0
-#fi
\ No newline at end of file
+# console
+if echo "${CONSOLE}" | grep -w "${SYSTEM_NAME}" >/dev/null; then
+    if [ "${SCRAP}" = true ]; then
+        for SCRAPER in ${CONSOLE_SCRAPERS}; do
+            Skyscraper --flags videos,unattend,noresize,unpack -p "${SYSTEM_NAME}" -s "${SCRAPER}"
+        done
+    fi
+    if [ "${BUILD}" = true ]; then
+        Skyscraper --flags videos,unattend,forcefilename,relative,skipexistingvideos -a $CONSOLE_ART -p "${SYSTEM_NAME}"
+        #Skyscraper --flags videos,unattend,relative,skipexistingvideos -a $CONSOLE_ART -p $i
+    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}"
+        done
+    fi
+    if [ "${BUILD}" = true ]; then
+        Skyscraper --flags videos,unattend,forcefilename,relative,skipexistingvideos,nobrackets -a $CONSOLECD_ART -p "$SYSTEM_NAME"
+    fi
+    exit 0
+fi
+
+# arcade
+if echo "${ARCADE}" | grep -w "${SYSTEM_NAME}" >/dev/null; then
+    if [ "${SCRAP}" = true ]; then
+        for SCRAPER in ${ARCADE_SCRAPERS}; do
+            Skyscraper --flags videos,unattend,noresize -p "${SYSTEM_NAME}" -s "${SCRAPER}"
+        done
+    fi
+    if [ "${BUILD}" = true ]; then
+        Skyscraper --flags videos,unattend,relative,skipexistingvideos,nobrackets -a $ARCADE_ART -p "${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
+        for SCRAPER in $CONSOLE_SCRAPERS; do
+            Skyscraper --flags videos,unattend,noresize -p "${SYSTEM_NAME}" -s "${SCRAPER}"
+        done
+    fi
+    if [ "${BUILD}" = true ]; then
+        Skyscraper --flags videos,unattend,forcefilename,relative,skipexistingvideos,nobrackets -a $CONSOLECD_ART -p "${SYSTEM_NAME}"
+    fi
+
+    mv -v "${ROM_DIR}"/pcengine "${ROM_DIR}"/pcenginecd
+    mv -v "${ROM_DIR}"/pcengine.cart "${ROM_DIR}"/pcengine
+    exit 0
+fi
\ No newline at end of file