diff --git a/bin/foamCreateBashCompletions b/bin/tools/foamCreateBashCompletions
similarity index 50%
rename from bin/foamCreateBashCompletions
rename to bin/tools/foamCreateBashCompletions
index 1c6a76cdcc347ddad6d67abd944124229938e670..ccc65a23136180fa27f27f6fe8716b6a8981fd64 100755
--- a/bin/foamCreateBashCompletions
+++ b/bin/tools/foamCreateBashCompletions
@@ -29,40 +29,56 @@
 #     Create bash completions for OpenFOAM applications
 #
 #------------------------------------------------------------------------------
-#set -x
-
 usage() {
     exec 1>&2
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
 
-Usage: $Script [OPTION] <file>
-
-* Create bash completions for OpenFOAM applications and write to <file>.
-  By default searches directories \$FOAM_APPBIN and \$FOAM_USER_APPBIN
+Usage: ${0##*/} [OPTION] <outputFile>
+options:
+  -d dir | -dir dir       Directory to process
+  -u | -user              Add \$FOAM_USER_APPBIN to the search directories
+  -h | -help              Print the usage
 
-
-Options:
-  -d | -directory   Directory to process
-  -h | -help        Print the usage
+Create bash completions for OpenFOAM applications and write to <outputFile>.
+By default searches \$FOAM_APPBIN only.
 
 USAGE
     exit 1
 }
 
+# Report error and exit
+die()
+{
+    exec 1>&2
+    echo
+    echo "Error encountered:"
+    while [ "$#" -ge 1 ]; do echo "    $1"; shift; done
+    echo
+    echo "See '${0##*/} -help' for usage"
+    echo
+    exit 1
+}
+
+#-------------------------------------------------------------------------------
+#set -x
+
 unset outFile
-searchDirs="$FOAM_APPBIN $FOAM_USER_APPBIN"
+searchDirs="$FOAM_APPBIN"
 while [ "$#" -gt 0 ]
 do
     case "$1" in
         -h | -help)
             usage
             ;;
-        -d | -directory)
+        -d | -dir)
             searchDirs="$2"
             [ -d $searchDirs ] || usage "directory not found '$searchDirs'"
             shift
             ;;
+        -u | -user)
+            searchDirs="$searchDirs $FOAM_USER_APPBIN"
+            ;;
         -*)
             usage "unknown option: '$1'"
             ;;
@@ -74,14 +90,14 @@ do
     shift
 done
 
-[ -n "$outFile" ] || usage
-\rm -f $outFile
-touch $outFile
+[ -n "$outFile" ] || usage "No output file specified"
 
 
-writeFilterFunction()
-{
-    cat<< WRITEFILTER >> $1
+# Generate header
+cat << HEADER > $outFile
+#----------------------------------*-sh-*--------------------------------------
+# Bash completions for OpenFOAM applications
+
 unset -f _of_filter_opts 2>/dev/null
 _of_filter_opts()
 {
@@ -92,72 +108,74 @@ _of_filter_opts()
     done
 }
 
-WRITEFILTER
-}
+HEADER
 
+#------------------------------------------------------------------------------
 
+#
+# Produce contents for switch for common options
+#
 commonOptions()
 {
-    local options=$@
-    local indent1="        "
-    local indent2="            "
-    for o in ${options[@]}; do
-        case $o in
-            -case)
-                echo "${indent1}-case)"
-                echo "${indent2}COMPREPLY=(\$(compgen -d -- \${cur}))"
-                echo "${indent2};;"
-                ;;
-            -srcDoc|-help)
-                echo "${indent1}-srcDoc|-help)"
-                echo "${indent2}COMPREPLY=()"
-                echo "${indent2};;"
-                ;;
-            -time)
-                echo "${indent1}-time)"
-                echo "${indent2}COMPREPLY=(\$(compgen -d -X '![-0-9]*' -- \${cur}))"
-                echo "${indent2};;"
-                ;;
-            -region)
-                echo "${indent1}-region)"
-                echo "${indent2}local regions=\$(sed 's#/##g' <<< \$([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))"
-                echo "${indent2}COMPREPLY=(\$(compgen -W \"\$regions\" -- \${cur}))"
-                echo "${indent2};;"
-                ;;
-            *Dict)
-                echo "${indent1}*Dict)"
-#                echo "${indent2}local dirs=\$(\ls -d s*/)"
-#                echo "${indent2}local files=\$(\ls -f | grep Dict)"
-#                echo "${indent2}COMPREPLY=(\$(compgen -W \"\$dirs \$files\" -- \${cur}))"
-                echo "${indent2}COMPREPLY=(\$(compgen -f -- \${cur}))"
-                echo "${indent2};;"
-                ;;
+    local indent1="    "
+    local indent2="        "
+    for opt
+    do
+        case $opt in
+        -case)
+            echo "${indent1}-case)"
+            echo "${indent2}COMPREPLY=(\$(compgen -d -- \${cur}))"
+            echo "${indent2};;"
+            ;;
+        -srcDoc|-help)
+            echo "${indent1}-srcDoc|-help)"
+            echo "${indent2}COMPREPLY=()"
+            echo "${indent2};;"
+            ;;
+        -time)
+            echo "${indent1}-time)"
+            echo "${indent2}COMPREPLY=(\$(compgen -d -X '![-0-9]*' -- \${cur}))"
+            echo "${indent2};;"
+            ;;
+        -region)
+            echo "${indent1}-region)"
+            echo "${indent2}local regions=\$(sed 's#/##g' <<< \$([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))"
+            echo "${indent2}COMPREPLY=(\$(compgen -W \"\$regions\" -- \${cur}))"
+            echo "${indent2};;"
+            ;;
+        *Dict)
+            echo "${indent1}*Dict)"
+#           echo "${indent2}local dirs=\$(\ls -d s*/)"
+#           echo "${indent2}local files=\$(\ls -f | grep Dict)"
+#           echo "${indent2}COMPREPLY=(\$(compgen -W \"\$dirs \$files\" -- \${cur}))"
+            echo "${indent2}COMPREPLY=(\$(compgen -f -- \${cur}))"
+            echo "${indent2};;"
+            ;;
         esac
     done
 }
 
 
