diff --git a/template_setup.sh b/template_setup.sh
index d6e3d28..2ca8b61 100644
--- a/template_setup.sh
+++ b/template_setup.sh
@@ -23,8 +23,8 @@ echo ""
 for scriptfile in "$SCRIPTDIR"/[0-9]*.sh
 do
 
-
-  TOPLEVELSUBDIRSCRIPTTEXT=$(echo "`basename $scriptfile | cut -f 1 -d '.' | sed 's/[0-9\-]/ /g'`")
+  TOPLEVELSUBDIRNAME=$(echo "`basename $TOPLEVELSUBDIRPATH | cut -f 1 -d '.' | sed 's/[0-9]/ /g; s/[\-]/ /; s/^[[:space:]]*//'`")
+  TOPLEVELSUBDIRSCRIPTTEXT=$(echo "`basename $TOPLEVELSUBDIRNAME | cut -f 1 -d '.' | sed 's/[0-9\-]/ /g'`")
   printf "${COL_GREEN}" "$TOPLEVELSUBDIRSCRIPTTEXT"
 
   /bin/bash $scriptfile