diff --git a/Shorewall-core/lib.cli b/Shorewall-core/lib.cli
index 28e8bc564..679fcaa0a 100644
--- a/Shorewall-core/lib.cli
+++ b/Shorewall-core/lib.cli
@@ -3862,6 +3862,9 @@ run_command() {
     fi
 }
 
+ecko() {
+    [ -z "$g_lite" ] && echo "$@"
+}
 #
 # Give Usage Information
 #
@@ -3871,13 +3874,16 @@ usage() # $1 = exit status
     echo "where <command> is one of:"
     echo "   add <interface>[:<host-list>] ... <zone>"
     echo "   allow <address> ..."
+    ecko "   [ check | ck ] [ -e ] [ -r ] [ -p ] [ -r ] [ -T ] [ -i ] [ <directory> ]"
     echo "   clear"
+    ecko "   [ compile | co ] [ -e ] [ -p ] [ -t ] [ -c ] [ -d ] [ -T ] [ -i ] [ <directory name> ] [ <path name> ]"
     echo "   close <source> <dest> [ <protocol> [ <port> ] ]" 
     echo "   delete <interface>[:<host-list>] ... <zone>"
     echo "   disable <interface>"
     echo "   drop <address> ..."
     echo "   dump [ -x ] [ -l ] [ -m ]"
     echo "   enable <interface>"
+    ecko "   export [ <directory1> ] [<user>@]<system>[:<directory2>]"
     echo "   forget [ <file name> ]"
     echo "   help"
 
@@ -3887,21 +3893,46 @@ usage() # $1 = exit status
 	echo "   iprange <address>-<address>"
     fi
 
+    if [ $g_family -eq 4 ]; then
+	echo "   iptrace <iptables match expression>"
+    else
+	echo "   iptrace <ip6tables match expression>"
+    fi
+
+    ecko "   load [ -s ] [ -c ] [ -r <root user> ] [ -T ] [ -i ] [ <directory> ] <system>"
     echo "   logdrop <address> ..."
     echo "   logreject <address> ..."
     echo "   logwatch [<refresh interval>]"
+
+    if [ $g_family -eq 4 ]; then
+	echo "   noiptrace <iptables match expression>"
+    else
+	echo "   noiptrace <ip6tables match expression>"
+    fi
+
     echo "   open <source> <dest> [ <protocol> [ <port> ] ]" 
-    echo "   reject <address> ..."
     echo "   reenable <interface>"
+    ecko "   refresh [ -d ] [ -n ] [ -T ] [ -D <directory> ] [ <chain>... ]"
+    echo "   reject <address> ..."
+    ecko "   reload [ -s ] [ -c ] [ -r <root user> ] [ -T ] [ -i ] [ <directory> ] <system>"
     echo "   reset [ <chain> ... ]"
-    echo "   restart [ -n ] [ -p ] [ -f ] [ -C ] [ <directory> ]"
+
+    if [ -n "$g_lite" ]; then
+	echo "   restart [ -n ] [ -p ] [ -f ] [ -C ] [ <directory> ]"
+    else
+	echo "   restart [ -n ] [ -p ] [-d] [ -f ] [ -c ] [ -T ] [ -i ] [ -C ] [ <directory> ]"
+    fi
+
     echo "   restore [ -n ] [ -p ] [ -C ] [ <file name> ]"
     echo "   run <command> [ <parameter> ... ]"
+    ecko "   safe-restart [ -t <timeout> ] [ <directory> ]"
+    ecko "   safe-start [ -t <timeout> ] [ <directory> ]"
     echo "   save [ -C ] [ <file name> ]"
     echo "   savesets"
     echo "   [ show | list | ls ] [ -b ] [ -x ] [ -t {filter|mangle|nat} ] [ {chain [<chain> [ <chain> ... ]"
-    echo "   [ show | list | ls ] [ -f ] capabilities"
+    ecko "   [ show | list | ls ] actions"
     echo "   [ show | list | ls ] arptables"
+    echo "   [ show | list | ls ] [ -f ] capabilities"
     echo "   [ show | list | ls ] [ -x ] {bl|blacklists}"
     echo "   [ show | list | ls ] classifiers"
     echo "   [ show | list | ls ] config"
@@ -3917,6 +3948,8 @@ usage() # $1 = exit status
 
     echo "   [ show | list | ls ] [ -m ] log [<regex>]"
     echo "   [ show | list | ls ] [ -x ] mangle|nat|raw|rawpost"
+    ecko "   [ show | list | ls ] macro <macro>"
+    ecko "   [ show | list | ls ] macros"
     echo "   [ show | list | ls ] nfacct"
     echo "   [ show | list | ls ] opens"
     echo "   [ show | list | ls ] policies"
@@ -3924,9 +3957,17 @@ usage() # $1 = exit status
     echo "   [ show | list | ls ] tc [ device ]"
     echo "   [ show | list | ls ] vardir"
     echo "   [ show | list | ls ] zones"
-    echo "   start [ -f ] [ -p ] [ -C ] [ <directory> ]"
-    echo "   stop"
+
+    if [ -n "$g_lite" ]; then
+	echo "   start [ -f ] [ -p ] [ -C ] [ <directory> ]"
+    else
+	echo "   start [ -f ] [ -n ] [ -p ] [ -c ] [ -T ] [ -i ] [ -C ] [ <directory> ]"
+    fi
+
     echo "   status [ -i ]"
+    echo "   stop"
+    ecko "   try <directory> [ <timeout> ]"
+    ecko "   update [ -a ] [ -b ] [ -r ] [ -T ]  [ -D ] [ -i ] [-t] [-A] [ <directory> ]"
     echo "   version [ -a ]"
     echo
     exit $1