-# Generate header
-cat << HEADER > $outFile
-#----------------------------------*-sh-*--------------------------------------
-# Bash completions for OpenFOAM applications
-
-HEADER
-
-writeFilterFunction $outFile
+#------------------------------------------------------------------------------
 
 for dir in ${searchDirs}
 do
-    echo "Processing directory $dir" 1>&2
+    if [ -d "$dir" ]
+    then
+        echo "Processing directory $dir" 1>&2
+    else
+        echo "No such directory: $dir" 1>&2
+        continue
+    fi
 
     # Sort with ignore-case
-    apps=($(\ls $dir | sort -f))
-    for appName in "${apps[@]}"
+    set -- $(\ls $dir | sort -f)
+    for appName
     do
         [ -f "$dir/$appName" -a -x "$dir/$appName" ] || continue
         appHelp=$($appName -help)
 
-        echo "Processing $appName" 1>&2
+        echo "    $appName" 1>&2
 
         # Options with args
         optsWithArgs=($(awk '/^ {0,4}-[a-z]/ && /</ {print $1}' <<< "$appHelp"))
@@ -165,7 +183,7 @@ do
         # Options without args
         opts=($(awk '/^ {0,4}-[a-z]/ && !/</ {print $1}' <<< "$appHelp"))
 
-        cat<<WRITECOMPLETION >> $outFile
+        cat << WRITECOMPLETION >> $outFile
 unset -f _of_${appName} 2>/dev/null
 _of_${appName}()
 {
@@ -177,19 +195,19 @@ _of_${appName}()
 
     case \${prev} in
 $(commonOptions ${optsWithArgs[@]})
-        *)
-            if [ "\${optsWithArgs/\${prev} /}" != "\${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=(\$(compgen -f -- \${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=\$(_of_filter_opts "\${opts}" "\${COMP_LINE}")
-                optsWithArgs=\$(_of_filter_opts "\${optsWithArgs}" "\${COMP_LINE}")
-                COMPREPLY=(\$(compgen -W "\${opts} \${optsWithArgs}" -- \${cur}))
-            fi
-            ;;
+    *)
+        if [ "\${optsWithArgs/\${prev} /}" != "\${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=(\$(compgen -f -- \${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=\$(_of_filter_opts "\${opts}" "\${COMP_LINE}")
+            optsWithArgs=\$(_of_filter_opts "\${optsWithArgs}" "\${COMP_LINE}")
+            COMPREPLY=(\$(compgen -W "\${opts} \${optsWithArgs}" -- \${cur}))
+        fi
+        ;;
     esac
 
     return 0
diff --git a/etc/bashrc b/etc/bashrc
index 43e931f6db8986b02cb72c4e4f1a6687a3adfe16..2060a58690b5a838f05c950471bd2b0606ae9916 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -169,12 +169,16 @@ export PATH LD_LIBRARY_PATH MANPATH
 # Source project setup files
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~
 _foamEtc config.sh/settings
-_foamEtc config.sh/aliases
 
-# Bash completions
-if command -v complete > /dev/null 2>&1
+if /usr/bin/tty -s 2>/dev/null  # Interactive shell
 then
-    _foamEtc config.sh/bashcompletion
+    _foamEtc config.sh/aliases
+
+    # Bash completions
+    if command -v complete > /dev/null 2>&1
+    then
+        _foamEtc config.sh/bashcompletion
+    fi
 fi
 
 
diff --git a/etc/config.sh/bashcompletion b/etc/config.sh/bashcompletion
index 464fb2f1ef7c5ea5028874b67e1b5a9b593865cc..82714979d2c50e09190a017bf69e3437fe8708af 100644
--- a/etc/config.sh/bashcompletion
+++ b/etc/config.sh/bashcompletion
@@ -21,22 +21,22 @@ _of_adiabaticFlameT()
     local optsWithArgs="-case "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -53,25 +53,25 @@ _of_adjointShapeOptimizationFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -88,22 +88,22 @@ _of_ansysToFoam()
     local optsWithArgs="-case -scale "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -120,29 +120,29 @@ _of_applyBoundaryLayer()
     local optsWithArgs="-case -decomposeParDict -region -roots -ybl "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -159,22 +159,22 @@ _of_attachMesh()
     local optsWithArgs="-case "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -191,22 +191,22 @@ _of_autoPatch()
     local optsWithArgs="-case "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -223,26 +223,26 @@ _of_blockMesh()
     local optsWithArgs="-case -dict -region "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -259,22 +259,22 @@ _of_boundaryFoam()
     local optsWithArgs="-case "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -291,22 +291,22 @@ _of_boxTurb()
     local optsWithArgs="-case "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -323,25 +323,25 @@ _of_buoyantBoussinesqPimpleFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -358,25 +358,25 @@ _of_buoyantBoussinesqSimpleFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -393,25 +393,25 @@ _of_buoyantPimpleFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -428,25 +428,25 @@ _of_buoyantSimpleFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -463,25 +463,25 @@ _of_cavitatingDyMFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -498,25 +498,25 @@ _of_cavitatingFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -533,22 +533,22 @@ _of_cfx4ToFoam()
     local optsWithArgs="-case -scale "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -565,35 +565,35 @@ _of_changeDictionary()
     local optsWithArgs="-case -decomposeParDict -dict -instance -region -roots -subDict -time "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
-            COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        *Dict)
-            COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -time)
-            COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -time)
+        COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -610,32 +610,32 @@ _of_checkMesh()
     local optsWithArgs="-case -decomposeParDict -region -roots -time -writeFields -writeSets "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
