diff --git a/SoftLayer/CLI/command.py b/SoftLayer/CLI/command.py
index 5b44da1a6..b38f89d7c 100644
--- a/SoftLayer/CLI/command.py
+++ b/SoftLayer/CLI/command.py
@@ -19,11 +19,15 @@
 
 
 class OptionHighlighter(RegexHighlighter):
-    """Provides highlighter regex for the Command help"""
+    """Provides highlighter regex for the Command help.
+
+    Defined in SoftLayer\\utils.py console_color_themes()
+    """
     highlights = [
         r"(?P<switch>^\-\w)",  # single options like -v
         r"(?P<option>\-\-[\w\-]+)",  # long options like --verbose
         r"(?P<default_option>\[[^\]]+\])",  # anything between [], usually default options
+        r"(?P<option_choices>Choices: )",
     ]
 
 
@@ -223,6 +227,11 @@ def format_options(self, ctx, formatter):
             if help_record:
                 help_message = param.get_help_record(ctx)[-1]
 
+            # Add Click choices to help message
+            if isinstance(param.type, click.Choice):
+                choices = ", ".join(param.type.choices)
+                help_message += f" Choices: {choices}"
+
             if param.metavar:
                 options += f" {param.metavar}"
             options_table.add_row(opt1, opt2, self.highlighter(help_message))
diff --git a/SoftLayer/CLI/firewall/cancel.py b/SoftLayer/CLI/firewall/cancel.py
index 2bad5ce2a..1be9f3a0e 100644
--- a/SoftLayer/CLI/firewall/cancel.py
+++ b/SoftLayer/CLI/firewall/cancel.py
@@ -6,29 +6,27 @@
 import SoftLayer
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import exceptions
-from SoftLayer.CLI import firewall
 from SoftLayer.CLI import formatting
 
 
 @click.command(cls=SoftLayer.CLI.command.SLCommand, )
 @click.argument('identifier')
+@click.option('--firewall-type', required=True, show_default=True, default='vlan',
+              type=click.Choice(['vlan', 'server'], case_sensitive=False),
+              help='Firewall type.')
 @environment.pass_env
-def cli(env, identifier):
+def cli(env, identifier, firewall_type):
     """Cancels a firewall."""
 
     mgr = SoftLayer.FirewallManager(env.client)
-    firewall_type, firewall_id = firewall.parse_id(identifier)
 
     if not (env.skip_confirmations or
-            formatting.confirm("This action will cancel a firewall from your "
-                               "account. Continue?")):
+            formatting.confirm("This action will cancel a firewall from your account. Continue?")):
         raise exceptions.CLIAbort('Aborted.')
 
-    if firewall_type in ['vs', 'server']:
-        mgr.cancel_firewall(firewall_id, dedicated=False)
-    elif firewall_type == 'vlan':
-        mgr.cancel_firewall(firewall_id, dedicated=True)
+    if firewall_type == 'server':
+        mgr.cancel_firewall(identifier, dedicated=False)
     else:
-        raise exceptions.CLIAbort('Unknown firewall type: %s' % firewall_type)
+        mgr.cancel_firewall(identifier, dedicated=True)
 
     env.fout('Firewall with id %s is being cancelled!' % identifier)
diff --git a/SoftLayer/managers/firewall.py b/SoftLayer/managers/firewall.py
index 0c4d10bbc..d5b6136c9 100644
--- a/SoftLayer/managers/firewall.py
+++ b/SoftLayer/managers/firewall.py
@@ -157,11 +157,9 @@ def _get_fwl_billing_item(self, firewall_id, dedicated=False):
             firewall_service = self.client['Network_Component_Firewall']
         firewall = firewall_service.getObject(id=firewall_id, mask=mask)
         if firewall is None:
-            raise exceptions.SoftLayerError(
-                "Unable to find firewall %d" % firewall_id)
+            raise exceptions.SoftLayerError(f"Unable to find firewall {firewall_id}")
         if firewall.get('billingItem') is None:
-            raise exceptions.SoftLayerError(
-                "Unable to find billing item for firewall %d" % firewall_id)
+            raise exceptions.SoftLayerError(f"Unable to find billing item for firewall {firewall_id}")
 
         return firewall['billingItem']
 
diff --git a/SoftLayer/utils.py b/SoftLayer/utils.py
index df6d34387..fc0afedfd 100644
--- a/SoftLayer/utils.py
+++ b/SoftLayer/utils.py
@@ -481,6 +481,7 @@ def console_color_themes(theme):
                 "default_option": "light_coral",
                 "option_keyword": "bold dark_cyan",
                 "args_keyword": "bold green4",
+                "option_choices": "gold3",
             })
         )
     return Console(theme=Theme(
@@ -497,6 +498,7 @@ def console_color_themes(theme):
             "default_option": "light_pink1",
             "option_keyword": "bold cyan",
             "args_keyword": "bold green",
+            "option_choices": "gold3",
         })
     )