diff --git a/Shorewall/lib.cli-std b/Shorewall/lib.cli-std
index ac56ab075..a13f0936f 100644
--- a/Shorewall/lib.cli-std
+++ b/Shorewall/lib.cli-std
@@ -1663,102 +1663,6 @@ run_command() {
     fi
 }
 
-#
-# Give Usage Information
-#
-usage() # $1 = exit status
-{
-    echo "Usage: $(basename $0) [debug|trace] [nolock] [ -q ] [ -v[-1|{0-2}] ] [ -t ] <command>"
-    echo "where <command> is one of:"
-    echo "   add <interface>[:<host-list>] ... <zone>"
-    echo "   allow <address> ..."
-    echo "   [ check | ck ] [ -e ] [ -r ] [ -p ] [ -r ] [ -T ] [ -i ] [ <directory> ]"
-    echo "   clear"
-    echo "   close <source> <dest> [ <protocol> [ <port> ] ]" 
-    echo "   [ compile | co ] [ -e ] [ -p ] [ -t ] [ -c ] [ -d ] [ -T ] [ -i ] [ <directory name> ] [ <path name> ]"
-    echo "   delete <interface>[:<host-list>] ... <zone>"
-    echo "   disable <interface>"
-    echo "   drop <address> ..."
-    echo "   dump [ -x ] [ -l ] [ -m ]"
-    echo "   enable <interface>"
-    echo "   export [ <directory1> ] [<user>@]<system>[:<directory2>]"
-    echo "   forget [ <file name> ]"
-    echo "   help"
-
-    if [ $g_family -eq 4 ]; then
-	echo "   hits [ -t ]"
-	echo "   ipcalc { <address>/<vlsm> | <address> <netmask> }"
-	echo "   ipdecimal { <address> | <integer> }"
-	echo "   iprange <address>-<address>"
-    fi
-
-    if [ $g_family -eq 4 ]; then
-	echo "   iptrace <iptables match expression>"
-    else
-	echo "   iptrace <ip6tables match expression>"
-    fi
-
-    echo "   load [ -s ] [ -c ] [ -r <root user> ] [ -T ] [ -i ] [ <directory> ] <system>"
-    echo "   logdrop <address> ..."
-    echo "   logreject <address> ..."
-    echo "   logwatch [<refresh interval>]"
-
-    if [ $g_family -eq 4 ]; then
-	echo "   noiptrace <iptables match expression>"
-    else
-	echo "   noiptrace <ip6tables match expression>"
-    fi
-
-    echo "   open <source> <dest> [ <protocol> [ <port> ] ]" 
-    echo "   reenable <interface>"
-    echo "   refresh [ -d ] [ -n ] [ -T ] [ -D <directory> ] [ <chain>... ]"
-    echo "   reject <address> ..."
-    echo "   reload [ -s ] [ -c ] [ -r <root user> ] [ -T ] [ -i ] [ <directory> ] <system>"
-    echo "   reset [ <chain> ... ]"
-    echo "   restart [ -n ] [ -p ] [-d] [ -f ] [ -c ] [ -T ] [ -i ] [ -C ] [ <directory> ]"
-    echo "   restore [ -n ] [ -p ] [ -C ] [ <file name> ]"
-    echo "   run <command> [ <parameter> ... ]"
-    echo "   safe-restart [ -t <timeout> ] [ <directory> ]"
-    echo "   safe-start [ -t <timeout> ] [ <directory> ]"
-    echo "   save [ -C ] [ <file name> ]"
-    echo "   savesets"
-    echo "   [ show | list | ls ] [ -x ] [ -t {filter|mangle|nat|raw|rawpost} ] [ {chain [<chain> [ <chain> ... ]"
-    echo "   [ show | list | ls ] actions"
-    echo "   [ show | list | ls ] [ -x ] {bl|blacklists}"
-    echo "   [ show | list | ls ] [ -f ] capabilities"
-    echo "   [ show | list | ls ] classifiers"
-    echo "   [ show | list | ls ] config"
-    echo "   [ show | list | ls ] connections"
-    echo "   [ show | list | ls ] dynamic <zone>"
-    echo "   [ show | list | ls ] filters"
-    echo "   [ show | list | ls ] ip"
-
-    if [ $g_family -eq 4 ]; then
-	echo "   [ show | list | ls ] ipa"
-    fi
-
-    echo "   [ show | list | ls ] [ -m ] log [<regex>]"
-    echo "   [ show | list | ls ] macro <macro>"
-    echo "   [ show | list | ls ] macros"
-    echo "   [ show | list | ls ] marks"
-    echo "   [ show | list | ls ] [ -x ] mangle|nat|raw|rawpost|routing"
-    echo "   [ show | list | ls ] nfacct"
-    echo "   [ show | list | ls ] opens"
-    echo "   [ show | list | ls ] policies"
-    echo "   [ show | list | ls ] routing"
-    echo "   [ show | list | ls ] tc [ device ]"
-    echo "   [ show | list | ls ] vardir"
-    echo "   [ show | list | ls ] zones"
-    echo "   start [ -f ] [ -n ] [ -p ] [ -c ] [ -T ] [ -i ] [ -C ] [ <directory> ]"
-    echo "   status [ -i ]"
-    echo "   stop"
-    echo "   try <directory> [ <timeout> ]"
-    echo "   update [ -a ] [ -b ] [ -r ] [ -T ]  [ -D ] [ -i ] [-t] [-A] [ <directory> ]"
-    echo "   version [ -a ]"
-    echo
-    exit $1
-}
-
 compiler_command() {
 
     case $COMMAND in