-            COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        -time)
-            COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    -time)
+        COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -652,22 +652,22 @@ _of_chemFoam()
     local optsWithArgs="-case "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -684,22 +684,22 @@ _of_chemkinToFoam()
     local optsWithArgs="-case "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -716,25 +716,25 @@ _of_chtMultiRegionFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -751,25 +751,25 @@ _of_chtMultiRegionSimpleFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -786,25 +786,25 @@ _of_coalChemistryFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -821,25 +821,25 @@ _of_coldEngineFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -856,28 +856,28 @@ _of_collapseEdges()
     local optsWithArgs="-case -collapseFaceSet -decomposeParDict -dict -roots -time "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -time)
+        COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -time)
-            COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -894,25 +894,25 @@ _of_combinePatchFaces()
     local optsWithArgs="-case -concaveAngle -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -929,25 +929,25 @@ _of_compressibleInterDyMFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -964,25 +964,25 @@ _of_compressibleInterFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -999,25 +999,25 @@ _of_compressibleMultiphaseInterFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -1034,29 +1034,29 @@ _of_createBaffles()
     local optsWithArgs="-case -decomposeParDict -dict -region -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -1073,29 +1073,29 @@ _of_createExternalCoupledPatchGeometry()
     local optsWithArgs="-case -commsDir -decomposeParDict -region -regions -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -1112,29 +1112,29 @@ _of_createPatch()
     local optsWithArgs="-case -decomposeParDict -dict -region -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -1151,25 +1151,25 @@ _of_createZeroDirectory()
     local optsWithArgs="-case -decomposeParDict -roots -templateDir "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -1186,22 +1186,22 @@ _of_datToFoam()
     local optsWithArgs="-case "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -1218,32 +1218,32 @@ _of_decomposePar()
     local optsWithArgs="-case -decomposeParDict -region -time "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
-            COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        -time)
-            COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    -time)
+        COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -1260,25 +1260,25 @@ _of_deformedGeom()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -1295,25 +1295,25 @@ _of_dnsFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -1330,25 +1330,25 @@ _of_DPMDyMFoam()
     local optsWithArgs="-case -cloudName -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -1365,25 +1365,25 @@ _of_DPMFoam()
     local optsWithArgs="-case -cloud -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -1400,25 +1400,25 @@ _of_driftFluxFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -1435,25 +1435,25 @@ _of_dsmcFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -1470,25 +1470,25 @@ _of_dsmcInitialise()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -1505,25 +1505,25 @@ _of_electrostaticFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -1540,25 +1540,25 @@ _of_engineCompRatio()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -1575,25 +1575,25 @@ _of_engineFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -1610,25 +1610,25 @@ _of_engineSwirl()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -1645,22 +1645,22 @@ _of_equilibriumCO()
     local optsWithArgs="-case "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -1677,22 +1677,22 @@ _of_equilibriumFlameT()
     local optsWithArgs="-case "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -1709,25 +1709,25 @@ _of_extrude2DMesh()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -1744,29 +1744,29 @@ _of_extrudeMesh()
     local optsWithArgs="-case -decomposeParDict -region -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -1783,29 +1783,29 @@ _of_extrudeToRegionMesh()
     local optsWithArgs="-case -decomposeParDict -dict -region -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -1822,29 +1822,29 @@ _of_faceAgglomerate()
     local optsWithArgs="-case -decomposeParDict -dict -region -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -1861,25 +1861,25 @@ _of_financialFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -1896,25 +1896,25 @@ _of_fireFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -1931,22 +1931,22 @@ _of_fireToFoam()
     local optsWithArgs="-case -scale "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -1963,25 +1963,25 @@ _of_flattenMesh()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -1998,22 +1998,22 @@ _of_fluent3DMeshToFoam()
     local optsWithArgs="-case -ignoreCellGroups -ignoreFaceGroups -scale "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -2030,22 +2030,22 @@ _of_fluentMeshToFoam()
     local optsWithArgs="-case -scale "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -2062,25 +2062,25 @@ _of_foamDataToFluent()
     local optsWithArgs="-case -time "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        -time)
