diff --git a/Scripts/Functions/cli_getPathComponent.sh b/Scripts/Functions/cli_getPathComponent.sh
index 93ea206..8935bf2 100755
--- a/Scripts/Functions/cli_getPathComponent.sh
+++ b/Scripts/Functions/cli_getPathComponent.sh
@@ -101,9 +101,9 @@ function cli_getPathComponent {
     #   Example:
     #                                +------> theme name
     #                                |-->| 
-    #   trunk/Identity/Images/Themes/Flame/1
-    #   trunk/Identity/Images/Themes/Flame/2 
-    #   trunk/Identity/Images/Themes/Flame/3
+    #   trunk/Identity/Themes/Motifs/Flame/1
+    #   trunk/Identity/Themes/Motifs/Flame/2 
+    #   trunk/Identity/Themes/Motifs/Flame/3
     #                                      |
     #                                      +----> theme version
     #
@@ -145,8 +145,8 @@ function cli_getPathComponent {
     #   Example:
     #                                   +------> theme name
     #                                   |-->| 
-    #       tags/Identity/Images/Themes/Flame/1.0
-    #      trunk/Identity/Images/Themes/Flame/1 |--> minor update
+    #       tags/Identity/Themes/Motifs/Flame/1.0
+    #      trunk/Identity/Themes/Motifs/Flame/1 |--> minor update
     #                                         |----> major udpate
     #
     # Tags have the format X.Z, where X is the first number in the
@@ -163,24 +163,24 @@ function cli_getPathComponent {
     #
     #   Consider the following relations: 
     #
-    #       trunk/Identity/Images/Themes/Flame/1
-    #       tags/Identity/Images/Themes/Flame/1.0
-    #       tags/Identity/Images/Themes/Flame/1.1
-    #       tags/Identity/Images/Themes/Flame/1.2
+    #       trunk/Identity/Themes/Motifs/Flame/1
+    #       tags/Identity/Themes/Motifs/Flame/1.0
+    #       tags/Identity/Themes/Motifs/Flame/1.1
+    #       tags/Identity/Themes/Motifs/Flame/1.2
     #
-    #       trunk/Identity/Images/Themes/Flame/2
-    #       tags/Identity/Images/Themes/Flame/2.0
-    #       tags/Identity/Images/Themes/Flame/2.1
-    #       tags/Identity/Images/Themes/Flame/2.2
+    #       trunk/Identity/Themes/Motifs/Flame/2
+    #       tags/Identity/Themes/Motifs/Flame/2.0
+    #       tags/Identity/Themes/Motifs/Flame/2.1
+    #       tags/Identity/Themes/Motifs/Flame/2.2
     #
-    #       trunk/Identity/Images/Themes/TreeFlower/1
+    #       trunk/Identity/Themes/Motifs/TreeFlower/1
     #       ...
     #       and so on. 
     #
     # Tag versions are created to release fixes and improvements, Tags
     # are immutable (i.e., once tags are created, they shouldn't be
     # modified.).
-    PATTERN[2]="^.+/Identity/Images/Themes/(([A-Za-z0-9]+)/(${PATTERN[0]}))/.+$"
+    PATTERN[2]="Identity/Themes/Motifs/(([A-Za-z0-9]+)/(${PATTERN[0]}))/"
 
     # Identify which part of the release we want to output.
     case "$OPTION" in
@@ -210,15 +210,15 @@ function cli_getPathComponent {
             ;;
 
         '--theme' )
-            echo "$LOCATION" | egrep "${PATTERN[2]}" | sed -r "s!${PATTERN[2]}!\1!"
+            echo "$LOCATION" | egrep "${PATTERN[2]}" | sed -r "s!.*${PATTERN[2]}.*!\1!"
             ;;
 
         '--theme-name' )
-            echo "$LOCATION" | egrep "${PATTERN[2]}" | sed -r "s!${PATTERN[2]}!\2!"
+            echo "$LOCATION" | egrep "${PATTERN[2]}" | sed -r "s!.*${PATTERN[2]}.*!\2!"
             ;;
 
         '--theme-release' )
-            echo "$LOCATION" | egrep "${PATTERN[2]}" | sed -r "s!${PATTERN[2]}!\3!"
+            echo "$LOCATION" | egrep "${PATTERN[2]}" | sed -r "s!.*${PATTERN[2]}.*!\3!"
             ;;
 
         '--theme-pattern' )