diff --git a/Scripts/Bash/Functions/Render/render_setThemes.sh b/Scripts/Bash/Functions/Render/render_setThemes.sh
index 7058525..134d6aa 100755
--- a/Scripts/Bash/Functions/Render/render_setThemes.sh
+++ b/Scripts/Bash/Functions/Render/render_setThemes.sh
@@ -80,7 +80,7 @@ function render_setThemes {
     # execution with an error message. There is an obvious typo in the
     # path provided.
     if [[ -z ${MOTIF_RENDERABLE_DIRS} ]];then
-        cli_printMessage "`gettext "Nothing to do."`" --as-error-line
+        cli_printMessage "`gettext "No related model was found for the path provided."`" --as-error-line
     fi
 
     # Rebuild list of render-able directory structures using an array
diff --git a/Scripts/Bash/Functions/Render/render_setThemesDirStructure.sh b/Scripts/Bash/Functions/Render/render_setThemesDirStructure.sh
index fed3eb9..ed98d3d 100755
--- a/Scripts/Bash/Functions/Render/render_setThemesDirStructure.sh
+++ b/Scripts/Bash/Functions/Render/render_setThemesDirStructure.sh
@@ -33,7 +33,7 @@ function render_setThemesDirStructure {
     local THEMES_SOURCE_DIR=$(cli_checkRepoDirSource "${1}")
     local THEMES_TARGET_DIR=$(cli_checkRepoDirSource "${2}")
 
-    local THEMES_FILTER=$(cli_getPathComponent ${ACTIONVAL} --repo-dir)
+    local THEMES_FILTER=${THEMES_TARGET_DIR}/$(cli_getPathComponent --motif ${ACTIONVAL})
 
     THEMES_TARGET_DIRS=$(cli_getFilesList ${THEMES_TARGET_DIR} \
         --pattern=".+/[[:digit:]]+$" --maxdepth=2 --mindepth=2 \