-            COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    -time)
+        COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -2097,25 +2097,25 @@ _of_foamDictionary()
     local optsWithArgs="-add -case -decomposeParDict -diff -entry -roots -set "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -2132,32 +2132,32 @@ _of_foamFormatConvert()
     local optsWithArgs="-case -decomposeParDict -region -roots -time "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
-            COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        -time)
-            COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    -time)
+        COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -2174,29 +2174,29 @@ _of_foamHelp()
     local optsWithArgs="-case -decomposeParDict -region -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -2213,22 +2213,22 @@ _of_foamList()
     local optsWithArgs="-case -scalarBCs -vectorBCs "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -2245,25 +2245,25 @@ _of_foamListTimes()
     local optsWithArgs="-case -time "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        -time)
-            COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    -time)
+        COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -2280,22 +2280,22 @@ _of_foamMeshToFluent()
     local optsWithArgs="-case "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -2312,32 +2312,32 @@ _of_foamToEnsight()
     local optsWithArgs="-case -cellZone -decomposeParDict -faceZones -fields -name -patches -region -roots -time -width "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
-            COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        -time)
-            COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    -time)
+        COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -2354,25 +2354,25 @@ _of_foamToEnsightParts()
     local optsWithArgs="-case -index -name -time -width "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        -time)
-            COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    -time)
+        COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -2389,25 +2389,25 @@ _of_foamToFireMesh()
     local optsWithArgs="-case -scale -time "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        -time)
-            COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    -time)
+        COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -2424,25 +2424,25 @@ _of_foamToGMV()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -2459,25 +2459,25 @@ _of_foamToStarMesh()
     local optsWithArgs="-case -scale -time "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        -time)
-            COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    -time)
+        COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -2494,25 +2494,25 @@ _of_foamToSurface()
     local optsWithArgs="-case -scale -time "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        -time)
-            COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    -time)
+        COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -2529,28 +2529,28 @@ _of_foamToTetDualMesh()
     local optsWithArgs="-case -decomposeParDict -roots -time "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -time)
+        COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -time)
-            COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -2567,32 +2567,32 @@ _of_foamToVTK()
     local optsWithArgs="-case -cellSet -decomposeParDict -excludePatches -faceSet -fields -name -pointSet -region -roots -time "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
-            COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        -time)
-            COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    -time)
+        COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -2609,32 +2609,32 @@ _of_foamUpgradeCyclics()
     local optsWithArgs="-case -decomposeParDict -region -roots -time "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
-            COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        -time)
-            COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    -time)
+        COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -2651,25 +2651,25 @@ _of_foamyHexMesh()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -2686,22 +2686,22 @@ _of_foamyQuadMesh()
     local optsWithArgs="-case -pointsFile "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -2718,22 +2718,22 @@ _of_gambitToFoam()
     local optsWithArgs="-case -scale "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -2750,26 +2750,26 @@ _of_gmshToFoam()
     local optsWithArgs="-case -region "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -2786,25 +2786,25 @@ _of_icoFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -2821,25 +2821,25 @@ _of_icoUncoupledKinematicParcelDyMFoam()
     local optsWithArgs="-case -cloud -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -2856,25 +2856,25 @@ _of_icoUncoupledKinematicParcelFoam()
     local optsWithArgs="-case -cloud -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -2891,22 +2891,22 @@ _of_ideasUnvToFoam()
     local optsWithArgs="-case "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -2923,25 +2923,25 @@ _of_insideCells()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -2958,25 +2958,25 @@ _of_interCondensatingEvaporatingFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -2993,25 +2993,25 @@ _of_interDyMFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -3028,25 +3028,25 @@ _of_interFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -3063,25 +3063,25 @@ _of_interMixingFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -3098,25 +3098,25 @@ _of_interPhaseChangeDyMFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -3133,25 +3133,25 @@ _of_interPhaseChangeFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -3168,22 +3168,22 @@ _of_kivaToFoam()
     local optsWithArgs="-case -file -version -zHeadMin "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -3200,25 +3200,25 @@ _of_laplacianFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -3235,25 +3235,25 @@ _of_magneticFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -3270,28 +3270,28 @@ _of_mapFields()
     local optsWithArgs="-case -mapMethod -sourceDecomposeParDict -sourceRegion -sourceTime -targetDecomposeParDict -targetRegion "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *Dict)
