diff --git a/retroarch/create_retroarch_thumbnails.sh b/retroarch/create_retroarch_thumbnails.sh
index 9b6ffb5..ad40a54 100755
--- a/retroarch/create_retroarch_thumbnails.sh
+++ b/retroarch/create_retroarch_thumbnails.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 function help_message() {
     printf "%s\n\n" "$USAGE"
-    printf "%s" "Where [SYSTEMS] are: "
+    printf "%s" "Where [SYSTEMS] are:\n"
     for WORD in $SYSTEMS; do
         printf "%s" "$WORD "
     done
@@ -46,10 +46,10 @@ case $SYSTEM in
     readonly PLAYLIST_NAME=""
     ;;
 amiga)
-    readonly PLAYLIST_NAME=""
+    readonly PLAYLIST_NAME="Commodore - Amiga"
     ;;
 amstradcpc)
-    readonly PLAYLIST_NAME=""
+    readonly PLAYLIST_NAME="Amstrad - CPC"
     ;;
 apple2)
     readonly PLAYLIST_NAME=""
@@ -82,13 +82,13 @@ atarilynx)
     readonly PLAYLIST_NAME="Atari - Lynx"
     ;;
 atarist)
-    readonly PLAYLIST_NAME=""
+    readonly PLAYLIST_NAME="Atari - ST"
     ;;
 c16)
     readonly PLAYLIST_NAME=""
     ;;
 c64)
-    readonly PLAYLIST_NAME=""
+    readonly PLAYLIST_NAME="Commodore - 64"
     ;;
 c128)
     readonly PLAYLIST_NAME=""
@@ -106,7 +106,7 @@ dragon32)
     readonly PLAYLIST_NAME=""
     ;;
 dreamcast)
-    readonly PLAYLIST_NAME=""
+    readonly PLAYLIST_NAME="Sega - Dreamcast"
     ;;
 fba)
     readonly PLAYLIST_NAME=""
@@ -217,7 +217,7 @@ psx)
     readonly PLAYLIST_NAME="Sony - PlayStation"
     ;;
 saturn)
-    readonly PLAYLIST_NAME=""
+    readonly PLAYLIST_NAME="Sega - Saturn"
     ;;
 scummvm)
     readonly PLAYLIST_NAME=""
@@ -253,7 +253,7 @@ videopac)
     readonly PLAYLIST_NAME=""
     ;;
 virtualboy)
-    readonly PLAYLIST_NAME=""
+    readonly PLAYLIST_NAME="Nintendo - Virtualboy"
     ;;
 wii)
     readonly PLAYLIST_NAME=""
@@ -277,7 +277,7 @@ zx81)
     readonly PLAYLIST_NAME=""
     ;;
 zxspectrum)
-    readonly PLAYLIST_NAME=""
+    readonly PLAYLIST_NAME="Sinclair - ZX Spectrum"
     ;;
 
 esac
diff --git a/skyscraper.sh b/skyscraper.sh
index e4d1eb7..2e264f6 100755
--- a/skyscraper.sh
+++ b/skyscraper.sh
@@ -4,6 +4,10 @@
 USAGE="
 USAGE:
 $(basename "$0") [BUILD | SCRAP | BOTH] [FRONTEND] [PATH]"
+readonly USAGE
+
+FRONTENDS="emulationstation pegasus"
+readonly FRONTENDS
 
 function help_message() {
     echo "$USAGE"
@@ -13,7 +17,6 @@ function help_message() {
         echo -e "\t$WORD"
     done
 }
-readonly USAGE
 
 ## check if there are all the parameters
 if [ "$#" -ne 3 ]; then
@@ -22,7 +25,6 @@ if [ "$#" -ne 3 ]; then
 fi
 
 ## check if the frontend parameter is valid
-FRONTENDS="emulationstation pegasus"
 if ! echo "$FRONTENDS" | grep -w "$2" >/dev/null; then
     printf "%s\n" "You must enter a valid FRONTEND name."
     help_message
@@ -93,7 +95,7 @@ for SYSTEM in $CONSOLE; do
 done
 
 ## arcade systems
-ARCADE="fba neogeo mame-advmame mame-mame4all"
+ARCADE="fba neogeo mame-advmame mame-mame4all mame-libretro"
 for SYSTEM in $ARCADE; do
     if test -d "${ROM_DIR}"/"${SYSTEM}"; then
         if [ "$SCRAP" = true ]; then