diff --git a/tools/ratbag-command.c b/tools/ratbag-command.c
index fe1bdba6..c6ab8471 100644
--- a/tools/ratbag-command.c
+++ b/tools/ratbag-command.c
@@ -93,62 +93,57 @@ usage(void)
 	       "Query or change a device's settings:\n"
 	       "\n"
 	       "Options:\n"
-	       "    --verbose	 		Print debugging output\n"
-	       "    --verbose=raw 		Print debugging output with protocol output.\n"
-	       "    --help 			Print this help.\n"
+	       "    --verbose                   Print debugging output\n"
+	       "    --verbose=raw               Print debugging output with protocol output.\n"
+	       "    --help                      Print this help.\n"
 	       "\n"
 	       "General Commands:\n"
-	       "  list 				List supported devices (does not take a device argument)\n"
+	       "  list                          List supported devices (does not take a device argument)\n"
 	       "\n"
 	       "Device Commands:\n"
-	       "  info				Print information about a device \n"
+	       "  info                          Print information about a device \n"
 	       "\n"
 	       "Profile Commands:\n"
-	       "  profile active get		Print the currently active profile\n"
-	       "  profile active set N		Set profile N as to the  active profile\n"
+	       "  profile active get            Print the currently active profile\n"
+	       "  profile active set N          Set profile N as to the  active profile\n"
 	       "  profile enable N              Enable profile N\n"
 	       "  profile disable N             Disable profile N\n"
-	       "  profile N {COMMAND}		Use profile N for COMMAND\n"
+	       "  profile N {COMMAND}           Use profile N for COMMAND\n"
 	       "\n"
 	       "Resolution Commands\n"
 	       "  Resolution commands work on the given profile, or on the\n"
 	       "  active profile if none is given.\n"
 	       "\n"
-	       "  resolution active get		Print the currently active resolution\n"
-	       "  resolution active set N	Set resolution N as the active resolution\n"
-	       "  resolution N {COMMAND}	Use resolution N for COMMAND\n"
+	       "  resolution active get         Print the currently active resolution\n"
+	       "  resolution active set N       Set resolution N as the active resolution\n"
+	       "  resolution N {COMMAND}        Use resolution N for COMMAND\n"
 	       "\n"
 	       "DPI Commands:\n"
 	       "  DPI commands work on the given profile and resolution, or on the\n"
 	       "  active resolution of the active profile if none are given.\n"
 	       "\n"
-	       "  dpi get			Print the dpi value\n"
-	       "  dpi set N			Set the dpi value to N\n"
-	       "  rate get			Print the report rate in Hz\n"
-	       "  rate set N			Set the report rate in N Hz\n"
+	       "  dpi get                       Print the dpi value\n"
+	       "  dpi set N                     Set the dpi value to N\n"
+	       "  rate get                      Print the report rate in Hz\n"
+	       "  rate set N                    Set the report rate in N Hz\n"
 	       "\n"
 	       "Button Commands:\n"
 	       "  Button commands work on the given profile, or on the\n"
 	       "  active profile if none is given.\n"
 	       "\n"
-	       "  button count			Print the number of buttons\n"
-	       "  button N action get		Print the button action\n"
-	       "  button N action set button B	Set the button action to button B\n"
-	       "  button N action set special S	Set the button action to special action S\n"
-	       "  button N action set macro ...	Set the button action to the given macro \n"
+	       "  button count                  Print the number of buttons\n"
+	       "  button N action get           Print the button action\n"
+	       "  button N action set button B  Set the button action to button B\n"
+	       "  button N action set special S Set the button action to special action S\n"
+	       "  button N action set macro ... Set the button action to the given macro \n"
 	       "\n"
 	       "  Macro syntax:\n"
-	       " 	A macro is a series of key events or waiting periods.\n"
-	       "	Keys must be specified in linux/input.h key names.\n"
-	       "	KEY_A			Press and release 'a'\n"
-	       "	+KEY_A			Press 'a'\n"
-	       "	-KEY_A			Release 'a'\n"
-	       "	t300			Wait 300ms\n"
-	       "\n"
-	       "Special Commands:\n"
-	       "These commands are for testing purposes and may be removed without notice\n"
-	       "\n"
-	       "  switch-etekcity		Switch the Etekcity mouse active profile\n"
+	       "        A macro is a series of key events or waiting periods.\n"
+	       "        Keys must be specified in linux/input.h key names.\n"
+	       "        KEY_A                   Press and release 'a'\n"
+	       "        +KEY_A                  Press 'a'\n"
+	       "        -KEY_A                  Release 'a'\n"
+	       "        t300                    Wait 300ms\n"
 	       "\n"
 	       "LED Commands:\n"
 	       "  LED commands work on the given profile, or on the\n"
@@ -162,6 +157,11 @@ usage(void)
 	       "             rate N                        sets LED's effect rate in Hz\n"
 	       "             brightness N                  sets LED's effect brightness\n"
 	       "\n"
+	       "Special Commands:\n"
+	       "These commands are for testing purposes and may be removed without notice\n"
+	       "\n"
+	       "  switch-etekcity               Switch the Etekcity mouse active profile\n"
+	       "\n"
 	       "Examples:\n"
 	       "  %s profile active get\n"
 	       "  %s profile 0 resolution active set 4\n"
@@ -173,10 +173,10 @@ usage(void)
 	       "  %s profile 0 led 0 set rate 20\n"
 	       "\n"
 	       "Exit codes:\n"
-	       "  0	Success\n"
-	       "  1	Unsupported feature or index out of available range\n"
-	       "  2	Commandline arguments are invalid\n"
-	       "  3	Invalid device or a command failed on the device\n"
+	       "  0     Success\n"
+	       "  1     Unsupported feature or index out of available range\n"
+	       "  2     Commandline arguments are invalid\n"
+	       "  3     Invalid device or a command failed on the device\n"
 	       "\n",
 		program_invocation_short_name,
 		program_invocation_short_name,