-            COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -3308,25 +3308,25 @@ _of_mapFieldsPar()
     local optsWithArgs="-case -decomposeParDict -fields -mapMethod -patchMapMethod -roots -sourceRegion -sourceTime -targetRegion "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -3343,25 +3343,25 @@ _of_mdEquilibrationFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -3378,25 +3378,25 @@ _of_mdFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -3413,25 +3413,25 @@ _of_mdInitialise()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -3448,25 +3448,25 @@ _of_mergeMeshes()
     local optsWithArgs="-addRegion -case -decomposeParDict -masterRegion -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -3483,29 +3483,29 @@ _of_mergeOrSplitBaffles()
     local optsWithArgs="-case -decomposeParDict -dict -region -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -3522,25 +3522,25 @@ _of_mhdFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -3557,25 +3557,25 @@ _of_mirrorMesh()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -3592,22 +3592,22 @@ _of_mixtureAdiabaticFlameT()
     local optsWithArgs="-case "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -3624,25 +3624,25 @@ _of_modifyMesh()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -3659,29 +3659,29 @@ _of_moveDynamicMesh()
     local optsWithArgs="-case -decomposeParDict -region -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -3698,25 +3698,25 @@ _of_moveEngineMesh()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -3733,25 +3733,25 @@ _of_moveMesh()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -3768,25 +3768,25 @@ _of_MPPICDyMFoam()
     local optsWithArgs="-case -cloudName -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -3803,25 +3803,25 @@ _of_MPPICFoam()
     local optsWithArgs="-case -cloud -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -3838,25 +3838,25 @@ _of_MPPICInterFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -3873,22 +3873,22 @@ _of_mshToFoam()
     local optsWithArgs="-case "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -3905,25 +3905,25 @@ _of_multiphaseEulerFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -3940,25 +3940,25 @@ _of_multiphaseInterDyMFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -3975,25 +3975,25 @@ _of_multiphaseInterFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -4010,25 +4010,25 @@ _of_netgenNeutralToFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -4045,25 +4045,25 @@ _of_noise()
     local optsWithArgs="-case -decomposeParDict -dict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -4080,25 +4080,25 @@ _of_nonNewtonianIcoFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -4115,22 +4115,22 @@ _of_objToVTK()
     local optsWithArgs="-case "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -4147,35 +4147,210 @@ _of_orientFaceZone()
     local optsWithArgs="-case -decomposeParDict -region -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
 }
 complete -o nospace -F _of_orientFaceZone orientFaceZone
 
+unset -f _of_overInterDyMFoam 2>/dev/null
+_of_overInterDyMFoam()
+{
+    local cur="${COMP_WORDS[COMP_CWORD]}"
+    local prev="${COMP_WORDS[COMP_CWORD-1]}"
+
+    local opts="-noFunctionObjects -parallel -postProcess -srcDoc -doc -help "
+    local optsWithArgs="-case -decomposeParDict -roots "
+
+    case ${prev} in
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
+    esac
+
+    return 0
+}
+complete -o nospace -F _of_overInterDyMFoam overInterDyMFoam
+
+unset -f _of_overLaplacianDyMFoam 2>/dev/null
+_of_overLaplacianDyMFoam()
+{
+    local cur="${COMP_WORDS[COMP_CWORD]}"
+    local prev="${COMP_WORDS[COMP_CWORD-1]}"
+
+    local opts="-noFunctionObjects -parallel -srcDoc -doc -help "
+    local optsWithArgs="-case -decomposeParDict -roots "
+
+    case ${prev} in
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
+    esac
+
+    return 0
+}
+complete -o nospace -F _of_overLaplacianDyMFoam overLaplacianDyMFoam
+
+unset -f _of_overPimpleDyMFoam 2>/dev/null
+_of_overPimpleDyMFoam()
+{
+    local cur="${COMP_WORDS[COMP_CWORD]}"
+    local prev="${COMP_WORDS[COMP_CWORD-1]}"
+
+    local opts="-noFunctionObjects -parallel -srcDoc -doc -help "
+    local optsWithArgs="-case -decomposeParDict -roots "
+
+    case ${prev} in
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
+    esac
+
+    return 0
+}
+complete -o nospace -F _of_overPimpleDyMFoam overPimpleDyMFoam
+
+unset -f _of_overRhoPimpleDyMFoam 2>/dev/null
+_of_overRhoPimpleDyMFoam()
+{
+    local cur="${COMP_WORDS[COMP_CWORD]}"
+    local prev="${COMP_WORDS[COMP_CWORD-1]}"
+
+    local opts="-noFunctionObjects -parallel -srcDoc -doc -help "
+    local optsWithArgs="-case -decomposeParDict -roots "
+
+    case ${prev} in
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
+    esac
+
+    return 0
+}
+complete -o nospace -F _of_overRhoPimpleDyMFoam overRhoPimpleDyMFoam
+
+unset -f _of_overSimpleFoam 2>/dev/null
+_of_overSimpleFoam()
+{
+    local cur="${COMP_WORDS[COMP_CWORD]}"
+    local prev="${COMP_WORDS[COMP_CWORD-1]}"
+
+    local opts="-noFunctionObjects -parallel -postProcess -srcDoc -doc -help "
+    local optsWithArgs="-case -decomposeParDict -roots "
+
+    case ${prev} in
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
+    esac
+
+    return 0
+}
+complete -o nospace -F _of_overSimpleFoam overSimpleFoam
+
 unset -f _of_particleTracks 2>/dev/null
 _of_particleTracks()
 {
@@ -4186,32 +4361,32 @@ _of_particleTracks()
     local optsWithArgs="-case -decomposeParDict -region -roots -time "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
-            COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        -time)
-            COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    -time)
+        COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -4228,32 +4403,32 @@ _of_patchSummary()
     local optsWithArgs="-case -decomposeParDict -region -roots -time "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
-            COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        -time)
-            COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    -time)
+        COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -4270,25 +4445,25 @@ _of_pdfPlot()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -4305,25 +4480,25 @@ _of_PDRFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -4340,25 +4515,25 @@ _of_PDRMesh()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -4375,25 +4550,25 @@ _of_pimpleDyMFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -4410,25 +4585,25 @@ _of_pimpleFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -4445,25 +4620,25 @@ _of_pisoFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -4480,22 +4655,22 @@ _of_plot3dToFoam()
     local optsWithArgs="-case -scale "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -4512,22 +4687,22 @@ _of_polyDualMesh()
     local optsWithArgs="-case "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -4544,25 +4719,25 @@ _of_porousSimpleFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -4579,25 +4754,25 @@ _of_postChannel()
     local optsWithArgs="-case -time "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        -time)
-            COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    -time)
+        COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -4614,32 +4789,32 @@ _of_postProcess()
     local optsWithArgs="-case -decomposeParDict -dict -field -fields -func -funcs -region -roots -time "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
-            COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        -time)
-            COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    -time)
+        COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -4656,25 +4831,25 @@ _of_potentialFoam()
     local optsWithArgs="-case -decomposeParDict -pName -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -4691,25 +4866,25 @@ _of_potentialFreeSurfaceDyMFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -4726,25 +4901,25 @@ _of_potentialFreeSurfaceFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -4761,25 +4936,25 @@ _of_reactingFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -4796,25 +4971,25 @@ _of_reactingMultiphaseEulerFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -4831,25 +5006,25 @@ _of_reactingParcelFilmFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -4866,25 +5041,25 @@ _of_reactingParcelFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -4901,25 +5076,25 @@ _of_reactingTwoPhaseEulerFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -4936,29 +5111,29 @@ _of_reconstructPar()
     local optsWithArgs="-case -fields -lagrangianFields -region -time "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        -time)
-            COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    -time)
+        COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -4975,29 +5150,29 @@ _of_reconstructParMesh()
     local optsWithArgs="-case -mergeTol -region -time "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        -time)
-            COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    -time)
+        COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -5014,32 +5189,32 @@ _of_redistributePar()
     local optsWithArgs="-case -decomposeParDict -mergeTol -region -roots -time "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
-            COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        -time)
-            COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    -time)
+        COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -5056,29 +5231,29 @@ _of_refineHexMesh()
     local optsWithArgs="-case -decomposeParDict -region -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -5095,25 +5270,25 @@ _of_refinementLevel()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -5130,29 +5305,29 @@ _of_refineMesh()
     local optsWithArgs="-case -decomposeParDict -dict -region -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -5169,25 +5344,25 @@ _of_refineWallLayer()
     local optsWithArgs="-case -decomposeParDict -roots -useSet "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -5204,25 +5379,25 @@ _of_removeFaces()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -5239,32 +5414,32 @@ _of_renumberMesh()
     local optsWithArgs="-case -decomposeParDict -dict -region -roots -time "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
-            COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        -time)
-            COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    -time)
+        COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -5281,25 +5456,25 @@ _of_rhoCentralDyMFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -5316,25 +5491,25 @@ _of_rhoCentralFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -5351,25 +5526,25 @@ _of_rhoPimpleDyMFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -5386,25 +5561,25 @@ _of_rhoPimpleFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -5421,25 +5596,25 @@ _of_rhoPorousSimpleFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -5456,25 +5631,25 @@ _of_rhoReactingBuoyantFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -5491,25 +5666,25 @@ _of_rhoReactingFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -5526,25 +5701,25 @@ _of_rhoSimpleFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -5561,28 +5736,28 @@ _of_rotateMesh()
     local optsWithArgs="-case -decomposeParDict -roots -time "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -time)
+        COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -time)
-            COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -5599,25 +5774,25 @@ _of_scalarTransportFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -5634,22 +5809,22 @@ _of_selectCells()
     local optsWithArgs="-case "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -5666,29 +5841,29 @@ _of_setFields()
     local optsWithArgs="-case -decomposeParDict -dict -region -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -5705,32 +5880,32 @@ _of_setSet()
     local optsWithArgs="-batch -case -decomposeParDict -region -roots -time "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
-            COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        -time)
-            COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    -time)
+        COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -5747,32 +5922,32 @@ _of_setsToZones()
     local optsWithArgs="-case -decomposeParDict -region -roots -time "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
-            COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        -time)
-            COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    -time)
+        COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -5789,25 +5964,25 @@ _of_shallowWaterFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -5824,25 +5999,25 @@ _of_simpleCoalParcelFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -5859,25 +6034,25 @@ _of_simpleFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -5894,25 +6069,25 @@ _of_simpleReactingParcelFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -5929,28 +6104,28 @@ _of_singleCellMesh()
     local optsWithArgs="-case -decomposeParDict -roots -time "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -time)
+        COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -time)
-            COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -5967,22 +6142,22 @@ _of_smapToFoam()
     local optsWithArgs="-case "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -5999,29 +6174,29 @@ _of_snappyHexMesh()
     local optsWithArgs="-case -decomposeParDict -dict -outFile -patches -region -roots -surfaceSimplify "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -6038,22 +6213,22 @@ _of_snappyRefineMesh()
     local optsWithArgs="-case "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -6070,25 +6245,25 @@ _of_solidDisplacementFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -6105,25 +6280,25 @@ _of_solidEquilibriumDisplacementFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -6140,25 +6315,25 @@ _of_sonicDyMFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -6175,25 +6350,25 @@ _of_sonicFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -6210,25 +6385,25 @@ _of_sonicLiquidFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -6245,22 +6420,22 @@ _of_splitCells()
     local optsWithArgs="-case -set -tol "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -6277,22 +6452,22 @@ _of_splitMesh()
     local optsWithArgs="-case "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -6309,29 +6484,29 @@ _of_splitMeshRegions()
     local optsWithArgs="-blockedFaces -case -cellZonesFileOnly -decomposeParDict -insidePoint -region -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -6348,25 +6523,25 @@ _of_sprayDyMFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -6383,25 +6558,25 @@ _of_sprayEngineFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -6418,25 +6593,25 @@ _of_sprayFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -6453,25 +6628,25 @@ _of_SRFPimpleFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -6488,25 +6663,25 @@ _of_SRFSimpleFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -6523,22 +6698,22 @@ _of_star4ToFoam()
     local optsWithArgs="-case -scale "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -6555,29 +6730,29 @@ _of_steadyParticleTracks()
     local optsWithArgs="-case -dict -region -time "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        -time)
-            COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    -time)
+        COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -6594,29 +6769,29 @@ _of_stitchMesh()
     local optsWithArgs="-case -region -toleranceDict "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -6633,29 +6808,29 @@ _of_subsetMesh()
     local optsWithArgs="-case -decomposeParDict -patch -patches -region -resultTime -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -6672,22 +6847,22 @@ _of_surfaceAdd()
     local optsWithArgs="-case -points "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -6704,22 +6879,22 @@ _of_surfaceBooleanFeatures()
     local optsWithArgs="-case -trim "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -6736,22 +6911,22 @@ _of_surfaceCheck()
     local optsWithArgs="-case -outputThreshold "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -6768,22 +6943,22 @@ _of_surfaceClean()
     local optsWithArgs="-case "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -6800,22 +6975,22 @@ _of_surfaceCoarsen()
     local optsWithArgs="-case "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -6832,22 +7007,22 @@ _of_surfaceConvert()
     local optsWithArgs="-case -scale -writePrecision "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -6864,22 +7039,22 @@ _of_surfaceFeatureConvert()
     local optsWithArgs="-case -scale "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -6896,22 +7071,22 @@ _of_surfaceFeatureExtract()
     local optsWithArgs="-case -dict "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -6928,22 +7103,22 @@ _of_surfaceFind()
     local optsWithArgs="-case -x -y -z "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -6960,22 +7135,22 @@ _of_surfaceHookUp()
     local optsWithArgs="-case -dict "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -6992,22 +7167,22 @@ _of_surfaceInertia()
     local optsWithArgs="-case -density -referencePoint "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -7024,22 +7199,22 @@ _of_surfaceInflate()
     local optsWithArgs="-case -featureAngle -nSmooth "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -7057,19 +7232,19 @@ _of_surfaceLambdaMuSmooth()
 
     case ${prev} in
 
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -7086,22 +7261,22 @@ _of_surfaceMeshConvert()
     local optsWithArgs="-case -dict -from -scaleIn -scaleOut -to "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -7118,22 +7293,22 @@ _of_surfaceMeshConvertTesting()
     local optsWithArgs="-case -scale "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -7150,22 +7325,22 @@ _of_surfaceMeshExport()
     local optsWithArgs="-case -dict -from -name -scaleIn -scaleOut -to "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -7182,22 +7357,22 @@ _of_surfaceMeshImport()
     local optsWithArgs="-case -dict -from -name -scaleIn -scaleOut -to "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -7214,22 +7389,22 @@ _of_surfaceMeshInfo()
     local optsWithArgs="-case -scale "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -7246,32 +7421,32 @@ _of_surfaceMeshTriangulate()
     local optsWithArgs="-case -decomposeParDict -faceZones -patches -region -roots -time "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
-            COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        -time)
-            COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    -time)
+        COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -7288,22 +7463,22 @@ _of_surfaceOrient()
     local optsWithArgs="-case "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -7320,22 +7495,22 @@ _of_surfacePatch()
     local optsWithArgs="-case -dict "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -7352,22 +7527,22 @@ _of_surfacePointMerge()
     local optsWithArgs="-case "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -7384,25 +7559,25 @@ _of_surfaceRedistributePar()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -7419,22 +7594,22 @@ _of_surfaceRefineRedGreen()
     local optsWithArgs="-case "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -7451,22 +7626,22 @@ _of_surfaceSplitByPatch()
     local optsWithArgs="-case "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -7484,19 +7659,19 @@ _of_surfaceSplitByTopology()
 
     case ${prev} in
 
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -7513,22 +7688,22 @@ _of_surfaceSplitNonManifolds()
     local optsWithArgs="-case "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -7545,22 +7720,22 @@ _of_surfaceSubset()
     local optsWithArgs="-case "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -7577,22 +7752,22 @@ _of_surfaceToPatch()
     local optsWithArgs="-case -faceSet -tol "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -7609,22 +7784,22 @@ _of_surfaceTransformPoints()
     local optsWithArgs="-case -rollPitchYaw -rotate -scale -translate -yawPitchRoll "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -7641,32 +7816,32 @@ _of_temporalInterpolate()
     local optsWithArgs="-case -decomposeParDict -divisions -fields -interpolationType -region -roots -time "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
-            COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        -time)
-            COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    -time)
+        COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -7683,25 +7858,25 @@ _of_tetgenToFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -7718,25 +7893,25 @@ _of_thermoFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -7753,32 +7928,32 @@ _of_topoSet()
     local optsWithArgs="-case -decomposeParDict -dict -region -roots -time "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
-            COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        -time)
-            COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    -time)
+        COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -7795,29 +7970,29 @@ _of_transformPoints()
     local optsWithArgs="-case -decomposeParDict -region -rollPitchYaw -roots -rotate -scale -translate -yawPitchRoll "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -7834,25 +8009,25 @@ _of_twoLiquidMixingFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -7869,25 +8044,25 @@ _of_twoPhaseEulerFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -7904,25 +8079,25 @@ _of_uncoupledKinematicParcelFoam()
     local optsWithArgs="-case -cloud -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -7939,29 +8114,29 @@ _of_viewFactorsGen()
     local optsWithArgs="-case -decomposeParDict -region -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -7978,22 +8153,22 @@ _of_vtkUnstructuredToFoam()
     local optsWithArgs="-case "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -8010,25 +8185,25 @@ _of_wallFunctionTable()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -8045,32 +8220,32 @@ _of_writeMeshObj()
     local optsWithArgs="-case -cell -cellSet -decomposeParDict -face -faceSet -point -region -roots -time "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
-            COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        -time)
-            COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    -time)
+        COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -8087,25 +8262,25 @@ _of_XiDyMFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -8122,25 +8297,25 @@ _of_XiFoam()
     local optsWithArgs="-case -decomposeParDict -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
             COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
@@ -8157,29 +8332,29 @@ _of_zipUpMesh()
     local optsWithArgs="-case -decomposeParDict -region -roots "
 
     case ${prev} in
-        -case)
-            COMPREPLY=($(compgen -d -- ${cur}))
-            ;;
-        *Dict)
-            COMPREPLY=($(compgen -f -- ${cur}))
-            ;;
-        -region)
-            local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
-            COMPREPLY=($(compgen -W "$regions" -- ${cur}))
-            ;;
-        *)
-            if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]; then
-                # Unknown what type of arg follows - set to files
-                # not always correct but at least can still navigate path if
-                # needed...
-                COMPREPLY=($(compgen -f -- ${cur}))
-            else
-                # Catch-all - present all remaining options
-                opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
-                optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
-                COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
-            fi
-            ;;
+    -case)
+        COMPREPLY=($(compgen -d -- ${cur}))
+        ;;
+    *Dict)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        ;;
+    -region)
+        local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
+        COMPREPLY=($(compgen -W "$regions" -- ${cur}))
+        ;;
+    *)
+        if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
+        then
+            # Unknown type of arg follows - set to files.
+            # Not always correct but can still navigate path if needed...
+            COMPREPLY=($(compgen -f -- ${cur}))
+        else
+            # Catch-all - present all remaining options
+            opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
+            optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
+            COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
+        fi
+        ;;
     esac
 
     return 0
diff --git a/etc/cshrc b/etc/cshrc
index 688905c2cf089b89ad4490b76c8a143fb5c7bc33..3208ca0ac8efcfb40dcf48fd4ae7467ba58b4514 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -216,7 +216,11 @@ if ( $status == 0 ) setenv MANPATH $cleaned
 # Source project setup files
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~
 _foamEtc config.csh/settings
-_foamEtc config.csh/aliases
+
+if ($?prompt) then  # Interactive shell
+    _foamEtc config.csh/aliases
+endif
+
 
 # Source user setup files for optional packages
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~